From 37bfc8db65419e0dc19143424e713d62962ce96a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Date: Sat, 28 Aug 2010 17:48:26 +0000 Subject: [PATCH 01/15] po/is.po: add Icelandic translation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Translate some non-TEST into Icelandic. This is far from a complete translation, I've only translated init-db.c. Signed-off-by: Ævar Arnfjörð Bjarmason --- po/is.po | 187 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 187 insertions(+) create mode 100644 po/is.po diff --git a/po/is.po b/po/is.po new file mode 100644 index 00000000000000..1c554143ca07bd --- /dev/null +++ b/po/is.po @@ -0,0 +1,187 @@ +msgid "" +msgstr "" +"Project-Id-Version: Git\n" +"PO-Revision-Date: 2011-07-06 19:07 +0000\n" +"Language-Team: Git Mailing List \n" +"Report-Msgid-Bugs-To: Git Mailing List \n" +"Last-Translator: Ævar Arnfjörð Bjarmason \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#~ # Icelandic translations for Git. +#~ # Copyright (C) 2010 Ævar Arnfjörð Bjarmason +#~ # This file is distributed under the same license as the Git package. +#~ # Ævar Arnfjörð Bjarmason , 2010. +#~ # +#~ msgid "" +#~ msgstr "" +#~ "Project-Id-Version: Git\n" +#~ "Report-Msgid-Bugs-To: Git Mailing List \n" +"POT-Creation-Date: 2010-09-20 20:14+0000\n" +"PO-Revision-Date: 2010-09-20 15:01+0000\n" +"Last-Translator: Ævar Arnfjörð Bjarmason \n" +"Language-Team: Git Mailing List \n" +"Language: is\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: builtin/init-db.c:34 +#, c-format +msgid "Could not make %s writable by group" +msgstr "Gat ekki gert %s skrifanlega af hóp" + +#: builtin/init-db.c:61 +#, c-format +msgid "insanely long template name %s" +msgstr "brjálæðislega langt sniðsnafn %s" + +#: builtin/init-db.c:66 +#, c-format +msgid "cannot stat '%s'" +msgstr "gat ekki stat-að '%s'" + +#: builtin/init-db.c:72 +#, c-format +msgid "cannot stat template '%s'" +msgstr "gat ekki stat-að sniðið '%s'" + +#: builtin/init-db.c:79 +#, c-format +msgid "cannot opendir '%s'" +msgstr "gat ekki opnað möppuna '%s'" + +#: builtin/init-db.c:96 +#, c-format +msgid "cannot readlink '%s'" +msgstr "gat ekki lesið tengilinn '%s'" + +#: builtin/init-db.c:98 +#, c-format +msgid "insanely long symlink %s" +msgstr "brjálæðislega langur tengill %s" + +#: builtin/init-db.c:101 +#, c-format +msgid "cannot symlink '%s' '%s'" +msgstr "gat ekki búið til tengilinn '%s' '%s'" + +#: builtin/init-db.c:105 +#, c-format +msgid "cannot copy '%s' to '%s'" +msgstr "gat ekki afritað '%s' til '%s'" + +#: builtin/init-db.c:109 +#, c-format +msgid "ignoring template %s" +msgstr "hunsa sniðið %s" + +#: builtin/init-db.c:132 +#, c-format +msgid "insanely long template path %s" +msgstr "brjálæðislega löng slóð á snið %s" + +#: builtin/init-db.c:140 +#, c-format +msgid "templates not found %s" +msgstr "sniðin funndust ekki %s" + +#: builtin/init-db.c:153 +#, c-format +msgid "not copying templates of a wrong format version %d from '%s'" +msgstr "afrita ekki sniðin vegna rangar útgáfu %d frá '%s'" + +#: builtin/init-db.c:191 +#, c-format +msgid "insane git directory %s" +msgstr "brjáluð git mappa %s" + +#. 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:355 +#, c-format +msgid "%s%s Git repository in %s%s\n" +msgstr "%s%s Git lind í %s%s\n" + +#: builtin/init-db.c:356 +msgid "Reinitialized existing" +msgstr "Endurgerði" + +#: builtin/init-db.c:356 +msgid "Initialized empty" +msgstr "Bjó til tóma" + +#: builtin/init-db.c:357 +msgid " shared" +msgstr " sameiginlega" + +#: builtin/init-db.c:376 +msgid "cannot tell cwd" +msgstr "finn ekki núverandi möppu" + +#: builtin/init-db.c:450 builtin/init-db.c:457 +#, c-format +msgid "cannot mkdir %s" +msgstr "get ekki búið til möppuna %s" + +#: builtin/init-db.c:461 +#, c-format +msgid "cannot chdir to %s" +msgstr "get ekki farið inn í möppuna %s" + +#: builtin/init-db.c:483 +#, c-format +msgid "" +"%s (or --work-tree=) not allowed without specifying %s (or --git-" +"dir=)" +msgstr "" +"%s (eða --work-tree=) ekki leyfilegt ásamt %s (eða --git-dir=)" + +#: builtin/init-db.c:509 +msgid "Cannot access current working directory" +msgstr "Get ekki opnað núverandi möppu" + +#: builtin/init-db.c:512 +#, c-format +msgid "Cannot access work tree '%s'" +msgstr "Get ekki opnað tréð '%s'" + +#. TRANSLATORS: This is a test. You don't need to translate it. +#: t/t0200/test.c:5 +msgid "See 'git help COMMAND' for more information on a specific command." +msgstr "Sjá 'git help SKIPUN' til að sjá hjálp fyrir tiltekna skipun." + +#. TRANSLATORS: This is a test. You don't need to translate it. +#: t/t0200/test.c:9 +msgid "TEST: A C test string" +msgstr "TILRAUN: C tilraunastrengur" + +#. TRANSLATORS: This is a test. You don't need to translate it. +#: t/t0200/test.c:12 +#, c-format +msgid "TEST: A C test string %s" +msgstr "TILRAUN: C tilraunastrengur %s" + +#. TRANSLATORS: This is a test. You don't need to translate it. +#: t/t0200/test.sh:8 +msgid "TEST: A Shell test string" +msgstr "TILRAUN: Skeljartilraunastrengur" + +#. TRANSLATORS: This is a test. You don't need to translate it. +#: t/t0200/test.sh:11 +#, sh-format +msgid "TEST: A Shell test $variable" +msgstr "TILRAUN: Skeljartilraunastrengur með breytunni $variable" + +#. TRANSLATORS: This is a test. You don't need to translate it. +#: t/t0200/test.perl:8 +msgid "TEST: A Perl test string" +msgstr "TILRAUN: Perl tilraunastrengur" + +#. TRANSLATORS: This is a test. You don't need to translate it. +#: t/t0200/test.perl:11 +#, perl-format +msgid "TEST: A Perl test variable %s" +msgstr "TILRAUN: Perl tilraunastrengur með breytunni %s" From d110c091320d881684b44022b28606dd2166e138 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Kr=C3=BCger?= Date: Fri, 3 Sep 2010 15:32:07 +0200 Subject: [PATCH 02/15] po/de.po: add German translation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit An incomplete German translation. Signed-off-by: Jan Krüger Signed-off-by: Ævar Arnfjörð Bjarmason --- po/de.po | 2923 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 2923 insertions(+) create mode 100644 po/de.po diff --git a/po/de.po b/po/de.po new file mode 100644 index 00000000000000..f82f62f7180a97 --- /dev/null +++ b/po/de.po @@ -0,0 +1,2923 @@ +# German translations for Git. +# Copyright (C) 2010 Jan Krüger +# This file is distributed under the same license as the Git package. +# Jan Krüger , 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: Git\n" +"Report-Msgid-Bugs-To: Git Mailing List \n" +"POT-Creation-Date: 2010-09-20 15:03+0000\n" +"PO-Revision-Date: 2010-09-05 19:09 +0000\n" +"Last-Translator: Jan Krüger \n" +"Language-Team: Git Mailing List \n" +"Language: de\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: wt-status.c:56 +msgid "# Unmerged paths:" +msgstr "# Verbleibende Konflikte in Pfaden:" + +#: wt-status.c:62 wt-status.c:79 +#, c-format +msgid "# (use \"git reset %s ...\" to unstage)" +msgstr "" +"# (benutze \"git reset %s \", um die Änderungen nicht mehr " +"vorzumerken)" + +#: wt-status.c:64 wt-status.c:81 +msgid "# (use \"git rm --cached ...\" to unstage)" +msgstr "" +"# (benutze \"git rm --cached \", um die Datei nicht mehr " +"vorzumerken)" + +#: wt-status.c:65 +msgid "# (use \"git add/rm ...\" as appropriate to mark resolution)" +msgstr "" +"# (benutze \"git add/rm ...\", um den Konflikt als gelöst zu " +"markieren)" + +#: wt-status.c:73 +msgid "# Changes to be committed:" +msgstr "# Vorgemerkte Änderungen für den nächsten Commit:" + +#: wt-status.c:91 +msgid "# Changed but not updated:" +msgstr "# Geändert, aber nicht für den nächsten Commit vorgemerkt:" + +#: wt-status.c:95 +msgid "# (use \"git add ...\" to update what will be committed)" +msgstr "" +"# (benutze \"git add ...\", um den aktuellen Stand vorzumerken)" + +#: wt-status.c:97 +msgid "# (use \"git add/rm ...\" to update what will be committed)" +msgstr "" +"# (benutze entsprechend \"git add/rm ...\", um den aktuellen Stand " +"vorzumerken)" + +#: wt-status.c:98 +msgid "" +"# (use \"git checkout -- ...\" to discard changes in working " +"directory)" +msgstr "" +"# (benutze \"git checkout -- ...\", um Änderungen in der Datei zu " +"verwerfen)" + +#: wt-status.c:100 +msgid "# (commit or discard the untracked or modified content in submodules)" +msgstr "" +"# (committe oder verwerfe die unberücksichtigten Dateien oder Änderungen " +"in Submodules)" + +#: wt-status.c:109 +#, c-format +msgid "# %s files:" +msgstr "# %s Dateien:" + +#: wt-status.c:112 +#, c-format +msgid "# (use \"git %s ...\" to include in what will be committed)" +msgstr "" +"# (benutze \"git %s ...\", um zu vorgemerkten Dateien hinzuzufügen)" + +#: wt-status.c:129 +msgid "bug" +msgstr "Bug" + +#: wt-status.c:134 +msgid "both deleted:" +msgstr "beide gelöscht:" + +#: wt-status.c:135 +msgid "added by us:" +msgstr "hier hinzugefügt:" + +#: wt-status.c:136 +msgid "deleted by them:" +msgstr "dort gelöscht:" + +#: wt-status.c:137 +msgid "added by them:" +msgstr "dort hinzugefügt:" + +#: wt-status.c:138 +msgid "deleted by us:" +msgstr "hier gelöscht:" + +#: wt-status.c:139 +msgid "both added:" +msgstr "bei beiden hinzugefügt:" + +#: wt-status.c:140 +msgid "both modified:" +msgstr "bei beiden geändert:" + +#: wt-status.c:170 +msgid "new commits, " +msgstr "neue Commits, " + +#: wt-status.c:172 +msgid "modified content, " +msgstr "veränderte Dateien, " + +#: wt-status.c:174 +msgid "untracked content, " +msgstr "unberücksichtigte Dateien, " + +#: wt-status.c:188 +#, c-format +msgid "new file: %s" +msgstr "neue Datei: %s" + +#: wt-status.c:191 +#, c-format +msgid "copied: %s -> %s" +msgstr "kopiert: %s -> %s" + +#: wt-status.c:194 +#, c-format +msgid "deleted: %s" +msgstr "gelöscht: %s" + +#: wt-status.c:197 +#, c-format +msgid "modified: %s" +msgstr "geändert: %s" + +#: wt-status.c:200 +#, c-format +msgid "renamed: %s -> %s" +msgstr "umbenannt: %s -> %s" + +#: wt-status.c:203 +#, c-format +msgid "typechange: %s" +msgstr "neuer Typ: %s" + +#: wt-status.c:206 +#, c-format +msgid "unknown: %s" +msgstr "unbekannt: %s" + +#: wt-status.c:209 +#, c-format +msgid "unmerged: %s" +msgstr "Konflikt: %s" + +#: wt-status.c:212 +#, c-format +msgid "bug: unhandled diff status %c" +msgstr "Bug: nicht behandelter Diff-Status %c" + +#: wt-status.c:635 +msgid "On branch " +msgstr "Aktueller Branch: " + +#: wt-status.c:642 +msgid "Not currently on any branch." +msgstr "Aktuell ist kein Branch aktiv." + +#: wt-status.c:652 +msgid "# Initial commit" +msgstr "# Erster Commit" + +#: wt-status.c:666 +msgid "Untracked" +msgstr "Unberücksichtigte" + +#: wt-status.c:668 +msgid "Ignored" +msgstr "Ignorierte" + +#: wt-status.c:670 +#, c-format +msgid "# Untracked files not listed%s\n" +msgstr "# Unberücksichtigte Dateien werden nicht aufgeführt%s\n" + +#: wt-status.c:672 +msgid " (use -u option to show untracked files)" +msgstr " (benutze die Option -u, um sie anzuzeigen)" + +#: wt-status.c:678 +#, c-format +msgid "# No changes\n" +msgstr "# Keine Änderungen\n" + +#: wt-status.c:682 +#, c-format +msgid "no changes added to commit%s\n" +msgstr "keine Änderungen für den Commit vorgemerkt%s\n" + +#: wt-status.c:684 +msgid " (use \"git add\" and/or \"git commit -a\")" +msgstr " (benutze \"git add\" und/oder \"git commit -a\")" + +#: wt-status.c:686 +#, c-format +msgid "nothing added to commit but untracked files present%s\n" +msgstr "" +"keine Änderungen für den Commit vorgemerkt, aber unberücksichtigte Dateien " +"vorhanden%s\n" + +#: wt-status.c:688 +msgid " (use \"git add\" to track)" +msgstr " (benutze \"git add\", um sie zu berücksichtigen)" + +#: wt-status.c:690 wt-status.c:693 wt-status.c:696 +#, c-format +msgid "nothing to commit%s\n" +msgstr "nichts zu committen%s\n" + +#: wt-status.c:691 +msgid " (create/copy files and use \"git add\" to track)" +msgstr " (erstelle Dateien und benutze \"git add\", um sie zu berücksichtigen)" + +#: wt-status.c:694 +msgid " (use -u to show untracked files)" +msgstr " (benutze -u, um unberücksichtigte Datei anzuzeigen)" + +#: wt-status.c:697 +msgid " (working directory clean)" +msgstr " (Arbeitsverzeichnis sauber)" + +#: wt-status.c:795 +msgid "HEAD (no branch)" +msgstr "HEAD (kein Branch)" + +#: wt-status.c:801 +msgid "Initial commit on " +msgstr "Erster Commit in " + +#: wt-status.c:816 +msgid "behind " +msgstr "nur dort " + +#: wt-status.c:819 wt-status.c:822 +msgid "ahead " +msgstr "nur hier " + +#: wt-status.c:824 +msgid ", behind " +msgstr "nur dort " + +#: builtin/add.c:41 +#, c-format +msgid "unexpected diff status %c" +msgstr "unerwarteter Diff-Status %c" + +#: builtin/add.c:67 builtin/commit.c:244 +msgid "updating files failed" +msgstr "Aktualisieren der Dateien ist fehlgeschlagen" + +#: builtin/add.c:77 +#, c-format +msgid "remove '%s'\n" +msgstr "entferne '%s'\n" + +#: builtin/add.c:175 +#, c-format +msgid "Path '%s' is in submodule '%.*s'" +msgstr "Pfad '%s' ist im Submodule '%.*s'" + +#: builtin/add.c:191 +msgid "Unstaged changes after refreshing the index:" +msgstr "Nicht vorgemerkte Änderungen nach Aktualisieren des Indexes:" + +#: builtin/add.c:194 builtin/add.c:452 builtin/rm.c:194 +#, c-format +msgid "pathspec '%s' did not match any files" +msgstr "Pfadangabe '%s' passt auf keine Dateien" + +#: builtin/add.c:208 +#, c-format +msgid "'%s' is beyond a symbolic link" +msgstr "'%s' befindet sich jenseits eines symbolischen Links" + +#: builtin/add.c:275 +msgid "Could not read the index" +msgstr "Konnte den Index nicht auslesen" + +#: builtin/add.c:284 +#, c-format +msgid "Could not open '%s' for writing." +msgstr "Konnte '%s' nicht zum Schreiben öffnen." + +#: builtin/add.c:288 +msgid "Could not write patch" +msgstr "Konnte keinen Patch erstellen" + +# Keine genaue Übersetzung, aber IMO im Kontext passend --jk@jk.gs +#: builtin/add.c:293 +#, c-format +msgid "Could not stat '%s'" +msgstr "Konnte '%s' nicht mehr finden" + +#: builtin/add.c:295 +msgid "Empty patch. Aborted." +msgstr "Leerer Patch. Breche ab." + +#: builtin/add.c:301 +#, c-format +msgid "Could not apply '%s'" +msgstr "Konnte '%s' nicht anwenden" + +#: builtin/add.c:349 +#, c-format +msgid "Use -f if you really want to add them.\n" +msgstr "Benutze -f, wenn du sie wirklich hinzufügen willst.\n" + +#: builtin/add.c:350 +msgid "no files added" +msgstr "keine Dateien hinzugefügt" + +#: builtin/add.c:356 +msgid "adding files failed" +msgstr "Das Hinzufügen der Dateien ist fehlgeschlagen" + +#: builtin/add.c:388 +msgid "-A and -u are mutually incompatible" +msgstr "-A und -u vertragen sich nicht" + +#: builtin/add.c:390 +msgid "Option --ignore-missing can only be used together with --dry-run" +msgstr "Option --ignore-missing kann nur zusammen mit --dry-run benutzt werden" + +#: builtin/add.c:410 +#, c-format +msgid "Nothing specified, nothing added.\n" +msgstr "Nichts angegeben, nichts hinzugefügt.\n" + +#: builtin/add.c:411 +#, c-format +msgid "Maybe you wanted to say 'git add .'?\n" +msgstr "Vielleicht wolltest du 'git add .' benutzen?\n" + +#: builtin/add.c:417 builtin/clean.c:95 builtin/commit.c:301 +#: builtin/commit.c:310 builtin/mv.c:77 builtin/rm.c:171 +msgid "index file corrupt" +msgstr "Indexdatei beschädigt" + +#: builtin/add.c:468 builtin/mv.c:223 builtin/rm.c:268 +msgid "Unable to write new index file" +msgstr "Konnte keine neue Indexdatei anlegen" + +#: builtin/archive.c:17 +#, fuzzy, c-format +msgid "could not create archive file '%s'" +msgstr "konnte Datei '%s' nicht anlegen" + +#: builtin/archive.c:20 +#, fuzzy +msgid "could not redirect output" +msgstr "konnte Kommentarvorlage nicht anlegen" + +#: builtin/archive.c:36 +msgid "git archive: Remote with no URL" +msgstr "" + +#: builtin/archive.c:46 +msgid "git archive: expected ACK/NAK, got EOF" +msgstr "" + +#: builtin/archive.c:51 +#, c-format +msgid "git archive: NACK %s" +msgstr "" + +#: builtin/archive.c:52 +msgid "git archive: protocol error" +msgstr "" + +#: builtin/archive.c:57 +msgid "git archive: expected a flush" +msgstr "" + +#: builtin/branch.c:136 +#, c-format +msgid "" +"deleting branch '%s' that has been merged to\n" +" '%s', but it is not yet merged to HEAD." +msgstr "" +"lösche Branch '%s', der nach '%s' gemerged wurde,\n" +" aber er ist noch nicht nach HEAD gemerged." + +#: builtin/branch.c:140 +#, c-format +msgid "" +"not deleting branch '%s' that is not yet merged to\n" +" '%s', even though it is merged to HEAD." +msgstr "" +"lösche Branch '%s' nicht, der noch nicht nach '%s' gemerged\n" +"wurde, auch wenn er schon nach HEAD gemerged wurde." + +#. TRANSLATORS: This is "remote " in "remote branch '%s' not found" +#: builtin/branch.c:161 +msgid "remote " +msgstr "Remote-" + +#: builtin/branch.c:169 +msgid "cannot use -a with -d" +msgstr "du kannst -a und -d nicht zusammen benutzen" + +#: builtin/branch.c:175 +msgid "Couldn't look up commit object for HEAD" +msgstr "Konnte Commit-Objekt für HEAD nicht finden" + +#: builtin/branch.c:180 +#, c-format +msgid "Cannot delete the branch '%s' which you are currently on." +msgstr "Du kannst den aktiven Branch '%s' nicht löschen." + +#: builtin/branch.c:190 +#, c-format +msgid "%sbranch '%s' not found." +msgstr "%sBranch '%s' nicht gefunden." + +#: builtin/branch.c:198 +#, c-format +msgid "Couldn't look up commit object for '%s'" +msgstr "Konnte Commit-Objekt für '%s' nicht finden" + +#: builtin/branch.c:204 +#, c-format +msgid "" +"The branch '%s' is not fully merged.\n" +"If you are sure you want to delete it, run 'git branch -D %s'." +msgstr "" +"Der Branch '%s' ist nicht komplett gemerged.\n" +"Wenn du ihn trotzdem löschen willst, benutze 'git branch -D %s'." + +#: builtin/branch.c:212 +#, c-format +msgid "Error deleting %sbranch '%s'" +msgstr "Fehler beim Löschen von %sBranch '%s'" + +#: builtin/branch.c:217 +#, c-format +msgid "Deleted %sbranch %s (was %s).\n" +msgstr "%sBranch '%s' gelöscht (war %s).\n" + +#: builtin/branch.c:222 +msgid "Update of config-file failed" +msgstr "Konfigurationsdatei konnte nicht aktualisiert werden" + +#: builtin/branch.c:304 +#, c-format +msgid "branch '%s' does not point at a commit" +msgstr "Branch '%s' zeigt nicht auf einen Commit" + +#: builtin/branch.c:381 +#, c-format +msgid "behind %d] " +msgstr "nur dort %d] " + +#: builtin/branch.c:383 +#, c-format +msgid "ahead %d] " +msgstr "nur hier %d] " + +#: builtin/branch.c:385 +#, c-format +msgid "ahead %d, behind %d] " +msgstr "nur hier %d, nur dort %d] " + +#: builtin/branch.c:484 +msgid "(no branch)" +msgstr "(kein Branch)" + +#: builtin/branch.c:544 +msgid "some refs could not be read" +msgstr "einige Einträge konnten nicht gelesen werden" + +#: builtin/branch.c:557 +msgid "cannot rename the current branch while not on any." +msgstr "" +"kann den aktuellen Branch nicht umbenennen, wenn es keinen aktuellen Branch " +"gibt." + +#: builtin/branch.c:567 builtin/branch.c:571 +#, c-format +msgid "Invalid branch name: '%s'" +msgstr "Ungültiger Name für Branch: '%s'" + +#: builtin/branch.c:574 +#, c-format +msgid "A branch named '%s' already exists." +msgstr "Einen Branch namens '%s' gibt es schon." + +#: builtin/branch.c:580 +msgid "Branch rename failed" +msgstr "Umbenennung des Branches fehlgeschlagen" + +#: builtin/branch.c:584 +#, c-format +msgid "Renamed a misnamed branch '%s' away" +msgstr "Ungültigen Branchnamen '%s' durch Umbenennen in Ordnung gebracht" + +#: builtin/branch.c:588 +#, c-format +msgid "Branch renamed to %s, but HEAD is not updated!" +msgstr "Branch umbenannt nach %s, aber HEAD nicht aktualisiert!" + +#: builtin/branch.c:595 +msgid "Branch is renamed, but update of config-file failed" +msgstr "" +"Branch wurde umbenannt, aber die Konfigurationsdatei konnte nicht " +"aktualisiert werden" + +#: builtin/branch.c:610 +#, c-format +msgid "malformed object name %s" +msgstr "ungültiger Objektname %s" + +#: builtin/branch.c:680 +msgid "Failed to resolve HEAD as a valid ref." +msgstr "Konnte HEAD nicht als gültige Referenze auflösen." + +#: builtin/branch.c:686 +msgid "HEAD not found below refs/heads!" +msgstr "HEAD zeigt nicht auf eine Referenz unter refs/heads!" + +#: builtin/branch.c:706 +msgid "-a and -r options to 'git branch' do not make sense with a branch name" +msgstr "" +"Die Optionen -a und -r für 'git branch' ergeben keinen Sinn zusammen mit " +"einem Branchnamen" + +#: builtin/bundle.c:47 +#, c-format +msgid "%s is okay\n" +msgstr "" + +#: builtin/bundle.c:56 +msgid "Need a repository to create a bundle." +msgstr "" + +#: builtin/bundle.c:60 +#, fuzzy +msgid "Need a repository to unbundle." +msgstr "Du musst ein Quell-Repository angeben." + +#: builtin/checkout.c:107 builtin/checkout.c:135 +#, c-format +msgid "path '%s' does not have our version" +msgstr "Pfad '%s' hat keine Version 'von uns' im Index" + +#: builtin/checkout.c:109 builtin/checkout.c:137 +#, c-format +msgid "path '%s' does not have their version" +msgstr "Pfad '%s' hat keine Version 'von denen' im Index" + +#: builtin/checkout.c:120 +#, c-format +msgid "path '%s' does not have all three versions" +msgstr "Pfad '%s' hat keine drei verschiedenen Versionen im Index" + +#: builtin/checkout.c:155 +#, c-format +msgid "path '%s' does not have all 3 versions" +msgstr "Pfad '%s' hat keine drei verschiedenen Versionen im Index" + +#: builtin/checkout.c:172 +#, c-format +msgid "path '%s': cannot merge" +msgstr "Pfad '%s': kann nicht mergen" + +#: builtin/checkout.c:189 +#, c-format +msgid "Unable to add merge result for '%s'" +msgstr "Kann Merge-Ergebnis für '%s' nicht hinzufügen" + +#: builtin/checkout.c:194 builtin/reset.c:170 +#, c-format +msgid "make_cache_entry failed for path '%s'" +msgstr "make_cache_entry fehlgeschlagen für Pfad '%s'" + +#: builtin/checkout.c:216 builtin/checkout.c:371 +msgid "corrupt index file" +msgstr "beschädigte Indexdatei" + +#: builtin/checkout.c:244 builtin/checkout.c:251 +#, c-format +msgid "path '%s' is unmerged" +msgstr "Pfad '%s' enthält Konflikte" + +#: builtin/checkout.c:280 builtin/checkout.c:475 builtin/clone.c:658 +#: builtin/merge.c:737 +msgid "unable to write new index file" +msgstr "kann keine neue Indexdatei anlegen" + +#: builtin/checkout.c:297 builtin/diff.c:307 builtin/merge.c:367 +msgid "diff_setup_done failed" +msgstr "diff_setup_done fehlgeschlagen" + +#: builtin/checkout.c:393 +msgid "you need to resolve your current index first" +msgstr "du musst zuerst Konflikte im aktuellen Index auflösen" + +#: builtin/checkout.c:524 +#, c-format +msgid "Can not do reflog for '%s'\n" +msgstr "Kann Reflog für '%s' nicht einrichten\n" + +#: builtin/checkout.c:550 +#, c-format +msgid "Already on '%s'\n" +msgstr "'%s' ist schon aktiv\n" + +#: builtin/checkout.c:554 +#, c-format +msgid "Switched to and reset branch '%s'\n" +msgstr "Zu Branch '%s' gewechselt und Inhalt überschrieben\n" + +#: builtin/checkout.c:556 +#, c-format +msgid "Switched to a new branch '%s'\n" +msgstr "Zu neuem Branch '%s' gewechselt\n" + +#: builtin/checkout.c:558 +#, c-format +msgid "Switched to branch '%s'\n" +msgstr "Zu Branch '%s' gewechselt\n" + +#: builtin/checkout.c:575 +msgid "HEAD is now at" +msgstr "HEAD zeigt jetzt auf" + +#: builtin/checkout.c:603 +msgid "You are on a branch yet to be born" +msgstr "Der aktive Branch ist noch nicht angelegt" + +#: builtin/checkout.c:617 +msgid "Previous HEAD position was" +msgstr "HEAD zeigte vorher auf" + +#: builtin/checkout.c:730 +msgid "-B cannot be used with -b" +msgstr "-B kann nicht mit -b kombiniert werden" + +#: builtin/checkout.c:738 +msgid "--patch is incompatible with all other options" +msgstr "--patch verträgt sich nicht mit allen anderen Optionen" + +#: builtin/checkout.c:744 +msgid "--track needs a branch name" +msgstr "--track braucht einen Branchnamen" + +#: builtin/checkout.c:751 +msgid "Missing branch name; try -b" +msgstr "Fehlender Branchname; versuch's mit -b" + +#: builtin/checkout.c:757 +msgid "--orphan and -b|-B are mutually exclusive" +msgstr "--orphan und -b|-B vertragen sich nicht" + +#: builtin/checkout.c:759 +msgid "--orphan cannot be used with -t" +msgstr "--orphan kann nicht mit -t kombiniert werden" + +#: builtin/checkout.c:769 +msgid "git checkout: -f and -m are incompatible" +msgstr "git checkout: -f und -m sind nicht kompatibel" + +#. case (1) +#: builtin/checkout.c:815 +#, c-format +msgid "invalid reference: %s" +msgstr "ungültige Referenz: %s" + +#. case (1): want a tree +#: builtin/checkout.c:852 +#, c-format +msgid "reference is not a tree: %s" +msgstr "Referenz ist kein Tree: %s" + +#: builtin/checkout.c:878 +msgid "invalid path specification" +msgstr "ungültige Pfadangabe" + +#: builtin/checkout.c:886 +#, c-format +msgid "" +"git checkout: updating paths is incompatible with switching branches.\n" +"Did you intend to checkout '%s' which can not be resolved as commit?" +msgstr "" +"git checkout: Pfade aktualisieren und den Branch wechseln kann nicht\n" +"kombiniert werden. Wolltest du '%s' (das wir nicht als Commit\n" +"finden können) auschecken?" + +#: builtin/checkout.c:888 +msgid "git checkout: updating paths is incompatible with switching branches." +msgstr "" +"git checkout: Pfade aktualisieren und den Branch wechseln kann nicht " +"kombiniert werden." + +#: builtin/checkout.c:893 +msgid "" +"git checkout: --ours/--theirs, --force and --merge are incompatible when\n" +"checking out of the index." +msgstr "" +"git checkout: --ours/--theirs, --force und --merge ergeben keinen Sinn, " +"wenn\n" +"Pfade aus dem Index ausgecheckt werden." + +#: builtin/checkout.c:904 +#, c-format +msgid "git checkout: we do not like '%s' as a branch name." +msgstr "git checkout: '%s' ist kein gültiger Branchname." + +#: builtin/checkout.c:909 +#, c-format +msgid "git checkout: branch %s already exists" +msgstr "git checkout: den Branch '%s' gibt es schon" + +#: builtin/checkout.c:916 +msgid "Cannot switch branch to a non-commit." +msgstr "Kann einen Branch nicht auf etwas anderes als einen Commit umbiegen." + +#: builtin/checkout.c:919 +msgid "--ours/--theirs is incompatible with switching branches." +msgstr "--ours/--theirs können nicht beim Branch-wechseln benutzt werden." + +#: builtin/clean.c:78 +#, fuzzy +msgid "-x and -X cannot be used together" +msgstr "--orphan kann nicht mit -t kombiniert werden" + +#: builtin/clean.c:82 +msgid "" +"clean.requireForce set to true and neither -n nor -f given; refusing to clean" +msgstr "" + +#: builtin/clean.c:85 +msgid "" +"clean.requireForce defaults to true and neither -n nor -f given; refusing to " +"clean" +msgstr "" + +#: builtin/clean.c:154 builtin/clean.c:175 +#, fuzzy, c-format +msgid "Would remove %s\n" +msgstr "entferne '%s'\n" + +#: builtin/clean.c:158 builtin/clean.c:178 +#, fuzzy, c-format +msgid "Removing %s\n" +msgstr "Hole %s\n" + +#: builtin/clean.c:161 builtin/clean.c:181 +#, fuzzy, c-format +msgid "failed to remove '%s'" +msgstr "konnte '%s' nicht öffnen" + +#: builtin/clean.c:165 +#, fuzzy, c-format +msgid "Would not remove %s\n" +msgstr "Konnte Objekt %s nicht lesen" + +#: builtin/clean.c:167 +#, fuzzy, c-format +msgid "Not removing %s\n" +msgstr "entferne '%s'\n" + +#: builtin/clone.c:208 +#, c-format +msgid "reference repository '%s' is not a local directory." +msgstr "Referenz-Repository '%s' ist kein lokales Verzeichnis." + +#: builtin/clone.c:235 +#, c-format +msgid "failed to open '%s'" +msgstr "konnte '%s' nicht öffnen" + +#: builtin/clone.c:239 +#, c-format +msgid "failed to create directory '%s'" +msgstr "konnte Verzeichnis '%s' nicht anlegen" + +#: builtin/clone.c:241 builtin/diff.c:74 +#, c-format +msgid "failed to stat '%s'" +msgstr "konnte '%s' nicht finden/prüfen" + +#: builtin/clone.c:243 +#, c-format +msgid "%s exists and is not a directory" +msgstr "%s existiert und ist kein Verzeichnis" + +#: builtin/clone.c:257 +#, c-format +msgid "failed to stat %s\n" +msgstr "konnte '%s' nicht finden/prüfen\n" + +#: builtin/clone.c:267 +#, c-format +msgid "failed to unlink '%s'" +msgstr "konnte '%s' nicht entfernen" + +#: builtin/clone.c:272 +#, c-format +msgid "failed to create link '%s'" +msgstr "konnte Link '%s' nicht anlegen" + +#: builtin/clone.c:276 +#, c-format +msgid "failed to copy file to '%s'" +msgstr "konnte Datei nicht nach '%s' kopieren" + +#: builtin/clone.c:305 +#, c-format +msgid "done.\n" +msgstr "fertig.\n" + +#: builtin/clone.c:387 +msgid "Too many arguments." +msgstr "Zu viele Parameter." + +#: builtin/clone.c:391 +msgid "You must specify a repository to clone." +msgstr "Du musst ein Quell-Repository angeben." + +#: builtin/clone.c:399 +#, c-format +msgid "--bare and --origin %s options are incompatible." +msgstr "--bare und --origin %s sind nicht kombinierbar." + +#: builtin/clone.c:428 +#, c-format +msgid "destination path '%s' already exists and is not an empty directory." +msgstr "Zielfpad '%s' existiert schon und ist kein leeres Verzeichnis." + +#: builtin/clone.c:438 +#, c-format +msgid "working tree '%s' already exists." +msgstr "Arbeitsverzeichnis '%s' existiert schon." + +#: builtin/clone.c:451 builtin/clone.c:465 +#, c-format +msgid "could not create leading directories of '%s'" +msgstr "konnte übergeordnete Verzeichnisse für '%s' nicht anlegen" + +#: builtin/clone.c:454 +#, c-format +msgid "could not create work tree dir '%s'." +msgstr "konnte Verzeichnis '%s' im Arbeitsverzeichnis nicht anlegen." + +#: builtin/clone.c:470 +#, c-format +msgid "Cloning into bare repository %s\n" +msgstr "Klone in Lager-Repository %s\n" + +#: builtin/clone.c:472 +#, c-format +msgid "Cloning into %s\n" +msgstr "Klone nach %s\n" + +#: builtin/clone.c:530 +#, c-format +msgid "Don't know how to clone %s" +msgstr "Ich weiß nicht, wie man %s klonen kann" + +#: builtin/clone.c:569 +#, c-format +msgid "Remote branch %s not found in upstream %s, using HEAD instead" +msgstr "" +"Remote-branch %s nicht in Ursprung %s gefunden, benutze stattdessen HEAD" + +#: builtin/clone.c:579 +msgid "You appear to have cloned an empty repository." +msgstr "Du hast anscheinend ein leeres Repository geklont." + +#: builtin/clone.c:621 +msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" +msgstr "" +"Ursprungs-HEAD verweist auf fehlende Referenz, kann keinen Checkout machen.\n" + +#: builtin/commit.c:41 +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" +"If the identity used for this commit is wrong, you can fix it with:\n" +"\n" +" git commit --amend --author='Your Name '\n" +msgstr "" +"Dein Name und deine E-Mail-Adresse wurden automatisch übernommen aus\n" +"deinem Benutzernamen und Hostnamen. Bitte prüfe, ob sie korrekt sind.\n" +"Du kannst diese Nachricht loswerden, indem du sie ausdrücklich einstellst:\n" +"\n" +" git config --global user.name \"Dein Name\"\n" +" git config --global user.email du@example.com\n" +"\n" +"Falls die Angaben nicht stimmten, kannst du sie im angelegten Commit\n" +"nachträglich korrigieren mit:\n" +"\n" +" git commit --amend --author='Dein Name '\n" + +#: builtin/commit.c:53 +msgid "" +"You asked to amend the most recent commit, but doing so would make\n" +"it empty. You can repeat your command with --allow-empty, or you can\n" +"remove the commit entirely with \"git reset HEAD^\".\n" +msgstr "" +"Du willst den neuesten Commit nachbearbeiten, aber dadurch würde er leer\n" +"werden. Du kannst deinen Befehl mit --allow-empty wiederholen oder den\n" +"Commit mit \"git reset HEAD^\" komplett entfernen.\n" + +#: builtin/commit.c:271 +msgid "failed to unpack HEAD tree object" +msgstr "konnte das HEAD-Tree-Objekt nicht entpacken" + +#: builtin/commit.c:299 +msgid "interactive add failed" +msgstr "Interaktives 'add' fehlgeschlagen" + +#: builtin/commit.c:330 builtin/commit.c:350 builtin/commit.c:396 +msgid "unable to write new_index file" +msgstr "konnte new_index-Datei nicht anlegen" + +#: builtin/commit.c:380 +msgid "cannot do a partial commit during a merge." +msgstr "" +"während eines Merges kannst du keinen Commit anlegen, der\n" +"vorgemerkte Änderungen ignoriert." + +#: builtin/commit.c:389 +msgid "cannot read the index" +msgstr "kann den Index nicht auslesen" + +#: builtin/commit.c:409 +msgid "unable to write temporary index file" +msgstr "kann keine temporäre Indexdatei anlegen" + +#: builtin/commit.c:456 builtin/commit.c:1294 +msgid "could not parse HEAD commit" +msgstr "konnte HEAD-Commit nicht analysieren" + +#: builtin/commit.c:475 builtin/commit.c:481 +#, c-format +msgid "invalid commit: %s" +msgstr "ungültiger Commit: %s" + +#: builtin/commit.c:499 +msgid "malformed --author parameter" +msgstr "ungültiger '--author'-Parameter" + +#: builtin/commit.c:573 builtin/shortlog.c:299 +#, c-format +msgid "(reading log message from standard input)\n" +msgstr "(Commit-Kommentar wird von der Standardeingabe gelesen)\n" + +#: builtin/commit.c:575 +msgid "could not read log from standard input" +msgstr "konnte Kommentar nicht von der Standardeingabe lesen" + +#: builtin/commit.c:579 +#, c-format +msgid "could not read log file '%s'" +msgstr "konnte Kommentardatei '%s' nicht lesen" + +#: builtin/commit.c:585 +msgid "commit has empty message" +msgstr "der Commit-Kommentar ist leer" + +#: builtin/commit.c:591 +msgid "could not read MERGE_MSG" +msgstr "konnte MERGE_MSG nicht lesen" + +#: builtin/commit.c:595 +msgid "could not read SQUASH_MSG" +msgstr "konnte SQUASH_MSG nicht lesen" + +#: builtin/commit.c:599 +#, c-format +msgid "could not read '%s'" +msgstr "konnte '%s' nicht lesen" + +#: builtin/commit.c:612 +#, c-format +msgid "could not open '%s'" +msgstr "konnte '%s' nicht öffnen" + +#: builtin/commit.c:636 +msgid "could not write commit template" +msgstr "konnte Kommentarvorlage nicht anlegen" + +#: builtin/commit.c:650 +#, 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" +"#\n" +msgstr "" +"#\n" +"# Es sieht so aus, als ob du einen MERGE committen willst.\n" +"# Falls das nicht stimmt, entferne bitte die Datei\n" +"#\t%s\n" +"# und versuch's noch einmal.\n" +"#\n" + +#: builtin/commit.c:659 +#, c-format +msgid "" +"\n" +"# Please enter the commit message for your changes." +msgstr "" +"\n" +"# Bitte gib einen Commit-Kommentar für deine Änderungen an." + +#: builtin/commit.c:663 +#, c-format +msgid "" +" Lines starting\n" +"# with '#' will be ignored, and an empty message aborts the commit.\n" +msgstr "" +" Zeilen, die mit '#'\n" +"# anfangen, werden ignoriert, und ein leerer Kommentar bricht den Commit " +"ab.\n" + +#: builtin/commit.c:668 +#, c-format +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" +msgstr "" +" Zeilen, die mit '#'\n" +"# anfangen, werden beibehalten; du kannst sie selbst entfernen, wenn du\n" +"willst. Ein leerer Kommentar bricht den Commit ab.\n" + +#: builtin/commit.c:680 +#, c-format +msgid "%s# Author: %s\n" +msgstr "%s# Autor: %s\n" + +#: builtin/commit.c:688 +#, c-format +msgid "%s# Committer: %s\n" +msgstr "%s# Committer: %s\n" + +#: builtin/commit.c:705 +msgid "Cannot read index" +msgstr "Kann Index nicht auslesen" + +#: builtin/commit.c:737 +msgid "Error building trees" +msgstr "Fehler beim Anlegen der Trees" + +#: builtin/commit.c:752 builtin/tag.c:321 +#, c-format +msgid "Please supply the message using either -m or -F option.\n" +msgstr "Bitte gib den Kommentar mit der Option -m oder -F an.\n" + +#: builtin/commit.c:832 +#, c-format +msgid "No existing author found with '%s'" +msgstr "Kein bekannter Autor gefunden mit '%s'" + +#: builtin/commit.c:847 builtin/commit.c:1039 +#, c-format +msgid "Invalid untracked files mode '%s'" +msgstr "Ungültiger Modus für unberücksichtigte Dateien: '%s'" + +#: builtin/commit.c:864 +msgid "Using both --reset-author and --author does not make sense" +msgstr "Es ist unsinnig, --reset-author und --author zusammen zu benutzen" + +#: builtin/commit.c:878 +msgid "You have nothing to amend." +msgstr "Da ist nichts, was du nachbearbeiten könntest." + +#: builtin/commit.c:880 +msgid "You are in the middle of a merge -- cannot amend." +msgstr "Du bist mitten in einem Merge; da kannst du nichts nachbearbeiten." + +#: builtin/commit.c:889 +msgid "Only one of -c/-C/-F can be used." +msgstr "Nur eine der Optionen -c/-C/-F kann auf einmal benutzt werden." + +#: builtin/commit.c:891 +msgid "Option -m cannot be combined with -c/-C/-F." +msgstr "Option -m kann nicht kombiniert werden mit -c/-C/-F." + +#: builtin/commit.c:897 +msgid "--reset-author can be used only with -C, -c or --amend." +msgstr "--reset-author kann nur mit -C, -c oder --amend benutzt werden." + +#: builtin/commit.c:906 +#, c-format +msgid "could not lookup commit %s" +msgstr "konnte Commit %s nicht finden" + +#: builtin/commit.c:909 +#, c-format +msgid "could not parse commit %s" +msgstr "konnte Commit %s nicht analysieren" + +#: builtin/commit.c:937 +msgid "Only one of --include/--only/--all/--interactive can be used." +msgstr "" +"Nur eins von --include/--only/--all/--interactive kann auf einmal benutzt " +"werden." + +#: builtin/commit.c:939 +msgid "No paths with --include/--only does not make sense." +msgstr "Für --include/--only musst du Pfade angeben." + +#: builtin/commit.c:941 +msgid "Clever... amending the last one with dirty index." +msgstr "" +"Bearbeite letzten Commit nach, ohne Änderungen an Dateien zu übernehmen." + +#: builtin/commit.c:943 +msgid "Explicit paths specified without -i nor -o; assuming --only paths..." +msgstr "" +"Pfade angegeben ohne ausdrückliches -i oder -o angegeben, ich nehme -o an..." + +#: builtin/commit.c:953 +#, c-format +msgid "Invalid cleanup mode %s" +msgstr "Ungültiger Aufräummodus (--cleanup=%s) für den Commit-Kommentar" + +#: builtin/commit.c:958 +msgid "Paths with -a does not make sense." +msgstr "Es ist unsinnig, mit -a Pfade anzugeben." + +#: builtin/commit.c:960 +msgid "Paths with --interactive does not make sense." +msgstr "Es ist unsinnig, Pfade mit --interactive anzugeben." + +#: builtin/commit.c:1142 +msgid "couldn't look up newly created commit" +msgstr "konnte neu angelegten Commit nicht finden" + +#: builtin/commit.c:1144 +msgid "could not parse newly created commit" +msgstr "konnte neu angelegten Commit nicht analysieren" + +#: builtin/commit.c:1185 +msgid "detached HEAD" +msgstr "von HEAD abgetrennt" + +#: builtin/commit.c:1187 +msgid " (root-commit)" +msgstr " (erster Commit)" + +#: builtin/commit.c:1307 builtin/merge.c:461 +#, c-format +msgid "could not open '%s' for reading" +msgstr "konnte '%s' nicht zum Lesen öffnen" + +#: builtin/commit.c:1312 +#, c-format +msgid "Corrupt MERGE_HEAD file (%s)" +msgstr "Beschädigte MERGE_HEAD-Datei (%s)" + +#: builtin/commit.c:1319 +msgid "could not read MERGE_MODE" +msgstr "konnte MERGE_MODE nicht auslesen" + +#: builtin/commit.c:1336 +#, c-format +msgid "could not read commit message: %s" +msgstr "konnte Commit-Kommentar nicht lesen: %s" + +#: builtin/commit.c:1350 +#, c-format +msgid "Aborting commit due to empty commit message.\n" +msgstr "Commit abgebrochen wegen leerem Kommentar.\n" + +#: builtin/commit.c:1358 +msgid "failed to write commit object" +msgstr "konnte Commit-Objekt nicht anlegen" + +#: builtin/commit.c:1375 +msgid "cannot lock HEAD ref" +msgstr "kann kein Lock für HEAD-Referenz anfordern" + +#: builtin/commit.c:1379 +msgid "cannot update HEAD ref" +msgstr "kann HEAD-Referenz nicht aktualisieren" + +#: builtin/commit.c:1388 +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 "" +"Repository wurde aktualisiert, aber ich kann die new_index-Datei nicht\n" +"anlegen. Stelle sicher, dass der Datenträger nicht voll ist und du deine\n" +"Limits nicht überschreitest, und benutze \"git reset HEAD\" zum Reparieren." + +#: builtin/describe.c:205 +#, c-format +msgid "annotated tag %s not available" +msgstr "" + +#: builtin/describe.c:209 +#, fuzzy, c-format +msgid "annotated tag %s has no embedded name" +msgstr "Kann keinen '%s'-Reset mitten in einem Merge machen." + +#: builtin/describe.c:211 +#, c-format +msgid "tag '%s' is really '%s' here" +msgstr "" + +#: builtin/describe.c:238 +#, fuzzy, c-format +msgid "Not a valid object name %s" +msgstr "kein gültiges Object: %s" + +#: builtin/describe.c:241 +#, fuzzy, c-format +msgid "%s is not a valid '%s' object" +msgstr "kein gültiges Object: %s" + +#: builtin/describe.c:258 +#, fuzzy, c-format +msgid "no tag exactly matches '%s'" +msgstr "kann Vorlage '%s' nicht anlegen/prüfen" + +#: builtin/describe.c:260 +#, fuzzy, c-format +msgid "searching to describe %s\n" +msgstr "Übertrag zu %s\n" + +#: builtin/describe.c:295 +#, fuzzy, c-format +msgid "finished search at %s\n" +msgstr "konnte '%s' nicht finden/prüfen\n" + +#: builtin/describe.c:319 +#, c-format +msgid "" +"No annotated tags can describe '%s'.\n" +"However, there were unannotated tags: try --tags." +msgstr "" + +#: builtin/describe.c:323 +#, c-format +msgid "" +"No tags can describe '%s'.\n" +"Try --always, or create some tags." +msgstr "" + +#: builtin/describe.c:344 +#, c-format +msgid "traversed %lu commits\n" +msgstr "" + +#: builtin/describe.c:347 +#, c-format +msgid "" +"more than %i tags found; listed %i most recent\n" +"gave up search at %s\n" +msgstr "" + +#: builtin/describe.c:398 +#, fuzzy +msgid "--long is incompatible with --abbrev=0" +msgstr "--patch verträgt sich nicht mit --{hard,mixed,soft}" + +#: builtin/describe.c:423 +msgid "No names found, cannot describe anything." +msgstr "" + +#: builtin/describe.c:430 +#, fuzzy +msgid "--dirty is incompatible with committishes" +msgstr "--patch verträgt sich nicht mit allen anderen Optionen" + +#: builtin/diff.c:76 +#, c-format +msgid "'%s': not a regular file or symlink" +msgstr "'%s': weder normale Datei noch Symlink" + +#: builtin/diff.c:225 +#, c-format +msgid "invalid option: %s" +msgstr "ungültige Option: %s" + +#: builtin/diff.c:302 +msgid "Not a git repository" +msgstr "Kein git-Repository" + +#: builtin/diff.c:334 +msgid "No HEAD commit to compare with (yet)" +msgstr "Es gibt (noch) keinen HEAD-Commit als Vergleich" + +#: builtin/diff.c:349 +#, c-format +msgid "invalid object '%s' given." +msgstr "ungültiges Objekt '%s' angegeben." + +#: builtin/diff.c:354 +#, c-format +msgid "more than %d trees given: '%s'" +msgstr "mehr als %d Trees angegeben: '%s'" + +#: builtin/diff.c:364 +#, c-format +msgid "more than two blobs given: '%s'" +msgstr "mehr als zwei Blobs angegeben: '%s'" + +#: builtin/diff.c:372 +#, c-format +msgid "unhandled object '%s' given." +msgstr "nicht unterstütztes Objekt '%s' angegeben." + +#: builtin/fetch.c:175 +msgid "Couldn't find remote ref HEAD" +msgstr "Konnte Remote-Referenz HEAD nicht finden" + +#: builtin/fetch.c:228 +#, c-format +msgid "object %s not found" +msgstr "Objekt %s nicht gefunden" + +#: builtin/fetch.c:233 +msgid "[up to date]" +msgstr "[aktuell]" + +#. +#. * If this is the head, and it's not okay to update +#. * the head, and the old value of the head isn't empty... +#. +#: builtin/fetch.c:246 +#, c-format +msgid "! %-*s %-*s -> %s (can't fetch in current branch)" +msgstr "! %-*s %-*s -> %s (kann nicht den aktuellen Branch überschreiben)" + +#: builtin/fetch.c:247 builtin/fetch.c:309 +msgid "[rejected]" +msgstr "[abgewiesen]" + +#: builtin/fetch.c:257 +msgid "[tag update]" +msgstr "[Tag-Update]" + +#: builtin/fetch.c:258 builtin/fetch.c:280 builtin/fetch.c:293 +msgid " (unable to update local ref)" +msgstr " (kann lokale Referenz nicht aktualisieren)" + +#: builtin/fetch.c:270 +msgid "[new tag]" +msgstr "" + +#: builtin/fetch.c:274 +#, fuzzy +msgid "[new branch]" +msgstr "Aktueller Branch: " + +#: builtin/fetch.c:305 +#, fuzzy +msgid "unable to update local ref" +msgstr " (kann lokale Referenz nicht aktualisieren)" + +#: builtin/fetch.c:305 +#, fuzzy +msgid "forced update" +msgstr "Bereits aktuell." + +#: builtin/fetch.c:310 +#, fuzzy +msgid "(non-fast-forward)" +msgstr "Update ohne Merge" + +#: builtin/fetch.c:328 builtin/fetch.c:651 +#, c-format +msgid "cannot open %s: %s\n" +msgstr "kann %s nicht öffnen: %s\n" + +#: builtin/fetch.c:406 +#, c-format +msgid "From %.*s\n" +msgstr "Von %.*s\n" + +#: builtin/fetch.c:417 +#, c-format +msgid "" +"some local refs could not be updated; try running\n" +" 'git remote prune %s' to remove any old, conflicting branches" +msgstr "" +"ein paar lokale Referenzen konnten nicht aktualisiert werden; versuche,\n" +"alte Branches, die evtl. im Weg sind, mit 'git remote prune %s' zu entfernen" + +#: builtin/fetch.c:467 +msgid "could not run rev-list" +msgstr "konnte rev-list nicht ausführen" + +#: builtin/fetch.c:481 +#, c-format +msgid "failed write to rev-list: %s" +msgstr "konnte Daten nicht an rev-list übergeben: %s" + +#: builtin/fetch.c:488 +#, c-format +msgid "failed to close rev-list's stdin: %s" +msgstr "konnte Standardeingabe von rev-list nicht schließen: %s" + +#: builtin/fetch.c:515 +#, c-format +msgid " (%s will become dangling)\n" +msgstr " (%s wird auf nichts mehr zeigen)\n" + +#: builtin/fetch.c:516 +#, c-format +msgid " (%s has become dangling)\n" +msgstr " (%s zeigt auf nichts mehr)\n" + +#: builtin/fetch.c:523 +msgid "[deleted]" +msgstr "[entfernt]" + +#: builtin/fetch.c:524 +msgid "(none)" +msgstr "(nichts)" + +#: builtin/fetch.c:641 +#, c-format +msgid "Refusing to fetch into current branch %s of non-bare repository" +msgstr "" +"Überschreiben des aktuellen Branches %s in Arbeits-Repository verweigert" + +#: builtin/fetch.c:675 +#, c-format +msgid "Don't know how to fetch from %s" +msgstr "Ich weiß nicht, wie man von %s fetchen kann" + +#: builtin/fetch.c:729 +#, c-format +msgid "Option \"%s\" value \"%s\" is not valid for %s" +msgstr "Option \"%s\" (Wert \"%s\") ist nicht gültig für %s" + +#: builtin/fetch.c:732 +#, c-format +msgid "Option \"%s\" is ignored for %s\n" +msgstr "Option \"%s\" wird für %s ignoriert\n" + +#: builtin/fetch.c:821 +#, c-format +msgid "Fetching %s\n" +msgstr "Hole %s\n" + +#: builtin/fetch.c:823 +#, c-format +msgid "Could not fetch %s" +msgstr "Konnte %s nicht holen" + +#: builtin/fetch.c:839 +msgid "" +"No remote repository specified. Please, specify either a URL or a\n" +"remote name from which new revisions should be fetched." +msgstr "" +"Kein Ursprungs-Repository angebene. Bitte gib entweder eine URL oder einen\n" +"Remote-Namen an, um die Quelle für neu geholte Revisionen festzulegen." + +#: builtin/fetch.c:859 +msgid "You need to specify a tag name." +msgstr "Du musst einen Tagnamen angeben." + +#: builtin/fetch.c:899 +msgid "fetch --all does not take a repository argument" +msgstr "" +"fetch --all akzeptiert keine ausdrückliche Angabe eines Ursprungs-Repositorys" + +#: builtin/fetch.c:901 +msgid "fetch --all does not make sense with refspecs" +msgstr "fetch --all ergibt keinen Sinn mit Refspecs" + +#: builtin/fetch.c:912 +#, c-format +msgid "No such remote or remote group: %s" +msgstr "Es gibt keinen Remote %s und auch keine entsprechende Remote-Grouppe" + +#: builtin/fetch.c:920 +msgid "Fetching a group and specifying refspecs does not make sense" +msgstr "Das Holen einer Gruppe unter Angabe von Refspecs ergibt keinen Sinn" + +#: builtin/gc.c:63 +#, fuzzy, c-format +msgid "Invalid %s: '%s'" +msgstr "Ungültiger Name für Branch: '%s'" + +#: builtin/gc.c:78 +msgid "Too many options specified" +msgstr "" + +#: builtin/gc.c:103 +#, fuzzy, c-format +msgid "insanely long object directory %.*s" +msgstr "irrsinniges git-Verzeichnis %s" + +#: builtin/gc.c:220 +#, c-format +msgid "Auto packing the repository for optimum performance.\n" +msgstr "" + +#: builtin/gc.c:223 +#, 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." +msgstr "" + +#: builtin/gc.c:251 +msgid "" +"There are too many unreachable loose objects; run 'git prune' to remove them." +msgstr "" + +#: builtin/grep.c:252 +#, c-format +msgid "grep: failed to create thread: %s" +msgstr "grep: konnte Thread nicht anlegen: %s" + +#: builtin/grep.c:457 +#, c-format +msgid "'%s': unable to read %s" +msgstr "'%s': kann %s nicht lesen" + +#: builtin/grep.c:508 +#, c-format +msgid "'%s': %s" +msgstr "'%s': %s" + +# FIXME: ich hab keine Ahnung, worum es hier geht +#: builtin/grep.c:519 +#, c-format +msgid "'%s': short read %s" +msgstr "'%s': short read %s" + +#: builtin/grep.c:581 +#, c-format +msgid "Failed to chdir: %s" +msgstr "Konnte Verzeichnis nicht wechseln: %s" + +#: builtin/grep.c:671 builtin/grep.c:697 +#, c-format +msgid "unable to read tree (%s)" +msgstr "kann Tree nicht lesen (%s)" + +#: builtin/grep.c:703 +#, c-format +msgid "unable to grep from object of type %s" +msgstr "kann Objekte des Typs %s nicht greppen" + +#: builtin/grep.c:755 +#, c-format +msgid "switch `%c' expects a numerical value" +msgstr "Option `%c' benötigt einen numerischen Wert" + +#: builtin/grep.c:771 +#, c-format +msgid "cannot open '%s'" +msgstr "kann '%s' nicht öffnen" + +#: builtin/grep.c:1012 +msgid "no pattern given." +msgstr "kein Suchmuster angegeben." + +#: builtin/grep.c:1016 +msgid "cannot mix --fixed-strings and regexp" +msgstr "kann --fixed-strings nicht mit regulärem Ausdruck kombinieren" + +#: builtin/grep.c:1041 +#, c-format +msgid "bad object %s" +msgstr "ungültiges Objekt %s" + +#: builtin/grep.c:1068 +msgid "--open-files-in-pager only works on the worktree" +msgstr "--open-files-in-pager funktioniert nur im Arbeitsverzeichnis" + +#: builtin/grep.c:1093 +msgid "--cached cannot be used with --no-index." +msgstr "--cached kann nicht mit --no-index kombiniert werden." + +#: builtin/grep.c:1095 +msgid "--no-index cannot be used with revs." +msgstr "--no-index kann nicht mit der Angabe von Revisionen kombiniert werden." + +#: builtin/grep.c:1104 +msgid "both --cached and trees are given." +msgstr "Du hast sowohl --cached als auch Trees angegeben." + +#: builtin/init-db.c:34 +#, c-format +msgid "Could not make %s writable by group" +msgstr "Konnte %s nicht für die Gruppe beschreibbar machen" + +#: builtin/init-db.c:61 +#, c-format +msgid "insanely long template name %s" +msgstr "irrsinnig langer Vorlagen-Name %s" + +#: builtin/init-db.c:66 +#, c-format +msgid "cannot stat '%s'" +msgstr "kann '%s' nicht finden/prüfen" + +#: builtin/init-db.c:72 +#, c-format +msgid "cannot stat template '%s'" +msgstr "kann Vorlage '%s' nicht anlegen/prüfen" + +#: builtin/init-db.c:79 +#, c-format +msgid "cannot opendir '%s'" +msgstr "kann Verzeichnis '%s' nicht auslesen" + +#: builtin/init-db.c:96 +#, c-format +msgid "cannot readlink '%s'" +msgstr "kann Linkziel für '%s' nicht ermitteln" + +#: builtin/init-db.c:98 +#, c-format +msgid "insanely long symlink %s" +msgstr "irrsinnig langer Symlink '%s'" + +#: builtin/init-db.c:101 +#, c-format +msgid "cannot symlink '%s' '%s'" +msgstr "kann '%s' nicht von '%s' aus symlinken" + +#: builtin/init-db.c:105 +#, c-format +msgid "cannot copy '%s' to '%s'" +msgstr "kann '%s' nicht nach '%s' kopieren" + +#: builtin/init-db.c:109 +#, c-format +msgid "ignoring template %s" +msgstr "ignoriere Vorlage %s" + +#: builtin/init-db.c:132 +#, c-format +msgid "insanely long template path %s" +msgstr "irrsinnig langer Vorlagen-Pfad %s" + +#: builtin/init-db.c:140 +#, c-format +msgid "templates not found %s" +msgstr "Vorlagen nicht gefunden: %s" + +#: builtin/init-db.c:153 +#, c-format +msgid "not copying templates of a wrong format version %d from '%s'" +msgstr "kopiere keine Vorlage in einer falschen Formatversion %d von '%s'" + +#: builtin/init-db.c:191 +#, c-format +msgid "insane git directory %s" +msgstr "irrsinniges git-Verzeichnis %s" + +#. 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:355 +#, c-format +msgid "%s%s Git repository in %s%s\n" +msgstr "%s%s git-Repository in %s%s\n" + +#: builtin/init-db.c:356 +msgid "Reinitialized existing" +msgstr "Noch einmal neu initialisiert:" + +#: builtin/init-db.c:356 +msgid "Initialized empty" +msgstr "Neu angelegt:" + +#: builtin/init-db.c:357 +msgid " shared" +msgstr " gemeinsam benutztes" + +#: builtin/init-db.c:376 +msgid "cannot tell cwd" +msgstr "kann aktuelles Verzeichnis nicht ermitteln" + +#: builtin/init-db.c:450 builtin/init-db.c:457 +#, c-format +msgid "cannot mkdir %s" +msgstr "cann Verzeichnis %s nicht anlegen" + +#: builtin/init-db.c:461 +#, c-format +msgid "cannot chdir to %s" +msgstr "kann nicht in Verzeichnis %s wechseln" + +#: builtin/init-db.c:483 +#, c-format +msgid "" +"%s (or --work-tree=) not allowed without specifying %s (or --git-" +"dir=)" +msgstr "" +"%s (oder --work-tree=) nicht erlaubt ohne %s (oder --git-" +"dir= manually.\n" +msgstr "" +"Konnte keinen verfolgten Remote-Branch finden, bitte gib selbst " +"an.\n" + +#: builtin/log.c:1410 builtin/log.c:1412 builtin/log.c:1424 +#, c-format +msgid "Unknown commit %s" +msgstr "Unbekannter Commit %s" + +#: builtin/merge.c:82 +msgid "switch `m' requires a value" +msgstr "Option `m' benötigt einen Wert" + +#: builtin/merge.c:119 +#, c-format +msgid "Could not find merge strategy '%s'.\n" +msgstr "Konnte Merge-Strategie '%s' nicht finden.\n" + +#: builtin/merge.c:120 +#, c-format +msgid "Available strategies are:" +msgstr "Verfügbare Strategien sind:" + +#: builtin/merge.c:125 +#, c-format +msgid "Available custom strategies are:" +msgstr "Verfügbare benutzerdefinierte Strategien sind:" + +#: builtin/merge.c:223 +msgid "could not run stash." +msgstr "konnte 'stash' nicht ausführen." + +#: builtin/merge.c:228 +msgid "stash failed" +msgstr "'stash' fehlgeschlagen" + +#: builtin/merge.c:233 +#, c-format +msgid "not a valid object: %s" +msgstr "kein gültiges Object: %s" + +#: builtin/merge.c:250 +msgid "read-tree failed" +msgstr "read-tree fehlgeschlagen" + +#: builtin/merge.c:279 +msgid " (nothing to squash)" +msgstr " (nichts zu kombinieren (--squash))" + +#: builtin/merge.c:292 +#, c-format +msgid "Squash commit -- not updating HEAD\n" +msgstr "Squash-Commit -- HEAD wird nicht aktualisiert\n" + +#: builtin/merge.c:295 builtin/merge.c:1290 builtin/merge.c:1299 +#: builtin/merge.c:1309 +#, c-format +msgid "Could not write to '%s'" +msgstr "Konnte '%s' nicht beschreiben" + +#: builtin/merge.c:323 +msgid "Writing SQUASH_MSG" +msgstr "Schreibe SQUASH_MSG" + +#: builtin/merge.c:325 +msgid "Finishing SQUASH_MSG" +msgstr "Schließe SQUASH_MSG ab" + +#: builtin/merge.c:345 +#, c-format +msgid "No merge message -- not updating HEAD\n" +msgstr "Kein Merge-Kommentar -- HEAD wird nicht aktualisiert\n" + +#: builtin/merge.c:396 +#, c-format +msgid "'%s' does not point to a commit" +msgstr "'%s' zeigt nicht auf einen Commit" + +#: builtin/merge.c:491 +#, c-format +msgid "Bad branch.%s.mergeoptions string: %s" +msgstr "Ungültiger Wert für branch.%s.mergeoptions: %s" + +#: builtin/merge.c:553 +msgid "git write-tree failed to write a tree" +msgstr "'git write-tree' konnte keinen Tree anlegen" + +#: builtin/merge.c:594 +msgid "failed to read the cache" +msgstr "konnte den Index nicht auslesen" + +#: builtin/merge.c:611 +msgid "Unable to write index." +msgstr "Konnte den Index nicht anlegen." + +#: builtin/merge.c:624 +msgid "Not handling anything other than two heads merge." +msgstr "Ich erledige ausschließlich Merges mit zwei Quellen." + +#: builtin/merge.c:651 +#, c-format +msgid "Unknown option for merge-recursive: -X%s" +msgstr "Unbekannte Option für merge-recursive: -X%s" + +#: builtin/merge.c:666 +#, c-format +msgid "unable to write %s" +msgstr "konnte %s nicht beschreiben" + +#: builtin/merge.c:791 +#, c-format +msgid "Wonderful.\n" +msgstr "Wunderbar.\n" + +#: builtin/merge.c:840 builtin/merge.c:1287 builtin/merge.c:1295 +#: builtin/merge.c:1303 +#, c-format +msgid "Could not open '%s' for writing" +msgstr "Konnte '%s' nicht zum Schreiben öffnen" + +#: builtin/merge.c:856 +#, c-format +msgid "Automatic merge failed; fix conflicts and then commit the result.\n" +msgstr "" +"Automatischer Merge fehlgeschlagen; behebe die Konflikte und committe das " +"Ergebnis.\n" + +#: builtin/merge.c:871 +#, c-format +msgid "'%s' is not a commit" +msgstr "'%s' ist kein Commit" + +#: builtin/merge.c:921 +msgid "" +"You have not concluded your merge (MERGE_HEAD exists).\n" +"Please, commit your changes before you can merge." +msgstr "" +"Du hast deinen Merge nicht abgeschlossen (MERGE_HEAD existiert).\n" +"Bitte committe deine Änderungen, bevor du einen weiteren Merge startest." + +#: builtin/merge.c:924 +msgid "You have not concluded your merge (MERGE_HEAD exists)." +msgstr "Du hast deinen Merge nicht abgeschlossen (MERGE_HEAD existiert)." + +#: builtin/merge.c:951 +msgid "You cannot combine --squash with --no-ff." +msgstr "Du kannst --squash nicht mit --no-ff kombinieren." + +#: builtin/merge.c:956 +msgid "You cannot combine --no-ff with --ff-only." +msgstr "Du kannst --no-ff nicht mit --ff-only kombinieren (wirklich wahr)." + +# Die Originalumschreibung "exactly one commit" ist irreführend; es geht +# natürlich um die gesamte History hinter diesem Commit +#: builtin/merge.c:984 +msgid "Can merge only exactly one commit into empty head" +msgstr "Kann nur exakt eine Historie in einen leeren Branch mergen" + +#: builtin/merge.c:987 +msgid "Squash commit into empty head not supported yet" +msgstr "Squash-Commit in leeren Branch wird noch nicht unterstützt" + +#: builtin/merge.c:989 +msgid "Non-fast-forward commit does not make sense into an empty head" +msgstr "Das Erzwingen eines Merge-Commits in einem leeren Branch ist unsinnig" + +#: builtin/merge.c:993 builtin/merge.c:1041 +#, c-format +msgid "%s - not something we can merge" +msgstr "%s ist etwas, das wir nicht mergen können" + +#: builtin/merge.c:1099 +#, c-format +msgid "Updating %s..%s\n" +msgstr "Aktualisiere %s..%s\n" + +#: builtin/merge.c:1133 +#, c-format +msgid "Trying really trivial in-index merge...\n" +msgstr "Probiere simplen Merge im Index...\n" + +#: builtin/merge.c:1137 +#, c-format +msgid "Nope.\n" +msgstr "Nö.\n" + +#: builtin/merge.c:1170 +msgid "Not possible to fast-forward, aborting." +msgstr "Kann nicht ohne Merge-Commit aktualisieren, breche ab." + +#: builtin/merge.c:1196 builtin/merge.c:1269 +#, c-format +msgid "Rewinding the tree to pristine...\n" +msgstr "Räume auf...\n" + +#: builtin/merge.c:1200 +#, c-format +msgid "Trying merge strategy %s...\n" +msgstr "Probiere Merge-Strategie %s...\n" + +#: builtin/merge.c:1261 +#, c-format +msgid "No merge strategy handled the merge.\n" +msgstr "Keine Merge-Strategie hat den Merge erledigt.\n" + +#: builtin/merge.c:1263 +#, c-format +msgid "Merge with strategy %s failed.\n" +msgstr "Merge mit Strategie '%s' fehlgeschlagen.\n" + +#: builtin/merge.c:1271 +#, c-format +msgid "Using the %s to prepare resolving by hand.\n" +msgstr "Benutze Strategie '%s', um auf manuelle Auflösung vorzubereiten.\n" + +#: builtin/merge.c:1314 +#, c-format +msgid "Automatic merge went well; stopped before committing as requested\n" +msgstr "" +"Automatischer Merge hat gut funktioniert; warte wie gewünscht vor dem " +"Commit\n" + +#: builtin/mv.c:103 +#, c-format +msgid "Checking rename of '%s' to '%s'\n" +msgstr "Prüfe Umbenennen von '%s' nach '%s'\n" + +#: builtin/mv.c:107 +msgid "bad source" +msgstr "ungültige Quelle" + +#: builtin/mv.c:110 +msgid "can not move directory into itself" +msgstr "kann ein Verzeichnis nicht in sich selbst verschieben" + +#: builtin/mv.c:113 +msgid "cannot move directory over file" +msgstr "kann Verzeichnis nicht an die Stelle einer Datei verschieben" + +#: builtin/mv.c:123 +#, c-format +msgid "Huh? %.*s is in index?" +msgstr "Hä? %.*s ist im Index?" + +#: builtin/mv.c:135 +msgid "source directory is empty" +msgstr "Quellverzeichnis ist leer" + +#: builtin/mv.c:166 +msgid "not under version control" +msgstr "nicht unter Versionskontrolle" + +#: builtin/mv.c:168 +msgid "destination exists" +msgstr "Ziel existiert schon" + +#: builtin/mv.c:175 +#, c-format +msgid "%s; will overwrite!" +msgstr "%s; werde überschreiben!" + +#: builtin/mv.c:178 +msgid "Cannot overwrite" +msgstr "Kann nicht überschreiben" + +#: builtin/mv.c:181 +msgid "multiple sources for the same target" +msgstr "mehrere Quellen für das gleiche Ziel" + +#: builtin/mv.c:196 +#, c-format +msgid "%s, source=%s, destination=%s" +msgstr "%s, Quelle=%s, Ziel=%s" + +#: builtin/mv.c:206 +#, c-format +msgid "Renaming %s to %s\n" +msgstr "Benenne %s um nach %s\n" + +#: builtin/mv.c:209 +#, c-format +msgid "renaming '%s' failed" +msgstr "Umbenennen von '%s' fehlgeschlagen" + +#: builtin/notes.c:122 +#, fuzzy, c-format +msgid "unable to start 'show' for object '%s'" +msgstr "kann Objekte des Typs %s nicht greppen" + +#: builtin/notes.c:128 +msgid "can't fdopen 'show' output fd" +msgstr "" + +#: builtin/notes.c:138 +#, fuzzy, c-format +msgid "failed to close pipe to 'show' for object '%s'" +msgstr "konnte Datei nicht nach '%s' kopieren" + +#: builtin/notes.c:141 +#, fuzzy, c-format +msgid "failed to finish 'show' for object '%s'" +msgstr "Übertragen einiger Referenzen zu '%s' fehlgeschlagen" + +#: builtin/notes.c:158 builtin/tag.c:311 +#, c-format +msgid "could not create file '%s'" +msgstr "konnte Datei '%s' nicht anlegen" + +#: builtin/notes.c:172 +#, fuzzy +msgid "Please supply the note contents using either -m or -F option" +msgstr "Bitte gib den Kommentar mit der Option -m oder -F an.\n" + +#: builtin/notes.c:193 builtin/notes.c:797 +#, fuzzy, c-format +msgid "Removing note for object %s\n" +msgstr "Konnte Objekt %s nicht lesen" + +#: builtin/notes.c:198 +#, fuzzy +msgid "unable to write note object" +msgstr "konnte Commit-Objekt nicht anlegen" + +#: builtin/notes.c:200 +#, fuzzy, c-format +msgid "The note contents has been left in %s" +msgstr "Der Tag-Kommentar wurde nach %s gesichert\n" + +#: builtin/notes.c:234 builtin/tag.c:445 +#, c-format +msgid "cannot read '%s'" +msgstr "kann '%s' nicht auslesen" + +#: builtin/notes.c:236 builtin/tag.c:448 +#, c-format +msgid "could not open or read '%s'" +msgstr "kann '%s' nicht öffnen oder auslesen" + +#: builtin/notes.c:255 builtin/notes.c:444 builtin/notes.c:446 +#: builtin/notes.c:508 builtin/notes.c:560 builtin/notes.c:631 +#: builtin/notes.c:636 builtin/notes.c:710 builtin/notes.c:752 +#: builtin/notes.c:789 builtin/reset.c:303 builtin/tag.c:461 +#, c-format +msgid "Failed to resolve '%s' as a valid ref." +msgstr "Konnte '%s' nicht als gültige Referenz auflösen." + +#: builtin/notes.c:258 +#, fuzzy, c-format +msgid "Failed to read object '%s'." +msgstr "Konnte Objekt %s nicht lesen" + +#: builtin/notes.c:283 +msgid "Cannot commit uninitialized/unreferenced notes tree" +msgstr "" + +#: builtin/notes.c:295 +msgid "Failed to write current notes tree to database" +msgstr "" + +#: builtin/notes.c:307 +#, fuzzy +msgid "Failed to commit notes tree to database" +msgstr "Konnte Tree von %s nicht finden." + +#: builtin/notes.c:339 +#, c-format +msgid "Bad notes.rewriteMode value: '%s'" +msgstr "" + +#: builtin/notes.c:349 +#, c-format +msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" +msgstr "" + +#. TRANSLATORS: The first %s is the name of the +#. environment variable, the second %s is its value +#: builtin/notes.c:376 +#, c-format +msgid "Bad %s value: '%s'" +msgstr "" + +#: builtin/notes.c:440 +#, fuzzy, c-format +msgid "Malformed input line: '%s'." +msgstr "ungültiger Objektname %s" + +#: builtin/notes.c:455 +#, fuzzy, c-format +msgid "Failed to copy notes from '%s' to '%s'" +msgstr "konnte Datei nicht nach '%s' kopieren" + +#. TRANSLATORS: The first %s is one of "git notes ACTION", +#. e.g. "add", "copy", "append" etc. +#: builtin/notes.c:481 +#, c-format +msgid "Refusing to %s notes in %s (outside of refs/notes/)" +msgstr "" + +#: builtin/notes.c:501 builtin/notes.c:553 builtin/notes.c:614 +#: builtin/notes.c:626 builtin/notes.c:698 builtin/notes.c:745 +#: builtin/notes.c:782 builtin/notes.c:821 +#, fuzzy +msgid "too many parameters" +msgstr "zu viele Parameter" + +#: builtin/notes.c:505 +msgid "list" +msgstr "" + +#: builtin/notes.c:514 builtin/notes.c:758 +#, fuzzy, c-format +msgid "No note found for object %s." +msgstr "Konnte Objekt %s nicht lesen" + +#: builtin/notes.c:562 +msgid "add" +msgstr "add" + +#: builtin/notes.c:567 +#, c-format +msgid "" +"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " +"existing notes" +msgstr "" + +#: builtin/notes.c:572 builtin/notes.c:649 +#, c-format +msgid "Overwriting existing notes for object %s\n" +msgstr "" + +#: builtin/notes.c:622 +#, fuzzy +msgid "too few parameters" +msgstr "zu viele Parameter" + +#: builtin/notes.c:638 +msgid "copy" +msgstr "" + +#: builtin/notes.c:643 +#, c-format +msgid "" +"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " +"existing notes" +msgstr "" + +#: builtin/notes.c:655 +#, c-format +msgid "Missing notes on source object %s. Cannot copy." +msgstr "" + +#: builtin/notes.c:703 +#, 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:754 +msgid "show" +msgstr "" + +#: builtin/notes.c:791 +#, fuzzy +msgid "remove" +msgstr "Remote-" + +#: builtin/notes.c:795 +#, fuzzy, c-format +msgid "Object %s has no note\n" +msgstr "Objekt %s nicht gefunden" + +#: builtin/notes.c:825 +msgid "prune" +msgstr "" + +#: builtin/notes.c:877 +#, fuzzy, c-format +msgid "Unknown subcommand: %s" +msgstr "Unbekannter Commit %s" + +#: builtin/push.c:43 +msgid "tag shorthand without " +msgstr "'tag'-Kurzschreibweise ohne " + +#: builtin/push.c:62 +msgid "--delete only accepts plain target ref names" +msgstr "--delete akzeptiert nur einfache Referenzen, keine Refspecs" + +#: builtin/push.c:72 +msgid "You are not currently on a branch." +msgstr "Es ist momentan kein Branch aktiv." + +#: builtin/push.c:74 +#, c-format +msgid "The current branch %s is not tracking anything." +msgstr "Der aktuelle Branch %s verfolgt keinen Branch." + +#: builtin/push.c:77 +#, c-format +msgid "The current branch %s is tracking multiple branches, refusing to push." +msgstr "Der aktuelle Branch %s verfolgt mehrere Branches, 'push' verweigert." + +#: builtin/push.c:100 +msgid "" +"You didn't specify any refspecs to push, and push.default is \"nothing\"." +msgstr "" +"Du hast keine Refspecs angegeben und push.default ist auf 'nothing' gesetzt." + +#: builtin/push.c:120 +#, c-format +msgid "Pushing to %s\n" +msgstr "Übertrag zu %s\n" + +#: builtin/push.c:124 +#, c-format +msgid "failed to push some refs to '%s'" +msgstr "Übertragen einiger Referenzen zu '%s' fehlgeschlagen" + +# TODO: Verweis auf Manpage aktualisieren, sobald wir die auch übersetzen +#: builtin/push.c:132 +#, 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 zu verhindern, dass du Daten verlierst, wurden Updates, die einen\n" +"Merge-Commit erfordern, zurückgewiesen. Merge die Änderungen im\n" +"im Ursprungs-Repository (z.B. 'git pull'), bevor du es nochmal versuchst.\n" +"Siehe den Abschnitt 'Note about fast-forwards' von 'git push --help' für\n" +"mehr Informationen.\n" + +#: builtin/push.c:149 +#, c-format +msgid "bad repository '%s'" +msgstr "ungültiges Repository '%s'" + +#: builtin/push.c:150 +msgid "No destination configured to push to." +msgstr "Kein Ziel für 'push' festgelegt." + +#: builtin/push.c:158 +msgid "--all and --tags are incompatible" +msgstr "--all und --tags vertragen sich nicht" + +#: builtin/push.c:159 +msgid "--all can't be combined with refspecs" +msgstr "--all kann nicht mit Refspecs kombiniert werden" + +#: builtin/push.c:164 +msgid "--mirror and --tags are incompatible" +msgstr "--mirror und --tags vertragen sich nicht" + +#: builtin/push.c:165 +msgid "--mirror can't be combined with refspecs" +msgstr "--mirror kann nicht mit Refspecs kombiniert werden" + +#: builtin/push.c:170 +msgid "--all and --mirror are incompatible" +msgstr "--all und --mirror vertragen sich nicht" + +#: builtin/push.c:235 +msgid "--delete is incompatible with --all, --mirror and --tags" +msgstr "--delete verträgt sich nicht mit --all, --mirror und --tags" + +#: builtin/push.c:237 +msgid "--delete doesn't make sense without any refs" +msgstr "--delete ergibt keinen Sinn ohne Angabe von Referenzen" + +# Originalwerte für diese Strings belassen wg. Übereinstimmung mit +# Optionsnamen +#: builtin/reset.c:33 +msgid "mixed" +msgstr "" + +#: builtin/reset.c:33 +msgid "soft" +msgstr "" + +#: builtin/reset.c:33 +msgid "hard" +msgstr "" + +#: builtin/reset.c:33 +msgid "merge" +msgstr "" + +#: builtin/reset.c:33 +msgid "keep" +msgstr "" + +#: builtin/reset.c:95 +msgid "You do not have a valid HEAD." +msgstr "Du hast kein gültiges HEAD." + +#: builtin/reset.c:97 +msgid "Failed to find tree of HEAD." +msgstr "Konnte Tree von HEAD nicht finden." + +#: builtin/reset.c:103 +#, c-format +msgid "Failed to find tree of %s." +msgstr "Konnte Tree von %s nicht finden." + +#: builtin/reset.c:108 +msgid "Could not write new index file." +msgstr "Konnte neue Indexdatei nicht anlegen." + +#: builtin/reset.c:118 +#, c-format +msgid "HEAD is now at %s" +msgstr "HEAD ist jetzt bei %s" + +#: builtin/reset.c:142 +msgid "Could not read index" +msgstr "Konnte den Index nicht auslesen" + +#: builtin/reset.c:145 +msgid "Unstaged changes after reset:" +msgstr "Nicht vorgemerkte Änderungen nach Reset:" + +#: builtin/reset.c:225 +#, c-format +msgid "Reflog action message too long: %.*s..." +msgstr "Aktionsbeschreibung im Reflog zu lang: %.*s..." + +#: builtin/reset.c:231 +#, c-format +msgid "Cannot do a %s reset in the middle of a merge." +msgstr "Kann keinen '%s'-Reset mitten in einem Merge machen." + +#: builtin/reset.c:307 +#, c-format +msgid "Could not parse object '%s'." +msgstr "Konnte Objekt '%s' nicht einlesen." + +#: builtin/reset.c:312 +msgid "--patch is incompatible with --{hard,mixed,soft}" +msgstr "--patch verträgt sich nicht mit --{hard,mixed,soft}" + +#: builtin/reset.c:321 +msgid "--mixed with paths is deprecated; use 'git reset -- ' instead." +msgstr "" +"--mixed mit Pfaden ist veraltet; benutze stattdessen 'git reset -- '." + +#: builtin/reset.c:323 +#, c-format +msgid "Cannot do %s reset with paths." +msgstr "Kann keinen '%s'-Reset mit Pfadangaben durchführen." + +#: builtin/reset.c:335 +#, c-format +msgid "%s reset is not allowed in a bare repository" +msgstr "'%s'-Reset ist in einem Lager-Repository nicht erlaubt" + +#: builtin/reset.c:351 +#, c-format +msgid "Could not reset index file to revision '%s'." +msgstr "Konnte Indexdatei nicht auf Revision '%s' zurücksetzen." + +#: builtin/revert.c:82 +msgid "program error" +msgstr "" + +#: builtin/revert.c:154 builtin/revert.c:188 +#, fuzzy, c-format +msgid "Could not read commit message of %s" +msgstr "konnte Commit-Kommentar nicht lesen: %s" + +#: builtin/revert.c:202 +#, fuzzy, c-format +msgid "Could not extract author email from %s" +msgstr "Konnte E-Mail-Adresse nicht aus der Committer-Angabe entnehmen." + +#: builtin/revert.c:214 +#, fuzzy, c-format +msgid "Could not extract author time from %s" +msgstr "konnte Verzeichnis '%s' im Arbeitsverzeichnis nicht anlegen." + +#: builtin/revert.c:230 +#, c-format +msgid "No author information found in %s" +msgstr "" + +#: builtin/revert.c:267 +#, fuzzy, c-format +msgid "Could not write to %s." +msgstr "Konnte '%s' nicht beschreiben" + +#: builtin/revert.c:270 +#, c-format +msgid "Error wrapping up %s" +msgstr "" + +#: builtin/revert.c:290 +msgid "" +"Your local changes would be overwritten by revert.\n" +"Please, commit your changes or stash them to proceed." +msgstr "" + +#: builtin/revert.c:293 +msgid "" +"Your local changes would be overwritten by cherry-pick.\n" +"Please, commit your changes or stash them to proceed." +msgstr "" + +#. TRANSLATORS: %s will be "revert" or "cherry-pick" +#: builtin/revert.c:351 +#, fuzzy, c-format +msgid "%s: Unable to write new index file" +msgstr "Konnte keine neue Indexdatei anlegen" + +#: builtin/revert.c:417 +msgid "Your index file is unmerged." +msgstr "" + +#: builtin/revert.c:420 +#, fuzzy +msgid "You do not have a valid HEAD" +msgstr "Du hast kein gültiges HEAD." + +#: builtin/revert.c:428 +#, fuzzy +msgid "Cannot revert a root commit" +msgstr "Kann nicht überschreiben" + +#: builtin/revert.c:437 +#, c-format +msgid "Commit %s is a merge but no -m option was given." +msgstr "" + +#: builtin/revert.c:445 +#, fuzzy, c-format +msgid "Commit %s does not have parent %d" +msgstr "Pfad '%s' hat keine Version 'von uns' im Index" + +#: builtin/revert.c:449 +#, 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 +#: builtin/revert.c:460 +#, fuzzy, c-format +msgid "%s: cannot parse parent commit %s" +msgstr "konnte Commit %s nicht analysieren" + +#: builtin/revert.c:464 +#, fuzzy, c-format +msgid "Cannot get commit message for %s" +msgstr "konnte Commit-Kommentar nicht lesen: %s" + +#: builtin/revert.c:525 +#, fuzzy, c-format +msgid "could not revert %s... %s" +msgstr "konnte '%s' nicht lesen" + +#: builtin/revert.c:526 +#, fuzzy, c-format +msgid "could not apply %s... %s" +msgstr "Konnte '%s' nicht anwenden" + +#: builtin/revert.c:559 +msgid "empty commit set passed" +msgstr "" + +#: builtin/revert.c:573 +#, fuzzy +msgid "cherry-pick --ff cannot be used with --signoff" +msgstr "--cached kann nicht mit --no-index kombiniert werden." + +#: builtin/revert.c:575 +#, fuzzy +msgid "cherry-pick --ff cannot be used with --no-commit" +msgstr "--cached kann nicht mit --no-index kombiniert werden." + +#: builtin/revert.c:577 +#, fuzzy +msgid "cherry-pick --ff cannot be used with -x" +msgstr "-B kann nicht mit -b kombiniert werden" + +#: builtin/revert.c:579 +#, fuzzy +msgid "cherry-pick --ff cannot be used with --edit" +msgstr "-B kann nicht mit -b kombiniert werden" + +#. TRANSLATORS: %s will be "revert" or "cherry-pick" +#: builtin/revert.c:584 +#, fuzzy, c-format +msgid "git %s: failed to read the index" +msgstr "konnte den Index nicht auslesen" + +#: builtin/rm.c:118 +#, c-format +msgid "" +"'%s' has staged content different from both the file and the HEAD\n" +"(use -f to force removal)" +msgstr "" +"'%s' hat vorgemerkte Änderungen, die sich sowohl von der Datei\n" +"als auch vom letzten Commit unterscheiden (-f, um trotzdem zu löschen)" + +#: builtin/rm.c:124 +#, c-format +msgid "" +"'%s' has changes staged in the index\n" +"(use --cached to keep the file, or -f to force removal)" +msgstr "" +"'%s' hat Änderungen im Index vorgemerkt\n" +"(--cached, um die Datei zu behalten, oder -f, um trotzdem zu löschen)" + +#: builtin/rm.c:128 +#, c-format +msgid "" +"'%s' has local modifications\n" +"(use --cached to keep the file, or -f to force removal)" +msgstr "" +"'%s' hat Änderungen im Arbeitsverzeichnis\n" +"(--cached, um die Datei zu behalten, oder -f, um trotzdem zu löschen)" + +#: builtin/rm.c:202 +#, c-format +msgid "not removing '%s' recursively without -r" +msgstr "entferne Verzeichnis '%s' nicht rekursiv ohne -r" + +#: builtin/rm.c:238 +#, c-format +msgid "git rm: unable to remove %s" +msgstr "git rm: kann %s nicht entfernen" + +#: builtin/shortlog.c:161 +#, fuzzy, c-format +msgid "Missing author: %s" +msgstr "Übertrag zu %s\n" + +#: builtin/tag.c:123 builtin/tag.c:464 +#, c-format +msgid "tag name too long: %.*s..." +msgstr "Tagname zu lang: %.*s..." + +#: builtin/tag.c:128 +#, c-format +msgid "tag '%s' not found." +msgstr "Tag '%s' nicht gefunden." + +#: builtin/tag.c:143 +#, c-format +msgid "Deleted tag '%s' (was %s)\n" +msgstr "Tag '%s' gelöscht (war %s)\n" + +#: builtin/tag.c:155 +#, c-format +msgid "could not verify the tag '%s'" +msgstr "konnte den Tag '%s' nicht überprüfen" + +#: builtin/tag.c:170 +msgid "committer info too long." +msgstr "Committer-Angabe zu lang." + +#: builtin/tag.c:190 +msgid "could not run gpg." +msgstr "konnte gpg nicht ausführen." + +#: builtin/tag.c:196 +msgid "gpg did not accept the tag data" +msgstr "gpg hat die Tag-Daten nicht angenommen" + +#: builtin/tag.c:203 +msgid "gpg failed to sign the tag" +msgstr "gpg konnte den Tag nicht signieren" + +#: builtin/tag.c:218 +msgid "" +"\n" +"#\n" +"# Write a tag message\n" +"#\n" +msgstr "" +"\n" +"#\n" +"# Schreibe einen Tag-Kommentar\n" +"#\n" + +#: builtin/tag.c:226 +#, c-format +msgid "signing key value too long (%.10s...)" +msgstr "Wert für Signatur-Key zu lang (%.10s...)" + +#: builtin/tag.c:272 +msgid "unable to sign the tag" +msgstr "kann den Tag nicht signieren" + +#: builtin/tag.c:274 +msgid "unable to write tag file" +msgstr "kann die Tag-Datei nicht anlegen" + +#: builtin/tag.c:289 +msgid "bad object type." +msgstr "ungültiger Objekttyp." + +#: builtin/tag.c:302 +msgid "tag header too big." +msgstr "Tag-Header zu groß." + +#: builtin/tag.c:329 +msgid "no tag message?" +msgstr "kein Tag-Kommentar?" + +#: builtin/tag.c:335 +#, c-format +msgid "The tag message has been left in %s\n" +msgstr "Der Tag-Kommentar wurde nach %s gesichert\n" + +#: builtin/tag.c:428 +msgid "-n option is only allowed with -l." +msgstr "-n ist nur in Kombination mit -l erlaubt." + +#: builtin/tag.c:430 +msgid "--contains option is only allowed with -l." +msgstr "--contains ist nur in Kombination mit -l erlaubt." + +#: builtin/tag.c:438 +msgid "only one -F or -m option is allowed." +msgstr "entweder -F oder -m -- entscheide dich." + +#: builtin/tag.c:458 +msgid "too many params" +msgstr "zu viele Parameter" + +#: builtin/tag.c:466 +#, c-format +msgid "'%s' is not a valid tag name." +msgstr "'%s' ist kein gültiger Tagname." + +#: builtin/tag.c:471 +#, c-format +msgid "tag '%s' already exists" +msgstr "Tag '%s' existiert schon" + +#: builtin/tag.c:479 +#, c-format +msgid "%s: cannot lock the ref" +msgstr "%s: kann kein Lock für die Referenz anfordern" + +#: builtin/tag.c:481 +#, c-format +msgid "%s: cannot update the ref" +msgstr "%s: kann die Referenz nicht aktualisieren" + +#: builtin/tag.c:483 +#, c-format +msgid "Updated tag '%s' (was %s)\n" +msgstr "Tag '%s' aktualisiert (war %s)\n" + +#: git-am.sh:47 +#, fuzzy +msgid "You need to set your committer info first" +msgstr "du musst zuerst Konflikte im aktuellen Index auflösen" + +#: git-am.sh:80 +#, sh-format +msgid "" +"When you have resolved this problem run \"$cmdline --resolved\".\n" +"If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n" +"To restore the original branch and stop patching run \"$cmdline --abort\"." +msgstr "" + +#: git-am.sh:96 +msgid "Cannot fall back to three-way merge." +msgstr "" + +#: git-am.sh:111 +msgid "Repository lacks necessary blobs to fall back on 3-way merge." +msgstr "" + +#: git-am.sh:120 +msgid "" +"Did you hand edit your patch?\n" +"It does not apply to blobs recorded in its index." +msgstr "" + +#: git-am.sh:236 +msgid "Only one StGIT patch series can be applied at once" +msgstr "" + +#: git-am.sh:288 +#, sh-format +msgid "Patch format $patch_format is not supported." +msgstr "" + +#: git-am.sh:290 +msgid "Patch format detection failed." +msgstr "" + +#: git-am.sh:340 +msgid "-d option is no longer supported. Do not use." +msgstr "" + +#: git-am.sh:403 +#, sh-format +msgid "previous rebase directory $dotest still exists but mbox given." +msgstr "" + +#: git-am.sh:408 +msgid "Please make up your mind. --skip or --abort?" +msgstr "" + +#: git-am.sh:434 +msgid "Resolve operation not in progress, we are not resuming." +msgstr "" + +#: git-am.sh:499 +#, sh-format +msgid "Dirty index: cannot apply patches (dirty: $files)" +msgstr "" + +#: git-am.sh:595 +#, sh-format +msgid "" +"Patch is empty. Was it split wrong?\n" +"If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n" +"To restore the original branch and stop patching run \"$cmdline --abort\"." +msgstr "" + +#: git-am.sh:632 +#, fuzzy +msgid "Patch does not have a valid e-mail address." +msgstr "Pfad '%s' hat keine drei verschiedenen Versionen im Index" + +#: git-am.sh:679 +msgid "cannot be interactive without stdin connected to a terminal." +msgstr "" + +#: git-am.sh:683 +msgid "Commit Body is:" +msgstr "" + +#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] +#. in your translation. The program will only accept English +#. input at this point. +#: git-am.sh:690 +msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " +msgstr "" + +#: git-am.sh:726 +#, sh-format +msgid "Applying: $FIRSTLINE" +msgstr "" + +#: git-am.sh:747 +msgid "" +"No changes - did you forget to use 'git add'?\n" +"If there is nothing left to stage, chances are that something else\n" +"already introduced the same changes; you might want to skip this patch." +msgstr "" + +#: git-am.sh:755 +msgid "" +"You still have unmerged paths in your index\n" +"did you forget to use 'git add'?" +msgstr "" + +#: git-am.sh:771 +msgid "No changes -- Patch already applied." +msgstr "" + +#: git-am.sh:781 +#, sh-format +msgid "Patch failed at $msgnum $FIRSTLINE" +msgstr "" + +#: git-am.sh:797 +msgid "applying to an empty history" +msgstr "" From f33d8f867945813b9f467c5a6fb92f54a65e2930 Mon Sep 17 00:00:00 2001 From: Sam Reed Date: Fri, 3 Sep 2010 17:29:48 +0000 Subject: [PATCH 03/15] po/en_GB.po: add British English translation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Translate three Git messages from US to British English. These all had to do with z v.s. s differences. Signed-off-by: Sam Reed Signed-off-by: Ævar Arnfjörð Bjarmason --- po/en_GB.po | 2784 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 2784 insertions(+) create mode 100644 po/en_GB.po diff --git a/po/en_GB.po b/po/en_GB.po new file mode 100644 index 00000000000000..4854e1ad580dd2 --- /dev/null +++ b/po/en_GB.po @@ -0,0 +1,2784 @@ +# British English translations for Git. +# Copyright (C) 2010 Sam Reed +# This file is distributed under the same license as the Git package. +# Sam Reed , 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: Git\n" +"Report-Msgid-Bugs-To: Git Mailing List \n" +"POT-Creation-Date: 2010-09-20 15:07+0000\n" +"PO-Revision-Date: 2010-09-02 19:09 +0000\n" +"Last-Translator: Sam Reed \n" +"Language-Team: Git Mailing List \n" +"Language: en-gb\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: wt-status.c:56 +msgid "# Unmerged paths:" +msgstr "" + +#: wt-status.c:62 wt-status.c:79 +#, c-format +msgid "# (use \"git reset %s ...\" to unstage)" +msgstr "" + +#: wt-status.c:64 wt-status.c:81 +msgid "# (use \"git rm --cached ...\" to unstage)" +msgstr "" + +#: wt-status.c:65 +msgid "# (use \"git add/rm ...\" as appropriate to mark resolution)" +msgstr "" + +#: wt-status.c:73 +msgid "# Changes to be committed:" +msgstr "" + +#: wt-status.c:91 +msgid "# Changed but not updated:" +msgstr "" + +#: wt-status.c:95 +msgid "# (use \"git add ...\" to update what will be committed)" +msgstr "" + +#: wt-status.c:97 +msgid "# (use \"git add/rm ...\" to update what will be committed)" +msgstr "" + +#: wt-status.c:98 +msgid "" +"# (use \"git checkout -- ...\" to discard changes in working " +"directory)" +msgstr "" + +#: wt-status.c:100 +msgid "# (commit or discard the untracked or modified content in submodules)" +msgstr "" + +#: wt-status.c:109 +#, c-format +msgid "# %s files:" +msgstr "" + +#: wt-status.c:112 +#, c-format +msgid "# (use \"git %s ...\" to include in what will be committed)" +msgstr "" + +#: wt-status.c:129 +msgid "bug" +msgstr "" + +#: wt-status.c:134 +msgid "both deleted:" +msgstr "" + +#: wt-status.c:135 +msgid "added by us:" +msgstr "" + +#: wt-status.c:136 +msgid "deleted by them:" +msgstr "" + +#: wt-status.c:137 +msgid "added by them:" +msgstr "" + +#: wt-status.c:138 +msgid "deleted by us:" +msgstr "" + +#: wt-status.c:139 +msgid "both added:" +msgstr "" + +#: wt-status.c:140 +msgid "both modified:" +msgstr "" + +#: wt-status.c:170 +msgid "new commits, " +msgstr "" + +#: wt-status.c:172 +msgid "modified content, " +msgstr "" + +#: wt-status.c:174 +msgid "untracked content, " +msgstr "" + +#: wt-status.c:188 +#, c-format +msgid "new file: %s" +msgstr "" + +#: wt-status.c:191 +#, c-format +msgid "copied: %s -> %s" +msgstr "" + +#: wt-status.c:194 +#, c-format +msgid "deleted: %s" +msgstr "" + +#: wt-status.c:197 +#, c-format +msgid "modified: %s" +msgstr "" + +#: wt-status.c:200 +#, c-format +msgid "renamed: %s -> %s" +msgstr "" + +#: wt-status.c:203 +#, c-format +msgid "typechange: %s" +msgstr "" + +#: wt-status.c:206 +#, c-format +msgid "unknown: %s" +msgstr "" + +#: wt-status.c:209 +#, c-format +msgid "unmerged: %s" +msgstr "" + +#: wt-status.c:212 +#, c-format +msgid "bug: unhandled diff status %c" +msgstr "" + +#: wt-status.c:635 +msgid "On branch " +msgstr "" + +#: wt-status.c:642 +msgid "Not currently on any branch." +msgstr "" + +#: wt-status.c:652 +msgid "# Initial commit" +msgstr "" + +#: wt-status.c:666 +msgid "Untracked" +msgstr "" + +#: wt-status.c:668 +msgid "Ignored" +msgstr "" + +#: wt-status.c:670 +#, c-format +msgid "# Untracked files not listed%s\n" +msgstr "" + +#: wt-status.c:672 +msgid " (use -u option to show untracked files)" +msgstr "" + +#: wt-status.c:678 +#, c-format +msgid "# No changes\n" +msgstr "" + +#: wt-status.c:682 +#, c-format +msgid "no changes added to commit%s\n" +msgstr "" + +#: wt-status.c:684 +msgid " (use \"git add\" and/or \"git commit -a\")" +msgstr "" + +#: wt-status.c:686 +#, c-format +msgid "nothing added to commit but untracked files present%s\n" +msgstr "" + +#: wt-status.c:688 +msgid " (use \"git add\" to track)" +msgstr "" + +#: wt-status.c:690 wt-status.c:693 wt-status.c:696 +#, c-format +msgid "nothing to commit%s\n" +msgstr "" + +#: wt-status.c:691 +msgid " (create/copy files and use \"git add\" to track)" +msgstr "" + +#: wt-status.c:694 +msgid " (use -u to show untracked files)" +msgstr "" + +#: wt-status.c:697 +msgid " (working directory clean)" +msgstr "" + +#: wt-status.c:795 +msgid "HEAD (no branch)" +msgstr "" + +#: wt-status.c:801 +msgid "Initial commit on " +msgstr "" + +#: wt-status.c:816 +msgid "behind " +msgstr "" + +#: wt-status.c:819 wt-status.c:822 +msgid "ahead " +msgstr "" + +#: wt-status.c:824 +msgid ", behind " +msgstr "" + +#: builtin/add.c:41 +#, c-format +msgid "unexpected diff status %c" +msgstr "" + +#: builtin/add.c:67 builtin/commit.c:244 +msgid "updating files failed" +msgstr "" + +#: builtin/add.c:77 +#, c-format +msgid "remove '%s'\n" +msgstr "" + +#: builtin/add.c:175 +#, c-format +msgid "Path '%s' is in submodule '%.*s'" +msgstr "" + +#: builtin/add.c:191 +msgid "Unstaged changes after refreshing the index:" +msgstr "" + +#: builtin/add.c:194 builtin/add.c:452 builtin/rm.c:194 +#, c-format +msgid "pathspec '%s' did not match any files" +msgstr "" + +#: builtin/add.c:208 +#, c-format +msgid "'%s' is beyond a symbolic link" +msgstr "" + +#: builtin/add.c:275 +msgid "Could not read the index" +msgstr "" + +#: builtin/add.c:284 +#, c-format +msgid "Could not open '%s' for writing." +msgstr "" + +#: builtin/add.c:288 +msgid "Could not write patch" +msgstr "" + +#: builtin/add.c:293 +#, c-format +msgid "Could not stat '%s'" +msgstr "" + +#: builtin/add.c:295 +msgid "Empty patch. Aborted." +msgstr "" + +#: builtin/add.c:301 +#, c-format +msgid "Could not apply '%s'" +msgstr "" + +#: builtin/add.c:349 +#, c-format +msgid "Use -f if you really want to add them.\n" +msgstr "" + +#: builtin/add.c:350 +msgid "no files added" +msgstr "" + +#: builtin/add.c:356 +msgid "adding files failed" +msgstr "" + +#: builtin/add.c:388 +msgid "-A and -u are mutually incompatible" +msgstr "" + +#: builtin/add.c:390 +msgid "Option --ignore-missing can only be used together with --dry-run" +msgstr "" + +#: builtin/add.c:410 +#, c-format +msgid "Nothing specified, nothing added.\n" +msgstr "" + +#: builtin/add.c:411 +#, c-format +msgid "Maybe you wanted to say 'git add .'?\n" +msgstr "" + +#: builtin/add.c:417 builtin/clean.c:95 builtin/commit.c:301 +#: builtin/commit.c:310 builtin/mv.c:77 builtin/rm.c:171 +msgid "index file corrupt" +msgstr "" + +#: builtin/add.c:468 builtin/mv.c:223 builtin/rm.c:268 +msgid "Unable to write new index file" +msgstr "" + +#: builtin/archive.c:17 +#, c-format +msgid "could not create archive file '%s'" +msgstr "" + +#: builtin/archive.c:20 +msgid "could not redirect output" +msgstr "" + +#: builtin/archive.c:36 +msgid "git archive: Remote with no URL" +msgstr "" + +#: builtin/archive.c:46 +msgid "git archive: expected ACK/NAK, got EOF" +msgstr "" + +#: builtin/archive.c:51 +#, c-format +msgid "git archive: NACK %s" +msgstr "" + +#: builtin/archive.c:52 +msgid "git archive: protocol error" +msgstr "" + +#: builtin/archive.c:57 +msgid "git archive: expected a flush" +msgstr "" + +#: builtin/branch.c:136 +#, c-format +msgid "" +"deleting branch '%s' that has been merged to\n" +" '%s', but it is not yet merged to HEAD." +msgstr "" + +#: builtin/branch.c:140 +#, c-format +msgid "" +"not deleting branch '%s' that is not yet merged to\n" +" '%s', even though it is merged to HEAD." +msgstr "" + +#. TRANSLATORS: This is "remote " in "remote branch '%s' not found" +#: builtin/branch.c:161 +msgid "remote " +msgstr "" + +#: builtin/branch.c:169 +msgid "cannot use -a with -d" +msgstr "" + +#: builtin/branch.c:175 +msgid "Couldn't look up commit object for HEAD" +msgstr "" + +#: builtin/branch.c:180 +#, c-format +msgid "Cannot delete the branch '%s' which you are currently on." +msgstr "" + +#: builtin/branch.c:190 +#, c-format +msgid "%sbranch '%s' not found." +msgstr "" + +#: builtin/branch.c:198 +#, c-format +msgid "Couldn't look up commit object for '%s'" +msgstr "" + +#: builtin/branch.c:204 +#, c-format +msgid "" +"The branch '%s' is not fully merged.\n" +"If you are sure you want to delete it, run 'git branch -D %s'." +msgstr "" + +#: builtin/branch.c:212 +#, c-format +msgid "Error deleting %sbranch '%s'" +msgstr "" + +#: builtin/branch.c:217 +#, c-format +msgid "Deleted %sbranch %s (was %s).\n" +msgstr "" + +#: builtin/branch.c:222 +msgid "Update of config-file failed" +msgstr "" + +#: builtin/branch.c:304 +#, c-format +msgid "branch '%s' does not point at a commit" +msgstr "" + +#: builtin/branch.c:381 +#, c-format +msgid "behind %d] " +msgstr "" + +#: builtin/branch.c:383 +#, c-format +msgid "ahead %d] " +msgstr "" + +#: builtin/branch.c:385 +#, c-format +msgid "ahead %d, behind %d] " +msgstr "" + +#: builtin/branch.c:484 +msgid "(no branch)" +msgstr "" + +#: builtin/branch.c:544 +msgid "some refs could not be read" +msgstr "" + +#: builtin/branch.c:557 +msgid "cannot rename the current branch while not on any." +msgstr "" + +#: builtin/branch.c:567 builtin/branch.c:571 +#, c-format +msgid "Invalid branch name: '%s'" +msgstr "" + +#: builtin/branch.c:574 +#, c-format +msgid "A branch named '%s' already exists." +msgstr "" + +#: builtin/branch.c:580 +msgid "Branch rename failed" +msgstr "" + +#: builtin/branch.c:584 +#, c-format +msgid "Renamed a misnamed branch '%s' away" +msgstr "" + +#: builtin/branch.c:588 +#, c-format +msgid "Branch renamed to %s, but HEAD is not updated!" +msgstr "" + +#: builtin/branch.c:595 +msgid "Branch is renamed, but update of config-file failed" +msgstr "" + +#: builtin/branch.c:610 +#, c-format +msgid "malformed object name %s" +msgstr "" + +#: builtin/branch.c:680 +msgid "Failed to resolve HEAD as a valid ref." +msgstr "" + +#: builtin/branch.c:686 +msgid "HEAD not found below refs/heads!" +msgstr "" + +#: builtin/branch.c:706 +msgid "-a and -r options to 'git branch' do not make sense with a branch name" +msgstr "" + +#: builtin/bundle.c:47 +#, c-format +msgid "%s is okay\n" +msgstr "" + +#: builtin/bundle.c:56 +msgid "Need a repository to create a bundle." +msgstr "" + +#: builtin/bundle.c:60 +msgid "Need a repository to unbundle." +msgstr "" + +#: builtin/checkout.c:107 builtin/checkout.c:135 +#, c-format +msgid "path '%s' does not have our version" +msgstr "" + +#: builtin/checkout.c:109 builtin/checkout.c:137 +#, c-format +msgid "path '%s' does not have their version" +msgstr "" + +#: builtin/checkout.c:120 +#, c-format +msgid "path '%s' does not have all three versions" +msgstr "" + +#: builtin/checkout.c:155 +#, c-format +msgid "path '%s' does not have all 3 versions" +msgstr "" + +#: builtin/checkout.c:172 +#, c-format +msgid "path '%s': cannot merge" +msgstr "" + +#: builtin/checkout.c:189 +#, c-format +msgid "Unable to add merge result for '%s'" +msgstr "" + +#: builtin/checkout.c:194 builtin/reset.c:170 +#, c-format +msgid "make_cache_entry failed for path '%s'" +msgstr "" + +#: builtin/checkout.c:216 builtin/checkout.c:371 +msgid "corrupt index file" +msgstr "" + +#: builtin/checkout.c:244 builtin/checkout.c:251 +#, c-format +msgid "path '%s' is unmerged" +msgstr "" + +#: builtin/checkout.c:280 builtin/checkout.c:475 builtin/clone.c:658 +#: builtin/merge.c:737 +msgid "unable to write new index file" +msgstr "" + +#: builtin/checkout.c:297 builtin/diff.c:307 builtin/merge.c:367 +msgid "diff_setup_done failed" +msgstr "" + +#: builtin/checkout.c:393 +msgid "you need to resolve your current index first" +msgstr "" + +#: builtin/checkout.c:524 +#, c-format +msgid "Can not do reflog for '%s'\n" +msgstr "" + +#: builtin/checkout.c:550 +#, c-format +msgid "Already on '%s'\n" +msgstr "" + +#: builtin/checkout.c:554 +#, c-format +msgid "Switched to and reset branch '%s'\n" +msgstr "" + +#: builtin/checkout.c:556 +#, c-format +msgid "Switched to a new branch '%s'\n" +msgstr "" + +#: builtin/checkout.c:558 +#, c-format +msgid "Switched to branch '%s'\n" +msgstr "" + +#: builtin/checkout.c:575 +msgid "HEAD is now at" +msgstr "" + +#: builtin/checkout.c:603 +msgid "You are on a branch yet to be born" +msgstr "" + +#: builtin/checkout.c:617 +msgid "Previous HEAD position was" +msgstr "" + +#: builtin/checkout.c:730 +msgid "-B cannot be used with -b" +msgstr "" + +#: builtin/checkout.c:738 +msgid "--patch is incompatible with all other options" +msgstr "" + +#: builtin/checkout.c:744 +msgid "--track needs a branch name" +msgstr "" + +#: builtin/checkout.c:751 +msgid "Missing branch name; try -b" +msgstr "" + +#: builtin/checkout.c:757 +msgid "--orphan and -b|-B are mutually exclusive" +msgstr "" + +#: builtin/checkout.c:759 +msgid "--orphan cannot be used with -t" +msgstr "" + +#: builtin/checkout.c:769 +msgid "git checkout: -f and -m are incompatible" +msgstr "" + +#. case (1) +#: builtin/checkout.c:815 +#, c-format +msgid "invalid reference: %s" +msgstr "" + +#. case (1): want a tree +#: builtin/checkout.c:852 +#, c-format +msgid "reference is not a tree: %s" +msgstr "" + +#: builtin/checkout.c:878 +msgid "invalid path specification" +msgstr "" + +#: builtin/checkout.c:886 +#, c-format +msgid "" +"git checkout: updating paths is incompatible with switching branches.\n" +"Did you intend to checkout '%s' which can not be resolved as commit?" +msgstr "" + +#: builtin/checkout.c:888 +msgid "git checkout: updating paths is incompatible with switching branches." +msgstr "" + +#: builtin/checkout.c:893 +msgid "" +"git checkout: --ours/--theirs, --force and --merge are incompatible when\n" +"checking out of the index." +msgstr "" + +#: builtin/checkout.c:904 +#, c-format +msgid "git checkout: we do not like '%s' as a branch name." +msgstr "" + +#: builtin/checkout.c:909 +#, c-format +msgid "git checkout: branch %s already exists" +msgstr "" + +#: builtin/checkout.c:916 +msgid "Cannot switch branch to a non-commit." +msgstr "" + +#: builtin/checkout.c:919 +msgid "--ours/--theirs is incompatible with switching branches." +msgstr "" + +#: builtin/clean.c:78 +msgid "-x and -X cannot be used together" +msgstr "" + +#: builtin/clean.c:82 +msgid "" +"clean.requireForce set to true and neither -n nor -f given; refusing to clean" +msgstr "" + +#: builtin/clean.c:85 +msgid "" +"clean.requireForce defaults to true and neither -n nor -f given; refusing to " +"clean" +msgstr "" + +#: builtin/clean.c:154 builtin/clean.c:175 +#, c-format +msgid "Would remove %s\n" +msgstr "" + +#: builtin/clean.c:158 builtin/clean.c:178 +#, c-format +msgid "Removing %s\n" +msgstr "" + +#: builtin/clean.c:161 builtin/clean.c:181 +#, c-format +msgid "failed to remove '%s'" +msgstr "" + +#: builtin/clean.c:165 +#, c-format +msgid "Would not remove %s\n" +msgstr "" + +#: builtin/clean.c:167 +#, c-format +msgid "Not removing %s\n" +msgstr "" + +#: builtin/clone.c:208 +#, c-format +msgid "reference repository '%s' is not a local directory." +msgstr "" + +#: builtin/clone.c:235 +#, c-format +msgid "failed to open '%s'" +msgstr "" + +#: builtin/clone.c:239 +#, c-format +msgid "failed to create directory '%s'" +msgstr "" + +#: builtin/clone.c:241 builtin/diff.c:74 +#, c-format +msgid "failed to stat '%s'" +msgstr "" + +#: builtin/clone.c:243 +#, c-format +msgid "%s exists and is not a directory" +msgstr "" + +#: builtin/clone.c:257 +#, c-format +msgid "failed to stat %s\n" +msgstr "" + +#: builtin/clone.c:267 +#, c-format +msgid "failed to unlink '%s'" +msgstr "" + +#: builtin/clone.c:272 +#, c-format +msgid "failed to create link '%s'" +msgstr "" + +#: builtin/clone.c:276 +#, c-format +msgid "failed to copy file to '%s'" +msgstr "" + +#: builtin/clone.c:305 +#, c-format +msgid "done.\n" +msgstr "" + +#: builtin/clone.c:387 +msgid "Too many arguments." +msgstr "" + +#: builtin/clone.c:391 +msgid "You must specify a repository to clone." +msgstr "" + +#: builtin/clone.c:399 +#, c-format +msgid "--bare and --origin %s options are incompatible." +msgstr "" + +#: builtin/clone.c:428 +#, c-format +msgid "destination path '%s' already exists and is not an empty directory." +msgstr "" + +#: builtin/clone.c:438 +#, c-format +msgid "working tree '%s' already exists." +msgstr "" + +#: builtin/clone.c:451 builtin/clone.c:465 +#, c-format +msgid "could not create leading directories of '%s'" +msgstr "" + +#: builtin/clone.c:454 +#, c-format +msgid "could not create work tree dir '%s'." +msgstr "" + +#: builtin/clone.c:470 +#, c-format +msgid "Cloning into bare repository %s\n" +msgstr "" + +#: builtin/clone.c:472 +#, c-format +msgid "Cloning into %s\n" +msgstr "" + +#: builtin/clone.c:530 +#, c-format +msgid "Don't know how to clone %s" +msgstr "" + +#: builtin/clone.c:569 +#, c-format +msgid "Remote branch %s not found in upstream %s, using HEAD instead" +msgstr "" + +#: builtin/clone.c:579 +msgid "You appear to have cloned an empty repository." +msgstr "" + +#: builtin/clone.c:621 +msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" +msgstr "" + +#: builtin/commit.c:41 +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" +"If the identity used for this commit is wrong, you can fix it with:\n" +"\n" +" git commit --amend --author='Your Name '\n" +msgstr "" + +#: builtin/commit.c:53 +msgid "" +"You asked to amend the most recent commit, but doing so would make\n" +"it empty. You can repeat your command with --allow-empty, or you can\n" +"remove the commit entirely with \"git reset HEAD^\".\n" +msgstr "" + +#: builtin/commit.c:271 +msgid "failed to unpack HEAD tree object" +msgstr "" + +#: builtin/commit.c:299 +msgid "interactive add failed" +msgstr "" + +#: builtin/commit.c:330 builtin/commit.c:350 builtin/commit.c:396 +msgid "unable to write new_index file" +msgstr "" + +#: builtin/commit.c:380 +msgid "cannot do a partial commit during a merge." +msgstr "" + +#: builtin/commit.c:389 +msgid "cannot read the index" +msgstr "" + +#: builtin/commit.c:409 +msgid "unable to write temporary index file" +msgstr "" + +#: builtin/commit.c:456 builtin/commit.c:1294 +msgid "could not parse HEAD commit" +msgstr "" + +#: builtin/commit.c:475 builtin/commit.c:481 +#, c-format +msgid "invalid commit: %s" +msgstr "" + +#: builtin/commit.c:499 +msgid "malformed --author parameter" +msgstr "" + +#: builtin/commit.c:573 builtin/shortlog.c:299 +#, c-format +msgid "(reading log message from standard input)\n" +msgstr "" + +#: builtin/commit.c:575 +msgid "could not read log from standard input" +msgstr "" + +#: builtin/commit.c:579 +#, c-format +msgid "could not read log file '%s'" +msgstr "" + +#: builtin/commit.c:585 +msgid "commit has empty message" +msgstr "" + +#: builtin/commit.c:591 +msgid "could not read MERGE_MSG" +msgstr "" + +#: builtin/commit.c:595 +msgid "could not read SQUASH_MSG" +msgstr "" + +#: builtin/commit.c:599 +#, c-format +msgid "could not read '%s'" +msgstr "" + +#: builtin/commit.c:612 +#, c-format +msgid "could not open '%s'" +msgstr "" + +#: builtin/commit.c:636 +msgid "could not write commit template" +msgstr "" + +#: builtin/commit.c:650 +#, 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" +"#\n" +msgstr "" + +#: builtin/commit.c:659 +#, c-format +msgid "" +"\n" +"# Please enter the commit message for your changes." +msgstr "" + +#: builtin/commit.c:663 +#, c-format +msgid "" +" Lines starting\n" +"# with '#' will be ignored, and an empty message aborts the commit.\n" +msgstr "" + +#: builtin/commit.c:668 +#, c-format +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" +msgstr "" + +#: builtin/commit.c:680 +#, c-format +msgid "%s# Author: %s\n" +msgstr "" + +#: builtin/commit.c:688 +#, c-format +msgid "%s# Committer: %s\n" +msgstr "" + +#: builtin/commit.c:705 +msgid "Cannot read index" +msgstr "" + +#: builtin/commit.c:737 +msgid "Error building trees" +msgstr "" + +#: builtin/commit.c:752 builtin/tag.c:321 +#, c-format +msgid "Please supply the message using either -m or -F option.\n" +msgstr "" + +#: builtin/commit.c:832 +#, c-format +msgid "No existing author found with '%s'" +msgstr "" + +#: builtin/commit.c:847 builtin/commit.c:1039 +#, c-format +msgid "Invalid untracked files mode '%s'" +msgstr "" + +#: builtin/commit.c:864 +msgid "Using both --reset-author and --author does not make sense" +msgstr "" + +#: builtin/commit.c:878 +msgid "You have nothing to amend." +msgstr "" + +#: builtin/commit.c:880 +msgid "You are in the middle of a merge -- cannot amend." +msgstr "" + +#: builtin/commit.c:889 +msgid "Only one of -c/-C/-F can be used." +msgstr "" + +#: builtin/commit.c:891 +msgid "Option -m cannot be combined with -c/-C/-F." +msgstr "" + +#: builtin/commit.c:897 +msgid "--reset-author can be used only with -C, -c or --amend." +msgstr "" + +#: builtin/commit.c:906 +#, c-format +msgid "could not lookup commit %s" +msgstr "" + +#: builtin/commit.c:909 +#, c-format +msgid "could not parse commit %s" +msgstr "" + +#: builtin/commit.c:937 +msgid "Only one of --include/--only/--all/--interactive can be used." +msgstr "" + +#: builtin/commit.c:939 +msgid "No paths with --include/--only does not make sense." +msgstr "" + +#: builtin/commit.c:941 +msgid "Clever... amending the last one with dirty index." +msgstr "" + +#: builtin/commit.c:943 +msgid "Explicit paths specified without -i nor -o; assuming --only paths..." +msgstr "" + +#: builtin/commit.c:953 +#, c-format +msgid "Invalid cleanup mode %s" +msgstr "" + +#: builtin/commit.c:958 +msgid "Paths with -a does not make sense." +msgstr "" + +#: builtin/commit.c:960 +msgid "Paths with --interactive does not make sense." +msgstr "" + +#: builtin/commit.c:1142 +msgid "couldn't look up newly created commit" +msgstr "" + +#: builtin/commit.c:1144 +msgid "could not parse newly created commit" +msgstr "" + +#: builtin/commit.c:1185 +msgid "detached HEAD" +msgstr "" + +#: builtin/commit.c:1187 +msgid " (root-commit)" +msgstr "" + +#: builtin/commit.c:1307 builtin/merge.c:461 +#, c-format +msgid "could not open '%s' for reading" +msgstr "" + +#: builtin/commit.c:1312 +#, c-format +msgid "Corrupt MERGE_HEAD file (%s)" +msgstr "" + +#: builtin/commit.c:1319 +msgid "could not read MERGE_MODE" +msgstr "" + +#: builtin/commit.c:1336 +#, c-format +msgid "could not read commit message: %s" +msgstr "" + +#: builtin/commit.c:1350 +#, c-format +msgid "Aborting commit due to empty commit message.\n" +msgstr "" + +#: builtin/commit.c:1358 +msgid "failed to write commit object" +msgstr "" + +#: builtin/commit.c:1375 +msgid "cannot lock HEAD ref" +msgstr "" + +#: builtin/commit.c:1379 +msgid "cannot update HEAD ref" +msgstr "" + +#: builtin/commit.c:1388 +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/describe.c:205 +#, c-format +msgid "annotated tag %s not available" +msgstr "" + +#: builtin/describe.c:209 +#, c-format +msgid "annotated tag %s has no embedded name" +msgstr "" + +#: builtin/describe.c:211 +#, c-format +msgid "tag '%s' is really '%s' here" +msgstr "" + +#: builtin/describe.c:238 +#, c-format +msgid "Not a valid object name %s" +msgstr "" + +#: builtin/describe.c:241 +#, c-format +msgid "%s is not a valid '%s' object" +msgstr "" + +#: builtin/describe.c:258 +#, c-format +msgid "no tag exactly matches '%s'" +msgstr "" + +#: builtin/describe.c:260 +#, c-format +msgid "searching to describe %s\n" +msgstr "" + +#: builtin/describe.c:295 +#, c-format +msgid "finished search at %s\n" +msgstr "" + +#: builtin/describe.c:319 +#, c-format +msgid "" +"No annotated tags can describe '%s'.\n" +"However, there were unannotated tags: try --tags." +msgstr "" + +#: builtin/describe.c:323 +#, c-format +msgid "" +"No tags can describe '%s'.\n" +"Try --always, or create some tags." +msgstr "" + +#: builtin/describe.c:344 +#, c-format +msgid "traversed %lu commits\n" +msgstr "" + +#: builtin/describe.c:347 +#, c-format +msgid "" +"more than %i tags found; listed %i most recent\n" +"gave up search at %s\n" +msgstr "" + +#: builtin/describe.c:398 +msgid "--long is incompatible with --abbrev=0" +msgstr "" + +#: builtin/describe.c:423 +msgid "No names found, cannot describe anything." +msgstr "" + +#: builtin/describe.c:430 +msgid "--dirty is incompatible with committishes" +msgstr "" + +#: builtin/diff.c:76 +#, c-format +msgid "'%s': not a regular file or symlink" +msgstr "" + +#: builtin/diff.c:225 +#, c-format +msgid "invalid option: %s" +msgstr "" + +#: builtin/diff.c:302 +msgid "Not a git repository" +msgstr "" + +#: builtin/diff.c:334 +msgid "No HEAD commit to compare with (yet)" +msgstr "" + +#: builtin/diff.c:349 +#, c-format +msgid "invalid object '%s' given." +msgstr "" + +#: builtin/diff.c:354 +#, c-format +msgid "more than %d trees given: '%s'" +msgstr "" + +#: builtin/diff.c:364 +#, c-format +msgid "more than two blobs given: '%s'" +msgstr "" + +#: builtin/diff.c:372 +#, c-format +msgid "unhandled object '%s' given." +msgstr "" + +#: builtin/fetch.c:175 +msgid "Couldn't find remote ref HEAD" +msgstr "" + +#: builtin/fetch.c:228 +#, c-format +msgid "object %s not found" +msgstr "" + +#: builtin/fetch.c:233 +msgid "[up to date]" +msgstr "" + +#. +#. * If this is the head, and it's not okay to update +#. * the head, and the old value of the head isn't empty... +#. +#: builtin/fetch.c:246 +#, c-format +msgid "! %-*s %-*s -> %s (can't fetch in current branch)" +msgstr "" + +#: builtin/fetch.c:247 builtin/fetch.c:309 +msgid "[rejected]" +msgstr "" + +#: builtin/fetch.c:257 +msgid "[tag update]" +msgstr "" + +#: builtin/fetch.c:258 builtin/fetch.c:280 builtin/fetch.c:293 +msgid " (unable to update local ref)" +msgstr "" + +#: builtin/fetch.c:270 +msgid "[new tag]" +msgstr "" + +#: builtin/fetch.c:274 +msgid "[new branch]" +msgstr "" + +#: builtin/fetch.c:305 +msgid "unable to update local ref" +msgstr "" + +#: builtin/fetch.c:305 +msgid "forced update" +msgstr "" + +#: builtin/fetch.c:310 +msgid "(non-fast-forward)" +msgstr "" + +#: builtin/fetch.c:328 builtin/fetch.c:651 +#, c-format +msgid "cannot open %s: %s\n" +msgstr "" + +#: builtin/fetch.c:406 +#, c-format +msgid "From %.*s\n" +msgstr "" + +#: builtin/fetch.c:417 +#, c-format +msgid "" +"some local refs could not be updated; try running\n" +" 'git remote prune %s' to remove any old, conflicting branches" +msgstr "" + +#: builtin/fetch.c:467 +msgid "could not run rev-list" +msgstr "" + +#: builtin/fetch.c:481 +#, c-format +msgid "failed write to rev-list: %s" +msgstr "" + +#: builtin/fetch.c:488 +#, c-format +msgid "failed to close rev-list's stdin: %s" +msgstr "" + +#: builtin/fetch.c:515 +#, c-format +msgid " (%s will become dangling)\n" +msgstr "" + +#: builtin/fetch.c:516 +#, c-format +msgid " (%s has become dangling)\n" +msgstr "" + +#: builtin/fetch.c:523 +msgid "[deleted]" +msgstr "" + +#: builtin/fetch.c:524 +msgid "(none)" +msgstr "" + +#: builtin/fetch.c:641 +#, c-format +msgid "Refusing to fetch into current branch %s of non-bare repository" +msgstr "" + +#: builtin/fetch.c:675 +#, c-format +msgid "Don't know how to fetch from %s" +msgstr "" + +#: builtin/fetch.c:729 +#, c-format +msgid "Option \"%s\" value \"%s\" is not valid for %s" +msgstr "" + +#: builtin/fetch.c:732 +#, c-format +msgid "Option \"%s\" is ignored for %s\n" +msgstr "" + +#: builtin/fetch.c:821 +#, c-format +msgid "Fetching %s\n" +msgstr "" + +#: builtin/fetch.c:823 +#, c-format +msgid "Could not fetch %s" +msgstr "" + +#: builtin/fetch.c:839 +msgid "" +"No remote repository specified. Please, specify either a URL or a\n" +"remote name from which new revisions should be fetched." +msgstr "" + +#: builtin/fetch.c:859 +msgid "You need to specify a tag name." +msgstr "" + +#: builtin/fetch.c:899 +msgid "fetch --all does not take a repository argument" +msgstr "" + +#: builtin/fetch.c:901 +msgid "fetch --all does not make sense with refspecs" +msgstr "" + +#: builtin/fetch.c:912 +#, c-format +msgid "No such remote or remote group: %s" +msgstr "" + +#: builtin/fetch.c:920 +msgid "Fetching a group and specifying refspecs does not make sense" +msgstr "" + +#: builtin/gc.c:63 +#, c-format +msgid "Invalid %s: '%s'" +msgstr "" + +#: builtin/gc.c:78 +msgid "Too many options specified" +msgstr "" + +#: builtin/gc.c:103 +#, c-format +msgid "insanely long object directory %.*s" +msgstr "" + +#: builtin/gc.c:220 +#, c-format +msgid "Auto packing the repository for optimum performance.\n" +msgstr "" + +#: builtin/gc.c:223 +#, 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." +msgstr "" + +#: builtin/gc.c:251 +msgid "" +"There are too many unreachable loose objects; run 'git prune' to remove them." +msgstr "" + +#: builtin/grep.c:252 +#, c-format +msgid "grep: failed to create thread: %s" +msgstr "" + +#: builtin/grep.c:457 +#, c-format +msgid "'%s': unable to read %s" +msgstr "" + +#: builtin/grep.c:508 +#, c-format +msgid "'%s': %s" +msgstr "" + +#: builtin/grep.c:519 +#, c-format +msgid "'%s': short read %s" +msgstr "" + +#: builtin/grep.c:581 +#, c-format +msgid "Failed to chdir: %s" +msgstr "" + +#: builtin/grep.c:671 builtin/grep.c:697 +#, c-format +msgid "unable to read tree (%s)" +msgstr "" + +#: builtin/grep.c:703 +#, c-format +msgid "unable to grep from object of type %s" +msgstr "" + +#: builtin/grep.c:755 +#, c-format +msgid "switch `%c' expects a numerical value" +msgstr "" + +#: builtin/grep.c:771 +#, c-format +msgid "cannot open '%s'" +msgstr "" + +#: builtin/grep.c:1012 +msgid "no pattern given." +msgstr "" + +#: builtin/grep.c:1016 +msgid "cannot mix --fixed-strings and regexp" +msgstr "" + +#: builtin/grep.c:1041 +#, c-format +msgid "bad object %s" +msgstr "" + +#: builtin/grep.c:1068 +msgid "--open-files-in-pager only works on the worktree" +msgstr "" + +#: builtin/grep.c:1093 +msgid "--cached cannot be used with --no-index." +msgstr "" + +#: builtin/grep.c:1095 +msgid "--no-index cannot be used with revs." +msgstr "" + +#: builtin/grep.c:1104 +msgid "both --cached and trees are given." +msgstr "" + +#: builtin/init-db.c:34 +#, c-format +msgid "Could not make %s writable by group" +msgstr "" + +#: builtin/init-db.c:61 +#, c-format +msgid "insanely long template name %s" +msgstr "" + +#: builtin/init-db.c:66 +#, c-format +msgid "cannot stat '%s'" +msgstr "" + +#: builtin/init-db.c:72 +#, c-format +msgid "cannot stat template '%s'" +msgstr "" + +#: builtin/init-db.c:79 +#, c-format +msgid "cannot opendir '%s'" +msgstr "" + +#: builtin/init-db.c:96 +#, c-format +msgid "cannot readlink '%s'" +msgstr "" + +#: builtin/init-db.c:98 +#, c-format +msgid "insanely long symlink %s" +msgstr "" + +#: builtin/init-db.c:101 +#, c-format +msgid "cannot symlink '%s' '%s'" +msgstr "" + +#: builtin/init-db.c:105 +#, c-format +msgid "cannot copy '%s' to '%s'" +msgstr "" + +#: builtin/init-db.c:109 +#, c-format +msgid "ignoring template %s" +msgstr "" + +#: builtin/init-db.c:132 +#, c-format +msgid "insanely long template path %s" +msgstr "" + +#: builtin/init-db.c:140 +#, c-format +msgid "templates not found %s" +msgstr "" + +#: builtin/init-db.c:153 +#, c-format +msgid "not copying templates of a wrong format version %d from '%s'" +msgstr "" + +#: builtin/init-db.c:191 +#, c-format +msgid "insane git directory %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:355 +#, c-format +msgid "%s%s Git repository in %s%s\n" +msgstr "" + +#: builtin/init-db.c:356 +msgid "Reinitialized existing" +msgstr "Reinitialised existing" + +#: builtin/init-db.c:356 +msgid "Initialized empty" +msgstr "Initialised empty" + +#: builtin/init-db.c:357 +msgid " shared" +msgstr "" + +#: builtin/init-db.c:376 +msgid "cannot tell cwd" +msgstr "" + +#: builtin/init-db.c:450 builtin/init-db.c:457 +#, c-format +msgid "cannot mkdir %s" +msgstr "" + +#: builtin/init-db.c:461 +#, c-format +msgid "cannot chdir to %s" +msgstr "" + +#: builtin/init-db.c:483 +#, c-format +msgid "" +"%s (or --work-tree=) not allowed without specifying %s (or --git-" +"dir=)" +msgstr "" + +#: builtin/init-db.c:509 +msgid "Cannot access current working directory" +msgstr "" + +#: builtin/init-db.c:512 +#, c-format +msgid "Cannot access work tree '%s'" +msgstr "" + +#: builtin/log.c:104 +#, c-format +msgid "invalid --decorate option: %s" +msgstr "" + +#: builtin/log.c:113 builtin/log.c:1138 builtin/shortlog.c:287 +#, c-format +msgid "unrecognized argument: %s" +msgstr "unrecognised argument: %s" + +#: builtin/log.c:156 +#, c-format +msgid "Final output: %d %s\n" +msgstr "" + +#: builtin/log.c:255 builtin/log.c:674 builtin/log.c:1222 builtin/log.c:1428 +#: builtin/merge.c:310 builtin/revert.c:556 builtin/shortlog.c:184 +msgid "revision walk setup failed" +msgstr "" + +#: builtin/log.c:347 builtin/log.c:434 +#, c-format +msgid "Could not read object %s" +msgstr "" + +#: builtin/log.c:458 +#, c-format +msgid "Unknown type: %d" +msgstr "" + +#: builtin/log.c:558 +msgid "format.headers without value" +msgstr "" + +#: builtin/log.c:630 +msgid "name of output directory is too long" +msgstr "" + +#: builtin/log.c:641 +#, c-format +msgid "Cannot open patch file %s" +msgstr "" + +#: builtin/log.c:655 +msgid "Need exactly one range." +msgstr "" + +#: builtin/log.c:663 +msgid "Not a range." +msgstr "" + +#: builtin/log.c:700 +msgid "Could not extract email from committer identity." +msgstr "" + +#: builtin/log.c:732 +msgid "Cover letter needs email format" +msgstr "" + +#: builtin/log.c:825 +#, c-format +msgid "insane in-reply-to: %s" +msgstr "" + +#: builtin/log.c:898 +msgid "Two output directories?" +msgstr "" + +#: builtin/log.c:1087 +#, c-format +msgid "bogus committer info %s" +msgstr "" + +#: builtin/log.c:1132 +msgid "-n and -k are mutually exclusive." +msgstr "" + +#: builtin/log.c:1134 +msgid "--subject-prefix and -k are mutually exclusive." +msgstr "" + +#: builtin/log.c:1141 +msgid "--name-only does not make sense" +msgstr "" + +#: builtin/log.c:1143 +msgid "--name-status does not make sense" +msgstr "" + +#: builtin/log.c:1145 +msgid "--check does not make sense" +msgstr "" + +#: builtin/log.c:1166 +msgid "standard output, or directory, which one?" +msgstr "" + +#: builtin/log.c:1168 +#, c-format +msgid "Could not create directory '%s'" +msgstr "" + +#: builtin/log.c:1307 +msgid "Failed to create output files" +msgstr "" + +#: builtin/log.c:1394 +#, c-format +msgid "" +"Could not find a tracked remote branch, please specify manually.\n" +msgstr "" + +#: builtin/log.c:1410 builtin/log.c:1412 builtin/log.c:1424 +#, c-format +msgid "Unknown commit %s" +msgstr "" + +#: builtin/merge.c:82 +msgid "switch `m' requires a value" +msgstr "" + +#: builtin/merge.c:119 +#, c-format +msgid "Could not find merge strategy '%s'.\n" +msgstr "" + +#: builtin/merge.c:120 +#, c-format +msgid "Available strategies are:" +msgstr "" + +#: builtin/merge.c:125 +#, c-format +msgid "Available custom strategies are:" +msgstr "" + +#: builtin/merge.c:223 +msgid "could not run stash." +msgstr "" + +#: builtin/merge.c:228 +msgid "stash failed" +msgstr "" + +#: builtin/merge.c:233 +#, c-format +msgid "not a valid object: %s" +msgstr "" + +#: builtin/merge.c:250 +msgid "read-tree failed" +msgstr "" + +#: builtin/merge.c:279 +msgid " (nothing to squash)" +msgstr "" + +#: builtin/merge.c:292 +#, c-format +msgid "Squash commit -- not updating HEAD\n" +msgstr "" + +#: builtin/merge.c:295 builtin/merge.c:1290 builtin/merge.c:1299 +#: builtin/merge.c:1309 +#, c-format +msgid "Could not write to '%s'" +msgstr "" + +#: builtin/merge.c:323 +msgid "Writing SQUASH_MSG" +msgstr "" + +#: builtin/merge.c:325 +msgid "Finishing SQUASH_MSG" +msgstr "" + +#: builtin/merge.c:345 +#, c-format +msgid "No merge message -- not updating HEAD\n" +msgstr "" + +#: builtin/merge.c:396 +#, c-format +msgid "'%s' does not point to a commit" +msgstr "" + +#: builtin/merge.c:491 +#, c-format +msgid "Bad branch.%s.mergeoptions string: %s" +msgstr "" + +#: builtin/merge.c:553 +msgid "git write-tree failed to write a tree" +msgstr "" + +#: builtin/merge.c:594 +msgid "failed to read the cache" +msgstr "" + +#: builtin/merge.c:611 +msgid "Unable to write index." +msgstr "" + +#: builtin/merge.c:624 +msgid "Not handling anything other than two heads merge." +msgstr "" + +#: builtin/merge.c:651 +#, c-format +msgid "Unknown option for merge-recursive: -X%s" +msgstr "" + +#: builtin/merge.c:666 +#, c-format +msgid "unable to write %s" +msgstr "" + +#: builtin/merge.c:791 +#, c-format +msgid "Wonderful.\n" +msgstr "" + +#: builtin/merge.c:840 builtin/merge.c:1287 builtin/merge.c:1295 +#: builtin/merge.c:1303 +#, c-format +msgid "Could not open '%s' for writing" +msgstr "" + +#: builtin/merge.c:856 +#, c-format +msgid "Automatic merge failed; fix conflicts and then commit the result.\n" +msgstr "" + +#: builtin/merge.c:871 +#, c-format +msgid "'%s' is not a commit" +msgstr "" + +#: builtin/merge.c:921 +msgid "" +"You have not concluded your merge (MERGE_HEAD exists).\n" +"Please, commit your changes before you can merge." +msgstr "" + +#: builtin/merge.c:924 +msgid "You have not concluded your merge (MERGE_HEAD exists)." +msgstr "" + +#: builtin/merge.c:951 +msgid "You cannot combine --squash with --no-ff." +msgstr "" + +#: builtin/merge.c:956 +msgid "You cannot combine --no-ff with --ff-only." +msgstr "" + +#: builtin/merge.c:984 +msgid "Can merge only exactly one commit into empty head" +msgstr "" + +#: builtin/merge.c:987 +msgid "Squash commit into empty head not supported yet" +msgstr "" + +#: builtin/merge.c:989 +msgid "Non-fast-forward commit does not make sense into an empty head" +msgstr "" + +#: builtin/merge.c:993 builtin/merge.c:1041 +#, c-format +msgid "%s - not something we can merge" +msgstr "" + +#: builtin/merge.c:1099 +#, c-format +msgid "Updating %s..%s\n" +msgstr "" + +#: builtin/merge.c:1133 +#, c-format +msgid "Trying really trivial in-index merge...\n" +msgstr "" + +#: builtin/merge.c:1137 +#, c-format +msgid "Nope.\n" +msgstr "" + +#: builtin/merge.c:1170 +msgid "Not possible to fast-forward, aborting." +msgstr "" + +#: builtin/merge.c:1196 builtin/merge.c:1269 +#, c-format +msgid "Rewinding the tree to pristine...\n" +msgstr "" + +#: builtin/merge.c:1200 +#, c-format +msgid "Trying merge strategy %s...\n" +msgstr "" + +#: builtin/merge.c:1261 +#, c-format +msgid "No merge strategy handled the merge.\n" +msgstr "" + +#: builtin/merge.c:1263 +#, c-format +msgid "Merge with strategy %s failed.\n" +msgstr "" + +#: builtin/merge.c:1271 +#, c-format +msgid "Using the %s to prepare resolving by hand.\n" +msgstr "" + +#: builtin/merge.c:1314 +#, c-format +msgid "Automatic merge went well; stopped before committing as requested\n" +msgstr "" + +#: builtin/mv.c:103 +#, c-format +msgid "Checking rename of '%s' to '%s'\n" +msgstr "" + +#: builtin/mv.c:107 +msgid "bad source" +msgstr "" + +#: builtin/mv.c:110 +msgid "can not move directory into itself" +msgstr "" + +#: builtin/mv.c:113 +msgid "cannot move directory over file" +msgstr "" + +#: builtin/mv.c:123 +#, c-format +msgid "Huh? %.*s is in index?" +msgstr "" + +#: builtin/mv.c:135 +msgid "source directory is empty" +msgstr "" + +#: builtin/mv.c:166 +msgid "not under version control" +msgstr "" + +#: builtin/mv.c:168 +msgid "destination exists" +msgstr "" + +#: builtin/mv.c:175 +#, c-format +msgid "%s; will overwrite!" +msgstr "" + +#: builtin/mv.c:178 +msgid "Cannot overwrite" +msgstr "" + +#: builtin/mv.c:181 +msgid "multiple sources for the same target" +msgstr "" + +#: builtin/mv.c:196 +#, c-format +msgid "%s, source=%s, destination=%s" +msgstr "" + +#: builtin/mv.c:206 +#, c-format +msgid "Renaming %s to %s\n" +msgstr "" + +#: builtin/mv.c:209 +#, c-format +msgid "renaming '%s' failed" +msgstr "" + +#: builtin/notes.c:122 +#, c-format +msgid "unable to start 'show' for object '%s'" +msgstr "" + +#: builtin/notes.c:128 +msgid "can't fdopen 'show' output fd" +msgstr "" + +#: builtin/notes.c:138 +#, c-format +msgid "failed to close pipe to 'show' for object '%s'" +msgstr "" + +#: builtin/notes.c:141 +#, c-format +msgid "failed to finish 'show' for object '%s'" +msgstr "" + +#: builtin/notes.c:158 builtin/tag.c:311 +#, c-format +msgid "could not create file '%s'" +msgstr "" + +#: builtin/notes.c:172 +msgid "Please supply the note contents using either -m or -F option" +msgstr "" + +#: builtin/notes.c:193 builtin/notes.c:797 +#, c-format +msgid "Removing note for object %s\n" +msgstr "" + +#: builtin/notes.c:198 +msgid "unable to write note object" +msgstr "" + +#: builtin/notes.c:200 +#, c-format +msgid "The note contents has been left in %s" +msgstr "" + +#: builtin/notes.c:234 builtin/tag.c:445 +#, c-format +msgid "cannot read '%s'" +msgstr "" + +#: builtin/notes.c:236 builtin/tag.c:448 +#, c-format +msgid "could not open or read '%s'" +msgstr "" + +#: builtin/notes.c:255 builtin/notes.c:444 builtin/notes.c:446 +#: builtin/notes.c:508 builtin/notes.c:560 builtin/notes.c:631 +#: builtin/notes.c:636 builtin/notes.c:710 builtin/notes.c:752 +#: builtin/notes.c:789 builtin/reset.c:303 builtin/tag.c:461 +#, c-format +msgid "Failed to resolve '%s' as a valid ref." +msgstr "" + +#: builtin/notes.c:258 +#, c-format +msgid "Failed to read object '%s'." +msgstr "" + +#: builtin/notes.c:283 +msgid "Cannot commit uninitialized/unreferenced notes tree" +msgstr "" + +#: builtin/notes.c:295 +msgid "Failed to write current notes tree to database" +msgstr "" + +#: builtin/notes.c:307 +msgid "Failed to commit notes tree to database" +msgstr "" + +#: builtin/notes.c:339 +#, c-format +msgid "Bad notes.rewriteMode value: '%s'" +msgstr "" + +#: builtin/notes.c:349 +#, c-format +msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" +msgstr "" + +#. TRANSLATORS: The first %s is the name of the +#. environment variable, the second %s is its value +#: builtin/notes.c:376 +#, c-format +msgid "Bad %s value: '%s'" +msgstr "" + +#: builtin/notes.c:440 +#, c-format +msgid "Malformed input line: '%s'." +msgstr "" + +#: builtin/notes.c:455 +#, c-format +msgid "Failed to copy notes from '%s' to '%s'" +msgstr "" + +#. TRANSLATORS: The first %s is one of "git notes ACTION", +#. e.g. "add", "copy", "append" etc. +#: builtin/notes.c:481 +#, c-format +msgid "Refusing to %s notes in %s (outside of refs/notes/)" +msgstr "" + +#: builtin/notes.c:501 builtin/notes.c:553 builtin/notes.c:614 +#: builtin/notes.c:626 builtin/notes.c:698 builtin/notes.c:745 +#: builtin/notes.c:782 builtin/notes.c:821 +msgid "too many parameters" +msgstr "" + +#: builtin/notes.c:505 +msgid "list" +msgstr "" + +#: builtin/notes.c:514 builtin/notes.c:758 +#, c-format +msgid "No note found for object %s." +msgstr "" + +#: builtin/notes.c:562 +msgid "add" +msgstr "" + +#: builtin/notes.c:567 +#, c-format +msgid "" +"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " +"existing notes" +msgstr "" + +#: builtin/notes.c:572 builtin/notes.c:649 +#, c-format +msgid "Overwriting existing notes for object %s\n" +msgstr "" + +#: builtin/notes.c:622 +msgid "too few parameters" +msgstr "" + +#: builtin/notes.c:638 +msgid "copy" +msgstr "" + +#: builtin/notes.c:643 +#, c-format +msgid "" +"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " +"existing notes" +msgstr "" + +#: builtin/notes.c:655 +#, c-format +msgid "Missing notes on source object %s. Cannot copy." +msgstr "" + +#: builtin/notes.c:703 +#, 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:754 +msgid "show" +msgstr "" + +#: builtin/notes.c:791 +msgid "remove" +msgstr "" + +#: builtin/notes.c:795 +#, c-format +msgid "Object %s has no note\n" +msgstr "" + +#: builtin/notes.c:825 +msgid "prune" +msgstr "" + +#: builtin/notes.c:877 +#, c-format +msgid "Unknown subcommand: %s" +msgstr "" + +#: builtin/push.c:43 +msgid "tag shorthand without " +msgstr "" + +#: builtin/push.c:62 +msgid "--delete only accepts plain target ref names" +msgstr "" + +#: builtin/push.c:72 +msgid "You are not currently on a branch." +msgstr "" + +#: builtin/push.c:74 +#, c-format +msgid "The current branch %s is not tracking anything." +msgstr "" + +#: builtin/push.c:77 +#, c-format +msgid "The current branch %s is tracking multiple branches, refusing to push." +msgstr "" + +#: builtin/push.c:100 +msgid "" +"You didn't specify any refspecs to push, and push.default is \"nothing\"." +msgstr "" + +#: builtin/push.c:120 +#, c-format +msgid "Pushing to %s\n" +msgstr "" + +#: builtin/push.c:124 +#, c-format +msgid "failed to push some refs to '%s'" +msgstr "" + +#: builtin/push.c:132 +#, 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 "" + +#: builtin/push.c:149 +#, c-format +msgid "bad repository '%s'" +msgstr "" + +#: builtin/push.c:150 +msgid "No destination configured to push to." +msgstr "" + +#: builtin/push.c:158 +msgid "--all and --tags are incompatible" +msgstr "" + +#: builtin/push.c:159 +msgid "--all can't be combined with refspecs" +msgstr "" + +#: builtin/push.c:164 +msgid "--mirror and --tags are incompatible" +msgstr "" + +#: builtin/push.c:165 +msgid "--mirror can't be combined with refspecs" +msgstr "" + +#: builtin/push.c:170 +msgid "--all and --mirror are incompatible" +msgstr "" + +#: builtin/push.c:235 +msgid "--delete is incompatible with --all, --mirror and --tags" +msgstr "" + +#: builtin/push.c:237 +msgid "--delete doesn't make sense without any refs" +msgstr "" + +#: builtin/reset.c:33 +msgid "mixed" +msgstr "" + +#: builtin/reset.c:33 +msgid "soft" +msgstr "" + +#: builtin/reset.c:33 +msgid "hard" +msgstr "" + +#: builtin/reset.c:33 +msgid "merge" +msgstr "" + +#: builtin/reset.c:33 +msgid "keep" +msgstr "" + +#: builtin/reset.c:95 +msgid "You do not have a valid HEAD." +msgstr "" + +#: builtin/reset.c:97 +msgid "Failed to find tree of HEAD." +msgstr "" + +#: builtin/reset.c:103 +#, c-format +msgid "Failed to find tree of %s." +msgstr "" + +#: builtin/reset.c:108 +msgid "Could not write new index file." +msgstr "" + +#: builtin/reset.c:118 +#, c-format +msgid "HEAD is now at %s" +msgstr "" + +#: builtin/reset.c:142 +msgid "Could not read index" +msgstr "" + +#: builtin/reset.c:145 +msgid "Unstaged changes after reset:" +msgstr "" + +#: builtin/reset.c:225 +#, c-format +msgid "Reflog action message too long: %.*s..." +msgstr "" + +#: builtin/reset.c:231 +#, c-format +msgid "Cannot do a %s reset in the middle of a merge." +msgstr "" + +#: builtin/reset.c:307 +#, c-format +msgid "Could not parse object '%s'." +msgstr "" + +#: builtin/reset.c:312 +msgid "--patch is incompatible with --{hard,mixed,soft}" +msgstr "" + +#: builtin/reset.c:321 +msgid "--mixed with paths is deprecated; use 'git reset -- ' instead." +msgstr "" + +#: builtin/reset.c:323 +#, c-format +msgid "Cannot do %s reset with paths." +msgstr "" + +#: builtin/reset.c:335 +#, c-format +msgid "%s reset is not allowed in a bare repository" +msgstr "" + +#: builtin/reset.c:351 +#, c-format +msgid "Could not reset index file to revision '%s'." +msgstr "" + +#: builtin/revert.c:82 +msgid "program error" +msgstr "" + +#: builtin/revert.c:154 builtin/revert.c:188 +#, c-format +msgid "Could not read commit message of %s" +msgstr "" + +#: builtin/revert.c:202 +#, c-format +msgid "Could not extract author email from %s" +msgstr "" + +#: builtin/revert.c:214 +#, c-format +msgid "Could not extract author time from %s" +msgstr "" + +#: builtin/revert.c:230 +#, c-format +msgid "No author information found in %s" +msgstr "" + +#: builtin/revert.c:267 +#, c-format +msgid "Could not write to %s." +msgstr "" + +#: builtin/revert.c:270 +#, c-format +msgid "Error wrapping up %s" +msgstr "" + +#: builtin/revert.c:290 +msgid "" +"Your local changes would be overwritten by revert.\n" +"Please, commit your changes or stash them to proceed." +msgstr "" + +#: builtin/revert.c:293 +msgid "" +"Your local changes would be overwritten by cherry-pick.\n" +"Please, commit your changes or stash them to proceed." +msgstr "" + +#. TRANSLATORS: %s will be "revert" or "cherry-pick" +#: builtin/revert.c:351 +#, c-format +msgid "%s: Unable to write new index file" +msgstr "" + +#: builtin/revert.c:417 +msgid "Your index file is unmerged." +msgstr "" + +#: builtin/revert.c:420 +msgid "You do not have a valid HEAD" +msgstr "" + +#: builtin/revert.c:428 +msgid "Cannot revert a root commit" +msgstr "" + +#: builtin/revert.c:437 +#, c-format +msgid "Commit %s is a merge but no -m option was given." +msgstr "" + +#: builtin/revert.c:445 +#, c-format +msgid "Commit %s does not have parent %d" +msgstr "" + +#: builtin/revert.c:449 +#, 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 +#: builtin/revert.c:460 +#, c-format +msgid "%s: cannot parse parent commit %s" +msgstr "" + +#: builtin/revert.c:464 +#, c-format +msgid "Cannot get commit message for %s" +msgstr "" + +#: builtin/revert.c:525 +#, c-format +msgid "could not revert %s... %s" +msgstr "" + +#: builtin/revert.c:526 +#, c-format +msgid "could not apply %s... %s" +msgstr "" + +#: builtin/revert.c:559 +msgid "empty commit set passed" +msgstr "" + +#: builtin/revert.c:573 +msgid "cherry-pick --ff cannot be used with --signoff" +msgstr "" + +#: builtin/revert.c:575 +msgid "cherry-pick --ff cannot be used with --no-commit" +msgstr "" + +#: builtin/revert.c:577 +msgid "cherry-pick --ff cannot be used with -x" +msgstr "" + +#: builtin/revert.c:579 +msgid "cherry-pick --ff cannot be used with --edit" +msgstr "" + +#. TRANSLATORS: %s will be "revert" or "cherry-pick" +#: builtin/revert.c:584 +#, c-format +msgid "git %s: failed to read the index" +msgstr "" + +#: builtin/rm.c:118 +#, c-format +msgid "" +"'%s' has staged content different from both the file and the HEAD\n" +"(use -f to force removal)" +msgstr "" + +#: builtin/rm.c:124 +#, c-format +msgid "" +"'%s' has changes staged in the index\n" +"(use --cached to keep the file, or -f to force removal)" +msgstr "" + +#: builtin/rm.c:128 +#, c-format +msgid "" +"'%s' has local modifications\n" +"(use --cached to keep the file, or -f to force removal)" +msgstr "" + +#: builtin/rm.c:202 +#, c-format +msgid "not removing '%s' recursively without -r" +msgstr "" + +#: builtin/rm.c:238 +#, c-format +msgid "git rm: unable to remove %s" +msgstr "" + +#: builtin/shortlog.c:161 +#, c-format +msgid "Missing author: %s" +msgstr "" + +#: builtin/tag.c:123 builtin/tag.c:464 +#, c-format +msgid "tag name too long: %.*s..." +msgstr "" + +#: builtin/tag.c:128 +#, c-format +msgid "tag '%s' not found." +msgstr "" + +#: builtin/tag.c:143 +#, c-format +msgid "Deleted tag '%s' (was %s)\n" +msgstr "" + +#: builtin/tag.c:155 +#, c-format +msgid "could not verify the tag '%s'" +msgstr "" + +#: builtin/tag.c:170 +msgid "committer info too long." +msgstr "" + +#: builtin/tag.c:190 +msgid "could not run gpg." +msgstr "" + +#: builtin/tag.c:196 +msgid "gpg did not accept the tag data" +msgstr "" + +#: builtin/tag.c:203 +msgid "gpg failed to sign the tag" +msgstr "" + +#: builtin/tag.c:218 +msgid "" +"\n" +"#\n" +"# Write a tag message\n" +"#\n" +msgstr "" + +#: builtin/tag.c:226 +#, c-format +msgid "signing key value too long (%.10s...)" +msgstr "" + +#: builtin/tag.c:272 +msgid "unable to sign the tag" +msgstr "" + +#: builtin/tag.c:274 +msgid "unable to write tag file" +msgstr "" + +#: builtin/tag.c:289 +msgid "bad object type." +msgstr "" + +#: builtin/tag.c:302 +msgid "tag header too big." +msgstr "" + +#: builtin/tag.c:329 +msgid "no tag message?" +msgstr "" + +#: builtin/tag.c:335 +#, c-format +msgid "The tag message has been left in %s\n" +msgstr "" + +#: builtin/tag.c:428 +msgid "-n option is only allowed with -l." +msgstr "" + +#: builtin/tag.c:430 +msgid "--contains option is only allowed with -l." +msgstr "" + +#: builtin/tag.c:438 +msgid "only one -F or -m option is allowed." +msgstr "" + +#: builtin/tag.c:458 +msgid "too many params" +msgstr "" + +#: builtin/tag.c:466 +#, c-format +msgid "'%s' is not a valid tag name." +msgstr "" + +#: builtin/tag.c:471 +#, c-format +msgid "tag '%s' already exists" +msgstr "" + +#: builtin/tag.c:479 +#, c-format +msgid "%s: cannot lock the ref" +msgstr "" + +#: builtin/tag.c:481 +#, c-format +msgid "%s: cannot update the ref" +msgstr "" + +#: builtin/tag.c:483 +#, c-format +msgid "Updated tag '%s' (was %s)\n" +msgstr "" + +#: git-am.sh:47 +msgid "You need to set your committer info first" +msgstr "" + +#: git-am.sh:80 +#, sh-format +msgid "" +"When you have resolved this problem run \"$cmdline --resolved\".\n" +"If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n" +"To restore the original branch and stop patching run \"$cmdline --abort\"." +msgstr "" + +#: git-am.sh:96 +msgid "Cannot fall back to three-way merge." +msgstr "" + +#: git-am.sh:111 +msgid "Repository lacks necessary blobs to fall back on 3-way merge." +msgstr "" + +#: git-am.sh:120 +msgid "" +"Did you hand edit your patch?\n" +"It does not apply to blobs recorded in its index." +msgstr "" + +#: git-am.sh:236 +msgid "Only one StGIT patch series can be applied at once" +msgstr "" + +#: git-am.sh:288 +#, sh-format +msgid "Patch format $patch_format is not supported." +msgstr "" + +#: git-am.sh:290 +msgid "Patch format detection failed." +msgstr "" + +#: git-am.sh:340 +msgid "-d option is no longer supported. Do not use." +msgstr "" + +#: git-am.sh:403 +#, sh-format +msgid "previous rebase directory $dotest still exists but mbox given." +msgstr "" + +#: git-am.sh:408 +msgid "Please make up your mind. --skip or --abort?" +msgstr "" + +#: git-am.sh:434 +msgid "Resolve operation not in progress, we are not resuming." +msgstr "" + +#: git-am.sh:499 +#, sh-format +msgid "Dirty index: cannot apply patches (dirty: $files)" +msgstr "" + +#: git-am.sh:595 +#, sh-format +msgid "" +"Patch is empty. Was it split wrong?\n" +"If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n" +"To restore the original branch and stop patching run \"$cmdline --abort\"." +msgstr "" + +#: git-am.sh:632 +msgid "Patch does not have a valid e-mail address." +msgstr "" + +#: git-am.sh:679 +msgid "cannot be interactive without stdin connected to a terminal." +msgstr "" + +#: git-am.sh:683 +msgid "Commit Body is:" +msgstr "" + +#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] +#. in your translation. The program will only accept English +#. input at this point. +#: git-am.sh:690 +msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " +msgstr "" + +#: git-am.sh:726 +#, sh-format +msgid "Applying: $FIRSTLINE" +msgstr "" + +#: git-am.sh:747 +msgid "" +"No changes - did you forget to use 'git add'?\n" +"If there is nothing left to stage, chances are that something else\n" +"already introduced the same changes; you might want to skip this patch." +msgstr "" + +#: git-am.sh:755 +msgid "" +"You still have unmerged paths in your index\n" +"did you forget to use 'git add'?" +msgstr "" + +#: git-am.sh:771 +msgid "No changes -- Patch already applied." +msgstr "" + +#: git-am.sh:781 +#, sh-format +msgid "Patch failed at $msgnum $FIRSTLINE" +msgstr "" + +#: git-am.sh:797 +msgid "applying to an empty history" +msgstr "" From 6f9416a2a81639b42a0e5fd38e8f3ce0fc6da2b3 Mon Sep 17 00:00:00 2001 From: Ramkumar Ramachandra Date: Thu, 9 Sep 2010 19:32:09 +0530 Subject: [PATCH 04/15] po/hi.po: add Hindi Translation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Translate a few Git messages to Standard Hindi. It uses a phonetic script called Devanagari. Focus especially on transforming grammar and tense in a sane manner to serve as a guideline for future translators. Note that Devanagari rendering is broken on many applications by default at this time- the latest Emacs, Vim and Chrome render it incorrectly. Signed-off-by: Ramkumar Ramachandra Acked-by: Antriksh Pany Acked-by: Ævar Arnfjörð Bjarmason --- po/hi.po | 2787 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 2787 insertions(+) create mode 100644 po/hi.po diff --git a/po/hi.po b/po/hi.po new file mode 100644 index 00000000000000..2bfa66ca4ac152 --- /dev/null +++ b/po/hi.po @@ -0,0 +1,2787 @@ +# Hindi translations for Git. +# Copyright (C) 2010 Ramkumar Ramachandra +# This file is distributed under the same license as the Git package. +# Ramkumar Ramachandra , 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: Git\n" +"Report-Msgid-Bugs-To: Git Mailing List \n" +"POT-Creation-Date: 2010-09-20 15:11+0000\n" +"PO-Revision-Date: 2010-09-09 20:55+0530\n" +"Last-Translator: Ramkumar Ramachandra \n" +"Language-Team: Git Mailing List \n" +"Language: hi\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: wt-status.c:56 +msgid "# Unmerged paths:" +msgstr "" + +#: wt-status.c:62 wt-status.c:79 +#, c-format +msgid "# (use \"git reset %s ...\" to unstage)" +msgstr "" + +#: wt-status.c:64 wt-status.c:81 +msgid "# (use \"git rm --cached ...\" to unstage)" +msgstr "" + +#: wt-status.c:65 +msgid "# (use \"git add/rm ...\" as appropriate to mark resolution)" +msgstr "" + +#: wt-status.c:73 +msgid "# Changes to be committed:" +msgstr "" + +#: wt-status.c:91 +msgid "# Changed but not updated:" +msgstr "" + +#: wt-status.c:95 +msgid "# (use \"git add ...\" to update what will be committed)" +msgstr "" + +#: wt-status.c:97 +msgid "# (use \"git add/rm ...\" to update what will be committed)" +msgstr "" + +#: wt-status.c:98 +msgid "" +"# (use \"git checkout -- ...\" to discard changes in working " +"directory)" +msgstr "" + +#: wt-status.c:100 +msgid "# (commit or discard the untracked or modified content in submodules)" +msgstr "" + +#: wt-status.c:109 +#, c-format +msgid "# %s files:" +msgstr "" + +#: wt-status.c:112 +#, c-format +msgid "# (use \"git %s ...\" to include in what will be committed)" +msgstr "" + +#: wt-status.c:129 +msgid "bug" +msgstr "" + +#: wt-status.c:134 +msgid "both deleted:" +msgstr "" + +#: wt-status.c:135 +msgid "added by us:" +msgstr "" + +#: wt-status.c:136 +msgid "deleted by them:" +msgstr "" + +#: wt-status.c:137 +msgid "added by them:" +msgstr "" + +#: wt-status.c:138 +msgid "deleted by us:" +msgstr "" + +#: wt-status.c:139 +msgid "both added:" +msgstr "" + +#: wt-status.c:140 +msgid "both modified:" +msgstr "" + +#: wt-status.c:170 +msgid "new commits, " +msgstr "" + +#: wt-status.c:172 +msgid "modified content, " +msgstr "" + +#: wt-status.c:174 +msgid "untracked content, " +msgstr "" + +#: wt-status.c:188 +#, c-format +msgid "new file: %s" +msgstr "" + +#: wt-status.c:191 +#, c-format +msgid "copied: %s -> %s" +msgstr "" + +#: wt-status.c:194 +#, c-format +msgid "deleted: %s" +msgstr "" + +#: wt-status.c:197 +#, c-format +msgid "modified: %s" +msgstr "" + +#: wt-status.c:200 +#, c-format +msgid "renamed: %s -> %s" +msgstr "" + +#: wt-status.c:203 +#, c-format +msgid "typechange: %s" +msgstr "" + +#: wt-status.c:206 +#, c-format +msgid "unknown: %s" +msgstr "" + +#: wt-status.c:209 +#, c-format +msgid "unmerged: %s" +msgstr "" + +#: wt-status.c:212 +#, c-format +msgid "bug: unhandled diff status %c" +msgstr "" + +#: wt-status.c:635 +msgid "On branch " +msgstr "" + +#: wt-status.c:642 +msgid "Not currently on any branch." +msgstr "" + +#: wt-status.c:652 +msgid "# Initial commit" +msgstr "" + +#: wt-status.c:666 +msgid "Untracked" +msgstr "" + +#: wt-status.c:668 +msgid "Ignored" +msgstr "" + +#: wt-status.c:670 +#, c-format +msgid "# Untracked files not listed%s\n" +msgstr "" + +#: wt-status.c:672 +msgid " (use -u option to show untracked files)" +msgstr "" + +#: wt-status.c:678 +#, c-format +msgid "# No changes\n" +msgstr "" + +#: wt-status.c:682 +#, c-format +msgid "no changes added to commit%s\n" +msgstr "" + +#: wt-status.c:684 +msgid " (use \"git add\" and/or \"git commit -a\")" +msgstr "" + +#: wt-status.c:686 +#, c-format +msgid "nothing added to commit but untracked files present%s\n" +msgstr "" + +#: wt-status.c:688 +msgid " (use \"git add\" to track)" +msgstr "" + +#: wt-status.c:690 wt-status.c:693 wt-status.c:696 +#, c-format +msgid "nothing to commit%s\n" +msgstr "" + +#: wt-status.c:691 +msgid " (create/copy files and use \"git add\" to track)" +msgstr "" + +#: wt-status.c:694 +msgid " (use -u to show untracked files)" +msgstr "" + +#: wt-status.c:697 +msgid " (working directory clean)" +msgstr "" + +#: wt-status.c:795 +msgid "HEAD (no branch)" +msgstr "" + +#: wt-status.c:801 +msgid "Initial commit on " +msgstr "" + +#: wt-status.c:816 +msgid "behind " +msgstr "" + +#: wt-status.c:819 wt-status.c:822 +msgid "ahead " +msgstr "" + +#: wt-status.c:824 +msgid ", behind " +msgstr "" + +#: builtin/add.c:41 +#, c-format +msgid "unexpected diff status %c" +msgstr "" + +#: builtin/add.c:67 builtin/commit.c:244 +msgid "updating files failed" +msgstr "" + +#: builtin/add.c:77 +#, c-format +msgid "remove '%s'\n" +msgstr "" + +#: builtin/add.c:175 +#, c-format +msgid "Path '%s' is in submodule '%.*s'" +msgstr "" + +#: builtin/add.c:191 +msgid "Unstaged changes after refreshing the index:" +msgstr "" + +#: builtin/add.c:194 builtin/add.c:452 builtin/rm.c:194 +#, c-format +msgid "pathspec '%s' did not match any files" +msgstr "" + +#: builtin/add.c:208 +#, c-format +msgid "'%s' is beyond a symbolic link" +msgstr "" + +#: builtin/add.c:275 +msgid "Could not read the index" +msgstr "" + +#: builtin/add.c:284 +#, c-format +msgid "Could not open '%s' for writing." +msgstr "" + +#: builtin/add.c:288 +#, fuzzy +msgid "Could not write patch" +msgstr "%s को समूह द्वारा लिखने की इजाज़त नही दे सके" + +#: builtin/add.c:293 +#, fuzzy, c-format +msgid "Could not stat '%s'" +msgstr "'%s' को [stat] नहीं कर सके" + +#: builtin/add.c:295 +msgid "Empty patch. Aborted." +msgstr "" + +#: builtin/add.c:301 +#, c-format +msgid "Could not apply '%s'" +msgstr "" + +#: builtin/add.c:349 +#, c-format +msgid "Use -f if you really want to add them.\n" +msgstr "" + +#: builtin/add.c:350 +msgid "no files added" +msgstr "" + +#: builtin/add.c:356 +msgid "adding files failed" +msgstr "" + +#: builtin/add.c:388 +msgid "-A and -u are mutually incompatible" +msgstr "" + +#: builtin/add.c:390 +msgid "Option --ignore-missing can only be used together with --dry-run" +msgstr "" + +#: builtin/add.c:410 +#, c-format +msgid "Nothing specified, nothing added.\n" +msgstr "" + +#: builtin/add.c:411 +#, c-format +msgid "Maybe you wanted to say 'git add .'?\n" +msgstr "" + +#: builtin/add.c:417 builtin/clean.c:95 builtin/commit.c:301 +#: builtin/commit.c:310 builtin/mv.c:77 builtin/rm.c:171 +msgid "index file corrupt" +msgstr "" + +#: builtin/add.c:468 builtin/mv.c:223 builtin/rm.c:268 +msgid "Unable to write new index file" +msgstr "" + +#: builtin/archive.c:17 +#, c-format +msgid "could not create archive file '%s'" +msgstr "" + +#: builtin/archive.c:20 +msgid "could not redirect output" +msgstr "" + +#: builtin/archive.c:36 +msgid "git archive: Remote with no URL" +msgstr "" + +#: builtin/archive.c:46 +msgid "git archive: expected ACK/NAK, got EOF" +msgstr "" + +#: builtin/archive.c:51 +#, c-format +msgid "git archive: NACK %s" +msgstr "" + +#: builtin/archive.c:52 +msgid "git archive: protocol error" +msgstr "" + +#: builtin/archive.c:57 +msgid "git archive: expected a flush" +msgstr "" + +#: builtin/branch.c:136 +#, c-format +msgid "" +"deleting branch '%s' that has been merged to\n" +" '%s', but it is not yet merged to HEAD." +msgstr "" + +#: builtin/branch.c:140 +#, c-format +msgid "" +"not deleting branch '%s' that is not yet merged to\n" +" '%s', even though it is merged to HEAD." +msgstr "" + +#. TRANSLATORS: This is "remote " in "remote branch '%s' not found" +#: builtin/branch.c:161 +msgid "remote " +msgstr "" + +#: builtin/branch.c:169 +msgid "cannot use -a with -d" +msgstr "" + +#: builtin/branch.c:175 +msgid "Couldn't look up commit object for HEAD" +msgstr "" + +#: builtin/branch.c:180 +#, c-format +msgid "Cannot delete the branch '%s' which you are currently on." +msgstr "" + +#: builtin/branch.c:190 +#, c-format +msgid "%sbranch '%s' not found." +msgstr "" + +#: builtin/branch.c:198 +#, c-format +msgid "Couldn't look up commit object for '%s'" +msgstr "" + +#: builtin/branch.c:204 +#, c-format +msgid "" +"The branch '%s' is not fully merged.\n" +"If you are sure you want to delete it, run 'git branch -D %s'." +msgstr "" + +#: builtin/branch.c:212 +#, c-format +msgid "Error deleting %sbranch '%s'" +msgstr "" + +#: builtin/branch.c:217 +#, c-format +msgid "Deleted %sbranch %s (was %s).\n" +msgstr "" + +#: builtin/branch.c:222 +msgid "Update of config-file failed" +msgstr "" + +#: builtin/branch.c:304 +#, c-format +msgid "branch '%s' does not point at a commit" +msgstr "" + +#: builtin/branch.c:381 +#, c-format +msgid "behind %d] " +msgstr "" + +#: builtin/branch.c:383 +#, c-format +msgid "ahead %d] " +msgstr "" + +#: builtin/branch.c:385 +#, c-format +msgid "ahead %d, behind %d] " +msgstr "" + +#: builtin/branch.c:484 +msgid "(no branch)" +msgstr "" + +#: builtin/branch.c:544 +msgid "some refs could not be read" +msgstr "" + +#: builtin/branch.c:557 +msgid "cannot rename the current branch while not on any." +msgstr "" + +#: builtin/branch.c:567 builtin/branch.c:571 +#, c-format +msgid "Invalid branch name: '%s'" +msgstr "" + +#: builtin/branch.c:574 +#, c-format +msgid "A branch named '%s' already exists." +msgstr "" + +#: builtin/branch.c:580 +msgid "Branch rename failed" +msgstr "" + +#: builtin/branch.c:584 +#, c-format +msgid "Renamed a misnamed branch '%s' away" +msgstr "" + +#: builtin/branch.c:588 +#, c-format +msgid "Branch renamed to %s, but HEAD is not updated!" +msgstr "" + +#: builtin/branch.c:595 +msgid "Branch is renamed, but update of config-file failed" +msgstr "" + +#: builtin/branch.c:610 +#, c-format +msgid "malformed object name %s" +msgstr "" + +#: builtin/branch.c:680 +msgid "Failed to resolve HEAD as a valid ref." +msgstr "" + +#: builtin/branch.c:686 +msgid "HEAD not found below refs/heads!" +msgstr "" + +#: builtin/branch.c:706 +msgid "-a and -r options to 'git branch' do not make sense with a branch name" +msgstr "" + +#: builtin/bundle.c:47 +#, c-format +msgid "%s is okay\n" +msgstr "" + +#: builtin/bundle.c:56 +msgid "Need a repository to create a bundle." +msgstr "" + +#: builtin/bundle.c:60 +msgid "Need a repository to unbundle." +msgstr "" + +#: builtin/checkout.c:107 builtin/checkout.c:135 +#, c-format +msgid "path '%s' does not have our version" +msgstr "" + +#: builtin/checkout.c:109 builtin/checkout.c:137 +#, c-format +msgid "path '%s' does not have their version" +msgstr "" + +#: builtin/checkout.c:120 +#, c-format +msgid "path '%s' does not have all three versions" +msgstr "" + +#: builtin/checkout.c:155 +#, c-format +msgid "path '%s' does not have all 3 versions" +msgstr "" + +#: builtin/checkout.c:172 +#, c-format +msgid "path '%s': cannot merge" +msgstr "" + +#: builtin/checkout.c:189 +#, c-format +msgid "Unable to add merge result for '%s'" +msgstr "" + +#: builtin/checkout.c:194 builtin/reset.c:170 +#, c-format +msgid "make_cache_entry failed for path '%s'" +msgstr "" + +#: builtin/checkout.c:216 builtin/checkout.c:371 +msgid "corrupt index file" +msgstr "" + +#: builtin/checkout.c:244 builtin/checkout.c:251 +#, c-format +msgid "path '%s' is unmerged" +msgstr "" + +#: builtin/checkout.c:280 builtin/checkout.c:475 builtin/clone.c:658 +#: builtin/merge.c:737 +msgid "unable to write new index file" +msgstr "" + +#: builtin/checkout.c:297 builtin/diff.c:307 builtin/merge.c:367 +msgid "diff_setup_done failed" +msgstr "" + +#: builtin/checkout.c:393 +msgid "you need to resolve your current index first" +msgstr "" + +#: builtin/checkout.c:524 +#, fuzzy, c-format +msgid "Can not do reflog for '%s'\n" +msgstr "निर्देशिका '%s' नहीं खोल सके" + +#: builtin/checkout.c:550 +#, c-format +msgid "Already on '%s'\n" +msgstr "" + +#: builtin/checkout.c:554 +#, c-format +msgid "Switched to and reset branch '%s'\n" +msgstr "" + +#: builtin/checkout.c:556 +#, c-format +msgid "Switched to a new branch '%s'\n" +msgstr "" + +#: builtin/checkout.c:558 +#, c-format +msgid "Switched to branch '%s'\n" +msgstr "" + +#: builtin/checkout.c:575 +msgid "HEAD is now at" +msgstr "" + +#: builtin/checkout.c:603 +msgid "You are on a branch yet to be born" +msgstr "" + +#: builtin/checkout.c:617 +msgid "Previous HEAD position was" +msgstr "" + +#: builtin/checkout.c:730 +msgid "-B cannot be used with -b" +msgstr "" + +#: builtin/checkout.c:738 +msgid "--patch is incompatible with all other options" +msgstr "" + +#: builtin/checkout.c:744 +msgid "--track needs a branch name" +msgstr "" + +#: builtin/checkout.c:751 +msgid "Missing branch name; try -b" +msgstr "" + +#: builtin/checkout.c:757 +msgid "--orphan and -b|-B are mutually exclusive" +msgstr "" + +#: builtin/checkout.c:759 +msgid "--orphan cannot be used with -t" +msgstr "" + +#: builtin/checkout.c:769 +msgid "git checkout: -f and -m are incompatible" +msgstr "" + +#. case (1) +#: builtin/checkout.c:815 +#, c-format +msgid "invalid reference: %s" +msgstr "" + +#. case (1): want a tree +#: builtin/checkout.c:852 +#, c-format +msgid "reference is not a tree: %s" +msgstr "" + +#: builtin/checkout.c:878 +msgid "invalid path specification" +msgstr "" + +#: builtin/checkout.c:886 +#, c-format +msgid "" +"git checkout: updating paths is incompatible with switching branches.\n" +"Did you intend to checkout '%s' which can not be resolved as commit?" +msgstr "" + +#: builtin/checkout.c:888 +msgid "git checkout: updating paths is incompatible with switching branches." +msgstr "" + +#: builtin/checkout.c:893 +msgid "" +"git checkout: --ours/--theirs, --force and --merge are incompatible when\n" +"checking out of the index." +msgstr "" + +#: builtin/checkout.c:904 +#, c-format +msgid "git checkout: we do not like '%s' as a branch name." +msgstr "" + +#: builtin/checkout.c:909 +#, c-format +msgid "git checkout: branch %s already exists" +msgstr "" + +#: builtin/checkout.c:916 +msgid "Cannot switch branch to a non-commit." +msgstr "" + +#: builtin/checkout.c:919 +msgid "--ours/--theirs is incompatible with switching branches." +msgstr "" + +#: builtin/clean.c:78 +msgid "-x and -X cannot be used together" +msgstr "" + +#: builtin/clean.c:82 +msgid "" +"clean.requireForce set to true and neither -n nor -f given; refusing to clean" +msgstr "" + +#: builtin/clean.c:85 +msgid "" +"clean.requireForce defaults to true and neither -n nor -f given; refusing to " +"clean" +msgstr "" + +#: builtin/clean.c:154 builtin/clean.c:175 +#, c-format +msgid "Would remove %s\n" +msgstr "" + +#: builtin/clean.c:158 builtin/clean.c:178 +#, c-format +msgid "Removing %s\n" +msgstr "" + +#: builtin/clean.c:161 builtin/clean.c:181 +#, c-format +msgid "failed to remove '%s'" +msgstr "" + +#: builtin/clean.c:165 +#, c-format +msgid "Would not remove %s\n" +msgstr "" + +#: builtin/clean.c:167 +#, c-format +msgid "Not removing %s\n" +msgstr "" + +#: builtin/clone.c:208 +#, c-format +msgid "reference repository '%s' is not a local directory." +msgstr "" + +#: builtin/clone.c:235 +#, fuzzy, c-format +msgid "failed to open '%s'" +msgstr "निर्देशिका '%s' नहीं खोल सके" + +#: builtin/clone.c:239 +#, fuzzy, c-format +msgid "failed to create directory '%s'" +msgstr "खराब गिट निर्देशिका %s" + +#: builtin/clone.c:241 builtin/diff.c:74 +#, fuzzy, c-format +msgid "failed to stat '%s'" +msgstr "'%s' को [stat] नहीं कर सके" + +#: builtin/clone.c:243 +#, fuzzy, c-format +msgid "%s exists and is not a directory" +msgstr "खराब गिट निर्देशिका %s" + +#: builtin/clone.c:257 +#, c-format +msgid "failed to stat %s\n" +msgstr "" + +#: builtin/clone.c:267 +#, c-format +msgid "failed to unlink '%s'" +msgstr "" + +#: builtin/clone.c:272 +#, fuzzy, c-format +msgid "failed to create link '%s'" +msgstr "लिंक '%s' नहीं पढ़ सके" + +#: builtin/clone.c:276 +#, fuzzy, c-format +msgid "failed to copy file to '%s'" +msgstr "'%s' की अनुकृति '%s' में नहीं कर सके" + +#: builtin/clone.c:305 +#, c-format +msgid "done.\n" +msgstr "" + +#: builtin/clone.c:387 +msgid "Too many arguments." +msgstr "" + +#: builtin/clone.c:391 +msgid "You must specify a repository to clone." +msgstr "" + +#: builtin/clone.c:399 +#, c-format +msgid "--bare and --origin %s options are incompatible." +msgstr "" + +#: builtin/clone.c:428 +#, c-format +msgid "destination path '%s' already exists and is not an empty directory." +msgstr "" + +#: builtin/clone.c:438 +#, c-format +msgid "working tree '%s' already exists." +msgstr "" + +#: builtin/clone.c:451 builtin/clone.c:465 +#, c-format +msgid "could not create leading directories of '%s'" +msgstr "" + +#: builtin/clone.c:454 +#, c-format +msgid "could not create work tree dir '%s'." +msgstr "" + +#: builtin/clone.c:470 +#, c-format +msgid "Cloning into bare repository %s\n" +msgstr "" + +#: builtin/clone.c:472 +#, c-format +msgid "Cloning into %s\n" +msgstr "" + +#: builtin/clone.c:530 +#, c-format +msgid "Don't know how to clone %s" +msgstr "" + +#: builtin/clone.c:569 +#, c-format +msgid "Remote branch %s not found in upstream %s, using HEAD instead" +msgstr "" + +#: builtin/clone.c:579 +msgid "You appear to have cloned an empty repository." +msgstr "" + +#: builtin/clone.c:621 +msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" +msgstr "" + +#: builtin/commit.c:41 +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" +"If the identity used for this commit is wrong, you can fix it with:\n" +"\n" +" git commit --amend --author='Your Name '\n" +msgstr "" + +#: builtin/commit.c:53 +msgid "" +"You asked to amend the most recent commit, but doing so would make\n" +"it empty. You can repeat your command with --allow-empty, or you can\n" +"remove the commit entirely with \"git reset HEAD^\".\n" +msgstr "" + +#: builtin/commit.c:271 +msgid "failed to unpack HEAD tree object" +msgstr "" + +#: builtin/commit.c:299 +msgid "interactive add failed" +msgstr "" + +#: builtin/commit.c:330 builtin/commit.c:350 builtin/commit.c:396 +msgid "unable to write new_index file" +msgstr "" + +#: builtin/commit.c:380 +msgid "cannot do a partial commit during a merge." +msgstr "" + +#: builtin/commit.c:389 +#, fuzzy +msgid "cannot read the index" +msgstr "लिंक '%s' नहीं पढ़ सके" + +#: builtin/commit.c:409 +msgid "unable to write temporary index file" +msgstr "" + +#: builtin/commit.c:456 builtin/commit.c:1294 +msgid "could not parse HEAD commit" +msgstr "" + +#: builtin/commit.c:475 builtin/commit.c:481 +#, c-format +msgid "invalid commit: %s" +msgstr "" + +#: builtin/commit.c:499 +msgid "malformed --author parameter" +msgstr "" + +#: builtin/commit.c:573 builtin/shortlog.c:299 +#, c-format +msgid "(reading log message from standard input)\n" +msgstr "" + +#: builtin/commit.c:575 +msgid "could not read log from standard input" +msgstr "" + +#: builtin/commit.c:579 +#, fuzzy, c-format +msgid "could not read log file '%s'" +msgstr "लिंक '%s' नहीं पढ़ सके" + +#: builtin/commit.c:585 +msgid "commit has empty message" +msgstr "" + +#: builtin/commit.c:591 +msgid "could not read MERGE_MSG" +msgstr "" + +#: builtin/commit.c:595 +msgid "could not read SQUASH_MSG" +msgstr "" + +#: builtin/commit.c:599 +#, fuzzy, c-format +msgid "could not read '%s'" +msgstr "लिंक '%s' नहीं पढ़ सके" + +#: builtin/commit.c:612 +#, fuzzy, c-format +msgid "could not open '%s'" +msgstr "निर्देशिका '%s' नहीं खोल सके" + +#: builtin/commit.c:636 +msgid "could not write commit template" +msgstr "" + +#: builtin/commit.c:650 +#, 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" +"#\n" +msgstr "" + +#: builtin/commit.c:659 +#, c-format +msgid "" +"\n" +"# Please enter the commit message for your changes." +msgstr "" + +#: builtin/commit.c:663 +#, c-format +msgid "" +" Lines starting\n" +"# with '#' will be ignored, and an empty message aborts the commit.\n" +msgstr "" + +#: builtin/commit.c:668 +#, c-format +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" +msgstr "" + +#: builtin/commit.c:680 +#, c-format +msgid "%s# Author: %s\n" +msgstr "" + +#: builtin/commit.c:688 +#, c-format +msgid "%s# Committer: %s\n" +msgstr "" + +#: builtin/commit.c:705 +#, fuzzy +msgid "Cannot read index" +msgstr "लिंक '%s' नहीं पढ़ सके" + +#: builtin/commit.c:737 +msgid "Error building trees" +msgstr "" + +#: builtin/commit.c:752 builtin/tag.c:321 +#, c-format +msgid "Please supply the message using either -m or -F option.\n" +msgstr "" + +#: builtin/commit.c:832 +#, c-format +msgid "No existing author found with '%s'" +msgstr "" + +#: builtin/commit.c:847 builtin/commit.c:1039 +#, c-format +msgid "Invalid untracked files mode '%s'" +msgstr "" + +#: builtin/commit.c:864 +msgid "Using both --reset-author and --author does not make sense" +msgstr "" + +#: builtin/commit.c:878 +msgid "You have nothing to amend." +msgstr "" + +#: builtin/commit.c:880 +msgid "You are in the middle of a merge -- cannot amend." +msgstr "" + +#: builtin/commit.c:889 +msgid "Only one of -c/-C/-F can be used." +msgstr "" + +#: builtin/commit.c:891 +msgid "Option -m cannot be combined with -c/-C/-F." +msgstr "" + +#: builtin/commit.c:897 +msgid "--reset-author can be used only with -C, -c or --amend." +msgstr "" + +#: builtin/commit.c:906 +#, c-format +msgid "could not lookup commit %s" +msgstr "" + +#: builtin/commit.c:909 +#, c-format +msgid "could not parse commit %s" +msgstr "" + +#: builtin/commit.c:937 +msgid "Only one of --include/--only/--all/--interactive can be used." +msgstr "" + +#: builtin/commit.c:939 +msgid "No paths with --include/--only does not make sense." +msgstr "" + +#: builtin/commit.c:941 +msgid "Clever... amending the last one with dirty index." +msgstr "" + +#: builtin/commit.c:943 +msgid "Explicit paths specified without -i nor -o; assuming --only paths..." +msgstr "" + +#: builtin/commit.c:953 +#, c-format +msgid "Invalid cleanup mode %s" +msgstr "" + +#: builtin/commit.c:958 +msgid "Paths with -a does not make sense." +msgstr "" + +#: builtin/commit.c:960 +msgid "Paths with --interactive does not make sense." +msgstr "" + +#: builtin/commit.c:1142 +msgid "couldn't look up newly created commit" +msgstr "" + +#: builtin/commit.c:1144 +msgid "could not parse newly created commit" +msgstr "" + +#: builtin/commit.c:1185 +msgid "detached HEAD" +msgstr "" + +#: builtin/commit.c:1187 +msgid " (root-commit)" +msgstr "" + +#: builtin/commit.c:1307 builtin/merge.c:461 +#, c-format +msgid "could not open '%s' for reading" +msgstr "" + +#: builtin/commit.c:1312 +#, c-format +msgid "Corrupt MERGE_HEAD file (%s)" +msgstr "" + +#: builtin/commit.c:1319 +msgid "could not read MERGE_MODE" +msgstr "" + +#: builtin/commit.c:1336 +#, c-format +msgid "could not read commit message: %s" +msgstr "" + +#: builtin/commit.c:1350 +#, c-format +msgid "Aborting commit due to empty commit message.\n" +msgstr "" + +#: builtin/commit.c:1358 +msgid "failed to write commit object" +msgstr "" + +#: builtin/commit.c:1375 +msgid "cannot lock HEAD ref" +msgstr "" + +#: builtin/commit.c:1379 +msgid "cannot update HEAD ref" +msgstr "" + +#: builtin/commit.c:1388 +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/describe.c:205 +#, c-format +msgid "annotated tag %s not available" +msgstr "" + +#: builtin/describe.c:209 +#, c-format +msgid "annotated tag %s has no embedded name" +msgstr "" + +#: builtin/describe.c:211 +#, c-format +msgid "tag '%s' is really '%s' here" +msgstr "" + +#: builtin/describe.c:238 +#, c-format +msgid "Not a valid object name %s" +msgstr "" + +#: builtin/describe.c:241 +#, c-format +msgid "%s is not a valid '%s' object" +msgstr "" + +#: builtin/describe.c:258 +#, fuzzy, c-format +msgid "no tag exactly matches '%s'" +msgstr "टेम्पलेट '%s' को [stat] नहीं कर सके" + +#: builtin/describe.c:260 +#, c-format +msgid "searching to describe %s\n" +msgstr "" + +#: builtin/describe.c:295 +#, c-format +msgid "finished search at %s\n" +msgstr "" + +#: builtin/describe.c:319 +#, c-format +msgid "" +"No annotated tags can describe '%s'.\n" +"However, there were unannotated tags: try --tags." +msgstr "" + +#: builtin/describe.c:323 +#, c-format +msgid "" +"No tags can describe '%s'.\n" +"Try --always, or create some tags." +msgstr "" + +#: builtin/describe.c:344 +#, c-format +msgid "traversed %lu commits\n" +msgstr "" + +#: builtin/describe.c:347 +#, c-format +msgid "" +"more than %i tags found; listed %i most recent\n" +"gave up search at %s\n" +msgstr "" + +#: builtin/describe.c:398 +msgid "--long is incompatible with --abbrev=0" +msgstr "" + +#: builtin/describe.c:423 +msgid "No names found, cannot describe anything." +msgstr "" + +#: builtin/describe.c:430 +msgid "--dirty is incompatible with committishes" +msgstr "" + +#: builtin/diff.c:76 +#, c-format +msgid "'%s': not a regular file or symlink" +msgstr "" + +#: builtin/diff.c:225 +#, c-format +msgid "invalid option: %s" +msgstr "" + +#: builtin/diff.c:302 +msgid "Not a git repository" +msgstr "" + +#: builtin/diff.c:334 +msgid "No HEAD commit to compare with (yet)" +msgstr "" + +#: builtin/diff.c:349 +#, c-format +msgid "invalid object '%s' given." +msgstr "" + +#: builtin/diff.c:354 +#, c-format +msgid "more than %d trees given: '%s'" +msgstr "" + +#: builtin/diff.c:364 +#, c-format +msgid "more than two blobs given: '%s'" +msgstr "" + +#: builtin/diff.c:372 +#, c-format +msgid "unhandled object '%s' given." +msgstr "" + +#: builtin/fetch.c:175 +msgid "Couldn't find remote ref HEAD" +msgstr "" + +#: builtin/fetch.c:228 +#, fuzzy, c-format +msgid "object %s not found" +msgstr "टेम्पलेट्स नहीं मिले: %s" + +#: builtin/fetch.c:233 +msgid "[up to date]" +msgstr "" + +#. +#. * If this is the head, and it's not okay to update +#. * the head, and the old value of the head isn't empty... +#. +#: builtin/fetch.c:246 +#, c-format +msgid "! %-*s %-*s -> %s (can't fetch in current branch)" +msgstr "" + +#: builtin/fetch.c:247 builtin/fetch.c:309 +msgid "[rejected]" +msgstr "" + +#: builtin/fetch.c:257 +msgid "[tag update]" +msgstr "" + +#: builtin/fetch.c:258 builtin/fetch.c:280 builtin/fetch.c:293 +msgid " (unable to update local ref)" +msgstr "" + +#: builtin/fetch.c:270 +msgid "[new tag]" +msgstr "" + +#: builtin/fetch.c:274 +msgid "[new branch]" +msgstr "" + +#: builtin/fetch.c:305 +msgid "unable to update local ref" +msgstr "" + +#: builtin/fetch.c:305 +msgid "forced update" +msgstr "" + +#: builtin/fetch.c:310 +msgid "(non-fast-forward)" +msgstr "" + +#: builtin/fetch.c:328 builtin/fetch.c:651 +#, fuzzy, c-format +msgid "cannot open %s: %s\n" +msgstr "निर्देशिका '%s' नहीं खोल सके" + +#: builtin/fetch.c:406 +#, c-format +msgid "From %.*s\n" +msgstr "" + +#: builtin/fetch.c:417 +#, c-format +msgid "" +"some local refs could not be updated; try running\n" +" 'git remote prune %s' to remove any old, conflicting branches" +msgstr "" + +#: builtin/fetch.c:467 +msgid "could not run rev-list" +msgstr "" + +#: builtin/fetch.c:481 +#, c-format +msgid "failed write to rev-list: %s" +msgstr "" + +#: builtin/fetch.c:488 +#, c-format +msgid "failed to close rev-list's stdin: %s" +msgstr "" + +#: builtin/fetch.c:515 +#, c-format +msgid " (%s will become dangling)\n" +msgstr "" + +#: builtin/fetch.c:516 +#, c-format +msgid " (%s has become dangling)\n" +msgstr "" + +#: builtin/fetch.c:523 +msgid "[deleted]" +msgstr "" + +#: builtin/fetch.c:524 +msgid "(none)" +msgstr "" + +#: builtin/fetch.c:641 +#, c-format +msgid "Refusing to fetch into current branch %s of non-bare repository" +msgstr "" + +#: builtin/fetch.c:675 +#, c-format +msgid "Don't know how to fetch from %s" +msgstr "" + +#: builtin/fetch.c:729 +#, c-format +msgid "Option \"%s\" value \"%s\" is not valid for %s" +msgstr "" + +#: builtin/fetch.c:732 +#, c-format +msgid "Option \"%s\" is ignored for %s\n" +msgstr "" + +#: builtin/fetch.c:821 +#, c-format +msgid "Fetching %s\n" +msgstr "" + +#: builtin/fetch.c:823 +#, c-format +msgid "Could not fetch %s" +msgstr "" + +#: builtin/fetch.c:839 +msgid "" +"No remote repository specified. Please, specify either a URL or a\n" +"remote name from which new revisions should be fetched." +msgstr "" + +#: builtin/fetch.c:859 +msgid "You need to specify a tag name." +msgstr "" + +#: builtin/fetch.c:899 +msgid "fetch --all does not take a repository argument" +msgstr "" + +#: builtin/fetch.c:901 +msgid "fetch --all does not make sense with refspecs" +msgstr "" + +#: builtin/fetch.c:912 +#, c-format +msgid "No such remote or remote group: %s" +msgstr "" + +#: builtin/fetch.c:920 +msgid "Fetching a group and specifying refspecs does not make sense" +msgstr "" + +#: builtin/gc.c:63 +#, c-format +msgid "Invalid %s: '%s'" +msgstr "" + +#: builtin/gc.c:78 +msgid "Too many options specified" +msgstr "" + +#: builtin/gc.c:103 +#, fuzzy, c-format +msgid "insanely long object directory %.*s" +msgstr "खराब गिट निर्देशिका %s" + +#: builtin/gc.c:220 +#, c-format +msgid "Auto packing the repository for optimum performance.\n" +msgstr "" + +#: builtin/gc.c:223 +#, 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." +msgstr "" + +#: builtin/gc.c:251 +msgid "" +"There are too many unreachable loose objects; run 'git prune' to remove them." +msgstr "" + +#: builtin/grep.c:252 +#, c-format +msgid "grep: failed to create thread: %s" +msgstr "" + +#: builtin/grep.c:457 +#, c-format +msgid "'%s': unable to read %s" +msgstr "" + +#: builtin/grep.c:508 +#, c-format +msgid "'%s': %s" +msgstr "" + +#: builtin/grep.c:519 +#, c-format +msgid "'%s': short read %s" +msgstr "" + +#: builtin/grep.c:581 +#, c-format +msgid "Failed to chdir: %s" +msgstr "" + +#: builtin/grep.c:671 builtin/grep.c:697 +#, c-format +msgid "unable to read tree (%s)" +msgstr "" + +#: builtin/grep.c:703 +#, c-format +msgid "unable to grep from object of type %s" +msgstr "" + +#: builtin/grep.c:755 +#, c-format +msgid "switch `%c' expects a numerical value" +msgstr "" + +#: builtin/grep.c:771 +#, fuzzy, c-format +msgid "cannot open '%s'" +msgstr "निर्देशिका '%s' नहीं खोल सके" + +#: builtin/grep.c:1012 +msgid "no pattern given." +msgstr "" + +#: builtin/grep.c:1016 +msgid "cannot mix --fixed-strings and regexp" +msgstr "" + +#: builtin/grep.c:1041 +#, c-format +msgid "bad object %s" +msgstr "" + +#: builtin/grep.c:1068 +msgid "--open-files-in-pager only works on the worktree" +msgstr "" + +#: builtin/grep.c:1093 +msgid "--cached cannot be used with --no-index." +msgstr "" + +#: builtin/grep.c:1095 +msgid "--no-index cannot be used with revs." +msgstr "" + +#: builtin/grep.c:1104 +msgid "both --cached and trees are given." +msgstr "" + +#: builtin/init-db.c:34 +#, c-format +msgid "Could not make %s writable by group" +msgstr "%s को समूह द्वारा लिखने की इजाज़त नही दे सके" + +#: builtin/init-db.c:61 +#, c-format +msgid "insanely long template name %s" +msgstr "टेम्पलेट %s का नाम अत्यंत लंबा" + +#: builtin/init-db.c:66 +#, c-format +msgid "cannot stat '%s'" +msgstr "'%s' को [stat] नहीं कर सके" + +#: builtin/init-db.c:72 +#, c-format +msgid "cannot stat template '%s'" +msgstr "टेम्पलेट '%s' को [stat] नहीं कर सके" + +#: builtin/init-db.c:79 +#, c-format +msgid "cannot opendir '%s'" +msgstr "निर्देशिका '%s' नहीं खोल सके" + +#: builtin/init-db.c:96 +#, c-format +msgid "cannot readlink '%s'" +msgstr "लिंक '%s' नहीं पढ़ सके" + +#: builtin/init-db.c:98 +#, c-format +msgid "insanely long symlink %s" +msgstr "प्रतीकात्मक लिंक %s अत्यंत लंबा" + +#: builtin/init-db.c:101 +#, c-format +msgid "cannot symlink '%s' '%s'" +msgstr "'%s' का प्रतीकात्मक लिंक '%s' में नहीं बना सके" + +#: builtin/init-db.c:105 +#, c-format +msgid "cannot copy '%s' to '%s'" +msgstr "'%s' की अनुकृति '%s' में नहीं कर सके" + +#: builtin/init-db.c:109 +#, c-format +msgid "ignoring template %s" +msgstr "टेम्पलेट %s की उपेक्षा कर रहे हैं" + +#: builtin/init-db.c:132 +#, c-format +msgid "insanely long template path %s" +msgstr "टेम्पलेट %s का [path] अत्यंत लंबा" + +#: builtin/init-db.c:140 +#, c-format +msgid "templates not found %s" +msgstr "टेम्पलेट्स नहीं मिले: %s" + +#: builtin/init-db.c:153 +#, c-format +msgid "not copying templates of a wrong format version %d from '%s'" +msgstr "'%2$s' से गलत स्वरूप संस्करण %1$d के टेम्पलेट्स की नकल नहीं कर रहे हैं" + +#: builtin/init-db.c:191 +#, c-format +msgid "insane git directory %s" +msgstr "खराब गिट निर्देशिका %s" + +#. 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:355 +#, c-format +msgid "%s%s Git repository in %s%s\n" +msgstr "" + +#: builtin/init-db.c:356 +msgid "Reinitialized existing" +msgstr "" + +#: builtin/init-db.c:356 +msgid "Initialized empty" +msgstr "" + +#: builtin/init-db.c:357 +msgid " shared" +msgstr "" + +#: builtin/init-db.c:376 +msgid "cannot tell cwd" +msgstr "" + +#: builtin/init-db.c:450 builtin/init-db.c:457 +#, fuzzy, c-format +msgid "cannot mkdir %s" +msgstr "निर्देशिका '%s' नहीं खोल सके" + +#: builtin/init-db.c:461 +#, fuzzy, c-format +msgid "cannot chdir to %s" +msgstr "निर्देशिका '%s' नहीं खोल सके" + +#: builtin/init-db.c:483 +#, c-format +msgid "" +"%s (or --work-tree=) not allowed without specifying %s (or --git-" +"dir=)" +msgstr "" + +#: builtin/init-db.c:509 +msgid "Cannot access current working directory" +msgstr "" + +#: builtin/init-db.c:512 +#, fuzzy, c-format +msgid "Cannot access work tree '%s'" +msgstr "टेम्पलेट '%s' को [stat] नहीं कर सके" + +#: builtin/log.c:104 +#, c-format +msgid "invalid --decorate option: %s" +msgstr "" + +#: builtin/log.c:113 builtin/log.c:1138 builtin/shortlog.c:287 +#, c-format +msgid "unrecognized argument: %s" +msgstr "" + +#: builtin/log.c:156 +#, c-format +msgid "Final output: %d %s\n" +msgstr "" + +#: builtin/log.c:255 builtin/log.c:674 builtin/log.c:1222 builtin/log.c:1428 +#: builtin/merge.c:310 builtin/revert.c:556 builtin/shortlog.c:184 +msgid "revision walk setup failed" +msgstr "" + +#: builtin/log.c:347 builtin/log.c:434 +#, c-format +msgid "Could not read object %s" +msgstr "" + +#: builtin/log.c:458 +#, c-format +msgid "Unknown type: %d" +msgstr "" + +#: builtin/log.c:558 +msgid "format.headers without value" +msgstr "" + +#: builtin/log.c:630 +msgid "name of output directory is too long" +msgstr "" + +#: builtin/log.c:641 +#, fuzzy, c-format +msgid "Cannot open patch file %s" +msgstr "निर्देशिका '%s' नहीं खोल सके" + +#: builtin/log.c:655 +msgid "Need exactly one range." +msgstr "" + +#: builtin/log.c:663 +msgid "Not a range." +msgstr "" + +#: builtin/log.c:700 +msgid "Could not extract email from committer identity." +msgstr "" + +#: builtin/log.c:732 +msgid "Cover letter needs email format" +msgstr "" + +#: builtin/log.c:825 +#, fuzzy, c-format +msgid "insane in-reply-to: %s" +msgstr "खराब गिट निर्देशिका %s" + +#: builtin/log.c:898 +msgid "Two output directories?" +msgstr "" + +#: builtin/log.c:1087 +#, c-format +msgid "bogus committer info %s" +msgstr "" + +#: builtin/log.c:1132 +msgid "-n and -k are mutually exclusive." +msgstr "" + +#: builtin/log.c:1134 +msgid "--subject-prefix and -k are mutually exclusive." +msgstr "" + +#: builtin/log.c:1141 +msgid "--name-only does not make sense" +msgstr "" + +#: builtin/log.c:1143 +msgid "--name-status does not make sense" +msgstr "" + +#: builtin/log.c:1145 +msgid "--check does not make sense" +msgstr "" + +#: builtin/log.c:1166 +msgid "standard output, or directory, which one?" +msgstr "" + +#: builtin/log.c:1168 +#, c-format +msgid "Could not create directory '%s'" +msgstr "" + +#: builtin/log.c:1307 +msgid "Failed to create output files" +msgstr "" + +#: builtin/log.c:1394 +#, c-format +msgid "" +"Could not find a tracked remote branch, please specify manually.\n" +msgstr "" + +#: builtin/log.c:1410 builtin/log.c:1412 builtin/log.c:1424 +#, c-format +msgid "Unknown commit %s" +msgstr "" + +#: builtin/merge.c:82 +msgid "switch `m' requires a value" +msgstr "" + +#: builtin/merge.c:119 +#, c-format +msgid "Could not find merge strategy '%s'.\n" +msgstr "" + +#: builtin/merge.c:120 +#, c-format +msgid "Available strategies are:" +msgstr "" + +#: builtin/merge.c:125 +#, c-format +msgid "Available custom strategies are:" +msgstr "" + +#: builtin/merge.c:223 +msgid "could not run stash." +msgstr "" + +#: builtin/merge.c:228 +msgid "stash failed" +msgstr "" + +#: builtin/merge.c:233 +#, c-format +msgid "not a valid object: %s" +msgstr "" + +#: builtin/merge.c:250 +msgid "read-tree failed" +msgstr "" + +#: builtin/merge.c:279 +msgid " (nothing to squash)" +msgstr "" + +#: builtin/merge.c:292 +#, c-format +msgid "Squash commit -- not updating HEAD\n" +msgstr "" + +#: builtin/merge.c:295 builtin/merge.c:1290 builtin/merge.c:1299 +#: builtin/merge.c:1309 +#, c-format +msgid "Could not write to '%s'" +msgstr "" + +#: builtin/merge.c:323 +msgid "Writing SQUASH_MSG" +msgstr "" + +#: builtin/merge.c:325 +msgid "Finishing SQUASH_MSG" +msgstr "" + +#: builtin/merge.c:345 +#, c-format +msgid "No merge message -- not updating HEAD\n" +msgstr "" + +#: builtin/merge.c:396 +#, c-format +msgid "'%s' does not point to a commit" +msgstr "" + +#: builtin/merge.c:491 +#, c-format +msgid "Bad branch.%s.mergeoptions string: %s" +msgstr "" + +#: builtin/merge.c:553 +msgid "git write-tree failed to write a tree" +msgstr "" + +#: builtin/merge.c:594 +msgid "failed to read the cache" +msgstr "" + +#: builtin/merge.c:611 +msgid "Unable to write index." +msgstr "" + +#: builtin/merge.c:624 +msgid "Not handling anything other than two heads merge." +msgstr "" + +#: builtin/merge.c:651 +#, c-format +msgid "Unknown option for merge-recursive: -X%s" +msgstr "" + +#: builtin/merge.c:666 +#, c-format +msgid "unable to write %s" +msgstr "" + +#: builtin/merge.c:791 +#, c-format +msgid "Wonderful.\n" +msgstr "" + +#: builtin/merge.c:840 builtin/merge.c:1287 builtin/merge.c:1295 +#: builtin/merge.c:1303 +#, fuzzy, c-format +msgid "Could not open '%s' for writing" +msgstr "%s को समूह द्वारा लिखने की इजाज़त नही दे सके" + +#: builtin/merge.c:856 +#, c-format +msgid "Automatic merge failed; fix conflicts and then commit the result.\n" +msgstr "" + +#: builtin/merge.c:871 +#, c-format +msgid "'%s' is not a commit" +msgstr "" + +#: builtin/merge.c:921 +msgid "" +"You have not concluded your merge (MERGE_HEAD exists).\n" +"Please, commit your changes before you can merge." +msgstr "" + +#: builtin/merge.c:924 +msgid "You have not concluded your merge (MERGE_HEAD exists)." +msgstr "" + +#: builtin/merge.c:951 +msgid "You cannot combine --squash with --no-ff." +msgstr "" + +#: builtin/merge.c:956 +msgid "You cannot combine --no-ff with --ff-only." +msgstr "" + +#: builtin/merge.c:984 +msgid "Can merge only exactly one commit into empty head" +msgstr "" + +#: builtin/merge.c:987 +msgid "Squash commit into empty head not supported yet" +msgstr "" + +#: builtin/merge.c:989 +msgid "Non-fast-forward commit does not make sense into an empty head" +msgstr "" + +#: builtin/merge.c:993 builtin/merge.c:1041 +#, c-format +msgid "%s - not something we can merge" +msgstr "" + +#: builtin/merge.c:1099 +#, c-format +msgid "Updating %s..%s\n" +msgstr "" + +#: builtin/merge.c:1133 +#, c-format +msgid "Trying really trivial in-index merge...\n" +msgstr "" + +#: builtin/merge.c:1137 +#, c-format +msgid "Nope.\n" +msgstr "" + +#: builtin/merge.c:1170 +msgid "Not possible to fast-forward, aborting." +msgstr "" + +#: builtin/merge.c:1196 builtin/merge.c:1269 +#, c-format +msgid "Rewinding the tree to pristine...\n" +msgstr "" + +#: builtin/merge.c:1200 +#, c-format +msgid "Trying merge strategy %s...\n" +msgstr "" + +#: builtin/merge.c:1261 +#, c-format +msgid "No merge strategy handled the merge.\n" +msgstr "" + +#: builtin/merge.c:1263 +#, c-format +msgid "Merge with strategy %s failed.\n" +msgstr "" + +#: builtin/merge.c:1271 +#, c-format +msgid "Using the %s to prepare resolving by hand.\n" +msgstr "" + +#: builtin/merge.c:1314 +#, c-format +msgid "Automatic merge went well; stopped before committing as requested\n" +msgstr "" + +#: builtin/mv.c:103 +#, fuzzy, c-format +msgid "Checking rename of '%s' to '%s'\n" +msgstr "'%s' की अनुकृति '%s' में नहीं कर सके" + +#: builtin/mv.c:107 +msgid "bad source" +msgstr "" + +#: builtin/mv.c:110 +msgid "can not move directory into itself" +msgstr "" + +#: builtin/mv.c:113 +msgid "cannot move directory over file" +msgstr "" + +#: builtin/mv.c:123 +#, c-format +msgid "Huh? %.*s is in index?" +msgstr "" + +#: builtin/mv.c:135 +msgid "source directory is empty" +msgstr "" + +#: builtin/mv.c:166 +msgid "not under version control" +msgstr "" + +#: builtin/mv.c:168 +msgid "destination exists" +msgstr "" + +#: builtin/mv.c:175 +#, c-format +msgid "%s; will overwrite!" +msgstr "" + +#: builtin/mv.c:178 +msgid "Cannot overwrite" +msgstr "" + +#: builtin/mv.c:181 +msgid "multiple sources for the same target" +msgstr "" + +#: builtin/mv.c:196 +#, c-format +msgid "%s, source=%s, destination=%s" +msgstr "" + +#: builtin/mv.c:206 +#, c-format +msgid "Renaming %s to %s\n" +msgstr "" + +#: builtin/mv.c:209 +#, c-format +msgid "renaming '%s' failed" +msgstr "" + +#: builtin/notes.c:122 +#, c-format +msgid "unable to start 'show' for object '%s'" +msgstr "" + +#: builtin/notes.c:128 +msgid "can't fdopen 'show' output fd" +msgstr "" + +#: builtin/notes.c:138 +#, c-format +msgid "failed to close pipe to 'show' for object '%s'" +msgstr "" + +#: builtin/notes.c:141 +#, c-format +msgid "failed to finish 'show' for object '%s'" +msgstr "" + +#: builtin/notes.c:158 builtin/tag.c:311 +#, fuzzy, c-format +msgid "could not create file '%s'" +msgstr "लिंक '%s' नहीं पढ़ सके" + +#: builtin/notes.c:172 +msgid "Please supply the note contents using either -m or -F option" +msgstr "" + +#: builtin/notes.c:193 builtin/notes.c:797 +#, c-format +msgid "Removing note for object %s\n" +msgstr "" + +#: builtin/notes.c:198 +msgid "unable to write note object" +msgstr "" + +#: builtin/notes.c:200 +#, c-format +msgid "The note contents has been left in %s" +msgstr "" + +#: builtin/notes.c:234 builtin/tag.c:445 +#, fuzzy, c-format +msgid "cannot read '%s'" +msgstr "लिंक '%s' नहीं पढ़ सके" + +#: builtin/notes.c:236 builtin/tag.c:448 +#, fuzzy, c-format +msgid "could not open or read '%s'" +msgstr "निर्देशिका '%s' नहीं खोल सके" + +#: builtin/notes.c:255 builtin/notes.c:444 builtin/notes.c:446 +#: builtin/notes.c:508 builtin/notes.c:560 builtin/notes.c:631 +#: builtin/notes.c:636 builtin/notes.c:710 builtin/notes.c:752 +#: builtin/notes.c:789 builtin/reset.c:303 builtin/tag.c:461 +#, c-format +msgid "Failed to resolve '%s' as a valid ref." +msgstr "" + +#: builtin/notes.c:258 +#, c-format +msgid "Failed to read object '%s'." +msgstr "" + +#: builtin/notes.c:283 +msgid "Cannot commit uninitialized/unreferenced notes tree" +msgstr "" + +#: builtin/notes.c:295 +msgid "Failed to write current notes tree to database" +msgstr "" + +#: builtin/notes.c:307 +msgid "Failed to commit notes tree to database" +msgstr "" + +#: builtin/notes.c:339 +#, c-format +msgid "Bad notes.rewriteMode value: '%s'" +msgstr "" + +#: builtin/notes.c:349 +#, c-format +msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" +msgstr "" + +#. TRANSLATORS: The first %s is the name of the +#. environment variable, the second %s is its value +#: builtin/notes.c:376 +#, c-format +msgid "Bad %s value: '%s'" +msgstr "" + +#: builtin/notes.c:440 +#, c-format +msgid "Malformed input line: '%s'." +msgstr "" + +#: builtin/notes.c:455 +#, fuzzy, c-format +msgid "Failed to copy notes from '%s' to '%s'" +msgstr "'%s' की अनुकृति '%s' में नहीं कर सके" + +#. TRANSLATORS: The first %s is one of "git notes ACTION", +#. e.g. "add", "copy", "append" etc. +#: builtin/notes.c:481 +#, c-format +msgid "Refusing to %s notes in %s (outside of refs/notes/)" +msgstr "" + +#: builtin/notes.c:501 builtin/notes.c:553 builtin/notes.c:614 +#: builtin/notes.c:626 builtin/notes.c:698 builtin/notes.c:745 +#: builtin/notes.c:782 builtin/notes.c:821 +msgid "too many parameters" +msgstr "" + +#: builtin/notes.c:505 +msgid "list" +msgstr "" + +#: builtin/notes.c:514 builtin/notes.c:758 +#, c-format +msgid "No note found for object %s." +msgstr "" + +#: builtin/notes.c:562 +msgid "add" +msgstr "" + +#: builtin/notes.c:567 +#, c-format +msgid "" +"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " +"existing notes" +msgstr "" + +#: builtin/notes.c:572 builtin/notes.c:649 +#, c-format +msgid "Overwriting existing notes for object %s\n" +msgstr "" + +#: builtin/notes.c:622 +msgid "too few parameters" +msgstr "" + +#: builtin/notes.c:638 +msgid "copy" +msgstr "" + +#: builtin/notes.c:643 +#, c-format +msgid "" +"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " +"existing notes" +msgstr "" + +#: builtin/notes.c:655 +#, c-format +msgid "Missing notes on source object %s. Cannot copy." +msgstr "" + +#: builtin/notes.c:703 +#, 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:754 +msgid "show" +msgstr "" + +#: builtin/notes.c:791 +msgid "remove" +msgstr "" + +#: builtin/notes.c:795 +#, c-format +msgid "Object %s has no note\n" +msgstr "" + +#: builtin/notes.c:825 +msgid "prune" +msgstr "" + +#: builtin/notes.c:877 +#, c-format +msgid "Unknown subcommand: %s" +msgstr "" + +#: builtin/push.c:43 +msgid "tag shorthand without " +msgstr "" + +#: builtin/push.c:62 +msgid "--delete only accepts plain target ref names" +msgstr "" + +#: builtin/push.c:72 +msgid "You are not currently on a branch." +msgstr "" + +#: builtin/push.c:74 +#, c-format +msgid "The current branch %s is not tracking anything." +msgstr "" + +#: builtin/push.c:77 +#, c-format +msgid "The current branch %s is tracking multiple branches, refusing to push." +msgstr "" + +#: builtin/push.c:100 +msgid "" +"You didn't specify any refspecs to push, and push.default is \"nothing\"." +msgstr "" + +#: builtin/push.c:120 +#, c-format +msgid "Pushing to %s\n" +msgstr "" + +#: builtin/push.c:124 +#, c-format +msgid "failed to push some refs to '%s'" +msgstr "" + +#: builtin/push.c:132 +#, 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 "" + +#: builtin/push.c:149 +#, c-format +msgid "bad repository '%s'" +msgstr "" + +#: builtin/push.c:150 +msgid "No destination configured to push to." +msgstr "" + +#: builtin/push.c:158 +msgid "--all and --tags are incompatible" +msgstr "" + +#: builtin/push.c:159 +msgid "--all can't be combined with refspecs" +msgstr "" + +#: builtin/push.c:164 +msgid "--mirror and --tags are incompatible" +msgstr "" + +#: builtin/push.c:165 +msgid "--mirror can't be combined with refspecs" +msgstr "" + +#: builtin/push.c:170 +msgid "--all and --mirror are incompatible" +msgstr "" + +#: builtin/push.c:235 +msgid "--delete is incompatible with --all, --mirror and --tags" +msgstr "" + +#: builtin/push.c:237 +msgid "--delete doesn't make sense without any refs" +msgstr "" + +#: builtin/reset.c:33 +msgid "mixed" +msgstr "" + +#: builtin/reset.c:33 +msgid "soft" +msgstr "" + +#: builtin/reset.c:33 +msgid "hard" +msgstr "" + +#: builtin/reset.c:33 +msgid "merge" +msgstr "" + +#: builtin/reset.c:33 +msgid "keep" +msgstr "" + +#: builtin/reset.c:95 +msgid "You do not have a valid HEAD." +msgstr "" + +#: builtin/reset.c:97 +msgid "Failed to find tree of HEAD." +msgstr "" + +#: builtin/reset.c:103 +#, c-format +msgid "Failed to find tree of %s." +msgstr "" + +#: builtin/reset.c:108 +msgid "Could not write new index file." +msgstr "" + +#: builtin/reset.c:118 +#, c-format +msgid "HEAD is now at %s" +msgstr "" + +#: builtin/reset.c:142 +msgid "Could not read index" +msgstr "" + +#: builtin/reset.c:145 +msgid "Unstaged changes after reset:" +msgstr "" + +#: builtin/reset.c:225 +#, c-format +msgid "Reflog action message too long: %.*s..." +msgstr "" + +#: builtin/reset.c:231 +#, c-format +msgid "Cannot do a %s reset in the middle of a merge." +msgstr "" + +#: builtin/reset.c:307 +#, c-format +msgid "Could not parse object '%s'." +msgstr "" + +#: builtin/reset.c:312 +msgid "--patch is incompatible with --{hard,mixed,soft}" +msgstr "" + +#: builtin/reset.c:321 +msgid "--mixed with paths is deprecated; use 'git reset -- ' instead." +msgstr "" + +#: builtin/reset.c:323 +#, c-format +msgid "Cannot do %s reset with paths." +msgstr "" + +#: builtin/reset.c:335 +#, c-format +msgid "%s reset is not allowed in a bare repository" +msgstr "" + +#: builtin/reset.c:351 +#, c-format +msgid "Could not reset index file to revision '%s'." +msgstr "" + +#: builtin/revert.c:82 +msgid "program error" +msgstr "" + +#: builtin/revert.c:154 builtin/revert.c:188 +#, c-format +msgid "Could not read commit message of %s" +msgstr "" + +#: builtin/revert.c:202 +#, c-format +msgid "Could not extract author email from %s" +msgstr "" + +#: builtin/revert.c:214 +#, c-format +msgid "Could not extract author time from %s" +msgstr "" + +#: builtin/revert.c:230 +#, c-format +msgid "No author information found in %s" +msgstr "" + +#: builtin/revert.c:267 +#, c-format +msgid "Could not write to %s." +msgstr "" + +#: builtin/revert.c:270 +#, c-format +msgid "Error wrapping up %s" +msgstr "" + +#: builtin/revert.c:290 +msgid "" +"Your local changes would be overwritten by revert.\n" +"Please, commit your changes or stash them to proceed." +msgstr "" + +#: builtin/revert.c:293 +msgid "" +"Your local changes would be overwritten by cherry-pick.\n" +"Please, commit your changes or stash them to proceed." +msgstr "" + +#. TRANSLATORS: %s will be "revert" or "cherry-pick" +#: builtin/revert.c:351 +#, c-format +msgid "%s: Unable to write new index file" +msgstr "" + +#: builtin/revert.c:417 +msgid "Your index file is unmerged." +msgstr "" + +#: builtin/revert.c:420 +msgid "You do not have a valid HEAD" +msgstr "" + +#: builtin/revert.c:428 +msgid "Cannot revert a root commit" +msgstr "" + +#: builtin/revert.c:437 +#, c-format +msgid "Commit %s is a merge but no -m option was given." +msgstr "" + +#: builtin/revert.c:445 +#, c-format +msgid "Commit %s does not have parent %d" +msgstr "" + +#: builtin/revert.c:449 +#, 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 +#: builtin/revert.c:460 +#, c-format +msgid "%s: cannot parse parent commit %s" +msgstr "" + +#: builtin/revert.c:464 +#, c-format +msgid "Cannot get commit message for %s" +msgstr "" + +#: builtin/revert.c:525 +#, c-format +msgid "could not revert %s... %s" +msgstr "" + +#: builtin/revert.c:526 +#, c-format +msgid "could not apply %s... %s" +msgstr "" + +#: builtin/revert.c:559 +msgid "empty commit set passed" +msgstr "" + +#: builtin/revert.c:573 +msgid "cherry-pick --ff cannot be used with --signoff" +msgstr "" + +#: builtin/revert.c:575 +msgid "cherry-pick --ff cannot be used with --no-commit" +msgstr "" + +#: builtin/revert.c:577 +msgid "cherry-pick --ff cannot be used with -x" +msgstr "" + +#: builtin/revert.c:579 +msgid "cherry-pick --ff cannot be used with --edit" +msgstr "" + +#. TRANSLATORS: %s will be "revert" or "cherry-pick" +#: builtin/revert.c:584 +#, c-format +msgid "git %s: failed to read the index" +msgstr "" + +#: builtin/rm.c:118 +#, c-format +msgid "" +"'%s' has staged content different from both the file and the HEAD\n" +"(use -f to force removal)" +msgstr "" + +#: builtin/rm.c:124 +#, c-format +msgid "" +"'%s' has changes staged in the index\n" +"(use --cached to keep the file, or -f to force removal)" +msgstr "" + +#: builtin/rm.c:128 +#, c-format +msgid "" +"'%s' has local modifications\n" +"(use --cached to keep the file, or -f to force removal)" +msgstr "" + +#: builtin/rm.c:202 +#, c-format +msgid "not removing '%s' recursively without -r" +msgstr "" + +#: builtin/rm.c:238 +#, c-format +msgid "git rm: unable to remove %s" +msgstr "" + +#: builtin/shortlog.c:161 +#, c-format +msgid "Missing author: %s" +msgstr "" + +#: builtin/tag.c:123 builtin/tag.c:464 +#, c-format +msgid "tag name too long: %.*s..." +msgstr "" + +#: builtin/tag.c:128 +#, fuzzy, c-format +msgid "tag '%s' not found." +msgstr "टेम्पलेट्स नहीं मिले: %s" + +#: builtin/tag.c:143 +#, c-format +msgid "Deleted tag '%s' (was %s)\n" +msgstr "" + +#: builtin/tag.c:155 +#, c-format +msgid "could not verify the tag '%s'" +msgstr "" + +#: builtin/tag.c:170 +msgid "committer info too long." +msgstr "" + +#: builtin/tag.c:190 +msgid "could not run gpg." +msgstr "" + +#: builtin/tag.c:196 +msgid "gpg did not accept the tag data" +msgstr "" + +#: builtin/tag.c:203 +msgid "gpg failed to sign the tag" +msgstr "" + +#: builtin/tag.c:218 +msgid "" +"\n" +"#\n" +"# Write a tag message\n" +"#\n" +msgstr "" + +#: builtin/tag.c:226 +#, c-format +msgid "signing key value too long (%.10s...)" +msgstr "" + +#: builtin/tag.c:272 +msgid "unable to sign the tag" +msgstr "" + +#: builtin/tag.c:274 +msgid "unable to write tag file" +msgstr "" + +#: builtin/tag.c:289 +msgid "bad object type." +msgstr "" + +#: builtin/tag.c:302 +msgid "tag header too big." +msgstr "" + +#: builtin/tag.c:329 +msgid "no tag message?" +msgstr "" + +#: builtin/tag.c:335 +#, c-format +msgid "The tag message has been left in %s\n" +msgstr "" + +#: builtin/tag.c:428 +msgid "-n option is only allowed with -l." +msgstr "" + +#: builtin/tag.c:430 +msgid "--contains option is only allowed with -l." +msgstr "" + +#: builtin/tag.c:438 +msgid "only one -F or -m option is allowed." +msgstr "" + +#: builtin/tag.c:458 +msgid "too many params" +msgstr "" + +#: builtin/tag.c:466 +#, c-format +msgid "'%s' is not a valid tag name." +msgstr "" + +#: builtin/tag.c:471 +#, c-format +msgid "tag '%s' already exists" +msgstr "" + +#: builtin/tag.c:479 +#, c-format +msgid "%s: cannot lock the ref" +msgstr "" + +#: builtin/tag.c:481 +#, c-format +msgid "%s: cannot update the ref" +msgstr "" + +#: builtin/tag.c:483 +#, c-format +msgid "Updated tag '%s' (was %s)\n" +msgstr "" + +#: git-am.sh:47 +msgid "You need to set your committer info first" +msgstr "" + +#: git-am.sh:80 +#, sh-format +msgid "" +"When you have resolved this problem run \"$cmdline --resolved\".\n" +"If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n" +"To restore the original branch and stop patching run \"$cmdline --abort\"." +msgstr "" + +#: git-am.sh:96 +msgid "Cannot fall back to three-way merge." +msgstr "" + +#: git-am.sh:111 +msgid "Repository lacks necessary blobs to fall back on 3-way merge." +msgstr "" + +#: git-am.sh:120 +msgid "" +"Did you hand edit your patch?\n" +"It does not apply to blobs recorded in its index." +msgstr "" + +#: git-am.sh:236 +msgid "Only one StGIT patch series can be applied at once" +msgstr "" + +#: git-am.sh:288 +#, sh-format +msgid "Patch format $patch_format is not supported." +msgstr "" + +#: git-am.sh:290 +msgid "Patch format detection failed." +msgstr "" + +#: git-am.sh:340 +msgid "-d option is no longer supported. Do not use." +msgstr "" + +#: git-am.sh:403 +#, sh-format +msgid "previous rebase directory $dotest still exists but mbox given." +msgstr "" + +#: git-am.sh:408 +msgid "Please make up your mind. --skip or --abort?" +msgstr "" + +#: git-am.sh:434 +msgid "Resolve operation not in progress, we are not resuming." +msgstr "" + +#: git-am.sh:499 +#, sh-format +msgid "Dirty index: cannot apply patches (dirty: $files)" +msgstr "" + +#: git-am.sh:595 +#, sh-format +msgid "" +"Patch is empty. Was it split wrong?\n" +"If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n" +"To restore the original branch and stop patching run \"$cmdline --abort\"." +msgstr "" + +#: git-am.sh:632 +msgid "Patch does not have a valid e-mail address." +msgstr "" + +#: git-am.sh:679 +msgid "cannot be interactive without stdin connected to a terminal." +msgstr "" + +#: git-am.sh:683 +msgid "Commit Body is:" +msgstr "" + +#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] +#. in your translation. The program will only accept English +#. input at this point. +#: git-am.sh:690 +msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " +msgstr "" + +#: git-am.sh:726 +#, sh-format +msgid "Applying: $FIRSTLINE" +msgstr "" + +#: git-am.sh:747 +msgid "" +"No changes - did you forget to use 'git add'?\n" +"If there is nothing left to stage, chances are that something else\n" +"already introduced the same changes; you might want to skip this patch." +msgstr "" + +#: git-am.sh:755 +msgid "" +"You still have unmerged paths in your index\n" +"did you forget to use 'git add'?" +msgstr "" + +#: git-am.sh:771 +msgid "No changes -- Patch already applied." +msgstr "" + +#: git-am.sh:781 +#, sh-format +msgid "Patch failed at $msgnum $FIRSTLINE" +msgstr "" + +#: git-am.sh:797 +msgid "applying to an empty history" +msgstr "" From 6f312e3eaa057ee0c2f7b4746eef32683d41101b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Cie=C5=9Blak?= Date: Mon, 30 Aug 2010 17:29:05 +0000 Subject: [PATCH 05/15] po/pl.po: add Polish translation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit An incomplete Polish translation. Signed-off-by: Ævar Arnfjörð Bjarmason Signed-off-by: Marcin Cieślak --- po/pl.po | 2793 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 2793 insertions(+) create mode 100644 po/pl.po diff --git a/po/pl.po b/po/pl.po new file mode 100644 index 00000000000000..577b47f20c7303 --- /dev/null +++ b/po/pl.po @@ -0,0 +1,2793 @@ +# Polish translations for Git. +# Copyright (C) 2010 Marcin Cieślak +# This file is distributed under the same license as the Git package. +# Marcin Cieślak , 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: Git\n" +"Report-Msgid-Bugs-To: Git Mailing List \n" +"POT-Creation-Date: 2010-09-20 15:09+0000\n" +"PO-Revision-Date: 2010-08-30 17:02+0200\n" +"Last-Translator: Marcin Cieślak \n" +"Language-Team: Git Mailing List \n" +"Language: pl\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" + +#: wt-status.c:56 +msgid "# Unmerged paths:" +msgstr "" + +#: wt-status.c:62 wt-status.c:79 +#, c-format +msgid "# (use \"git reset %s ...\" to unstage)" +msgstr "" + +#: wt-status.c:64 wt-status.c:81 +msgid "# (use \"git rm --cached ...\" to unstage)" +msgstr "" + +#: wt-status.c:65 +msgid "# (use \"git add/rm ...\" as appropriate to mark resolution)" +msgstr "" + +#: wt-status.c:73 +msgid "# Changes to be committed:" +msgstr "" + +#: wt-status.c:91 +msgid "# Changed but not updated:" +msgstr "" + +#: wt-status.c:95 +msgid "# (use \"git add ...\" to update what will be committed)" +msgstr "" + +#: wt-status.c:97 +msgid "# (use \"git add/rm ...\" to update what will be committed)" +msgstr "" + +#: wt-status.c:98 +msgid "" +"# (use \"git checkout -- ...\" to discard changes in working " +"directory)" +msgstr "" + +#: wt-status.c:100 +msgid "# (commit or discard the untracked or modified content in submodules)" +msgstr "" + +#: wt-status.c:109 +#, c-format +msgid "# %s files:" +msgstr "" + +#: wt-status.c:112 +#, c-format +msgid "# (use \"git %s ...\" to include in what will be committed)" +msgstr "" + +#: wt-status.c:129 +msgid "bug" +msgstr "" + +#: wt-status.c:134 +msgid "both deleted:" +msgstr "" + +#: wt-status.c:135 +msgid "added by us:" +msgstr "" + +#: wt-status.c:136 +msgid "deleted by them:" +msgstr "" + +#: wt-status.c:137 +msgid "added by them:" +msgstr "" + +#: wt-status.c:138 +msgid "deleted by us:" +msgstr "" + +#: wt-status.c:139 +msgid "both added:" +msgstr "" + +#: wt-status.c:140 +msgid "both modified:" +msgstr "" + +#: wt-status.c:170 +msgid "new commits, " +msgstr "" + +#: wt-status.c:172 +msgid "modified content, " +msgstr "" + +#: wt-status.c:174 +msgid "untracked content, " +msgstr "" + +#: wt-status.c:188 +#, c-format +msgid "new file: %s" +msgstr "" + +#: wt-status.c:191 +#, c-format +msgid "copied: %s -> %s" +msgstr "" + +#: wt-status.c:194 +#, c-format +msgid "deleted: %s" +msgstr "" + +#: wt-status.c:197 +#, c-format +msgid "modified: %s" +msgstr "" + +#: wt-status.c:200 +#, c-format +msgid "renamed: %s -> %s" +msgstr "" + +#: wt-status.c:203 +#, c-format +msgid "typechange: %s" +msgstr "" + +#: wt-status.c:206 +#, c-format +msgid "unknown: %s" +msgstr "" + +#: wt-status.c:209 +#, c-format +msgid "unmerged: %s" +msgstr "" + +#: wt-status.c:212 +#, c-format +msgid "bug: unhandled diff status %c" +msgstr "" + +#: wt-status.c:635 +msgid "On branch " +msgstr "" + +#: wt-status.c:642 +msgid "Not currently on any branch." +msgstr "" + +#: wt-status.c:652 +#, fuzzy +msgid "# Initial commit" +msgstr "Utworzyłem puste" + +#: wt-status.c:666 +msgid "Untracked" +msgstr "" + +#: wt-status.c:668 +msgid "Ignored" +msgstr "" + +#: wt-status.c:670 +#, c-format +msgid "# Untracked files not listed%s\n" +msgstr "" + +#: wt-status.c:672 +msgid " (use -u option to show untracked files)" +msgstr "" + +#: wt-status.c:678 +#, c-format +msgid "# No changes\n" +msgstr "" + +#: wt-status.c:682 +#, c-format +msgid "no changes added to commit%s\n" +msgstr "" + +#: wt-status.c:684 +msgid " (use \"git add\" and/or \"git commit -a\")" +msgstr "" + +#: wt-status.c:686 +#, c-format +msgid "nothing added to commit but untracked files present%s\n" +msgstr "" + +#: wt-status.c:688 +msgid " (use \"git add\" to track)" +msgstr "" + +#: wt-status.c:690 wt-status.c:693 wt-status.c:696 +#, c-format +msgid "nothing to commit%s\n" +msgstr "" + +#: wt-status.c:691 +msgid " (create/copy files and use \"git add\" to track)" +msgstr "" + +#: wt-status.c:694 +msgid " (use -u to show untracked files)" +msgstr "" + +#: wt-status.c:697 +msgid " (working directory clean)" +msgstr "" + +#: wt-status.c:795 +msgid "HEAD (no branch)" +msgstr "" + +#: wt-status.c:801 +msgid "Initial commit on " +msgstr "" + +#: wt-status.c:816 +msgid "behind " +msgstr "" + +#: wt-status.c:819 wt-status.c:822 +msgid "ahead " +msgstr "" + +#: wt-status.c:824 +msgid ", behind " +msgstr "" + +#: builtin/add.c:41 +#, c-format +msgid "unexpected diff status %c" +msgstr "" + +#: builtin/add.c:67 builtin/commit.c:244 +msgid "updating files failed" +msgstr "" + +#: builtin/add.c:77 +#, c-format +msgid "remove '%s'\n" +msgstr "" + +#: builtin/add.c:175 +#, c-format +msgid "Path '%s' is in submodule '%.*s'" +msgstr "" + +#: builtin/add.c:191 +msgid "Unstaged changes after refreshing the index:" +msgstr "" + +#: builtin/add.c:194 builtin/add.c:452 builtin/rm.c:194 +#, c-format +msgid "pathspec '%s' did not match any files" +msgstr "" + +#: builtin/add.c:208 +#, c-format +msgid "'%s' is beyond a symbolic link" +msgstr "" + +#: builtin/add.c:275 +msgid "Could not read the index" +msgstr "" + +#: builtin/add.c:284 +#, c-format +msgid "Could not open '%s' for writing." +msgstr "" + +#: builtin/add.c:288 +#, fuzzy +msgid "Could not write patch" +msgstr "Nie mogę dać prawa zapisu grupie w %s" + +#: builtin/add.c:293 +#, fuzzy, c-format +msgid "Could not stat '%s'" +msgstr "nie mogę tknąć '%s'" + +#: builtin/add.c:295 +msgid "Empty patch. Aborted." +msgstr "" + +#: builtin/add.c:301 +#, c-format +msgid "Could not apply '%s'" +msgstr "" + +#: builtin/add.c:349 +#, c-format +msgid "Use -f if you really want to add them.\n" +msgstr "" + +#: builtin/add.c:350 +msgid "no files added" +msgstr "" + +#: builtin/add.c:356 +msgid "adding files failed" +msgstr "" + +#: builtin/add.c:388 +msgid "-A and -u are mutually incompatible" +msgstr "" + +#: builtin/add.c:390 +msgid "Option --ignore-missing can only be used together with --dry-run" +msgstr "" + +#: builtin/add.c:410 +#, c-format +msgid "Nothing specified, nothing added.\n" +msgstr "" + +#: builtin/add.c:411 +#, c-format +msgid "Maybe you wanted to say 'git add .'?\n" +msgstr "" + +#: builtin/add.c:417 builtin/clean.c:95 builtin/commit.c:301 +#: builtin/commit.c:310 builtin/mv.c:77 builtin/rm.c:171 +msgid "index file corrupt" +msgstr "" + +#: builtin/add.c:468 builtin/mv.c:223 builtin/rm.c:268 +msgid "Unable to write new index file" +msgstr "" + +#: builtin/archive.c:17 +#, c-format +msgid "could not create archive file '%s'" +msgstr "" + +#: builtin/archive.c:20 +msgid "could not redirect output" +msgstr "" + +#: builtin/archive.c:36 +msgid "git archive: Remote with no URL" +msgstr "" + +#: builtin/archive.c:46 +msgid "git archive: expected ACK/NAK, got EOF" +msgstr "" + +#: builtin/archive.c:51 +#, c-format +msgid "git archive: NACK %s" +msgstr "" + +#: builtin/archive.c:52 +msgid "git archive: protocol error" +msgstr "" + +#: builtin/archive.c:57 +msgid "git archive: expected a flush" +msgstr "" + +#: builtin/branch.c:136 +#, c-format +msgid "" +"deleting branch '%s' that has been merged to\n" +" '%s', but it is not yet merged to HEAD." +msgstr "" + +#: builtin/branch.c:140 +#, c-format +msgid "" +"not deleting branch '%s' that is not yet merged to\n" +" '%s', even though it is merged to HEAD." +msgstr "" + +#. TRANSLATORS: This is "remote " in "remote branch '%s' not found" +#: builtin/branch.c:161 +msgid "remote " +msgstr "" + +#: builtin/branch.c:169 +#, fuzzy +msgid "cannot use -a with -d" +msgstr "nie wiem w którym katalogu jestem" + +#: builtin/branch.c:175 +msgid "Couldn't look up commit object for HEAD" +msgstr "" + +#: builtin/branch.c:180 +#, c-format +msgid "Cannot delete the branch '%s' which you are currently on." +msgstr "" + +#: builtin/branch.c:190 +#, c-format +msgid "%sbranch '%s' not found." +msgstr "" + +#: builtin/branch.c:198 +#, c-format +msgid "Couldn't look up commit object for '%s'" +msgstr "" + +#: builtin/branch.c:204 +#, c-format +msgid "" +"The branch '%s' is not fully merged.\n" +"If you are sure you want to delete it, run 'git branch -D %s'." +msgstr "" + +#: builtin/branch.c:212 +#, c-format +msgid "Error deleting %sbranch '%s'" +msgstr "" + +#: builtin/branch.c:217 +#, c-format +msgid "Deleted %sbranch %s (was %s).\n" +msgstr "" + +#: builtin/branch.c:222 +msgid "Update of config-file failed" +msgstr "" + +#: builtin/branch.c:304 +#, c-format +msgid "branch '%s' does not point at a commit" +msgstr "" + +#: builtin/branch.c:381 +#, c-format +msgid "behind %d] " +msgstr "" + +#: builtin/branch.c:383 +#, c-format +msgid "ahead %d] " +msgstr "" + +#: builtin/branch.c:385 +#, c-format +msgid "ahead %d, behind %d] " +msgstr "" + +#: builtin/branch.c:484 +msgid "(no branch)" +msgstr "" + +#: builtin/branch.c:544 +msgid "some refs could not be read" +msgstr "" + +#: builtin/branch.c:557 +msgid "cannot rename the current branch while not on any." +msgstr "" + +#: builtin/branch.c:567 builtin/branch.c:571 +#, c-format +msgid "Invalid branch name: '%s'" +msgstr "" + +#: builtin/branch.c:574 +#, c-format +msgid "A branch named '%s' already exists." +msgstr "" + +#: builtin/branch.c:580 +msgid "Branch rename failed" +msgstr "" + +#: builtin/branch.c:584 +#, c-format +msgid "Renamed a misnamed branch '%s' away" +msgstr "" + +#: builtin/branch.c:588 +#, c-format +msgid "Branch renamed to %s, but HEAD is not updated!" +msgstr "" + +#: builtin/branch.c:595 +msgid "Branch is renamed, but update of config-file failed" +msgstr "" + +#: builtin/branch.c:610 +#, c-format +msgid "malformed object name %s" +msgstr "" + +#: builtin/branch.c:680 +msgid "Failed to resolve HEAD as a valid ref." +msgstr "" + +#: builtin/branch.c:686 +msgid "HEAD not found below refs/heads!" +msgstr "" + +#: builtin/branch.c:706 +msgid "-a and -r options to 'git branch' do not make sense with a branch name" +msgstr "" + +#: builtin/bundle.c:47 +#, c-format +msgid "%s is okay\n" +msgstr "" + +#: builtin/bundle.c:56 +msgid "Need a repository to create a bundle." +msgstr "" + +#: builtin/bundle.c:60 +msgid "Need a repository to unbundle." +msgstr "" + +#: builtin/checkout.c:107 builtin/checkout.c:135 +#, c-format +msgid "path '%s' does not have our version" +msgstr "" + +#: builtin/checkout.c:109 builtin/checkout.c:137 +#, c-format +msgid "path '%s' does not have their version" +msgstr "" + +#: builtin/checkout.c:120 +#, c-format +msgid "path '%s' does not have all three versions" +msgstr "" + +#: builtin/checkout.c:155 +#, c-format +msgid "path '%s' does not have all 3 versions" +msgstr "" + +#: builtin/checkout.c:172 +#, c-format +msgid "path '%s': cannot merge" +msgstr "" + +#: builtin/checkout.c:189 +#, c-format +msgid "Unable to add merge result for '%s'" +msgstr "" + +#: builtin/checkout.c:194 builtin/reset.c:170 +#, c-format +msgid "make_cache_entry failed for path '%s'" +msgstr "" + +#: builtin/checkout.c:216 builtin/checkout.c:371 +msgid "corrupt index file" +msgstr "" + +#: builtin/checkout.c:244 builtin/checkout.c:251 +#, c-format +msgid "path '%s' is unmerged" +msgstr "" + +#: builtin/checkout.c:280 builtin/checkout.c:475 builtin/clone.c:658 +#: builtin/merge.c:737 +msgid "unable to write new index file" +msgstr "" + +#: builtin/checkout.c:297 builtin/diff.c:307 builtin/merge.c:367 +msgid "diff_setup_done failed" +msgstr "" + +#: builtin/checkout.c:393 +msgid "you need to resolve your current index first" +msgstr "" + +#: builtin/checkout.c:524 +#, fuzzy, c-format +msgid "Can not do reflog for '%s'\n" +msgstr "nie mogę otworzyć katalogu '%s'" + +#: builtin/checkout.c:550 +#, c-format +msgid "Already on '%s'\n" +msgstr "" + +#: builtin/checkout.c:554 +#, c-format +msgid "Switched to and reset branch '%s'\n" +msgstr "" + +#: builtin/checkout.c:556 +#, c-format +msgid "Switched to a new branch '%s'\n" +msgstr "" + +#: builtin/checkout.c:558 +#, c-format +msgid "Switched to branch '%s'\n" +msgstr "" + +#: builtin/checkout.c:575 +msgid "HEAD is now at" +msgstr "" + +#: builtin/checkout.c:603 +msgid "You are on a branch yet to be born" +msgstr "" + +#: builtin/checkout.c:617 +msgid "Previous HEAD position was" +msgstr "" + +#: builtin/checkout.c:730 +msgid "-B cannot be used with -b" +msgstr "" + +#: builtin/checkout.c:738 +msgid "--patch is incompatible with all other options" +msgstr "" + +#: builtin/checkout.c:744 +msgid "--track needs a branch name" +msgstr "" + +#: builtin/checkout.c:751 +msgid "Missing branch name; try -b" +msgstr "" + +#: builtin/checkout.c:757 +msgid "--orphan and -b|-B are mutually exclusive" +msgstr "" + +#: builtin/checkout.c:759 +msgid "--orphan cannot be used with -t" +msgstr "" + +#: builtin/checkout.c:769 +msgid "git checkout: -f and -m are incompatible" +msgstr "" + +#. case (1) +#: builtin/checkout.c:815 +#, c-format +msgid "invalid reference: %s" +msgstr "" + +#. case (1): want a tree +#: builtin/checkout.c:852 +#, c-format +msgid "reference is not a tree: %s" +msgstr "" + +#: builtin/checkout.c:878 +msgid "invalid path specification" +msgstr "" + +#: builtin/checkout.c:886 +#, c-format +msgid "" +"git checkout: updating paths is incompatible with switching branches.\n" +"Did you intend to checkout '%s' which can not be resolved as commit?" +msgstr "" + +#: builtin/checkout.c:888 +msgid "git checkout: updating paths is incompatible with switching branches." +msgstr "" + +#: builtin/checkout.c:893 +msgid "" +"git checkout: --ours/--theirs, --force and --merge are incompatible when\n" +"checking out of the index." +msgstr "" + +#: builtin/checkout.c:904 +#, c-format +msgid "git checkout: we do not like '%s' as a branch name." +msgstr "" + +#: builtin/checkout.c:909 +#, c-format +msgid "git checkout: branch %s already exists" +msgstr "" + +#: builtin/checkout.c:916 +msgid "Cannot switch branch to a non-commit." +msgstr "" + +#: builtin/checkout.c:919 +msgid "--ours/--theirs is incompatible with switching branches." +msgstr "" + +#: builtin/clean.c:78 +msgid "-x and -X cannot be used together" +msgstr "" + +#: builtin/clean.c:82 +msgid "" +"clean.requireForce set to true and neither -n nor -f given; refusing to clean" +msgstr "" + +#: builtin/clean.c:85 +msgid "" +"clean.requireForce defaults to true and neither -n nor -f given; refusing to " +"clean" +msgstr "" + +#: builtin/clean.c:154 builtin/clean.c:175 +#, c-format +msgid "Would remove %s\n" +msgstr "" + +#: builtin/clean.c:158 builtin/clean.c:178 +#, c-format +msgid "Removing %s\n" +msgstr "" + +#: builtin/clean.c:161 builtin/clean.c:181 +#, c-format +msgid "failed to remove '%s'" +msgstr "" + +#: builtin/clean.c:165 +#, c-format +msgid "Would not remove %s\n" +msgstr "" + +#: builtin/clean.c:167 +#, c-format +msgid "Not removing %s\n" +msgstr "" + +#: builtin/clone.c:208 +#, c-format +msgid "reference repository '%s' is not a local directory." +msgstr "" + +#: builtin/clone.c:235 +#, fuzzy, c-format +msgid "failed to open '%s'" +msgstr "nie mogę otworzyć katalogu '%s'" + +#: builtin/clone.c:239 +#, fuzzy, c-format +msgid "failed to create directory '%s'" +msgstr "beznadziejny katalog gita %s" + +#: builtin/clone.c:241 builtin/diff.c:74 +#, fuzzy, c-format +msgid "failed to stat '%s'" +msgstr "nie mogę tknąć '%s'" + +#: builtin/clone.c:243 +#, fuzzy, c-format +msgid "%s exists and is not a directory" +msgstr "beznadziejny katalog gita %s" + +#: builtin/clone.c:257 +#, c-format +msgid "failed to stat %s\n" +msgstr "" + +#: builtin/clone.c:267 +#, c-format +msgid "failed to unlink '%s'" +msgstr "" + +#: builtin/clone.c:272 +#, fuzzy, c-format +msgid "failed to create link '%s'" +msgstr "readlink nie zadziałało dla '%s'" + +#: builtin/clone.c:276 +#, fuzzy, c-format +msgid "failed to copy file to '%s'" +msgstr "nie mogę skopiować '%s' to '%s'" + +#: builtin/clone.c:305 +#, c-format +msgid "done.\n" +msgstr "" + +#: builtin/clone.c:387 +msgid "Too many arguments." +msgstr "" + +#: builtin/clone.c:391 +msgid "You must specify a repository to clone." +msgstr "" + +#: builtin/clone.c:399 +#, c-format +msgid "--bare and --origin %s options are incompatible." +msgstr "" + +#: builtin/clone.c:428 +#, c-format +msgid "destination path '%s' already exists and is not an empty directory." +msgstr "" + +#: builtin/clone.c:438 +#, c-format +msgid "working tree '%s' already exists." +msgstr "" + +#: builtin/clone.c:451 builtin/clone.c:465 +#, c-format +msgid "could not create leading directories of '%s'" +msgstr "" + +#: builtin/clone.c:454 +#, fuzzy, c-format +msgid "could not create work tree dir '%s'." +msgstr "Nie mogę dostać się do drzewa roboczego '%s'" + +#: builtin/clone.c:470 +#, c-format +msgid "Cloning into bare repository %s\n" +msgstr "" + +#: builtin/clone.c:472 +#, c-format +msgid "Cloning into %s\n" +msgstr "" + +#: builtin/clone.c:530 +#, c-format +msgid "Don't know how to clone %s" +msgstr "" + +#: builtin/clone.c:569 +#, c-format +msgid "Remote branch %s not found in upstream %s, using HEAD instead" +msgstr "" + +#: builtin/clone.c:579 +msgid "You appear to have cloned an empty repository." +msgstr "" + +#: builtin/clone.c:621 +msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" +msgstr "" + +#: builtin/commit.c:41 +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" +"If the identity used for this commit is wrong, you can fix it with:\n" +"\n" +" git commit --amend --author='Your Name '\n" +msgstr "" + +#: builtin/commit.c:53 +msgid "" +"You asked to amend the most recent commit, but doing so would make\n" +"it empty. You can repeat your command with --allow-empty, or you can\n" +"remove the commit entirely with \"git reset HEAD^\".\n" +msgstr "" + +#: builtin/commit.c:271 +msgid "failed to unpack HEAD tree object" +msgstr "" + +#: builtin/commit.c:299 +msgid "interactive add failed" +msgstr "" + +#: builtin/commit.c:330 builtin/commit.c:350 builtin/commit.c:396 +msgid "unable to write new_index file" +msgstr "" + +#: builtin/commit.c:380 +msgid "cannot do a partial commit during a merge." +msgstr "" + +#: builtin/commit.c:389 +#, fuzzy +msgid "cannot read the index" +msgstr "readlink nie zadziałało dla '%s'" + +#: builtin/commit.c:409 +msgid "unable to write temporary index file" +msgstr "" + +#: builtin/commit.c:456 builtin/commit.c:1294 +msgid "could not parse HEAD commit" +msgstr "" + +#: builtin/commit.c:475 builtin/commit.c:481 +#, c-format +msgid "invalid commit: %s" +msgstr "" + +#: builtin/commit.c:499 +msgid "malformed --author parameter" +msgstr "" + +#: builtin/commit.c:573 builtin/shortlog.c:299 +#, c-format +msgid "(reading log message from standard input)\n" +msgstr "" + +#: builtin/commit.c:575 +msgid "could not read log from standard input" +msgstr "" + +#: builtin/commit.c:579 +#, fuzzy, c-format +msgid "could not read log file '%s'" +msgstr "readlink nie zadziałało dla '%s'" + +#: builtin/commit.c:585 +msgid "commit has empty message" +msgstr "" + +#: builtin/commit.c:591 +msgid "could not read MERGE_MSG" +msgstr "" + +#: builtin/commit.c:595 +msgid "could not read SQUASH_MSG" +msgstr "" + +#: builtin/commit.c:599 +#, fuzzy, c-format +msgid "could not read '%s'" +msgstr "readlink nie zadziałało dla '%s'" + +#: builtin/commit.c:612 +#, fuzzy, c-format +msgid "could not open '%s'" +msgstr "nie mogę otworzyć katalogu '%s'" + +#: builtin/commit.c:636 +msgid "could not write commit template" +msgstr "" + +#: builtin/commit.c:650 +#, 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" +"#\n" +msgstr "" + +#: builtin/commit.c:659 +#, c-format +msgid "" +"\n" +"# Please enter the commit message for your changes." +msgstr "" + +#: builtin/commit.c:663 +#, c-format +msgid "" +" Lines starting\n" +"# with '#' will be ignored, and an empty message aborts the commit.\n" +msgstr "" + +#: builtin/commit.c:668 +#, c-format +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" +msgstr "" + +#: builtin/commit.c:680 +#, c-format +msgid "%s# Author: %s\n" +msgstr "" + +#: builtin/commit.c:688 +#, c-format +msgid "%s# Committer: %s\n" +msgstr "" + +#: builtin/commit.c:705 +#, fuzzy +msgid "Cannot read index" +msgstr "readlink nie zadziałało dla '%s'" + +#: builtin/commit.c:737 +msgid "Error building trees" +msgstr "" + +#: builtin/commit.c:752 builtin/tag.c:321 +#, c-format +msgid "Please supply the message using either -m or -F option.\n" +msgstr "" + +#: builtin/commit.c:832 +#, c-format +msgid "No existing author found with '%s'" +msgstr "" + +#: builtin/commit.c:847 builtin/commit.c:1039 +#, c-format +msgid "Invalid untracked files mode '%s'" +msgstr "" + +#: builtin/commit.c:864 +msgid "Using both --reset-author and --author does not make sense" +msgstr "" + +#: builtin/commit.c:878 +msgid "You have nothing to amend." +msgstr "" + +#: builtin/commit.c:880 +msgid "You are in the middle of a merge -- cannot amend." +msgstr "" + +#: builtin/commit.c:889 +msgid "Only one of -c/-C/-F can be used." +msgstr "" + +#: builtin/commit.c:891 +msgid "Option -m cannot be combined with -c/-C/-F." +msgstr "" + +#: builtin/commit.c:897 +msgid "--reset-author can be used only with -C, -c or --amend." +msgstr "" + +#: builtin/commit.c:906 +#, c-format +msgid "could not lookup commit %s" +msgstr "" + +#: builtin/commit.c:909 +#, c-format +msgid "could not parse commit %s" +msgstr "" + +#: builtin/commit.c:937 +msgid "Only one of --include/--only/--all/--interactive can be used." +msgstr "" + +#: builtin/commit.c:939 +msgid "No paths with --include/--only does not make sense." +msgstr "" + +#: builtin/commit.c:941 +msgid "Clever... amending the last one with dirty index." +msgstr "" + +#: builtin/commit.c:943 +msgid "Explicit paths specified without -i nor -o; assuming --only paths..." +msgstr "" + +#: builtin/commit.c:953 +#, c-format +msgid "Invalid cleanup mode %s" +msgstr "" + +#: builtin/commit.c:958 +msgid "Paths with -a does not make sense." +msgstr "" + +#: builtin/commit.c:960 +msgid "Paths with --interactive does not make sense." +msgstr "" + +#: builtin/commit.c:1142 +msgid "couldn't look up newly created commit" +msgstr "" + +#: builtin/commit.c:1144 +msgid "could not parse newly created commit" +msgstr "" + +#: builtin/commit.c:1185 +msgid "detached HEAD" +msgstr "" + +#: builtin/commit.c:1187 +msgid " (root-commit)" +msgstr "" + +#: builtin/commit.c:1307 builtin/merge.c:461 +#, c-format +msgid "could not open '%s' for reading" +msgstr "" + +#: builtin/commit.c:1312 +#, c-format +msgid "Corrupt MERGE_HEAD file (%s)" +msgstr "" + +#: builtin/commit.c:1319 +msgid "could not read MERGE_MODE" +msgstr "" + +#: builtin/commit.c:1336 +#, c-format +msgid "could not read commit message: %s" +msgstr "" + +#: builtin/commit.c:1350 +#, c-format +msgid "Aborting commit due to empty commit message.\n" +msgstr "" + +#: builtin/commit.c:1358 +msgid "failed to write commit object" +msgstr "" + +#: builtin/commit.c:1375 +msgid "cannot lock HEAD ref" +msgstr "" + +#: builtin/commit.c:1379 +msgid "cannot update HEAD ref" +msgstr "" + +#: builtin/commit.c:1388 +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/describe.c:205 +#, c-format +msgid "annotated tag %s not available" +msgstr "" + +#: builtin/describe.c:209 +#, c-format +msgid "annotated tag %s has no embedded name" +msgstr "" + +#: builtin/describe.c:211 +#, c-format +msgid "tag '%s' is really '%s' here" +msgstr "" + +#: builtin/describe.c:238 +#, c-format +msgid "Not a valid object name %s" +msgstr "" + +#: builtin/describe.c:241 +#, c-format +msgid "%s is not a valid '%s' object" +msgstr "" + +#: builtin/describe.c:258 +#, fuzzy, c-format +msgid "no tag exactly matches '%s'" +msgstr "nie mogę tknąć szablonu '%s'" + +#: builtin/describe.c:260 +#, c-format +msgid "searching to describe %s\n" +msgstr "" + +#: builtin/describe.c:295 +#, c-format +msgid "finished search at %s\n" +msgstr "" + +#: builtin/describe.c:319 +#, c-format +msgid "" +"No annotated tags can describe '%s'.\n" +"However, there were unannotated tags: try --tags." +msgstr "" + +#: builtin/describe.c:323 +#, c-format +msgid "" +"No tags can describe '%s'.\n" +"Try --always, or create some tags." +msgstr "" + +#: builtin/describe.c:344 +#, c-format +msgid "traversed %lu commits\n" +msgstr "" + +#: builtin/describe.c:347 +#, c-format +msgid "" +"more than %i tags found; listed %i most recent\n" +"gave up search at %s\n" +msgstr "" + +#: builtin/describe.c:398 +msgid "--long is incompatible with --abbrev=0" +msgstr "" + +#: builtin/describe.c:423 +msgid "No names found, cannot describe anything." +msgstr "" + +#: builtin/describe.c:430 +msgid "--dirty is incompatible with committishes" +msgstr "" + +#: builtin/diff.c:76 +#, c-format +msgid "'%s': not a regular file or symlink" +msgstr "" + +#: builtin/diff.c:225 +#, c-format +msgid "invalid option: %s" +msgstr "" + +#: builtin/diff.c:302 +msgid "Not a git repository" +msgstr "" + +#: builtin/diff.c:334 +msgid "No HEAD commit to compare with (yet)" +msgstr "" + +#: builtin/diff.c:349 +#, c-format +msgid "invalid object '%s' given." +msgstr "" + +#: builtin/diff.c:354 +#, c-format +msgid "more than %d trees given: '%s'" +msgstr "" + +#: builtin/diff.c:364 +#, c-format +msgid "more than two blobs given: '%s'" +msgstr "" + +#: builtin/diff.c:372 +#, c-format +msgid "unhandled object '%s' given." +msgstr "" + +#: builtin/fetch.c:175 +msgid "Couldn't find remote ref HEAD" +msgstr "" + +#: builtin/fetch.c:228 +#, fuzzy, c-format +msgid "object %s not found" +msgstr "nie znaleziono szablonów %s" + +#: builtin/fetch.c:233 +msgid "[up to date]" +msgstr "" + +#. +#. * If this is the head, and it's not okay to update +#. * the head, and the old value of the head isn't empty... +#. +#: builtin/fetch.c:246 +#, c-format +msgid "! %-*s %-*s -> %s (can't fetch in current branch)" +msgstr "" + +#: builtin/fetch.c:247 builtin/fetch.c:309 +msgid "[rejected]" +msgstr "" + +#: builtin/fetch.c:257 +msgid "[tag update]" +msgstr "" + +#: builtin/fetch.c:258 builtin/fetch.c:280 builtin/fetch.c:293 +msgid " (unable to update local ref)" +msgstr "" + +#: builtin/fetch.c:270 +msgid "[new tag]" +msgstr "" + +#: builtin/fetch.c:274 +msgid "[new branch]" +msgstr "" + +#: builtin/fetch.c:305 +msgid "unable to update local ref" +msgstr "" + +#: builtin/fetch.c:305 +msgid "forced update" +msgstr "" + +#: builtin/fetch.c:310 +msgid "(non-fast-forward)" +msgstr "" + +#: builtin/fetch.c:328 builtin/fetch.c:651 +#, fuzzy, c-format +msgid "cannot open %s: %s\n" +msgstr "nie mogę otworzyć katalogu '%s'" + +#: builtin/fetch.c:406 +#, c-format +msgid "From %.*s\n" +msgstr "" + +#: builtin/fetch.c:417 +#, c-format +msgid "" +"some local refs could not be updated; try running\n" +" 'git remote prune %s' to remove any old, conflicting branches" +msgstr "" + +#: builtin/fetch.c:467 +msgid "could not run rev-list" +msgstr "" + +#: builtin/fetch.c:481 +#, c-format +msgid "failed write to rev-list: %s" +msgstr "" + +#: builtin/fetch.c:488 +#, c-format +msgid "failed to close rev-list's stdin: %s" +msgstr "" + +#: builtin/fetch.c:515 +#, c-format +msgid " (%s will become dangling)\n" +msgstr "" + +#: builtin/fetch.c:516 +#, c-format +msgid " (%s has become dangling)\n" +msgstr "" + +#: builtin/fetch.c:523 +msgid "[deleted]" +msgstr "" + +#: builtin/fetch.c:524 +msgid "(none)" +msgstr "" + +#: builtin/fetch.c:641 +#, c-format +msgid "Refusing to fetch into current branch %s of non-bare repository" +msgstr "" + +#: builtin/fetch.c:675 +#, c-format +msgid "Don't know how to fetch from %s" +msgstr "" + +#: builtin/fetch.c:729 +#, c-format +msgid "Option \"%s\" value \"%s\" is not valid for %s" +msgstr "" + +#: builtin/fetch.c:732 +#, c-format +msgid "Option \"%s\" is ignored for %s\n" +msgstr "" + +#: builtin/fetch.c:821 +#, c-format +msgid "Fetching %s\n" +msgstr "" + +#: builtin/fetch.c:823 +#, c-format +msgid "Could not fetch %s" +msgstr "" + +#: builtin/fetch.c:839 +msgid "" +"No remote repository specified. Please, specify either a URL or a\n" +"remote name from which new revisions should be fetched." +msgstr "" + +#: builtin/fetch.c:859 +msgid "You need to specify a tag name." +msgstr "" + +#: builtin/fetch.c:899 +msgid "fetch --all does not take a repository argument" +msgstr "" + +#: builtin/fetch.c:901 +msgid "fetch --all does not make sense with refspecs" +msgstr "" + +#: builtin/fetch.c:912 +#, c-format +msgid "No such remote or remote group: %s" +msgstr "" + +#: builtin/fetch.c:920 +msgid "Fetching a group and specifying refspecs does not make sense" +msgstr "" + +#: builtin/gc.c:63 +#, c-format +msgid "Invalid %s: '%s'" +msgstr "" + +#: builtin/gc.c:78 +msgid "Too many options specified" +msgstr "" + +#: builtin/gc.c:103 +#, fuzzy, c-format +msgid "insanely long object directory %.*s" +msgstr "beznadziejny katalog gita %s" + +#: builtin/gc.c:220 +#, c-format +msgid "Auto packing the repository for optimum performance.\n" +msgstr "" + +#: builtin/gc.c:223 +#, 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." +msgstr "" + +#: builtin/gc.c:251 +msgid "" +"There are too many unreachable loose objects; run 'git prune' to remove them." +msgstr "" + +#: builtin/grep.c:252 +#, c-format +msgid "grep: failed to create thread: %s" +msgstr "" + +#: builtin/grep.c:457 +#, c-format +msgid "'%s': unable to read %s" +msgstr "" + +#: builtin/grep.c:508 +#, c-format +msgid "'%s': %s" +msgstr "" + +#: builtin/grep.c:519 +#, c-format +msgid "'%s': short read %s" +msgstr "" + +#: builtin/grep.c:581 +#, c-format +msgid "Failed to chdir: %s" +msgstr "" + +#: builtin/grep.c:671 builtin/grep.c:697 +#, c-format +msgid "unable to read tree (%s)" +msgstr "" + +#: builtin/grep.c:703 +#, c-format +msgid "unable to grep from object of type %s" +msgstr "" + +#: builtin/grep.c:755 +#, c-format +msgid "switch `%c' expects a numerical value" +msgstr "" + +#: builtin/grep.c:771 +#, fuzzy, c-format +msgid "cannot open '%s'" +msgstr "nie mogę otworzyć katalogu '%s'" + +#: builtin/grep.c:1012 +msgid "no pattern given." +msgstr "" + +#: builtin/grep.c:1016 +msgid "cannot mix --fixed-strings and regexp" +msgstr "" + +#: builtin/grep.c:1041 +#, c-format +msgid "bad object %s" +msgstr "" + +#: builtin/grep.c:1068 +msgid "--open-files-in-pager only works on the worktree" +msgstr "" + +#: builtin/grep.c:1093 +msgid "--cached cannot be used with --no-index." +msgstr "" + +#: builtin/grep.c:1095 +msgid "--no-index cannot be used with revs." +msgstr "" + +#: builtin/grep.c:1104 +msgid "both --cached and trees are given." +msgstr "" + +#: builtin/init-db.c:34 +#, c-format +msgid "Could not make %s writable by group" +msgstr "Nie mogę dać prawa zapisu grupie w %s" + +#: builtin/init-db.c:61 +#, c-format +msgid "insanely long template name %s" +msgstr "beznadziejnie długa nazwa szablonu %s" + +#: builtin/init-db.c:66 +#, c-format +msgid "cannot stat '%s'" +msgstr "nie mogę tknąć '%s'" + +#: builtin/init-db.c:72 +#, c-format +msgid "cannot stat template '%s'" +msgstr "nie mogę tknąć szablonu '%s'" + +#: builtin/init-db.c:79 +#, c-format +msgid "cannot opendir '%s'" +msgstr "nie mogę otworzyć katalogu '%s'" + +#: builtin/init-db.c:96 +#, c-format +msgid "cannot readlink '%s'" +msgstr "readlink nie zadziałało dla '%s'" + +#: builtin/init-db.c:98 +#, c-format +msgid "insanely long symlink %s" +msgstr "beznadziejnie długi link symboliczny %s" + +#: builtin/init-db.c:101 +#, c-format +msgid "cannot symlink '%s' '%s'" +msgstr "nie mogę założyć symbolicznego link z '%s' do '%s'" + +#: builtin/init-db.c:105 +#, c-format +msgid "cannot copy '%s' to '%s'" +msgstr "nie mogę skopiować '%s' to '%s'" + +#: builtin/init-db.c:109 +#, c-format +msgid "ignoring template %s" +msgstr "pomijam szablon %s" + +#: builtin/init-db.c:132 +#, c-format +msgid "insanely long template path %s" +msgstr "beznadziejnie długa śieżka do wzorca %s" + +#: builtin/init-db.c:140 +#, c-format +msgid "templates not found %s" +msgstr "nie znaleziono szablonów %s" + +#: builtin/init-db.c:153 +#, c-format +msgid "not copying templates of a wrong format version %d from '%s'" +msgstr "" +"nie będę kopiować szablonów oznaczonych niewłaściwym numerem wersji %d z '%s'" + +#: builtin/init-db.c:191 +#, c-format +msgid "insane git directory %s" +msgstr "beznadziejny katalog gita %s" + +#. 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:355 +#, c-format +msgid "%s%s Git repository in %s%s\n" +msgstr "%s%s repozytorium Gita w %s%s\n" + +#: builtin/init-db.c:356 +msgid "Reinitialized existing" +msgstr "Ponownie zainicjowałem istniejące" + +#: builtin/init-db.c:356 +msgid "Initialized empty" +msgstr "Utworzyłem puste" + +#: builtin/init-db.c:357 +msgid " shared" +msgstr " współdzielone" + +#: builtin/init-db.c:376 +msgid "cannot tell cwd" +msgstr "nie wiem w którym katalogu jestem" + +#: builtin/init-db.c:450 builtin/init-db.c:457 +#, c-format +msgid "cannot mkdir %s" +msgstr "nie mogę utworzyć katalogu %s" + +#: builtin/init-db.c:461 +#, c-format +msgid "cannot chdir to %s" +msgstr "nie mogę wejść do katalogu %s" + +#: builtin/init-db.c:483 +#, c-format +msgid "" +"%s (or --work-tree=) not allowed without specifying %s (or --git-" +"dir=)" +msgstr "" +"nie można użyć %s (or --work-tree=) bez podania %s (or --git-" +"dir=)" + +#: builtin/init-db.c:509 +msgid "Cannot access current working directory" +msgstr "Nie mogę dobrać się do bieżącego katalogu" + +#: builtin/init-db.c:512 +#, c-format +msgid "Cannot access work tree '%s'" +msgstr "Nie mogę dostać się do drzewa roboczego '%s'" + +#: builtin/log.c:104 +#, c-format +msgid "invalid --decorate option: %s" +msgstr "" + +#: builtin/log.c:113 builtin/log.c:1138 builtin/shortlog.c:287 +#, c-format +msgid "unrecognized argument: %s" +msgstr "" + +#: builtin/log.c:156 +#, c-format +msgid "Final output: %d %s\n" +msgstr "" + +#: builtin/log.c:255 builtin/log.c:674 builtin/log.c:1222 builtin/log.c:1428 +#: builtin/merge.c:310 builtin/revert.c:556 builtin/shortlog.c:184 +msgid "revision walk setup failed" +msgstr "" + +#: builtin/log.c:347 builtin/log.c:434 +#, c-format +msgid "Could not read object %s" +msgstr "" + +#: builtin/log.c:458 +#, c-format +msgid "Unknown type: %d" +msgstr "" + +#: builtin/log.c:558 +msgid "format.headers without value" +msgstr "" + +#: builtin/log.c:630 +msgid "name of output directory is too long" +msgstr "" + +#: builtin/log.c:641 +#, fuzzy, c-format +msgid "Cannot open patch file %s" +msgstr "nie mogę otworzyć katalogu '%s'" + +#: builtin/log.c:655 +msgid "Need exactly one range." +msgstr "" + +#: builtin/log.c:663 +msgid "Not a range." +msgstr "" + +#: builtin/log.c:700 +msgid "Could not extract email from committer identity." +msgstr "" + +#: builtin/log.c:732 +msgid "Cover letter needs email format" +msgstr "" + +#: builtin/log.c:825 +#, fuzzy, c-format +msgid "insane in-reply-to: %s" +msgstr "beznadziejny katalog gita %s" + +#: builtin/log.c:898 +msgid "Two output directories?" +msgstr "" + +#: builtin/log.c:1087 +#, c-format +msgid "bogus committer info %s" +msgstr "" + +#: builtin/log.c:1132 +msgid "-n and -k are mutually exclusive." +msgstr "" + +#: builtin/log.c:1134 +msgid "--subject-prefix and -k are mutually exclusive." +msgstr "" + +#: builtin/log.c:1141 +msgid "--name-only does not make sense" +msgstr "" + +#: builtin/log.c:1143 +msgid "--name-status does not make sense" +msgstr "" + +#: builtin/log.c:1145 +msgid "--check does not make sense" +msgstr "" + +#: builtin/log.c:1166 +msgid "standard output, or directory, which one?" +msgstr "" + +#: builtin/log.c:1168 +#, c-format +msgid "Could not create directory '%s'" +msgstr "" + +#: builtin/log.c:1307 +msgid "Failed to create output files" +msgstr "" + +#: builtin/log.c:1394 +#, c-format +msgid "" +"Could not find a tracked remote branch, please specify manually.\n" +msgstr "" + +#: builtin/log.c:1410 builtin/log.c:1412 builtin/log.c:1424 +#, c-format +msgid "Unknown commit %s" +msgstr "" + +#: builtin/merge.c:82 +msgid "switch `m' requires a value" +msgstr "" + +#: builtin/merge.c:119 +#, c-format +msgid "Could not find merge strategy '%s'.\n" +msgstr "" + +#: builtin/merge.c:120 +#, c-format +msgid "Available strategies are:" +msgstr "" + +#: builtin/merge.c:125 +#, c-format +msgid "Available custom strategies are:" +msgstr "" + +#: builtin/merge.c:223 +msgid "could not run stash." +msgstr "" + +#: builtin/merge.c:228 +msgid "stash failed" +msgstr "" + +#: builtin/merge.c:233 +#, c-format +msgid "not a valid object: %s" +msgstr "" + +#: builtin/merge.c:250 +msgid "read-tree failed" +msgstr "" + +#: builtin/merge.c:279 +msgid " (nothing to squash)" +msgstr "" + +#: builtin/merge.c:292 +#, c-format +msgid "Squash commit -- not updating HEAD\n" +msgstr "" + +#: builtin/merge.c:295 builtin/merge.c:1290 builtin/merge.c:1299 +#: builtin/merge.c:1309 +#, c-format +msgid "Could not write to '%s'" +msgstr "" + +#: builtin/merge.c:323 +msgid "Writing SQUASH_MSG" +msgstr "" + +#: builtin/merge.c:325 +msgid "Finishing SQUASH_MSG" +msgstr "" + +#: builtin/merge.c:345 +#, c-format +msgid "No merge message -- not updating HEAD\n" +msgstr "" + +#: builtin/merge.c:396 +#, c-format +msgid "'%s' does not point to a commit" +msgstr "" + +#: builtin/merge.c:491 +#, c-format +msgid "Bad branch.%s.mergeoptions string: %s" +msgstr "" + +#: builtin/merge.c:553 +msgid "git write-tree failed to write a tree" +msgstr "" + +#: builtin/merge.c:594 +msgid "failed to read the cache" +msgstr "" + +#: builtin/merge.c:611 +msgid "Unable to write index." +msgstr "" + +#: builtin/merge.c:624 +msgid "Not handling anything other than two heads merge." +msgstr "" + +#: builtin/merge.c:651 +#, c-format +msgid "Unknown option for merge-recursive: -X%s" +msgstr "" + +#: builtin/merge.c:666 +#, c-format +msgid "unable to write %s" +msgstr "" + +#: builtin/merge.c:791 +#, c-format +msgid "Wonderful.\n" +msgstr "" + +#: builtin/merge.c:840 builtin/merge.c:1287 builtin/merge.c:1295 +#: builtin/merge.c:1303 +#, fuzzy, c-format +msgid "Could not open '%s' for writing" +msgstr "Nie mogę dać prawa zapisu grupie w %s" + +#: builtin/merge.c:856 +#, c-format +msgid "Automatic merge failed; fix conflicts and then commit the result.\n" +msgstr "" + +#: builtin/merge.c:871 +#, c-format +msgid "'%s' is not a commit" +msgstr "" + +#: builtin/merge.c:921 +msgid "" +"You have not concluded your merge (MERGE_HEAD exists).\n" +"Please, commit your changes before you can merge." +msgstr "" + +#: builtin/merge.c:924 +msgid "You have not concluded your merge (MERGE_HEAD exists)." +msgstr "" + +#: builtin/merge.c:951 +msgid "You cannot combine --squash with --no-ff." +msgstr "" + +#: builtin/merge.c:956 +msgid "You cannot combine --no-ff with --ff-only." +msgstr "" + +#: builtin/merge.c:984 +msgid "Can merge only exactly one commit into empty head" +msgstr "" + +#: builtin/merge.c:987 +msgid "Squash commit into empty head not supported yet" +msgstr "" + +#: builtin/merge.c:989 +msgid "Non-fast-forward commit does not make sense into an empty head" +msgstr "" + +#: builtin/merge.c:993 builtin/merge.c:1041 +#, c-format +msgid "%s - not something we can merge" +msgstr "" + +#: builtin/merge.c:1099 +#, c-format +msgid "Updating %s..%s\n" +msgstr "" + +#: builtin/merge.c:1133 +#, c-format +msgid "Trying really trivial in-index merge...\n" +msgstr "" + +#: builtin/merge.c:1137 +#, c-format +msgid "Nope.\n" +msgstr "" + +#: builtin/merge.c:1170 +msgid "Not possible to fast-forward, aborting." +msgstr "" + +#: builtin/merge.c:1196 builtin/merge.c:1269 +#, c-format +msgid "Rewinding the tree to pristine...\n" +msgstr "" + +#: builtin/merge.c:1200 +#, c-format +msgid "Trying merge strategy %s...\n" +msgstr "" + +#: builtin/merge.c:1261 +#, c-format +msgid "No merge strategy handled the merge.\n" +msgstr "" + +#: builtin/merge.c:1263 +#, c-format +msgid "Merge with strategy %s failed.\n" +msgstr "" + +#: builtin/merge.c:1271 +#, c-format +msgid "Using the %s to prepare resolving by hand.\n" +msgstr "" + +#: builtin/merge.c:1314 +#, c-format +msgid "Automatic merge went well; stopped before committing as requested\n" +msgstr "" + +#: builtin/mv.c:103 +#, fuzzy, c-format +msgid "Checking rename of '%s' to '%s'\n" +msgstr "nie mogę skopiować '%s' to '%s'" + +#: builtin/mv.c:107 +msgid "bad source" +msgstr "" + +#: builtin/mv.c:110 +msgid "can not move directory into itself" +msgstr "" + +#: builtin/mv.c:113 +msgid "cannot move directory over file" +msgstr "" + +#: builtin/mv.c:123 +#, c-format +msgid "Huh? %.*s is in index?" +msgstr "" + +#: builtin/mv.c:135 +msgid "source directory is empty" +msgstr "" + +#: builtin/mv.c:166 +msgid "not under version control" +msgstr "" + +#: builtin/mv.c:168 +msgid "destination exists" +msgstr "" + +#: builtin/mv.c:175 +#, c-format +msgid "%s; will overwrite!" +msgstr "" + +#: builtin/mv.c:178 +msgid "Cannot overwrite" +msgstr "" + +#: builtin/mv.c:181 +msgid "multiple sources for the same target" +msgstr "" + +#: builtin/mv.c:196 +#, c-format +msgid "%s, source=%s, destination=%s" +msgstr "" + +#: builtin/mv.c:206 +#, c-format +msgid "Renaming %s to %s\n" +msgstr "" + +#: builtin/mv.c:209 +#, c-format +msgid "renaming '%s' failed" +msgstr "" + +#: builtin/notes.c:122 +#, c-format +msgid "unable to start 'show' for object '%s'" +msgstr "" + +#: builtin/notes.c:128 +msgid "can't fdopen 'show' output fd" +msgstr "" + +#: builtin/notes.c:138 +#, c-format +msgid "failed to close pipe to 'show' for object '%s'" +msgstr "" + +#: builtin/notes.c:141 +#, c-format +msgid "failed to finish 'show' for object '%s'" +msgstr "" + +#: builtin/notes.c:158 builtin/tag.c:311 +#, fuzzy, c-format +msgid "could not create file '%s'" +msgstr "readlink nie zadziałało dla '%s'" + +#: builtin/notes.c:172 +msgid "Please supply the note contents using either -m or -F option" +msgstr "" + +#: builtin/notes.c:193 builtin/notes.c:797 +#, c-format +msgid "Removing note for object %s\n" +msgstr "" + +#: builtin/notes.c:198 +msgid "unable to write note object" +msgstr "" + +#: builtin/notes.c:200 +#, c-format +msgid "The note contents has been left in %s" +msgstr "" + +#: builtin/notes.c:234 builtin/tag.c:445 +#, fuzzy, c-format +msgid "cannot read '%s'" +msgstr "readlink nie zadziałało dla '%s'" + +#: builtin/notes.c:236 builtin/tag.c:448 +#, fuzzy, c-format +msgid "could not open or read '%s'" +msgstr "nie mogę otworzyć katalogu '%s'" + +#: builtin/notes.c:255 builtin/notes.c:444 builtin/notes.c:446 +#: builtin/notes.c:508 builtin/notes.c:560 builtin/notes.c:631 +#: builtin/notes.c:636 builtin/notes.c:710 builtin/notes.c:752 +#: builtin/notes.c:789 builtin/reset.c:303 builtin/tag.c:461 +#, c-format +msgid "Failed to resolve '%s' as a valid ref." +msgstr "" + +#: builtin/notes.c:258 +#, c-format +msgid "Failed to read object '%s'." +msgstr "" + +#: builtin/notes.c:283 +msgid "Cannot commit uninitialized/unreferenced notes tree" +msgstr "" + +#: builtin/notes.c:295 +msgid "Failed to write current notes tree to database" +msgstr "" + +#: builtin/notes.c:307 +msgid "Failed to commit notes tree to database" +msgstr "" + +#: builtin/notes.c:339 +#, c-format +msgid "Bad notes.rewriteMode value: '%s'" +msgstr "" + +#: builtin/notes.c:349 +#, c-format +msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" +msgstr "" + +#. TRANSLATORS: The first %s is the name of the +#. environment variable, the second %s is its value +#: builtin/notes.c:376 +#, c-format +msgid "Bad %s value: '%s'" +msgstr "" + +#: builtin/notes.c:440 +#, c-format +msgid "Malformed input line: '%s'." +msgstr "" + +#: builtin/notes.c:455 +#, fuzzy, c-format +msgid "Failed to copy notes from '%s' to '%s'" +msgstr "nie mogę skopiować '%s' to '%s'" + +#. TRANSLATORS: The first %s is one of "git notes ACTION", +#. e.g. "add", "copy", "append" etc. +#: builtin/notes.c:481 +#, c-format +msgid "Refusing to %s notes in %s (outside of refs/notes/)" +msgstr "" + +#: builtin/notes.c:501 builtin/notes.c:553 builtin/notes.c:614 +#: builtin/notes.c:626 builtin/notes.c:698 builtin/notes.c:745 +#: builtin/notes.c:782 builtin/notes.c:821 +msgid "too many parameters" +msgstr "" + +#: builtin/notes.c:505 +msgid "list" +msgstr "" + +#: builtin/notes.c:514 builtin/notes.c:758 +#, c-format +msgid "No note found for object %s." +msgstr "" + +#: builtin/notes.c:562 +msgid "add" +msgstr "" + +#: builtin/notes.c:567 +#, c-format +msgid "" +"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " +"existing notes" +msgstr "" + +#: builtin/notes.c:572 builtin/notes.c:649 +#, c-format +msgid "Overwriting existing notes for object %s\n" +msgstr "" + +#: builtin/notes.c:622 +msgid "too few parameters" +msgstr "" + +#: builtin/notes.c:638 +msgid "copy" +msgstr "" + +#: builtin/notes.c:643 +#, c-format +msgid "" +"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " +"existing notes" +msgstr "" + +#: builtin/notes.c:655 +#, c-format +msgid "Missing notes on source object %s. Cannot copy." +msgstr "" + +#: builtin/notes.c:703 +#, 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:754 +msgid "show" +msgstr "" + +#: builtin/notes.c:791 +msgid "remove" +msgstr "" + +#: builtin/notes.c:795 +#, c-format +msgid "Object %s has no note\n" +msgstr "" + +#: builtin/notes.c:825 +msgid "prune" +msgstr "" + +#: builtin/notes.c:877 +#, c-format +msgid "Unknown subcommand: %s" +msgstr "" + +#: builtin/push.c:43 +msgid "tag shorthand without " +msgstr "" + +#: builtin/push.c:62 +msgid "--delete only accepts plain target ref names" +msgstr "" + +#: builtin/push.c:72 +msgid "You are not currently on a branch." +msgstr "" + +#: builtin/push.c:74 +#, c-format +msgid "The current branch %s is not tracking anything." +msgstr "" + +#: builtin/push.c:77 +#, c-format +msgid "The current branch %s is tracking multiple branches, refusing to push." +msgstr "" + +#: builtin/push.c:100 +msgid "" +"You didn't specify any refspecs to push, and push.default is \"nothing\"." +msgstr "" + +#: builtin/push.c:120 +#, c-format +msgid "Pushing to %s\n" +msgstr "" + +#: builtin/push.c:124 +#, c-format +msgid "failed to push some refs to '%s'" +msgstr "" + +#: builtin/push.c:132 +#, 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 "" + +#: builtin/push.c:149 +#, c-format +msgid "bad repository '%s'" +msgstr "" + +#: builtin/push.c:150 +msgid "No destination configured to push to." +msgstr "" + +#: builtin/push.c:158 +msgid "--all and --tags are incompatible" +msgstr "" + +#: builtin/push.c:159 +msgid "--all can't be combined with refspecs" +msgstr "" + +#: builtin/push.c:164 +msgid "--mirror and --tags are incompatible" +msgstr "" + +#: builtin/push.c:165 +msgid "--mirror can't be combined with refspecs" +msgstr "" + +#: builtin/push.c:170 +msgid "--all and --mirror are incompatible" +msgstr "" + +#: builtin/push.c:235 +msgid "--delete is incompatible with --all, --mirror and --tags" +msgstr "" + +#: builtin/push.c:237 +msgid "--delete doesn't make sense without any refs" +msgstr "" + +#: builtin/reset.c:33 +msgid "mixed" +msgstr "" + +#: builtin/reset.c:33 +msgid "soft" +msgstr "" + +#: builtin/reset.c:33 +msgid "hard" +msgstr "" + +#: builtin/reset.c:33 +msgid "merge" +msgstr "" + +#: builtin/reset.c:33 +msgid "keep" +msgstr "" + +#: builtin/reset.c:95 +msgid "You do not have a valid HEAD." +msgstr "" + +#: builtin/reset.c:97 +msgid "Failed to find tree of HEAD." +msgstr "" + +#: builtin/reset.c:103 +#, c-format +msgid "Failed to find tree of %s." +msgstr "" + +#: builtin/reset.c:108 +msgid "Could not write new index file." +msgstr "" + +#: builtin/reset.c:118 +#, c-format +msgid "HEAD is now at %s" +msgstr "" + +#: builtin/reset.c:142 +msgid "Could not read index" +msgstr "" + +#: builtin/reset.c:145 +msgid "Unstaged changes after reset:" +msgstr "" + +#: builtin/reset.c:225 +#, c-format +msgid "Reflog action message too long: %.*s..." +msgstr "" + +#: builtin/reset.c:231 +#, c-format +msgid "Cannot do a %s reset in the middle of a merge." +msgstr "" + +#: builtin/reset.c:307 +#, c-format +msgid "Could not parse object '%s'." +msgstr "" + +#: builtin/reset.c:312 +msgid "--patch is incompatible with --{hard,mixed,soft}" +msgstr "" + +#: builtin/reset.c:321 +msgid "--mixed with paths is deprecated; use 'git reset -- ' instead." +msgstr "" + +#: builtin/reset.c:323 +#, c-format +msgid "Cannot do %s reset with paths." +msgstr "" + +#: builtin/reset.c:335 +#, c-format +msgid "%s reset is not allowed in a bare repository" +msgstr "" + +#: builtin/reset.c:351 +#, c-format +msgid "Could not reset index file to revision '%s'." +msgstr "" + +#: builtin/revert.c:82 +msgid "program error" +msgstr "" + +#: builtin/revert.c:154 builtin/revert.c:188 +#, c-format +msgid "Could not read commit message of %s" +msgstr "" + +#: builtin/revert.c:202 +#, c-format +msgid "Could not extract author email from %s" +msgstr "" + +#: builtin/revert.c:214 +#, c-format +msgid "Could not extract author time from %s" +msgstr "" + +#: builtin/revert.c:230 +#, c-format +msgid "No author information found in %s" +msgstr "" + +#: builtin/revert.c:267 +#, c-format +msgid "Could not write to %s." +msgstr "" + +#: builtin/revert.c:270 +#, c-format +msgid "Error wrapping up %s" +msgstr "" + +#: builtin/revert.c:290 +msgid "" +"Your local changes would be overwritten by revert.\n" +"Please, commit your changes or stash them to proceed." +msgstr "" + +#: builtin/revert.c:293 +msgid "" +"Your local changes would be overwritten by cherry-pick.\n" +"Please, commit your changes or stash them to proceed." +msgstr "" + +#. TRANSLATORS: %s will be "revert" or "cherry-pick" +#: builtin/revert.c:351 +#, c-format +msgid "%s: Unable to write new index file" +msgstr "" + +#: builtin/revert.c:417 +msgid "Your index file is unmerged." +msgstr "" + +#: builtin/revert.c:420 +msgid "You do not have a valid HEAD" +msgstr "" + +#: builtin/revert.c:428 +msgid "Cannot revert a root commit" +msgstr "" + +#: builtin/revert.c:437 +#, c-format +msgid "Commit %s is a merge but no -m option was given." +msgstr "" + +#: builtin/revert.c:445 +#, c-format +msgid "Commit %s does not have parent %d" +msgstr "" + +#: builtin/revert.c:449 +#, 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 +#: builtin/revert.c:460 +#, c-format +msgid "%s: cannot parse parent commit %s" +msgstr "" + +#: builtin/revert.c:464 +#, c-format +msgid "Cannot get commit message for %s" +msgstr "" + +#: builtin/revert.c:525 +#, c-format +msgid "could not revert %s... %s" +msgstr "" + +#: builtin/revert.c:526 +#, c-format +msgid "could not apply %s... %s" +msgstr "" + +#: builtin/revert.c:559 +msgid "empty commit set passed" +msgstr "" + +#: builtin/revert.c:573 +msgid "cherry-pick --ff cannot be used with --signoff" +msgstr "" + +#: builtin/revert.c:575 +msgid "cherry-pick --ff cannot be used with --no-commit" +msgstr "" + +#: builtin/revert.c:577 +msgid "cherry-pick --ff cannot be used with -x" +msgstr "" + +#: builtin/revert.c:579 +msgid "cherry-pick --ff cannot be used with --edit" +msgstr "" + +#. TRANSLATORS: %s will be "revert" or "cherry-pick" +#: builtin/revert.c:584 +#, c-format +msgid "git %s: failed to read the index" +msgstr "" + +#: builtin/rm.c:118 +#, c-format +msgid "" +"'%s' has staged content different from both the file and the HEAD\n" +"(use -f to force removal)" +msgstr "" + +#: builtin/rm.c:124 +#, c-format +msgid "" +"'%s' has changes staged in the index\n" +"(use --cached to keep the file, or -f to force removal)" +msgstr "" + +#: builtin/rm.c:128 +#, c-format +msgid "" +"'%s' has local modifications\n" +"(use --cached to keep the file, or -f to force removal)" +msgstr "" + +#: builtin/rm.c:202 +#, c-format +msgid "not removing '%s' recursively without -r" +msgstr "" + +#: builtin/rm.c:238 +#, c-format +msgid "git rm: unable to remove %s" +msgstr "" + +#: builtin/shortlog.c:161 +#, c-format +msgid "Missing author: %s" +msgstr "" + +#: builtin/tag.c:123 builtin/tag.c:464 +#, c-format +msgid "tag name too long: %.*s..." +msgstr "" + +#: builtin/tag.c:128 +#, fuzzy, c-format +msgid "tag '%s' not found." +msgstr "nie znaleziono szablonów %s" + +#: builtin/tag.c:143 +#, c-format +msgid "Deleted tag '%s' (was %s)\n" +msgstr "" + +#: builtin/tag.c:155 +#, c-format +msgid "could not verify the tag '%s'" +msgstr "" + +#: builtin/tag.c:170 +msgid "committer info too long." +msgstr "" + +#: builtin/tag.c:190 +msgid "could not run gpg." +msgstr "" + +#: builtin/tag.c:196 +msgid "gpg did not accept the tag data" +msgstr "" + +#: builtin/tag.c:203 +msgid "gpg failed to sign the tag" +msgstr "" + +#: builtin/tag.c:218 +msgid "" +"\n" +"#\n" +"# Write a tag message\n" +"#\n" +msgstr "" + +#: builtin/tag.c:226 +#, c-format +msgid "signing key value too long (%.10s...)" +msgstr "" + +#: builtin/tag.c:272 +msgid "unable to sign the tag" +msgstr "" + +#: builtin/tag.c:274 +msgid "unable to write tag file" +msgstr "" + +#: builtin/tag.c:289 +msgid "bad object type." +msgstr "" + +#: builtin/tag.c:302 +msgid "tag header too big." +msgstr "" + +#: builtin/tag.c:329 +msgid "no tag message?" +msgstr "" + +#: builtin/tag.c:335 +#, c-format +msgid "The tag message has been left in %s\n" +msgstr "" + +#: builtin/tag.c:428 +msgid "-n option is only allowed with -l." +msgstr "" + +#: builtin/tag.c:430 +msgid "--contains option is only allowed with -l." +msgstr "" + +#: builtin/tag.c:438 +msgid "only one -F or -m option is allowed." +msgstr "" + +#: builtin/tag.c:458 +msgid "too many params" +msgstr "" + +#: builtin/tag.c:466 +#, c-format +msgid "'%s' is not a valid tag name." +msgstr "" + +#: builtin/tag.c:471 +#, c-format +msgid "tag '%s' already exists" +msgstr "" + +#: builtin/tag.c:479 +#, c-format +msgid "%s: cannot lock the ref" +msgstr "" + +#: builtin/tag.c:481 +#, c-format +msgid "%s: cannot update the ref" +msgstr "" + +#: builtin/tag.c:483 +#, c-format +msgid "Updated tag '%s' (was %s)\n" +msgstr "" + +#: git-am.sh:47 +msgid "You need to set your committer info first" +msgstr "" + +#: git-am.sh:80 +#, sh-format +msgid "" +"When you have resolved this problem run \"$cmdline --resolved\".\n" +"If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n" +"To restore the original branch and stop patching run \"$cmdline --abort\"." +msgstr "" + +#: git-am.sh:96 +msgid "Cannot fall back to three-way merge." +msgstr "" + +#: git-am.sh:111 +msgid "Repository lacks necessary blobs to fall back on 3-way merge." +msgstr "" + +#: git-am.sh:120 +msgid "" +"Did you hand edit your patch?\n" +"It does not apply to blobs recorded in its index." +msgstr "" + +#: git-am.sh:236 +msgid "Only one StGIT patch series can be applied at once" +msgstr "" + +#: git-am.sh:288 +#, sh-format +msgid "Patch format $patch_format is not supported." +msgstr "" + +#: git-am.sh:290 +msgid "Patch format detection failed." +msgstr "" + +#: git-am.sh:340 +msgid "-d option is no longer supported. Do not use." +msgstr "" + +#: git-am.sh:403 +#, sh-format +msgid "previous rebase directory $dotest still exists but mbox given." +msgstr "" + +#: git-am.sh:408 +msgid "Please make up your mind. --skip or --abort?" +msgstr "" + +#: git-am.sh:434 +msgid "Resolve operation not in progress, we are not resuming." +msgstr "" + +#: git-am.sh:499 +#, sh-format +msgid "Dirty index: cannot apply patches (dirty: $files)" +msgstr "" + +#: git-am.sh:595 +#, sh-format +msgid "" +"Patch is empty. Was it split wrong?\n" +"If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n" +"To restore the original branch and stop patching run \"$cmdline --abort\"." +msgstr "" + +#: git-am.sh:632 +msgid "Patch does not have a valid e-mail address." +msgstr "" + +#: git-am.sh:679 +msgid "cannot be interactive without stdin connected to a terminal." +msgstr "" + +#: git-am.sh:683 +msgid "Commit Body is:" +msgstr "" + +#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] +#. in your translation. The program will only accept English +#. input at this point. +#: git-am.sh:690 +msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " +msgstr "" + +#: git-am.sh:726 +#, sh-format +msgid "Applying: $FIRSTLINE" +msgstr "" + +#: git-am.sh:747 +msgid "" +"No changes - did you forget to use 'git add'?\n" +"If there is nothing left to stage, chances are that something else\n" +"already introduced the same changes; you might want to skip this patch." +msgstr "" + +#: git-am.sh:755 +msgid "" +"You still have unmerged paths in your index\n" +"did you forget to use 'git add'?" +msgstr "" + +#: git-am.sh:771 +msgid "No changes -- Patch already applied." +msgstr "" + +#: git-am.sh:781 +#, sh-format +msgid "Patch failed at $msgnum $FIRSTLINE" +msgstr "" + +#: git-am.sh:797 +msgid "applying to an empty history" +msgstr "" From 5c8a0068806df853392a55ef978057a99f5018bf Mon Sep 17 00:00:00 2001 From: Peter Krefting Date: Sun, 12 Sep 2010 21:10:21 +0100 Subject: [PATCH 06/15] po/sv.po: add Swedish translation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Peter Krefting Signed-off-by: Ævar Arnfjörð Bjarmason --- po/sv.po | 3492 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 3492 insertions(+) create mode 100644 po/sv.po diff --git a/po/sv.po b/po/sv.po new file mode 100644 index 00000000000000..78b4d9a11ddada --- /dev/null +++ b/po/sv.po @@ -0,0 +1,3492 @@ +# Swedish translations for Git. +# Copyright (C) 2010 Peter krefting +# This file is distributed under the same license as the Git package. +# Peter krefting , 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: git 1.7.3\n" +"Report-Msgid-Bugs-To: Git Mailing List \n" +"POT-Creation-Date: 2010-09-20 15:16+0000\n" +"PO-Revision-Date: 2010-09-12 21:07+0100\n" +"Last-Translator: Peter Krefting \n" +"Language-Team: Swedish \n" +"Language: sv\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: wt-status.c:56 +msgid "# Unmerged paths:" +msgstr "# Ej sammanslagna sökvägar:" + +#: wt-status.c:62 wt-status.c:79 +#, c-format +msgid "# (use \"git reset %s ...\" to unstage)" +msgstr "# (använd \"git reset %s ...\" för att ta bort från kö)" + +#: wt-status.c:64 wt-status.c:81 +msgid "# (use \"git rm --cached ...\" to unstage)" +msgstr "# (använd \"git rm --cached ...\" för att ta bort från kö)" + +#: wt-status.c:65 +msgid "# (use \"git add/rm ...\" as appropriate to mark resolution)" +msgstr "# (använd \"git add/rm ...\" som lämpligt för att ange lösning)" + +#: wt-status.c:73 +msgid "# Changes to be committed:" +msgstr "# Ändringar att checka in:" + +#: wt-status.c:91 +msgid "# Changed but not updated:" +msgstr "# Ändrade men inte uppdaterade:" + +#: wt-status.c:95 +msgid "# (use \"git add ...\" to update what will be committed)" +msgstr "" +"# (använd \"git add ...\" för att uppdatera vad som skall checkas in)" + +#: wt-status.c:97 +msgid "# (use \"git add/rm ...\" to update what will be committed)" +msgstr "" +"# (använd \"git add/rm ...\" för att uppdatera vad som skall checkas " +"in)" + +#: wt-status.c:98 +msgid "" +"# (use \"git checkout -- ...\" to discard changes in working " +"directory)" +msgstr "" +"# (använd \"git checkout -- ...\" för att förkasta ändringar i " +"arbetskatalogen)" + +#: wt-status.c:100 +msgid "# (commit or discard the untracked or modified content in submodules)" +msgstr "" +"# (checka in eller förkasta ospårat eller ändrat innehåll i undermoduler)" + +#: wt-status.c:109 +#, c-format +msgid "# %s files:" +msgstr "# %s filer:" + +#: wt-status.c:112 +#, c-format +msgid "# (use \"git %s ...\" to include in what will be committed)" +msgstr "" +"# (använd \"git %s ...\" för att ta med i vad som skall checkas in)" + +#: wt-status.c:129 +msgid "bug" +msgstr "programfel" + +#: wt-status.c:134 +msgid "both deleted:" +msgstr "borttaget av bägge:" + +#: wt-status.c:135 +msgid "added by us:" +msgstr "tillagt av oss:" + +#: wt-status.c:136 +msgid "deleted by them:" +msgstr "borttaget av dem:" + +#: wt-status.c:137 +msgid "added by them:" +msgstr "tillagt av dem:" + +#: wt-status.c:138 +msgid "deleted by us:" +msgstr "borttaget av oss:" + +#: wt-status.c:139 +msgid "both added:" +msgstr "tillagt av bägge:" + +#: wt-status.c:140 +msgid "both modified:" +msgstr "ändrat av bägge:" + +#: wt-status.c:170 +msgid "new commits, " +msgstr "nya incheckningar, " + +#: wt-status.c:172 +msgid "modified content, " +msgstr "ändrat innehåll, " + +#: wt-status.c:174 +msgid "untracked content, " +msgstr "ospårat innehåll, " + +#: wt-status.c:188 +#, c-format +msgid "new file: %s" +msgstr "ny fil: %s" + +#: wt-status.c:191 +#, c-format +msgid "copied: %s -> %s" +msgstr "kopierad: %s -> %s" + +#: wt-status.c:194 +#, c-format +msgid "deleted: %s" +msgstr "borttagen: %s" + +#: wt-status.c:197 +#, c-format +msgid "modified: %s" +msgstr "ändrad: %s" + +#: wt-status.c:200 +#, c-format +msgid "renamed: %s -> %s" +msgstr "namnbyte: %s -> %s" + +#: wt-status.c:203 +#, c-format +msgid "typechange: %s" +msgstr "typbyte: %s" + +#: wt-status.c:206 +#, c-format +msgid "unknown: %s" +msgstr "okänd: %s" + +#: wt-status.c:209 +#, c-format +msgid "unmerged: %s" +msgstr "osammansl.: %s" + +#: wt-status.c:212 +#, c-format +msgid "bug: unhandled diff status %c" +msgstr "programfel: diff-status %c ej hanterad" + +#: wt-status.c:635 +msgid "On branch " +msgstr "På grenen " + +#: wt-status.c:642 +msgid "Not currently on any branch." +msgstr "Inte på någon gren för närvarande." + +#: wt-status.c:652 +msgid "# Initial commit" +msgstr "# Grundincheckning" + +#: wt-status.c:666 +msgid "Untracked" +msgstr "Ospårad" + +#: wt-status.c:668 +msgid "Ignored" +msgstr "Ignorerad" + +#: wt-status.c:670 +#, c-format +msgid "# Untracked files not listed%s\n" +msgstr "# Ospårade filer visas ej%s\n" + +#: wt-status.c:672 +msgid " (use -u option to show untracked files)" +msgstr " (använd flaggan -u för att visa ospårade filer)" + +#: wt-status.c:678 +#, c-format +msgid "# No changes\n" +msgstr "# Inga ändringar\n" + +#: wt-status.c:682 +#, c-format +msgid "no changes added to commit%s\n" +msgstr "inga ändringar att checka in%s\n" + +#: wt-status.c:684 +msgid " (use \"git add\" and/or \"git commit -a\")" +msgstr " (använd \"git add\" och/eller \"git commit -a\")" + +#: wt-status.c:686 +#, c-format +msgid "nothing added to commit but untracked files present%s\n" +msgstr "inget köat för incheckning, men ospårade filer finns%s\n" + +#: wt-status.c:688 +msgid " (use \"git add\" to track)" +msgstr " (använd \"git add\" för att spåra)" + +#: wt-status.c:690 wt-status.c:693 wt-status.c:696 +#, c-format +msgid "nothing to commit%s\n" +msgstr "inget att checka in%s\n" + +#: wt-status.c:691 +msgid " (create/copy files and use \"git add\" to track)" +msgstr " (skapa/kopiera filer och använd \"git add\" för att spåra)" + +#: wt-status.c:694 +msgid " (use -u to show untracked files)" +msgstr " (använd -u för att visa ospårade filer)" + +#: wt-status.c:697 +msgid " (working directory clean)" +msgstr " (arbetskatalogen ren)" + +#: wt-status.c:795 +msgid "HEAD (no branch)" +msgstr "HEAD (ingen gren)" + +#: wt-status.c:801 +msgid "Initial commit on " +msgstr "Grundincheckning på " + +#: wt-status.c:816 +msgid "behind " +msgstr "efter " + +#: wt-status.c:819 wt-status.c:822 +msgid "ahead " +msgstr "före " + +#: wt-status.c:824 +msgid ", behind " +msgstr ", efter " + +#: builtin/add.c:41 +#, c-format +msgid "unexpected diff status %c" +msgstr "diff-status %c förväntades inte" + +#: builtin/add.c:67 builtin/commit.c:244 +msgid "updating files failed" +msgstr "misslyckades uppdatera filer" + +#: builtin/add.c:77 +#, c-format +msgid "remove '%s'\n" +msgstr "ta bort \"%s\"\n" + +#: builtin/add.c:175 +#, c-format +msgid "Path '%s' is in submodule '%.*s'" +msgstr "Sökvägen \"%s\" är i undermodulen \"%.*s\"" + +#: builtin/add.c:191 +msgid "Unstaged changes after refreshing the index:" +msgstr "Ospårade ändringar efter att ha uppdaterat indexet:" + +#: builtin/add.c:194 builtin/add.c:452 builtin/rm.c:194 +#, c-format +msgid "pathspec '%s' did not match any files" +msgstr "sökvägsangivelsen \"%s\" motsvarade inte några filer" + +#: builtin/add.c:208 +#, c-format +msgid "'%s' is beyond a symbolic link" +msgstr "\"%s\" är på andra sidan av en symbolisk länk" + +#: builtin/add.c:275 +msgid "Could not read the index" +msgstr "Kunde inte läsa indexet" + +#: builtin/add.c:284 +#, c-format +msgid "Could not open '%s' for writing." +msgstr "Kunde inte öppna \"%s\" för skrivning" + +#: builtin/add.c:288 +msgid "Could not write patch" +msgstr "Kunde inte skriva patch" + +#: builtin/add.c:293 +#, c-format +msgid "Could not stat '%s'" +msgstr "Kunde inte ta status på \"%s\"" + +#: builtin/add.c:295 +msgid "Empty patch. Aborted." +msgstr "Tom patch. Avbryter." + +#: builtin/add.c:301 +#, c-format +msgid "Could not apply '%s'" +msgstr "Kunde inte applicera \"%s\"" + +#: builtin/add.c:349 +#, c-format +msgid "Use -f if you really want to add them.\n" +msgstr "Använd -f om du verkligen vill lägga till dem.\n" + +#: builtin/add.c:350 +msgid "no files added" +msgstr "inga filer har lagts till" + +#: builtin/add.c:356 +msgid "adding files failed" +msgstr "misslyckades lägga till filer" + +#: builtin/add.c:388 +msgid "-A and -u are mutually incompatible" +msgstr "-A och -u är ömsesidigt inkompatibla" + +#: builtin/add.c:390 +msgid "Option --ignore-missing can only be used together with --dry-run" +msgstr "Flaggan --ignore-missing kan endast användas tillsammans med --dry-run" + +#: builtin/add.c:410 +#, c-format +msgid "Nothing specified, nothing added.\n" +msgstr "Inget angivet, inget tillagt.\n" + +#: builtin/add.c:411 +#, c-format +msgid "Maybe you wanted to say 'git add .'?\n" +msgstr "Kanske menade du att skriva \"git add .\"?\n" + +#: builtin/add.c:417 builtin/clean.c:95 builtin/commit.c:301 +#: builtin/commit.c:310 builtin/mv.c:77 builtin/rm.c:171 +msgid "index file corrupt" +msgstr "indexfilen trasig" + +#: builtin/add.c:468 builtin/mv.c:223 builtin/rm.c:268 +msgid "Unable to write new index file" +msgstr "Kunde inte skriva ny indexfil" + +#: builtin/archive.c:17 +#, c-format +msgid "could not create archive file '%s'" +msgstr "Kunde inte skapa arkivfilen \"%s\"" + +#: builtin/archive.c:20 +msgid "could not redirect output" +msgstr "kunde inte omdirigera utdata" + +#: builtin/archive.c:36 +msgid "git archive: Remote with no URL" +msgstr "git archive: Fjärr utan URL" + +#: builtin/archive.c:46 +msgid "git archive: expected ACK/NAK, got EOF" +msgstr "git archive: förväntade ACK/NAK, fick EOF" + +#: builtin/archive.c:51 +#, c-format +msgid "git archive: NACK %s" +msgstr "git archive: NACK %s" + +#: builtin/archive.c:52 +msgid "git archive: protocol error" +msgstr "git archive: protokollfel" + +#: builtin/archive.c:57 +msgid "git archive: expected a flush" +msgstr "git archive: förväntade en tömning (flush)" + +#: builtin/branch.c:136 +#, c-format +msgid "" +"deleting branch '%s' that has been merged to\n" +" '%s', but it is not yet merged to HEAD." +msgstr "" +"tar bort grenen \"%s\" som inte har slagits ihop med\n" +" \"%s\", men som ännu inte slagits ihop med HEAD." + +#: builtin/branch.c:140 +#, c-format +msgid "" +"not deleting branch '%s' that is not yet merged to\n" +" '%s', even though it is merged to HEAD." +msgstr "" +"tar inte bort grenen \"%s\" som inte har slagits ihop med\n" +" \"%s\", trots att den har slagits ihop med HEAD." + +#. TRANSLATORS: This is "remote " in "remote branch '%s' not found" +#: builtin/branch.c:161 +msgid "remote " +msgstr "fjärr" + +#: builtin/branch.c:169 +msgid "cannot use -a with -d" +msgstr "kan inte ange -a med -d" + +#: builtin/branch.c:175 +msgid "Couldn't look up commit object for HEAD" +msgstr "Kunde inte slå upp incheckningsobjekt för HEAD" + +#: builtin/branch.c:180 +#, c-format +msgid "Cannot delete the branch '%s' which you are currently on." +msgstr "Kan inte ta bort grenen \"%s\" som du befinner dig på för närvarande." + +#: builtin/branch.c:190 +#, c-format +msgid "%sbranch '%s' not found." +msgstr "%sgrenen \"%s\" hittades inte." + +#: builtin/branch.c:198 +#, c-format +msgid "Couldn't look up commit object for '%s'" +msgstr "Kunde inte slå upp incheckningsobjekt för \"%s\"" + +#: builtin/branch.c:204 +#, c-format +msgid "" +"The branch '%s' is not fully merged.\n" +"If you are sure you want to delete it, run 'git branch -D %s'." +msgstr "" +"Grenen \"%s\" har inte slagits samman i sin helhet.\n" +"Om du är säker på att du vill ta bort den, kör \"git branch -D %s\"." + +#: builtin/branch.c:212 +#, c-format +msgid "Error deleting %sbranch '%s'" +msgstr "Fel vid borttagning av %sgrenen \"%s\"" + +#: builtin/branch.c:217 +#, c-format +msgid "Deleted %sbranch %s (was %s).\n" +msgstr "Tog bort %sgrenen %s (var %s).\n" + +#: builtin/branch.c:222 +msgid "Update of config-file failed" +msgstr "Misslyckades uppdatera konfigurationsfil" + +#: builtin/branch.c:304 +#, c-format +msgid "branch '%s' does not point at a commit" +msgstr "grenen \"%s\" pekar inte på en incheckning" + +#: builtin/branch.c:381 +#, c-format +msgid "behind %d] " +msgstr "bakom %d] " + +#: builtin/branch.c:383 +#, c-format +msgid "ahead %d] " +msgstr "före %d] " + +#: builtin/branch.c:385 +#, c-format +msgid "ahead %d, behind %d] " +msgstr "före %d, bakom %d] " + +#: builtin/branch.c:484 +msgid "(no branch)" +msgstr "(ingen gren)" + +#: builtin/branch.c:544 +msgid "some refs could not be read" +msgstr "vissa referenser kunde inte läsas" + +#: builtin/branch.c:557 +msgid "cannot rename the current branch while not on any." +msgstr "" +"kunde inte byta namn på aktuell gren när du inte befinner dig på någon." + +#: builtin/branch.c:567 builtin/branch.c:571 +#, c-format +msgid "Invalid branch name: '%s'" +msgstr "Felaktigt namn på gren: \"%s\"" + +#: builtin/branch.c:574 +#, c-format +msgid "A branch named '%s' already exists." +msgstr "Det finns redan en gren som heter \"%s\"" + +#: builtin/branch.c:580 +msgid "Branch rename failed" +msgstr "Misslyckades byta namn på gren" + +#: builtin/branch.c:584 +#, c-format +msgid "Renamed a misnamed branch '%s' away" +msgstr "Bytte bort namn på en felaktigt namngiven gren \"%s\"" + +#: builtin/branch.c:588 +#, c-format +msgid "Branch renamed to %s, but HEAD is not updated!" +msgstr "Grenen namnbytt till %s, men HEAD har inte uppdaterats!" + +#: builtin/branch.c:595 +msgid "Branch is renamed, but update of config-file failed" +msgstr "Grenen namnbytt, men misslyckades uppdatera konfigurationsfilen" + +#: builtin/branch.c:610 +#, c-format +msgid "malformed object name %s" +msgstr "felformat objektnamn %s" + +#: builtin/branch.c:680 +msgid "Failed to resolve HEAD as a valid ref." +msgstr "Misslyckades slå upp HEAD som giltig referens" + +#: builtin/branch.c:686 +msgid "HEAD not found below refs/heads!" +msgstr "HEAD hittades inte under refs/heads!" + +#: builtin/branch.c:706 +msgid "-a and -r options to 'git branch' do not make sense with a branch name" +msgstr "" +"flaggorna -a och -r på \"git branch\" kan inte anges tillsammans med ett " +"grennamn" + +#: builtin/bundle.c:47 +#, c-format +msgid "%s is okay\n" +msgstr "%s är okej\n" + +#: builtin/bundle.c:56 +msgid "Need a repository to create a bundle." +msgstr "Behöver ett arkiv för att skapa ett paket (bundle)." + +#: builtin/bundle.c:60 +msgid "Need a repository to unbundle." +msgstr "Behöver ett arkiv för att packa upp ett paket (bundle)." + +#: builtin/checkout.c:107 builtin/checkout.c:135 +#, c-format +msgid "path '%s' does not have our version" +msgstr "sökvägen \"%s\" har inte vår version" + +#: builtin/checkout.c:109 builtin/checkout.c:137 +#, c-format +msgid "path '%s' does not have their version" +msgstr "sökvägen \"%s\" har inte deras version" + +#: builtin/checkout.c:120 +#, c-format +msgid "path '%s' does not have all three versions" +msgstr "sökvägen \"%s\" har inte alla tre versionerna" + +#: builtin/checkout.c:155 +#, c-format +msgid "path '%s' does not have all 3 versions" +msgstr "sökvägen \"%s\" har inte alla 3 versionerna" + +#: builtin/checkout.c:172 +#, c-format +msgid "path '%s': cannot merge" +msgstr "sökväg \"%s\": kan inte slå ihop" + +#: builtin/checkout.c:189 +#, c-format +msgid "Unable to add merge result for '%s'" +msgstr "Kunde inte lägga till sammanslagningsresultat för \"%s\"" + +#: builtin/checkout.c:194 builtin/reset.c:170 +#, c-format +msgid "make_cache_entry failed for path '%s'" +msgstr "make_cache_entry misslyckades för sökvägen \"%s\"" + +#: builtin/checkout.c:216 builtin/checkout.c:371 +msgid "corrupt index file" +msgstr "indexfilen är trasig" + +#: builtin/checkout.c:244 builtin/checkout.c:251 +#, c-format +msgid "path '%s' is unmerged" +msgstr "sökvägen \"%s\" har inte slagits ihop" + +#: builtin/checkout.c:280 builtin/checkout.c:475 builtin/clone.c:658 +#: builtin/merge.c:737 +msgid "unable to write new index file" +msgstr "kunde inte skriva ny indexfil" + +#: builtin/checkout.c:297 builtin/diff.c:307 builtin/merge.c:367 +msgid "diff_setup_done failed" +msgstr "diff_setup_done misslyckades" + +#: builtin/checkout.c:393 +msgid "you need to resolve your current index first" +msgstr "du måste lösa ditt befintliga index först" + +#: builtin/checkout.c:524 +#, c-format +msgid "Can not do reflog for '%s'\n" +msgstr "Kan inte skapa referenslog för \"%s\"\n" + +#: builtin/checkout.c:550 +#, c-format +msgid "Already on '%s'\n" +msgstr "Redan på \"%s\"\n" + +#: builtin/checkout.c:554 +#, c-format +msgid "Switched to and reset branch '%s'\n" +msgstr "Växlade till och nollställde grenen \"%s\"\n" + +#: builtin/checkout.c:556 +#, c-format +msgid "Switched to a new branch '%s'\n" +msgstr "Växlade till en ny gren \"%s\"\n" + +#: builtin/checkout.c:558 +#, c-format +msgid "Switched to branch '%s'\n" +msgstr "Växlade till grenen \"%s\"\n" + +#: builtin/checkout.c:575 +msgid "HEAD is now at" +msgstr "HEAD är nu på" + +#: builtin/checkout.c:603 +msgid "You are on a branch yet to be born" +msgstr "Du är på en gren som ännu inte är född" + +#: builtin/checkout.c:617 +msgid "Previous HEAD position was" +msgstr "Tidigare position för HEAD var" + +#: builtin/checkout.c:730 +msgid "-B cannot be used with -b" +msgstr "-B kan inte användas med -b" + +#: builtin/checkout.c:738 +msgid "--patch is incompatible with all other options" +msgstr "--patch är inkompatibel med alla andra flaggor" + +#: builtin/checkout.c:744 +msgid "--track needs a branch name" +msgstr "--track behöver ett namn på en gren" + +#: builtin/checkout.c:751 +msgid "Missing branch name; try -b" +msgstr "Grennamn saknas; försök med -b" + +#: builtin/checkout.c:757 +msgid "--orphan and -b|-B are mutually exclusive" +msgstr "--orphan och --b|-B kan inte användas samtidigt" + +#: builtin/checkout.c:759 +msgid "--orphan cannot be used with -t" +msgstr "--orphan kan inte användas med -t" + +#: builtin/checkout.c:769 +msgid "git checkout: -f and -m are incompatible" +msgstr "git checkout: -f och -m är inkompatibla" + +#. case (1) +#: builtin/checkout.c:815 +#, c-format +msgid "invalid reference: %s" +msgstr "felaktig referens: %s" + +#. case (1): want a tree +#: builtin/checkout.c:852 +#, c-format +msgid "reference is not a tree: %s" +msgstr "referensen är inte ett träd: %s" + +#: builtin/checkout.c:878 +msgid "invalid path specification" +msgstr "felaktig sökvägsangivelse" + +#: builtin/checkout.c:886 +#, c-format +msgid "" +"git checkout: updating paths is incompatible with switching branches.\n" +"Did you intend to checkout '%s' which can not be resolved as commit?" +msgstr "" +"git checkout: uppdatera sökvägar är inkompatibelt med att växla gren.\n" +"Ville du checka ut \"%s\" som inte kan lösas som en sammanslaning?" + +#: builtin/checkout.c:888 +msgid "git checkout: updating paths is incompatible with switching branches." +msgstr "git checkout: uppdatera sökvägar är inkompatibelt med att växla gren." + +#: builtin/checkout.c:893 +msgid "" +"git checkout: --ours/--theirs, --force and --merge are incompatible when\n" +"checking out of the index." +msgstr "" +"git checkout: --ours/--theirs, --force och --merge är inkompatibla när\n" +"du checkar ut från indexet." + +#: builtin/checkout.c:904 +#, c-format +msgid "git checkout: we do not like '%s' as a branch name." +msgstr "git checkout: vi tycker inte om \"%s\" som namn på en gren." + +#: builtin/checkout.c:909 +#, c-format +msgid "git checkout: branch %s already exists" +msgstr "git checkout: grenen %s finns redan" + +#: builtin/checkout.c:916 +msgid "Cannot switch branch to a non-commit." +msgstr "Kan inte växla gren på en icke-incheckning." + +#: builtin/checkout.c:919 +msgid "--ours/--theirs is incompatible with switching branches." +msgstr "--ours/--theirs är inkompatibla när du växlar gren." + +#: builtin/clean.c:78 +msgid "-x and -X cannot be used together" +msgstr "-x och -X kan inte användas samtidigt" + +#: builtin/clean.c:82 +msgid "" +"clean.requireForce set to true and neither -n nor -f given; refusing to clean" +msgstr "" +"clean.requireForce satt till true, men varken -n eller -f angavs; vägrar " +"städa" + +#: builtin/clean.c:85 +msgid "" +"clean.requireForce defaults to true and neither -n nor -f given; refusing to " +"clean" +msgstr "" +"clean.requireForce har standardvärdet true, men varken -n eller -f angavs; " +"vägrar städa" + +#: builtin/clean.c:154 builtin/clean.c:175 +#, c-format +msgid "Would remove %s\n" +msgstr "Skulle ta bort %s\n" + +#: builtin/clean.c:158 builtin/clean.c:178 +#, c-format +msgid "Removing %s\n" +msgstr "Tar bort %s\n" + +#: builtin/clean.c:161 builtin/clean.c:181 +#, c-format +msgid "failed to remove '%s'" +msgstr "kunde inte ta bort \"%s\"" + +#: builtin/clean.c:165 +#, c-format +msgid "Would not remove %s\n" +msgstr "Skulle inte ta bort %s\n" + +#: builtin/clean.c:167 +#, c-format +msgid "Not removing %s\n" +msgstr "Tar inte bort %s\n" + +#: builtin/clone.c:208 +#, c-format +msgid "reference repository '%s' is not a local directory." +msgstr "referensarkivet \"%s\" är inte en lokal katalog." + +#: builtin/clone.c:235 +#, c-format +msgid "failed to open '%s'" +msgstr "misslyckades öppna \"%s\"" + +#: builtin/clone.c:239 +#, c-format +msgid "failed to create directory '%s'" +msgstr "misslyckades skapa katalogen \"%s\"" + +#: builtin/clone.c:241 builtin/diff.c:74 +#, c-format +msgid "failed to stat '%s'" +msgstr "misslyckades ta status på \"%s\"" + +#: builtin/clone.c:243 +#, c-format +msgid "%s exists and is not a directory" +msgstr "%s finns och är ingen katalog" + +#: builtin/clone.c:257 +#, c-format +msgid "failed to stat %s\n" +msgstr "misslyckades ta status på %s\n" + +#: builtin/clone.c:267 +#, c-format +msgid "failed to unlink '%s'" +msgstr "misslyckades ta bort länken \"%s\"" + +#: builtin/clone.c:272 +#, c-format +msgid "failed to create link '%s'" +msgstr "misslyckades skapa länken \"%s\"" + +#: builtin/clone.c:276 +#, c-format +msgid "failed to copy file to '%s'" +msgstr "misslyckades kopiera filen till \"%s\"" + +#: builtin/clone.c:305 +#, c-format +msgid "done.\n" +msgstr "klart.\n" + +#: builtin/clone.c:387 +msgid "Too many arguments." +msgstr "För många argument." + +#: builtin/clone.c:391 +msgid "You must specify a repository to clone." +msgstr "Du måste ange ett arkiv att klona." + +#: builtin/clone.c:399 +#, c-format +msgid "--bare and --origin %s options are incompatible." +msgstr "flaggorna --bare och --origin %s är inkompatibla." + +#: builtin/clone.c:428 +#, c-format +msgid "destination path '%s' already exists and is not an empty directory." +msgstr "destinationssökvägen \"%s\" finns redan och är inte en tom katalog." + +#: builtin/clone.c:438 +#, c-format +msgid "working tree '%s' already exists." +msgstr "arbetsträdet \"%s\" finns redan." + +#: builtin/clone.c:451 builtin/clone.c:465 +#, c-format +msgid "could not create leading directories of '%s'" +msgstr "kunde inte skapa inledande kataloger för \"%s\"" + +#: builtin/clone.c:454 +#, c-format +msgid "could not create work tree dir '%s'." +msgstr "kunde inte skapa arbetskatalogen \"%s\"" + +#: builtin/clone.c:470 +#, c-format +msgid "Cloning into bare repository %s\n" +msgstr "Klonar till ett naket arkiv %s\n" + +#: builtin/clone.c:472 +#, c-format +msgid "Cloning into %s\n" +msgstr "Klonar till %s\n" + +#: builtin/clone.c:530 +#, c-format +msgid "Don't know how to clone %s" +msgstr "Vet inte hur man klonar %s" + +#: builtin/clone.c:569 +#, c-format +msgid "Remote branch %s not found in upstream %s, using HEAD instead" +msgstr "" +"Fjärrgrenen %s hittades inte i uppströmsarkivet %s, använder HEAD istället" + +#: builtin/clone.c:579 +msgid "You appear to have cloned an empty repository." +msgstr "Du verkar ha klonat ett tomt arkiv." + +#: builtin/clone.c:621 +msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" +msgstr "" +"HEAD hos fjärren pekar på en obefintlig referens, kan inte checka ut.\n" + +#: builtin/commit.c:41 +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" +"If the identity used for this commit is wrong, you can fix it with:\n" +"\n" +" git commit --amend --author='Your Name '\n" +msgstr "" +"Ditt namn och e-postadress konfigurerades automatiskt baserat på\n" +"ditt användar-id och värdnamn. Kontrollera att de är riktiga. Du\n" +"kan förhindra det här meddelandet genom att ställa dem explicit:\n" +"\n" +" git config --global user.name \"Ditt namn\"\n" +" git config --global user.email du@example.com\n" +"\n" +"Om identiteten som användes för incheckningen är felaktig kan du\n" +"rätta den med:\n" +"\n" +" git commit --amend --author='Ditt namn '\n" + +#: builtin/commit.c:53 +msgid "" +"You asked to amend the most recent commit, but doing so would make\n" +"it empty. You can repeat your command with --allow-empty, or you can\n" +"remove the commit entirely with \"git reset HEAD^\".\n" +msgstr "" +"Du bad om att utöka den senaste incheckningen, men om du gör det\n" +"blir den tom. Du kan köra kommandot på nytt med --allow-empty, eller\n" +"så kan du ta bort incheckningen helt med \"git reset HEAD^\".\n" + +#: builtin/commit.c:271 +msgid "failed to unpack HEAD tree object" +msgstr "misslyckades packa upp HEAD:s trädobjekt" + +#: builtin/commit.c:299 +msgid "interactive add failed" +msgstr "interaktiv tilläggning misslyckades" + +#: builtin/commit.c:330 builtin/commit.c:350 builtin/commit.c:396 +msgid "unable to write new_index file" +msgstr "kunde inte skriva filen new_index" + +#: builtin/commit.c:380 +msgid "cannot do a partial commit during a merge." +msgstr "kan inte utföra en delvis incheckning under en sammanslagning." + +#: builtin/commit.c:389 +msgid "cannot read the index" +msgstr "kan inte läsa indexet" + +#: builtin/commit.c:409 +msgid "unable to write temporary index file" +msgstr "kunde inte skriva temporär indexfil" + +#: builtin/commit.c:456 builtin/commit.c:1294 +msgid "could not parse HEAD commit" +msgstr "kunde inte tolka HEAD:s incheckning" + +#: builtin/commit.c:475 builtin/commit.c:481 +#, c-format +msgid "invalid commit: %s" +msgstr "felaktig incheckning: %s" + +#: builtin/commit.c:499 +msgid "malformed --author parameter" +msgstr "felformad \"--author\"-flagga" + +#: builtin/commit.c:573 builtin/shortlog.c:299 +#, c-format +msgid "(reading log message from standard input)\n" +msgstr "(läser loggmeddelande från standard in)\n" + +#: builtin/commit.c:575 +msgid "could not read log from standard input" +msgstr "kunde inte läsa logg från standard in" + +#: builtin/commit.c:579 +#, c-format +msgid "could not read log file '%s'" +msgstr "kunde inte läsa loggfilen \"%s\"" + +#: builtin/commit.c:585 +msgid "commit has empty message" +msgstr "incheckningen har ett tomt meddelande" + +#: builtin/commit.c:591 +msgid "could not read MERGE_MSG" +msgstr "kunde inte läsa MERGE_MSG" + +#: builtin/commit.c:595 +msgid "could not read SQUASH_MSG" +msgstr "kunde inte läsa SQUASH_MSG" + +#: builtin/commit.c:599 +#, c-format +msgid "could not read '%s'" +msgstr "kunde inte läsa \"%s\"" + +#: builtin/commit.c:612 +#, c-format +msgid "could not open '%s'" +msgstr "kunde inte öppna \"%s\"" + +#: builtin/commit.c:636 +msgid "could not write commit template" +msgstr "kunde inte skriva incheckningsmall" + +#: builtin/commit.c:650 +#, 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" +"#\n" +msgstr "" +"#\n" +"# Det verkar som du checkar in en SAMMANSLAGNING.\n" +"# Om det inte stämmer tar du bort filen\n" +"#\t%s\n" +"# och försöker igen.\n" +"#\n" + +#: builtin/commit.c:659 +#, c-format +msgid "" +"\n" +"# Please enter the commit message for your changes." +msgstr "" +"\n" +"# Ange ett incheckningsmeddelande för dina ändringar." + +#: builtin/commit.c:663 +#, c-format +msgid "" +" Lines starting\n" +"# with '#' will be ignored, and an empty message aborts the commit.\n" +msgstr "" +" Rader som inleds\n" +"# med \"#\" kommer ignoreras, och ett tomt meddelande avbryter " +"incheckningen.\n" + +#: builtin/commit.c:668 +#, c-format +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" +msgstr "" +" Rader som inleds\n" +"# med \"#\" kommer behållas; du kan själv ta bort dem om du vill.\n" +"# Ett tomt meddelande avbryter incheckningen.\n" + +#: builtin/commit.c:680 +#, c-format +msgid "%s# Author: %s\n" +msgstr "%s# Författare: %s\n" + +#: builtin/commit.c:688 +#, c-format +msgid "%s# Committer: %s\n" +msgstr "%s# Incheckare: %s\n" + +#: builtin/commit.c:705 +msgid "Cannot read index" +msgstr "Kan inte läsa indexet" + +#: builtin/commit.c:737 +msgid "Error building trees" +msgstr "Fel vid byggande av träd" + +#: builtin/commit.c:752 builtin/tag.c:321 +#, c-format +msgid "Please supply the message using either -m or -F option.\n" +msgstr "Ange meddelandet en av flaggorna -m eller -F.\n" + +#: builtin/commit.c:832 +#, c-format +msgid "No existing author found with '%s'" +msgstr "Hittade ingen befintlig författare med \"%s\"" + +#: builtin/commit.c:847 builtin/commit.c:1039 +#, c-format +msgid "Invalid untracked files mode '%s'" +msgstr "Ogiltigt läge för ospårade filer: \"%s\"" + +#: builtin/commit.c:864 +msgid "Using both --reset-author and --author does not make sense" +msgstr "Kan inte använda både --reset-author och --author" + +#: builtin/commit.c:878 +msgid "You have nothing to amend." +msgstr "Du har inget att utöka." + +#: builtin/commit.c:880 +msgid "You are in the middle of a merge -- cannot amend." +msgstr "Du är i mitten av en incheckning -- kan inte utöka." + +#: builtin/commit.c:889 +msgid "Only one of -c/-C/-F can be used." +msgstr "Kan endast använda en av -c/-C/-F." + +#: builtin/commit.c:891 +msgid "Option -m cannot be combined with -c/-C/-F." +msgstr "Flaggan -m kan inte kombineras med -c/-C/-F." + +#: builtin/commit.c:897 +msgid "--reset-author can be used only with -C, -c or --amend." +msgstr "--reset-author kan endast användas med -C, -c eller --amend." + +#: builtin/commit.c:906 +#, c-format +msgid "could not lookup commit %s" +msgstr "kunde inte slå upp incheckningen %s" + +#: builtin/commit.c:909 +#, c-format +msgid "could not parse commit %s" +msgstr "kunde inte tolka incheckningen %s" + +#: builtin/commit.c:937 +msgid "Only one of --include/--only/--all/--interactive can be used." +msgstr "Endast en av --include/--only/--all/--interactive kan användas." + +#: builtin/commit.c:939 +msgid "No paths with --include/--only does not make sense." +msgstr "Du måste ange sökvägar tillsammans med --include/--only." + +#: builtin/commit.c:941 +msgid "Clever... amending the last one with dirty index." +msgstr "Smart... utöka den senaste med smutsigt index." + +#: builtin/commit.c:943 +msgid "Explicit paths specified without -i nor -o; assuming --only paths..." +msgstr "Explicita sökvägar angavs utan -i eller -o; antar --only-paths..." + +#: builtin/commit.c:953 +#, c-format +msgid "Invalid cleanup mode %s" +msgstr "Felaktigt städningsläge %s" + +#: builtin/commit.c:958 +msgid "Paths with -a does not make sense." +msgstr "Kan inte ange sökvägar med -a." + +#: builtin/commit.c:960 +msgid "Paths with --interactive does not make sense." +msgstr "Kan inte ange sökvägar med --interactive." + +#: builtin/commit.c:1142 +msgid "couldn't look up newly created commit" +msgstr "kunde inte slå upp en precis skapad incheckning" + +#: builtin/commit.c:1144 +msgid "could not parse newly created commit" +msgstr "kunde inte tolka en precis skapad incheckning" + +#: builtin/commit.c:1185 +msgid "detached HEAD" +msgstr "frånkopplad HEAD" + +#: builtin/commit.c:1187 +msgid " (root-commit)" +msgstr " (rotincheckning)" + +#: builtin/commit.c:1307 builtin/merge.c:461 +#, c-format +msgid "could not open '%s' for reading" +msgstr "kunde inte öppna \"%s\" för läsning" + +#: builtin/commit.c:1312 +#, c-format +msgid "Corrupt MERGE_HEAD file (%s)" +msgstr "Trasig MERGE_HEAD-fil (%s)" + +#: builtin/commit.c:1319 +msgid "could not read MERGE_MODE" +msgstr "kunde inte läsa MERGE_MODE" + +#: builtin/commit.c:1336 +#, c-format +msgid "could not read commit message: %s" +msgstr "kunde inte läsa incheckningsmeddelande: %s" + +#: builtin/commit.c:1350 +#, c-format +msgid "Aborting commit due to empty commit message.\n" +msgstr "Avbryter på grund av tomt incheckningsmeddelande.\n" + +#: builtin/commit.c:1358 +msgid "failed to write commit object" +msgstr "kunde inte skriva incheckningsobjekt" + +#: builtin/commit.c:1375 +msgid "cannot lock HEAD ref" +msgstr "kunde inte låsa HEAD-referens" + +#: builtin/commit.c:1379 +msgid "cannot update HEAD ref" +msgstr "kunde inte uppdatera HEAD-referens" + +#: builtin/commit.c:1388 +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 "" +"Arkivet har uppdaterats, men kunde inte skriva filen\n" +"new_index. Kontrollera att disken inte är full och\n" +"att kvoten inte har överskridits, och kör sedan\n" +"\"git reset HEAD\" för att återställa." + +#: builtin/describe.c:205 +#, c-format +msgid "annotated tag %s not available" +msgstr "den dekorerade taggen %s inte tillgänglig" + +#: builtin/describe.c:209 +#, c-format +msgid "annotated tag %s has no embedded name" +msgstr "den dekorerade taggen %s har inget inbäddat namn" + +#: builtin/describe.c:211 +#, c-format +msgid "tag '%s' is really '%s' here" +msgstr "taggen \"%s\" är i verkligheten \"%s\" här" + +#: builtin/describe.c:238 +#, c-format +msgid "Not a valid object name %s" +msgstr "Objektnamnet är inte giltigt: %s" + +#: builtin/describe.c:241 +#, c-format +msgid "%s is not a valid '%s' object" +msgstr "%s är inte ett giltigt \"%s\"-objekt" + +#: builtin/describe.c:258 +#, c-format +msgid "no tag exactly matches '%s'" +msgstr "ingen tagg motsvarar \"%s\" exakt" + +#: builtin/describe.c:260 +#, c-format +msgid "searching to describe %s\n" +msgstr "söker för att beskriva %s\n" + +#: builtin/describe.c:295 +#, c-format +msgid "finished search at %s\n" +msgstr "avslutade sökning på %s\n" + +#: builtin/describe.c:319 +#, c-format +msgid "" +"No annotated tags can describe '%s'.\n" +"However, there were unannotated tags: try --tags." +msgstr "" +"Inga dekorerade taggar kan beskriva \"%s\".\n" +"Det finns dock odekorerade taggar: testa --tags." + +#: builtin/describe.c:323 +#, c-format +msgid "" +"No tags can describe '%s'.\n" +"Try --always, or create some tags." +msgstr "" +"Inga taggar kan beskriva \"%s\".\n" +"Testa --always, eller skapa några taggar." + +#: builtin/describe.c:344 +#, c-format +msgid "traversed %lu commits\n" +msgstr "traverserade %lu incheckningar\n" + +#: builtin/describe.c:347 +#, c-format +msgid "" +"more than %i tags found; listed %i most recent\n" +"gave up search at %s\n" +msgstr "" +"mer än %i taggar hittades; listar de %i senaste\n" +"gav upp sökningen vid %s\n" + +#: builtin/describe.c:398 +msgid "--long is incompatible with --abbrev=0" +msgstr "--long är inkompatibel med --abbrev=0" + +#: builtin/describe.c:423 +msgid "No names found, cannot describe anything." +msgstr "Inga namn hittades, kan inte beskriva något." + +#: builtin/describe.c:430 +msgid "--dirty is incompatible with committishes" +msgstr "--dirty är inkompatibelt med \"committish\"-värden" + +#: builtin/diff.c:76 +#, c-format +msgid "'%s': not a regular file or symlink" +msgstr "\"%s\": inte en normal fil eller symbolisk länk" + +#: builtin/diff.c:225 +#, c-format +msgid "invalid option: %s" +msgstr "ogiltig flagga: %s" + +#: builtin/diff.c:302 +msgid "Not a git repository" +msgstr "Inte ett git-arkiv" + +#: builtin/diff.c:334 +msgid "No HEAD commit to compare with (yet)" +msgstr "Ingen HEAD-incheckning att jämföra med (ännu)" + +#: builtin/diff.c:349 +#, c-format +msgid "invalid object '%s' given." +msgstr "objektet \"%s\" som angavs är felaktigt." + +#: builtin/diff.c:354 +#, c-format +msgid "more than %d trees given: '%s'" +msgstr "mer än %d träd angavs: \"%s\"" + +#: builtin/diff.c:364 +#, c-format +msgid "more than two blobs given: '%s'" +msgstr "mer än två blobbar angavs: \"%s\"" + +#: builtin/diff.c:372 +#, c-format +msgid "unhandled object '%s' given." +msgstr "ej hanterat objekt \"%s\" angavs." + +#: builtin/fetch.c:175 +msgid "Couldn't find remote ref HEAD" +msgstr "Kunde inte hitta fjärr-referensen HEAD" + +#: builtin/fetch.c:228 +#, c-format +msgid "object %s not found" +msgstr "objektet %s hittades inte" + +#: builtin/fetch.c:233 +msgid "[up to date]" +msgstr "[àjour]" + +#. +#. * If this is the head, and it's not okay to update +#. * the head, and the old value of the head isn't empty... +#. +#: builtin/fetch.c:246 +#, c-format +msgid "! %-*s %-*s -> %s (can't fetch in current branch)" +msgstr "! %-*s %-*s -> %s (kan inte hämta i aktuell gren)" + +#: builtin/fetch.c:247 builtin/fetch.c:309 +msgid "[rejected]" +msgstr "[refuserad]" + +#: builtin/fetch.c:257 +msgid "[tag update]" +msgstr "[uppdaterad tagg]" + +#: builtin/fetch.c:258 builtin/fetch.c:280 builtin/fetch.c:293 +msgid " (unable to update local ref)" +msgstr " (kunde inte uppdatera lokal ref)" + +#: builtin/fetch.c:270 +msgid "[new tag]" +msgstr "[ny tagg]" + +#: builtin/fetch.c:274 +msgid "[new branch]" +msgstr "[ny gren]" + +#: builtin/fetch.c:305 +msgid "unable to update local ref" +msgstr "kunde inte uppdatera lokal ref" + +#: builtin/fetch.c:305 +msgid "forced update" +msgstr "tvingad uppdatering" + +#: builtin/fetch.c:310 +msgid "(non-fast-forward)" +msgstr "(ej snabbspolad)" + +#: builtin/fetch.c:328 builtin/fetch.c:651 +#, c-format +msgid "cannot open %s: %s\n" +msgstr "kan inte öppna %s. %s\n" + +#: builtin/fetch.c:406 +#, c-format +msgid "From %.*s\n" +msgstr "Från %.*s\n" + +#: builtin/fetch.c:417 +#, c-format +msgid "" +"some local refs could not be updated; try running\n" +" 'git remote prune %s' to remove any old, conflicting branches" +msgstr "" +"några lokala referenser kunde inte uppdateras; testa att köra\n" +" \"git remote prune %s\" för att ta bort gamla grenar som står i konflikt" + +#: builtin/fetch.c:467 +msgid "could not run rev-list" +msgstr "kunde inte köra rev-list" + +#: builtin/fetch.c:481 +#, c-format +msgid "failed write to rev-list: %s" +msgstr "kunde inte skriva till rev-list: %s" + +#: builtin/fetch.c:488 +#, c-format +msgid "failed to close rev-list's stdin: %s" +msgstr "kunde inte stänga rev-list:s standard in: %s" + +#: builtin/fetch.c:515 +#, c-format +msgid " (%s will become dangling)\n" +msgstr " (%s kommer bli dinglande)\n" + +#: builtin/fetch.c:516 +#, c-format +msgid " (%s has become dangling)\n" +msgstr " (%s har blivit dinglande)\n" + +#: builtin/fetch.c:523 +msgid "[deleted]" +msgstr "[borttagen]" + +#: builtin/fetch.c:524 +msgid "(none)" +msgstr "(ingen)" + +#: builtin/fetch.c:641 +#, c-format +msgid "Refusing to fetch into current branch %s of non-bare repository" +msgstr "Vägrar hämta till aktuell gren %s i ett icke-naket arkiv" + +#: builtin/fetch.c:675 +#, c-format +msgid "Don't know how to fetch from %s" +msgstr "Vet inte hur man hämtar från %s" + +#: builtin/fetch.c:729 +#, c-format +msgid "Option \"%s\" value \"%s\" is not valid for %s" +msgstr "Flaggan \"%s\" och värdet \"%s\" är inte giltigt för %s" + +#: builtin/fetch.c:732 +#, c-format +msgid "Option \"%s\" is ignored for %s\n" +msgstr "Flaggan \"%s\" ignoreras för %s\n" + +#: builtin/fetch.c:821 +#, c-format +msgid "Fetching %s\n" +msgstr "Hämtar %s\n" + +#: builtin/fetch.c:823 +#, c-format +msgid "Could not fetch %s" +msgstr "Kunde inte hämta %s" + +#: builtin/fetch.c:839 +msgid "" +"No remote repository specified. Please, specify either a URL or a\n" +"remote name from which new revisions should be fetched." +msgstr "" +"Inget fjärrarkiv angavs. Ange antingen en URL eller namnet på ett\n" +"fjärrarkiv som nya incheckningar skall hämtas från." + +#: builtin/fetch.c:859 +msgid "You need to specify a tag name." +msgstr "Du måste ange namnet på en tagg." + +#: builtin/fetch.c:899 +msgid "fetch --all does not take a repository argument" +msgstr "fetch --all tar inte namnet på ett arkiv som argument" + +#: builtin/fetch.c:901 +msgid "fetch --all does not make sense with refspecs" +msgstr "fetch --all kan inte anges med referensspecifikationer" + +#: builtin/fetch.c:912 +#, c-format +msgid "No such remote or remote group: %s" +msgstr "Fjärren eller fjärrgruppen finns inte: %s" + +#: builtin/fetch.c:920 +msgid "Fetching a group and specifying refspecs does not make sense" +msgstr "Kan inte hämta från grupp och ange referensspecifikationer" + +#: builtin/gc.c:63 +#, c-format +msgid "Invalid %s: '%s'" +msgstr "Felaktigt %s: \"%s\"" + +#: builtin/gc.c:78 +msgid "Too many options specified" +msgstr "För många flaggor angavs" + +#: builtin/gc.c:103 +#, c-format +msgid "insanely long object directory %.*s" +msgstr "tokigt lång objektkatalog %.*s" + +#: builtin/gc.c:220 +#, c-format +msgid "Auto packing the repository for optimum performance.\n" +msgstr "Packar arkivet automatiskt för optimal prestanda.\n" + +#: builtin/gc.c:223 +#, 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." +msgstr "" +"Packar arkivet automatiskt för optimal prestanda. Du kan även\n" +"köra \"git gc\" manuellt. Se \"git help gc\" för mer information." + +#: builtin/gc.c:251 +msgid "" +"There are too many unreachable loose objects; run 'git prune' to remove them." +msgstr "" +"Det finns för många onåbara lösa objekt; kör \"git prune\" för att ta bort " +"dem." + +#: builtin/grep.c:252 +#, c-format +msgid "grep: failed to create thread: %s" +msgstr "grep: misslyckades skapa tråd. %s" + +#: builtin/grep.c:457 +#, c-format +msgid "'%s': unable to read %s" +msgstr "\"%s\" kunde inte läsa %s" + +#: builtin/grep.c:508 +#, c-format +msgid "'%s': %s" +msgstr "\"%s\": %s" + +#: builtin/grep.c:519 +#, c-format +msgid "'%s': short read %s" +msgstr "\"%s\": kort läsning %s" + +#: builtin/grep.c:581 +#, c-format +msgid "Failed to chdir: %s" +msgstr "Kunde inte byta katalog (chdir): %s" + +#: builtin/grep.c:671 builtin/grep.c:697 +#, c-format +msgid "unable to read tree (%s)" +msgstr "kunde inte läsa träd (%s)" + +#: builtin/grep.c:703 +#, c-format +msgid "unable to grep from object of type %s" +msgstr "Kunde inte \"grep\" från objekt av typen %s" + +#: builtin/grep.c:755 +#, c-format +msgid "switch `%c' expects a numerical value" +msgstr "flaggan \"%c\" antar ett numeriskt värde" + +#: builtin/grep.c:771 +#, c-format +msgid "cannot open '%s'" +msgstr "kan inte öppna \"%s\"" + +#: builtin/grep.c:1012 +msgid "no pattern given." +msgstr "inget mönster angavs." + +#: builtin/grep.c:1016 +msgid "cannot mix --fixed-strings and regexp" +msgstr "kan inte blanda --fixed-strings och reguljära uttryck" + +#: builtin/grep.c:1041 +#, c-format +msgid "bad object %s" +msgstr "felaktigt objekt %s" + +#: builtin/grep.c:1068 +msgid "--open-files-in-pager only works on the worktree" +msgstr "--open-files-in-pager fungerar endast i arbetskatalogen" + +#: builtin/grep.c:1093 +msgid "--cached cannot be used with --no-index." +msgstr "--cached kan inte användas med --no-index." + +#: builtin/grep.c:1095 +msgid "--no-index cannot be used with revs." +msgstr "--no-index kan inte användas med revisioner." + +#: builtin/grep.c:1104 +msgid "both --cached and trees are given." +msgstr "både --cached och träd angavs." + +#: builtin/init-db.c:34 +#, c-format +msgid "Could not make %s writable by group" +msgstr "Kunde inte göra %s skrivbar för grubben" + +#: builtin/init-db.c:61 +#, c-format +msgid "insanely long template name %s" +msgstr "tokigt långt namn på mallen %s" + +#: builtin/init-db.c:66 +#, c-format +msgid "cannot stat '%s'" +msgstr "kan inte ta status på \"%s\"" + +#: builtin/init-db.c:72 +#, c-format +msgid "cannot stat template '%s'" +msgstr "kan inte ta status på mallen \"%s\"" + +#: builtin/init-db.c:79 +#, c-format +msgid "cannot opendir '%s'" +msgstr "kan inte öppna katalogen (opendir) \"%s\"" + +#: builtin/init-db.c:96 +#, c-format +msgid "cannot readlink '%s'" +msgstr "kan inte läsa länk (readlink) \"%s\"" + +#: builtin/init-db.c:98 +#, c-format +msgid "insanely long symlink %s" +msgstr "tokigt lång symbolisk länk %s" + +#: builtin/init-db.c:101 +#, c-format +msgid "cannot symlink '%s' '%s'" +msgstr "kan inte skapa symbolisk länk \"%s\" \"%s\"" + +#: builtin/init-db.c:105 +#, c-format +msgid "cannot copy '%s' to '%s'" +msgstr "kan inte kopiera \"%s\" till \"%s\"" + +#: builtin/init-db.c:109 +#, c-format +msgid "ignoring template %s" +msgstr "ignorerar mallen %s" + +#: builtin/init-db.c:132 +#, c-format +msgid "insanely long template path %s" +msgstr "tokigt lång mallsökväg %s" + +#: builtin/init-db.c:140 +#, c-format +msgid "templates not found %s" +msgstr "mallarna hittades inte %s" + +#: builtin/init-db.c:153 +#, c-format +msgid "not copying templates of a wrong format version %d from '%s'" +msgstr "kopierade inte mallar från felaktig formatversion %d från \"%s\"" + +#: builtin/init-db.c:191 +#, c-format +msgid "insane git directory %s" +msgstr "tokig git-katalog %s" + +#. 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:355 +#, c-format +msgid "%s%s Git repository in %s%s\n" +msgstr "%s%s Git-arkiv i %s%s\n" + +#: builtin/init-db.c:356 +msgid "Reinitialized existing" +msgstr "Ominitierade befintligt" + +#: builtin/init-db.c:356 +msgid "Initialized empty" +msgstr "Initierade tomt" + +#: builtin/init-db.c:357 +msgid " shared" +msgstr " delat" + +#: builtin/init-db.c:376 +msgid "cannot tell cwd" +msgstr "kan inte läsa aktuell katalog (cwd)" + +#: builtin/init-db.c:450 builtin/init-db.c:457 +#, c-format +msgid "cannot mkdir %s" +msgstr "kan inte skapa katalogen (mkdir) %s" + +#: builtin/init-db.c:461 +#, c-format +msgid "cannot chdir to %s" +msgstr "kan inte byta katalog (chdir) till %s" + +#: builtin/init-db.c:483 +#, c-format +msgid "" +"%s (or --work-tree=) not allowed without specifying %s (or --git-" +"dir=)" +msgstr "" +"%s (eller --work-tree=) inte tillåtet utan att ange %s (eller --git-" +"dir=)" + +#: builtin/init-db.c:509 +msgid "Cannot access current working directory" +msgstr "Kan inte komma åt aktuell arbetskatalog" + +#: builtin/init-db.c:512 +#, c-format +msgid "Cannot access work tree '%s'" +msgstr "Kan inte komma åt arbetskatalogen \"%s\"" + +#: builtin/log.c:104 +#, c-format +msgid "invalid --decorate option: %s" +msgstr "felaktigt värde till --decorate: %s" + +#: builtin/log.c:113 builtin/log.c:1138 builtin/shortlog.c:287 +#, c-format +msgid "unrecognized argument: %s" +msgstr "okänt argument: %s" + +#: builtin/log.c:156 +#, c-format +msgid "Final output: %d %s\n" +msgstr "Slututdata: %d %s\n" + +#: builtin/log.c:255 builtin/log.c:674 builtin/log.c:1222 builtin/log.c:1428 +#: builtin/merge.c:310 builtin/revert.c:556 builtin/shortlog.c:184 +msgid "revision walk setup failed" +msgstr "misslyckades skapa revisionstraversering" + +#: builtin/log.c:347 builtin/log.c:434 +#, c-format +msgid "Could not read object %s" +msgstr "Kunde inte läsa objektet %s" + +#: builtin/log.c:458 +#, c-format +msgid "Unknown type: %d" +msgstr "Okänd typ: %d" + +#: builtin/log.c:558 +msgid "format.headers without value" +msgstr "format.headers utan värde" + +#: builtin/log.c:630 +msgid "name of output directory is too long" +msgstr "namn på utdatakatalogen är för lång" + +#: builtin/log.c:641 +#, c-format +msgid "Cannot open patch file %s" +msgstr "Kan inte öppna patchfilen %s" + +#: builtin/log.c:655 +msgid "Need exactly one range." +msgstr "Behöver precis ett intervall." + +#: builtin/log.c:663 +msgid "Not a range." +msgstr "Inte ett intervall." + +#: builtin/log.c:700 +msgid "Could not extract email from committer identity." +msgstr "Kunde inte extrahera e-postadress från incheckarens identitet." + +#: builtin/log.c:732 +msgid "Cover letter needs email format" +msgstr "Omslagsbrevet behöver e-postformat" + +#: builtin/log.c:825 +#, c-format +msgid "insane in-reply-to: %s" +msgstr "tokigt in-reply-to: %s" + +#: builtin/log.c:898 +msgid "Two output directories?" +msgstr "Två utdatakataloger?" + +#: builtin/log.c:1087 +#, c-format +msgid "bogus committer info %s" +msgstr "felaktig incheckarinformation %s" + +#: builtin/log.c:1132 +msgid "-n and -k are mutually exclusive." +msgstr "-n och -k kan inte användas samtidigt." + +#: builtin/log.c:1134 +msgid "--subject-prefix and -k are mutually exclusive." +msgstr "--subject-prefix och -k kan inte användas samtidigt." + +#: builtin/log.c:1141 +msgid "--name-only does not make sense" +msgstr "kan inte använda --name-only" + +#: builtin/log.c:1143 +msgid "--name-status does not make sense" +msgstr "kan inte använda --name-status" + +#: builtin/log.c:1145 +msgid "--check does not make sense" +msgstr "kan inte använda --check" + +#: builtin/log.c:1166 +msgid "standard output, or directory, which one?" +msgstr "standard ut, eller katalog, vilken skall det vara?" + +#: builtin/log.c:1168 +#, c-format +msgid "Could not create directory '%s'" +msgstr "Kunde inte skapa katalogen \"%s\"" + +#: builtin/log.c:1307 +msgid "Failed to create output files" +msgstr "Misslyckades skapa utdatafiler" + +#: builtin/log.c:1394 +#, c-format +msgid "" +"Could not find a tracked remote branch, please specify manually.\n" +msgstr "Kunde inte hitta en spårad fjärrgren, ange manuellt.\n" + +#: builtin/log.c:1410 builtin/log.c:1412 builtin/log.c:1424 +#, c-format +msgid "Unknown commit %s" +msgstr "Okänd incheckning %s" + +#: builtin/merge.c:82 +msgid "switch `m' requires a value" +msgstr "flaggan \"m\" behöver ett värde" + +#: builtin/merge.c:119 +#, c-format +msgid "Could not find merge strategy '%s'.\n" +msgstr "Kunde inte hitta sammanslagningsstrategin \"%s\".\n" + +#: builtin/merge.c:120 +#, c-format +msgid "Available strategies are:" +msgstr "Tillgängliga strategier är:" + +#: builtin/merge.c:125 +#, c-format +msgid "Available custom strategies are:" +msgstr "Tillgängliga skräddarsydda strategier är:" + +#: builtin/merge.c:223 +msgid "could not run stash." +msgstr "kunde köra stash." + +#: builtin/merge.c:228 +msgid "stash failed" +msgstr "stash misslyckades" + +#: builtin/merge.c:233 +#, c-format +msgid "not a valid object: %s" +msgstr "inte ett giltigt objekt: %s" + +#: builtin/merge.c:250 +msgid "read-tree failed" +msgstr "read-tree misslyckades" + +#: builtin/merge.c:279 +msgid " (nothing to squash)" +msgstr " (inget att platta till)" + +#: builtin/merge.c:292 +#, c-format +msgid "Squash commit -- not updating HEAD\n" +msgstr "Tillplattningsincheckning -- uppdaterar inte HEAD\n" + +#: builtin/merge.c:295 builtin/merge.c:1290 builtin/merge.c:1299 +#: builtin/merge.c:1309 +#, c-format +msgid "Could not write to '%s'" +msgstr "Kunde inte skriva till \"%s\"" + +#: builtin/merge.c:323 +msgid "Writing SQUASH_MSG" +msgstr "Skriver SQUASH_MSG" + +#: builtin/merge.c:325 +msgid "Finishing SQUASH_MSG" +msgstr "Avslutar SQUASH_MSG" + +#: builtin/merge.c:345 +#, c-format +msgid "No merge message -- not updating HEAD\n" +msgstr "Inget sammanslagningsmeddelande -- uppdaterar inte HEAD\n" + +#: builtin/merge.c:396 +#, c-format +msgid "'%s' does not point to a commit" +msgstr "\"%s\" verkar inte peka på en incheckning" + +#: builtin/merge.c:491 +#, c-format +msgid "Bad branch.%s.mergeoptions string: %s" +msgstr "Felaktig branch.%s.mergeoptions-sträng: %s" + +#: builtin/merge.c:553 +msgid "git write-tree failed to write a tree" +msgstr "git write--tree misslyckades skriva ett träd" + +#: builtin/merge.c:594 +msgid "failed to read the cache" +msgstr "misslyckads läsa cachen" + +#: builtin/merge.c:611 +msgid "Unable to write index." +msgstr "Kunde inte skriva indexet." + +#: builtin/merge.c:624 +msgid "Not handling anything other than two heads merge." +msgstr "Hanterar inte något annat än en sammanslagning av två huvuden." + +#: builtin/merge.c:651 +#, c-format +msgid "Unknown option for merge-recursive: -X%s" +msgstr "Felaktig flagga för merge-recursive: -X%s" + +#: builtin/merge.c:666 +#, c-format +msgid "unable to write %s" +msgstr "kunde inte skriva %s" + +#: builtin/merge.c:791 +#, c-format +msgid "Wonderful.\n" +msgstr "Underbart.\n" + +#: builtin/merge.c:840 builtin/merge.c:1287 builtin/merge.c:1295 +#: builtin/merge.c:1303 +#, c-format +msgid "Could not open '%s' for writing" +msgstr "Kunde inte öppna \"%s\" för skrivning" + +#: builtin/merge.c:856 +#, c-format +msgid "Automatic merge failed; fix conflicts and then commit the result.\n" +msgstr "" +"Kunde inte slå ihop automatiskt; fixa konflikter och checka in resultatet.\n" + +#: builtin/merge.c:871 +#, c-format +msgid "'%s' is not a commit" +msgstr "\"%s\" är inte en incheckning" + +#: builtin/merge.c:921 git-pull.sh:31 +msgid "" +"You have not concluded your merge (MERGE_HEAD exists).\n" +"Please, commit your changes before you can merge." +msgstr "" +"Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n" +"Checka in dina ändringar innan du kan slå ihop." + +#: builtin/merge.c:924 git-pull.sh:34 +msgid "You have not concluded your merge (MERGE_HEAD exists)." +msgstr "Du har inte avslutat sammanslagningen (MERGE_HEAD finns)." + +#: builtin/merge.c:951 +msgid "You cannot combine --squash with --no-ff." +msgstr "Du kan inte kombinera --squash med --no-ff." + +#: builtin/merge.c:956 +msgid "You cannot combine --no-ff with --ff-only." +msgstr "Du kan inte kombinera --no-ff med --ff-only." + +#: builtin/merge.c:984 +msgid "Can merge only exactly one commit into empty head" +msgstr "Kan endast slå ihop en enda incheckning i ett tomt huvud." + +#: builtin/merge.c:987 +msgid "Squash commit into empty head not supported yet" +msgstr "Stöder inte en tillplattningsincheckning på ett tomt huvud ännu" + +#: builtin/merge.c:989 +msgid "Non-fast-forward commit does not make sense into an empty head" +msgstr "Icke-snabbspolad incheckning kan inte användas med ett tomt huvud" + +#: builtin/merge.c:993 builtin/merge.c:1041 +#, c-format +msgid "%s - not something we can merge" +msgstr "%s - inte något vi kan slå ihop" + +#: builtin/merge.c:1099 +#, c-format +msgid "Updating %s..%s\n" +msgstr "Uppdaterar %s..%s\n" + +#: builtin/merge.c:1133 +#, c-format +msgid "Trying really trivial in-index merge...\n" +msgstr "Försöker riktigt enkel sammanslagning i indexet...\n" + +#: builtin/merge.c:1137 +#, c-format +msgid "Nope.\n" +msgstr "Nej.\n" + +#: builtin/merge.c:1170 +msgid "Not possible to fast-forward, aborting." +msgstr "Kan inte snabbspola, avbryter." + +#: builtin/merge.c:1196 builtin/merge.c:1269 +#, c-format +msgid "Rewinding the tree to pristine...\n" +msgstr "Återspolar trädet till ofördärvat...\n" + +#: builtin/merge.c:1200 +#, c-format +msgid "Trying merge strategy %s...\n" +msgstr "Försöker sammanslagninsstrategin %s...\n" + +#: builtin/merge.c:1261 +#, c-format +msgid "No merge strategy handled the merge.\n" +msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n" + +#: builtin/merge.c:1263 +#, c-format +msgid "Merge with strategy %s failed.\n" +msgstr "Sammanslaning med strategin %s misslyckades.\n" + +#: builtin/merge.c:1271 +#, c-format +msgid "Using the %s to prepare resolving by hand.\n" +msgstr "Använder %s för att förbereda lösning för hand.\n" + +#: builtin/merge.c:1314 +#, c-format +msgid "Automatic merge went well; stopped before committing as requested\n" +msgstr "" +"Automatisk sammanslagning lyckades; stoppar före incheckning som önskat\n" + +#: builtin/mv.c:103 +#, c-format +msgid "Checking rename of '%s' to '%s'\n" +msgstr "Kontrollerar namnbyte av \"%s\" till \"%s\"\n" + +#: builtin/mv.c:107 +msgid "bad source" +msgstr "felaktig källa" + +#: builtin/mv.c:110 +msgid "can not move directory into itself" +msgstr "kan inte flytta katalog till sig själv" + +#: builtin/mv.c:113 +msgid "cannot move directory over file" +msgstr "kan inte flytta katalog över fil" + +#: builtin/mv.c:123 +#, c-format +msgid "Huh? %.*s is in index?" +msgstr "Vad? %.*s är i indexet?" + +#: builtin/mv.c:135 +msgid "source directory is empty" +msgstr "källkatalogen är tom" + +#: builtin/mv.c:166 +msgid "not under version control" +msgstr "inte versionshanterad" + +#: builtin/mv.c:168 +msgid "destination exists" +msgstr "destinationen finns" + +#: builtin/mv.c:175 +#, c-format +msgid "%s; will overwrite!" +msgstr "%s; kommer skriva över!" + +#: builtin/mv.c:178 +msgid "Cannot overwrite" +msgstr "Kan inte skriva över" + +#: builtin/mv.c:181 +msgid "multiple sources for the same target" +msgstr "flera källor för samma mål" + +#: builtin/mv.c:196 +#, c-format +msgid "%s, source=%s, destination=%s" +msgstr "%s, källa=%s, mål=%s" + +#: builtin/mv.c:206 +#, c-format +msgid "Renaming %s to %s\n" +msgstr "Byter namn på %s till %s\n" + +#: builtin/mv.c:209 +#, c-format +msgid "renaming '%s' failed" +msgstr "misslyckades byta namn på \"%s\"" + +#: builtin/notes.c:122 +#, c-format +msgid "unable to start 'show' for object '%s'" +msgstr "kunde int estarta \"show\" för objektet \"%s\"" + +#: builtin/notes.c:128 +msgid "can't fdopen 'show' output fd" +msgstr "kunde inte öppna (fdopen) \"show\"-utdata-filhandtag" + +#: builtin/notes.c:138 +#, c-format +msgid "failed to close pipe to 'show' for object '%s'" +msgstr "kunde inte stänga röret till \"show\" för objektet \"%s\"" + +#: builtin/notes.c:141 +#, c-format +msgid "failed to finish 'show' for object '%s'" +msgstr "kunde inte avsluta \"show\" för objektet \"%s\"" + +#: builtin/notes.c:158 builtin/tag.c:311 +#, c-format +msgid "could not create file '%s'" +msgstr "kunde inte skapa filen \"%s\"" + +#: builtin/notes.c:172 +msgid "Please supply the note contents using either -m or -F option" +msgstr "Ange innehåll för anteckningen med antingen -m eller -F" + +#: builtin/notes.c:193 builtin/notes.c:797 +#, c-format +msgid "Removing note for object %s\n" +msgstr "Tar bort anteckning för objektet %s\n" + +#: builtin/notes.c:198 +msgid "unable to write note object" +msgstr "kunde inte skriva anteckningsobjekt" + +#: builtin/notes.c:200 +#, c-format +msgid "The note contents has been left in %s" +msgstr "Anteckningens innehåll har lämnats kvar i %s" + +#: builtin/notes.c:234 builtin/tag.c:445 +#, c-format +msgid "cannot read '%s'" +msgstr "kunde inte läsa \"%s\"" + +#: builtin/notes.c:236 builtin/tag.c:448 +#, c-format +msgid "could not open or read '%s'" +msgstr "kunde inte öppna eller läsa \"%s\"" + +#: builtin/notes.c:255 builtin/notes.c:444 builtin/notes.c:446 +#: builtin/notes.c:508 builtin/notes.c:560 builtin/notes.c:631 +#: builtin/notes.c:636 builtin/notes.c:710 builtin/notes.c:752 +#: builtin/notes.c:789 builtin/reset.c:303 builtin/tag.c:461 +#, c-format +msgid "Failed to resolve '%s' as a valid ref." +msgstr "Kunde inte slå upp \"%s\" som en giltig referens." + +#: builtin/notes.c:258 +#, c-format +msgid "Failed to read object '%s'." +msgstr "Kunde inte läsa objektet \"%s\"." + +#: builtin/notes.c:283 +msgid "Cannot commit uninitialized/unreferenced notes tree" +msgstr "Kan inte checka in oinitierat/orefererat anteckningsträd" + +#: builtin/notes.c:295 +msgid "Failed to write current notes tree to database" +msgstr "Kunde inte skriva aktuellt anteckningsträd till databasen" + +#: builtin/notes.c:307 +msgid "Failed to commit notes tree to database" +msgstr "Kunde inte checka in anteckningsträd i databasen" + +#: builtin/notes.c:339 +#, c-format +msgid "Bad notes.rewriteMode value: '%s'" +msgstr "Felaktigt värde för notes.rewriteMode: '%s'" + +#: builtin/notes.c:349 +#, c-format +msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" +msgstr "Vägrar skriva över anteckningar i %s (utanför refs/notes/)" + +#. TRANSLATORS: The first %s is the name of the +#. environment variable, the second %s is its value +#: builtin/notes.c:376 +#, c-format +msgid "Bad %s value: '%s'" +msgstr "Felaktigt värde på %s: \"%s\"" + +#: builtin/notes.c:440 +#, c-format +msgid "Malformed input line: '%s'." +msgstr "Felaktig indatarad: \"%s\"." + +#: builtin/notes.c:455 +#, c-format +msgid "Failed to copy notes from '%s' to '%s'" +msgstr "Misslyckades kopiera anteckningar från \"%s\" till \"%s\"" + +# FIXME: Untranslatable! +# +#. TRANSLATORS: The first %s is one of "git notes ACTION", +#. e.g. "add", "copy", "append" etc. +#: builtin/notes.c:481 +#, c-format +msgid "Refusing to %s notes in %s (outside of refs/notes/)" +msgstr "Vägrar %s anteckningar i %s (utanför refs/notes/)" + +#: builtin/notes.c:501 builtin/notes.c:553 builtin/notes.c:614 +#: builtin/notes.c:626 builtin/notes.c:698 builtin/notes.c:745 +#: builtin/notes.c:782 builtin/notes.c:821 +msgid "too many parameters" +msgstr "för många parametrar" + +#: builtin/notes.c:505 +msgid "list" +msgstr "list" + +#: builtin/notes.c:514 builtin/notes.c:758 +#, c-format +msgid "No note found for object %s." +msgstr "Inga anteckningar hittades för objektet %s." + +#: builtin/notes.c:562 +msgid "add" +msgstr "add" + +#: builtin/notes.c:567 +#, c-format +msgid "" +"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " +"existing notes" +msgstr "" +"Kan inte lägga till anteckningar. Hittade befintliga anteckningar för " +"objektet %s. Använd \"-f\" för att skriva över befintliga anteckningar" + +#: builtin/notes.c:572 builtin/notes.c:649 +#, c-format +msgid "Overwriting existing notes for object %s\n" +msgstr "Skriver över befintliga anteckningar för objektet %s\n" + +#: builtin/notes.c:622 +msgid "too few parameters" +msgstr "för få parametrar" + +#: builtin/notes.c:638 +msgid "copy" +msgstr "copy" + +#: builtin/notes.c:643 +#, c-format +msgid "" +"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " +"existing notes" +msgstr "" +"Kan inte kopiera anteckningar. Hittade befintliga anteckningar för objektet " +"%s. Använd \"-f\" för att skriva över befintliga anteckningar" + +#: builtin/notes.c:655 +#, c-format +msgid "Missing notes on source object %s. Cannot copy." +msgstr "Anteckningar på källobjektet %s saknas. Kan inte kopiera." + +#: builtin/notes.c:703 +#, 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 "" +"Flaggorna -m/-F/-c/-C rekommenderas inte för underkommandot \"edit\".\n" +"Använd \"git notes add -f -m/-F/-c/-C\" istället.\n" + +#: builtin/notes.c:754 +msgid "show" +msgstr "show" + +#: builtin/notes.c:791 +msgid "remove" +msgstr "remove" + +#: builtin/notes.c:795 +#, c-format +msgid "Object %s has no note\n" +msgstr "Objektet %s har ingen anteckning\n" + +#: builtin/notes.c:825 +msgid "prune" +msgstr "prune" + +#: builtin/notes.c:877 +#, c-format +msgid "Unknown subcommand: %s" +msgstr "Okänt underkommando: %s" + +#: builtin/push.c:43 +msgid "tag shorthand without " +msgstr "taggförkortning utan " + +#: builtin/push.c:62 +msgid "--delete only accepts plain target ref names" +msgstr "--delete godtar endast enkla målreferensnamn" + +#: builtin/push.c:72 +msgid "You are not currently on a branch." +msgstr "Du är inte på någon gren för närvarande." + +#: builtin/push.c:74 +#, c-format +msgid "The current branch %s is not tracking anything." +msgstr "Den aktuella grenen %s spårar ingenting." + +#: builtin/push.c:77 +#, c-format +msgid "The current branch %s is tracking multiple branches, refusing to push." +msgstr "Den aktuella grenen %s spårar flera grenar, vägrar sända." + +#: builtin/push.c:100 +msgid "" +"You didn't specify any refspecs to push, and push.default is \"nothing\"." +msgstr "" +"Du angav inga referensspecifikationer att sända, och push.default är " +"\"nothing\"." + +#: builtin/push.c:120 +#, c-format +msgid "Pushing to %s\n" +msgstr "Sänder till %s\n" + +#: builtin/push.c:124 +#, c-format +msgid "failed to push some refs to '%s'" +msgstr "misslyckades sända några referenser till \"%s\"" + +#: builtin/push.c:132 +#, 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 "" +"För att förhindra att du tappar historik har icke snabbspolande " +"uppdateringar\n" +"avvisats. Slå ihop fjärrändringarna (t.ex \"git pull\") innan du sänder " +"igen.\n" +"Se avsnittet \"Note about fast-forward\" i \"git push --help\" för " +"detaljer.\n" + +#: builtin/push.c:149 +#, c-format +msgid "bad repository '%s'" +msgstr "felaktigt arkiv \"%s\"" + +#: builtin/push.c:150 +msgid "No destination configured to push to." +msgstr "Har inte ställt in någon destination att sända till." + +#: builtin/push.c:158 +msgid "--all and --tags are incompatible" +msgstr "--all och --tags är inkompatibla" + +#: builtin/push.c:159 +msgid "--all can't be combined with refspecs" +msgstr "--all kan inte kombineras med referensspecifikationer" + +#: builtin/push.c:164 +msgid "--mirror and --tags are incompatible" +msgstr "--mirror och --tags är inkompatibla" + +#: builtin/push.c:165 +msgid "--mirror can't be combined with refspecs" +msgstr "--mirror kan inte kombineras med referensspecifikationer" + +#: builtin/push.c:170 +msgid "--all and --mirror are incompatible" +msgstr "--all och --mirror är inkompatibla" + +#: builtin/push.c:235 +msgid "--delete is incompatible with --all, --mirror and --tags" +msgstr "--delete är imkompatibel med --all, --mirror och --tags" + +#: builtin/push.c:237 +msgid "--delete doesn't make sense without any refs" +msgstr "--delete kan inte användas utan referenser" + +#: builtin/reset.c:33 +msgid "mixed" +msgstr "blandad" + +#: builtin/reset.c:33 +msgid "soft" +msgstr "mjuk" + +#: builtin/reset.c:33 +msgid "hard" +msgstr "hård" + +#: builtin/reset.c:33 +msgid "merge" +msgstr "sammanslagning" + +#: builtin/reset.c:33 +msgid "keep" +msgstr "behåll" + +#: builtin/reset.c:95 +msgid "You do not have a valid HEAD." +msgstr "Du har inte en giltig HEAD." + +#: builtin/reset.c:97 +msgid "Failed to find tree of HEAD." +msgstr "Kunde inte hitta träder för HEAD." + +#: builtin/reset.c:103 +#, c-format +msgid "Failed to find tree of %s." +msgstr "Kunde inte hitta träder för %s." + +#: builtin/reset.c:108 +msgid "Could not write new index file." +msgstr "Kunde inte skriva ny indexfil." + +#: builtin/reset.c:118 +#, c-format +msgid "HEAD is now at %s" +msgstr "HEAD är nu på %s" + +#: builtin/reset.c:142 +msgid "Could not read index" +msgstr "Kunde inte läsa indexet" + +#: builtin/reset.c:145 +msgid "Unstaged changes after reset:" +msgstr "Oköade ändringar efter återställning:" + +#: builtin/reset.c:225 +#, c-format +msgid "Reflog action message too long: %.*s..." +msgstr "Reflog-händelsemeddelande för långt: %.*s..." + +#: builtin/reset.c:231 +#, c-format +msgid "Cannot do a %s reset in the middle of a merge." +msgstr "Kan inte utföra en %s återställning mitt i en sammanslagning." + +#: builtin/reset.c:307 +#, c-format +msgid "Could not parse object '%s'." +msgstr "Kan inte tolka objektet \"%s\"" + +#: builtin/reset.c:312 +msgid "--patch is incompatible with --{hard,mixed,soft}" +msgstr "--patch är inkompatibel med --{hard,mixed,soft}" + +#: builtin/reset.c:321 +msgid "--mixed with paths is deprecated; use 'git reset -- ' instead." +msgstr "" +"--mixed rekommenderas inte med sökvägar; använd \"git reset -- \"." + +#: builtin/reset.c:323 +#, c-format +msgid "Cannot do %s reset with paths." +msgstr "Kan inte göra %s återställning med sökvägar." + +#: builtin/reset.c:335 +#, c-format +msgid "%s reset is not allowed in a bare repository" +msgstr "%s återställning tillåts inte i ett naket arkiv" + +#: builtin/reset.c:351 +#, c-format +msgid "Could not reset index file to revision '%s'." +msgstr "Kunde inte återställa indexfilen till versionen \"%s\"." + +#: builtin/revert.c:82 +msgid "program error" +msgstr "programfel" + +#: builtin/revert.c:154 builtin/revert.c:188 +#, c-format +msgid "Could not read commit message of %s" +msgstr "Kunde inte läsa incheckningsmeddelandet för %s" + +#: builtin/revert.c:202 +#, c-format +msgid "Could not extract author email from %s" +msgstr "Kunde inte hämta författarens e-postadress från %s" + +#: builtin/revert.c:214 +#, c-format +msgid "Could not extract author time from %s" +msgstr "Kunde inte hämta författartid från %s" + +#: builtin/revert.c:230 +#, c-format +msgid "No author information found in %s" +msgstr "Hittade ingen författarinformation i %s" + +#: builtin/revert.c:267 +#, c-format +msgid "Could not write to %s." +msgstr "Kunde inte skriva till %s." + +#: builtin/revert.c:270 +#, c-format +msgid "Error wrapping up %s" +msgstr "Fel vid ombrytning av %s" + +#: builtin/revert.c:290 +msgid "" +"Your local changes would be overwritten by revert.\n" +"Please, commit your changes or stash them to proceed." +msgstr "" +"Dina lokala ändringar skulle skrivas över av \"revert\".\n" +"Checka in dina ändringar eller använd \"stash\" för att fortsätta." + +#: builtin/revert.c:293 +msgid "" +"Your local changes would be overwritten by cherry-pick.\n" +"Please, commit your changes or stash them to proceed." +msgstr "" +"Dina lokala ändringar skulle skrivas över av \"cherry-pick\".\n" +"Checka in dina ändringar eller använd \"stash\" för att fortsätta." + +#. TRANSLATORS: %s will be "revert" or "cherry-pick" +#: builtin/revert.c:351 +#, c-format +msgid "%s: Unable to write new index file" +msgstr "%s: Kunde inte skriva ny indexfil" + +#: builtin/revert.c:417 +msgid "Your index file is unmerged." +msgstr "Din indexfil har inte slagits ihop." + +#: builtin/revert.c:420 +msgid "You do not have a valid HEAD" +msgstr "Du har ingen giltig HEAD" + +#: builtin/revert.c:428 +msgid "Cannot revert a root commit" +msgstr "Kan inte ångra en rotincheckning" + +#: builtin/revert.c:437 +#, c-format +msgid "Commit %s is a merge but no -m option was given." +msgstr "Incheckning %s är en sammanslagning, men flaggan -m angavs inte." + +#: builtin/revert.c:445 +#, c-format +msgid "Commit %s does not have parent %d" +msgstr "Incheckning %s har inte förälder %d" + +#: builtin/revert.c:449 +#, c-format +msgid "Mainline was specified but commit %s is not a merge." +msgstr "Huvudlinje angavs, men incheckningen %s är inte en sammanslagning" + +#. TRANSLATORS: The first %s will be "revert" or +#. "cherry-pick", the second %s a SHA1 +#: builtin/revert.c:460 +#, c-format +msgid "%s: cannot parse parent commit %s" +msgstr "%s: kan inte tolka föräldraincheckningen %s" + +#: builtin/revert.c:464 +#, c-format +msgid "Cannot get commit message for %s" +msgstr "Kan inte hämta incheckningsmeddelande för %s" + +#: builtin/revert.c:525 +#, c-format +msgid "could not revert %s... %s" +msgstr "kunde inte ångra %s... %s" + +#: builtin/revert.c:526 +#, c-format +msgid "could not apply %s... %s" +msgstr "kunde inte applicera %s... %s" + +#: builtin/revert.c:559 +msgid "empty commit set passed" +msgstr "den angivna uppsättningen incheckningar är tom" + +#: builtin/revert.c:573 +msgid "cherry-pick --ff cannot be used with --signoff" +msgstr "cherry-pick --ff kan inte användas med --signoff" + +#: builtin/revert.c:575 +msgid "cherry-pick --ff cannot be used with --no-commit" +msgstr "cherry-pick --ff kan inte användas med --no-commit" + +#: builtin/revert.c:577 +msgid "cherry-pick --ff cannot be used with -x" +msgstr "cherry-pick --ff kan inte användas med -x" + +#: builtin/revert.c:579 +msgid "cherry-pick --ff cannot be used with --edit" +msgstr "cherry-pick --ff kan inte användas med --edit" + +#. TRANSLATORS: %s will be "revert" or "cherry-pick" +#: builtin/revert.c:584 +#, c-format +msgid "git %s: failed to read the index" +msgstr "git %s: misslyckades läsa indexet" + +#: builtin/rm.c:118 +#, c-format +msgid "" +"'%s' has staged content different from both the file and the HEAD\n" +"(use -f to force removal)" +msgstr "" +"\"%s\" har köat ändringar som skiljer sig både från filen och HEAD\n" +"(använd -f för att tvinga borttagning)" + +#: builtin/rm.c:124 +#, c-format +msgid "" +"'%s' has changes staged in the index\n" +"(use --cached to keep the file, or -f to force removal)" +msgstr "" +"\"%s\" har köade ändringar i indexet\n" +"(använd --cached för att behålla filen eller -f för att tvinga borttagning)" + +#: builtin/rm.c:128 +#, c-format +msgid "" +"'%s' has local modifications\n" +"(use --cached to keep the file, or -f to force removal)" +msgstr "" +"\"%s\" har lokala ändringar\n" +"(använd --cached för att behålla filen eller -f för att tvinga borttagning)" + +#: builtin/rm.c:202 +#, c-format +msgid "not removing '%s' recursively without -r" +msgstr "tar inte bort \"%s\" rekursivt utan -r" + +#: builtin/rm.c:238 +#, c-format +msgid "git rm: unable to remove %s" +msgstr "git rm: kan inte ta bort %s" + +#: builtin/shortlog.c:161 +#, c-format +msgid "Missing author: %s" +msgstr "Saknad författare: %s" + +#: builtin/tag.c:123 builtin/tag.c:464 +#, c-format +msgid "tag name too long: %.*s..." +msgstr "taggnamnet för långt: %.*s..." + +#: builtin/tag.c:128 +#, c-format +msgid "tag '%s' not found." +msgstr "taggen \"%s\" hittades inte." + +#: builtin/tag.c:143 +#, c-format +msgid "Deleted tag '%s' (was %s)\n" +msgstr "Tog bort tagg \"%s\" (var %s)\n" + +#: builtin/tag.c:155 +#, c-format +msgid "could not verify the tag '%s'" +msgstr "kunde inte bekräfta taggen \"%s\"" + +#: builtin/tag.c:170 +msgid "committer info too long." +msgstr "incheckarinformation för lång." + +#: builtin/tag.c:190 +msgid "could not run gpg." +msgstr "kunde inte köra gpg." + +#: builtin/tag.c:196 +msgid "gpg did not accept the tag data" +msgstr "gpg godtog inte taggdata" + +#: builtin/tag.c:203 +msgid "gpg failed to sign the tag" +msgstr "gpg misslyckades signera taggen" + +#: builtin/tag.c:218 +msgid "" +"\n" +"#\n" +"# Write a tag message\n" +"#\n" +msgstr "" +"\n" +"#\n" +"# Skriv ett taggmeddelande\n" +"#\n" + +#: builtin/tag.c:226 +#, c-format +msgid "signing key value too long (%.10s...)" +msgstr "signeringsnyckelvärdet för långt (%.10s...)" + +#: builtin/tag.c:272 +msgid "unable to sign the tag" +msgstr "kunde inte signera taggen" + +#: builtin/tag.c:274 +msgid "unable to write tag file" +msgstr "kunde inte skriva tagg-filen" + +#: builtin/tag.c:289 +msgid "bad object type." +msgstr "felaktig objekttyp" + +#: builtin/tag.c:302 +msgid "tag header too big." +msgstr "tagghuvud för stort." + +#: builtin/tag.c:329 +msgid "no tag message?" +msgstr "inget taggmeddelande?" + +#: builtin/tag.c:335 +#, c-format +msgid "The tag message has been left in %s\n" +msgstr "Taggmeddelandet har lämnats i %s\n" + +#: builtin/tag.c:428 +msgid "-n option is only allowed with -l." +msgstr "Flaggan -n är endast tillåten tillsammans med -l." + +#: builtin/tag.c:430 +msgid "--contains option is only allowed with -l." +msgstr "Flaggan --contains är endast tillåten tillsammans med -l" + +#: builtin/tag.c:438 +msgid "only one -F or -m option is allowed." +msgstr "endast en av flaggorna -F eller -m tillåts." + +#: builtin/tag.c:458 +msgid "too many params" +msgstr "för många parametrar" + +#: builtin/tag.c:466 +#, c-format +msgid "'%s' is not a valid tag name." +msgstr "\"%s\" är inte ett giltigt taggnamn." + +#: builtin/tag.c:471 +#, c-format +msgid "tag '%s' already exists" +msgstr "taggen \"%s\" finns redan" + +#: builtin/tag.c:479 +#, c-format +msgid "%s: cannot lock the ref" +msgstr "%s: kan inte låsa referensen" + +#: builtin/tag.c:481 +#, c-format +msgid "%s: cannot update the ref" +msgstr "%s: kan inte uppdatera referensen" + +#: builtin/tag.c:483 +#, c-format +msgid "Updated tag '%s' (was %s)\n" +msgstr "Uppdaterad tagg \"%s\" (var %s)\n" + +#: git-am.sh:47 +msgid "You need to set your committer info first" +msgstr "Du måste ställa in din incheckarinformation först" + +#: git-am.sh:80 +#, sh-format +msgid "" +"When you have resolved this problem run \"$cmdline --resolved\".\n" +"If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n" +"To restore the original branch and stop patching run \"$cmdline --abort\"." +msgstr "" +"När du har löst problemet kör du \"$cmdline --resolved\".\n" +"Om du vill hoppa över patchen kör du istället \"$cmdline --skip\".\n" +"För att återställa originalgrenen och avbryta kör du \"$cmdline --abort\"." + +#: git-am.sh:96 +msgid "Cannot fall back to three-way merge." +msgstr "Kan inte falla tillbaka på trevägssammanslagning." + +#: git-am.sh:111 +msgid "Repository lacks necessary blobs to fall back on 3-way merge." +msgstr "" +"Arkivet saknar objekt som behövs för att falla tillbaka på 3-" +"vägssammanslagning." + +#: git-am.sh:120 +msgid "" +"Did you hand edit your patch?\n" +"It does not apply to blobs recorded in its index." +msgstr "" +"Vill du handredigera din patch?\n" +"Den kan inte appliceras på blobbar som antecknats i dess index." + +#: git-am.sh:236 +msgid "Only one StGIT patch series can be applied at once" +msgstr "Endast en StGIT-patchserie kan appliceras åt gången" + +#: git-am.sh:288 +#, sh-format +msgid "Patch format $patch_format is not supported." +msgstr "Patchformatet $patch_format stöds inte." + +#: git-am.sh:290 +msgid "Patch format detection failed." +msgstr "Misslyckades detektera patchformat." + +#: git-am.sh:340 +msgid "-d option is no longer supported. Do not use." +msgstr "Flaggan -d stöds inte lägre. Använd inte." + +#: git-am.sh:403 +#, sh-format +msgid "previous rebase directory $dotest still exists but mbox given." +msgstr "tidigare rebase-katalog $dotest finns redan, men mbox angavs." + +#: git-am.sh:408 +msgid "Please make up your mind. --skip or --abort?" +msgstr "Bestäm dig. --skip eller --abort?" + +#: git-am.sh:434 +msgid "Resolve operation not in progress, we are not resuming." +msgstr "Lösningsoperation pågår inte, vi återupptar inte." + +#: git-am.sh:499 +#, sh-format +msgid "Dirty index: cannot apply patches (dirty: $files)" +msgstr "Smutsigt index: kan inte applicera patchar (smutsiga: $files)" + +#: git-am.sh:595 +#, sh-format +msgid "" +"Patch is empty. Was it split wrong?\n" +"If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n" +"To restore the original branch and stop patching run \"$cmdline --abort\"." +msgstr "" +"Patchen är tom. Delades den upp felaktigt?\n" +"Om du vill hoppa över patchen kör du istället \"$cmdline --skip\".\n" +"För att återställa originalgrenen och avbryta kör du \"$cmdline --abort\"." + +#: git-am.sh:632 +msgid "Patch does not have a valid e-mail address." +msgstr "Patchen har inte någon giltig e-postadress." + +#: git-am.sh:679 +msgid "cannot be interactive without stdin connected to a terminal." +msgstr "" +"kan inte vara interaktiv om standard in inte är ansluten till en terminal." + +#: git-am.sh:683 +msgid "Commit Body is:" +msgstr "Incheckningskroppen är:" + +#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] +#. in your translation. The program will only accept English +#. input at this point. +#: git-am.sh:690 +msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " +msgstr "Applicera? Y=ja/N=nej/E=redigera/V=visa patch/A=godta alla " + +#: git-am.sh:726 +#, sh-format +msgid "Applying: $FIRSTLINE" +msgstr "Applicerar: $FIRSTLINE" + +#: git-am.sh:747 +msgid "" +"No changes - did you forget to use 'git add'?\n" +"If there is nothing left to stage, chances are that something else\n" +"already introduced the same changes; you might want to skip this patch." +msgstr "" +"Inga ändrinar - glömde du använda \"git add\"?\n" +"Om det inte är något kvar att köa kan det hända att någon annan redan\n" +"introducerat samma ändringar; kanske du bör hoppa över patchen." + +#: git-am.sh:755 +msgid "" +"You still have unmerged paths in your index\n" +"did you forget to use 'git add'?" +msgstr "" +"Du har fortfarande sökvägar som inte slagits samman i ditt index\n" +"glömde du använda \"git add\"?" + +#: git-am.sh:771 +msgid "No changes -- Patch already applied." +msgstr "Inga ändringar -- Patchen har redan applicerats." + +#: git-am.sh:781 +#, sh-format +msgid "Patch failed at $msgnum $FIRSTLINE" +msgstr "Patchen misslyckades vid $msgnum $FIRSTLINE" + +#: git-am.sh:797 +msgid "applying to an empty history" +msgstr "applicerar på en tom historik" + +#: git-bisect.sh:39 +#, fuzzy +msgid "You need to start by \"git bisect start\"" +msgstr "Du måste ställa in din incheckarinformation först" + +#. TRANSLATORS: Make sure to include [Y] and [n] in your +#. translation. The program will only accept English input +#. at this point. +#: git-bisect.sh:45 +msgid "Do you want me to do it for you [Y/n]? " +msgstr "" + +#: git-bisect.sh:64 +msgid "Bad HEAD - I need a HEAD" +msgstr "" + +#: git-bisect.sh:83 +msgid "won't bisect on seeked tree" +msgstr "" + +#: git-bisect.sh:87 +msgid "Bad HEAD - strange symbolic ref" +msgstr "" + +#: git-bisect.sh:117 +#, sh-format +msgid "'$arg' does not appear to be a valid revision" +msgstr "" + +#: git-bisect.sh:162 +#, sh-format +msgid "Bad bisect_write argument: $state" +msgstr "" + +#: git-bisect.sh:190 +#, sh-format +msgid "Bad rev input: $arg" +msgstr "" + +#: git-bisect.sh:204 +msgid "Please call 'bisect_state' with at least one argument." +msgstr "" + +#: git-bisect.sh:207 +msgid "Bad rev input: HEAD" +msgstr "" + +#: git-bisect.sh:216 +#, sh-format +msgid "Bad rev input: $rev" +msgstr "" + +#: git-bisect.sh:222 +msgid "'git bisect bad' can take only one argument." +msgstr "" + +#. have bad but not good. we could bisect although +#. this is less optimum. +#: git-bisect.sh:245 +msgid "Warning: bisecting only with a bad commit." +msgstr "" + +#. TRANSLATORS: Make sure to include [Y] and [n] in your +#. translation. The program will only accept English input +#. at this point. +#: git-bisect.sh:251 +msgid "Are you sure [Y/n]? " +msgstr "" + +#: git-bisect.sh:261 +msgid "" +"You need to give me at least one good and one bad revisions.\n" +"(You can use \"git bisect bad\" and \"git bisect good\" for that.)" +msgstr "" + +#: git-bisect.sh:264 +msgid "" +"You need to start by \"git bisect start\".\n" +"You then need to give me at least one good and one bad revisions.\n" +"(You can use \"git bisect bad\" and \"git bisect good\" for that.)" +msgstr "" + +#: git-bisect.sh:316 +msgid "We are not bisecting." +msgstr "" + +#: git-bisect.sh:323 +#, fuzzy, sh-format +msgid "'$invalid' is not a valid commit" +msgstr "\"%s\" är inte en incheckning" + +#: git-bisect.sh:352 +#, fuzzy, sh-format +msgid "cannot read $file for replaying" +msgstr "kan inte läsa indexet" + +#: git-bisect.sh:368 +msgid "?? what are you talking about?" +msgstr "" + +#: git-bisect.sh:380 +#, sh-format +msgid "running $command" +msgstr "" + +#: git-bisect.sh:386 +#, sh-format +msgid "" +"bisect run failed:\n" +"exit code $res from '$command' is < 0 or >= 128" +msgstr "" + +#: git-bisect.sh:409 +msgid "bisect run cannot continue any more" +msgstr "" + +#: git-bisect.sh:414 +#, sh-format +msgid "" +"bisect run failed:\n" +"'bisect_state $state' exited with error code $res" +msgstr "" + +#: git-bisect.sh:420 +msgid "bisect run success" +msgstr "" + +#: git-pull.sh:21 +msgid "" +"Pull is not possible because you have unmerged files.\n" +"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 "" + +#: git-pull.sh:25 +msgid "Pull is not possible because you have unmerged files." +msgstr "" + +#: git-pull.sh:141 +msgid "" +"There is no candidate for rebasing against among the refs that you just " +"fetched.\n" +"Generally this means that you provided a wildcard refspec which had no\n" +"matches on the remote end." +msgstr "" + +#: git-pull.sh:145 +msgid "" +"There are no candidates for merging against among the refs that you just " +"fetched.\n" +"Generally this means that you provided a wildcard refspec which had no\n" +"matches on the remote end." +msgstr "" + +#. TRANSLATORS: $requested_remote will be a remote name, like +#. "origin" or "avar" +#: git-pull.sh:153 +#, sh-format +msgid "" +"You asked to pull from the remote '$requested_remote', but did not specify\n" +"a branch. Because this is not the default configured remote\n" +"for your current branch, you must specify a branch on the command line." +msgstr "" + +#: git-pull.sh:157 +msgid "" +"You are not currently on a branch, so I cannot use any\n" +"'branch..merge' in your configuration file.\n" +"Please specify which remote branch you want to use on the command\n" +"line and try again (e.g. 'git pull ').\n" +"See git-pull(1) for details." +msgstr "" + +#: git-pull.sh:165 +#, sh-format +msgid "" +"You asked me to pull without telling me which branch you\n" +"want to rebase against, and 'branch.${curr_branch}.merge' in\n" +"your configuration file does not tell me, either. Please\n" +"specify which branch you want to use on the command line and\n" +"try again (e.g. 'git pull ').\n" +"See git-pull(1) for details.\n" +"\n" +"If you often rebase against the same branch, you may want to\n" +"use something like the following in your configuration file:\n" +"\n" +" [branch \"${curr_branch}\"]\n" +" remote = \n" +" merge = \n" +" rebase = true\n" +"\n" +" [remote \"\"]\n" +" url = \n" +" fetch = \n" +"\n" +"See git-config(1) for details." +msgstr "" + +#: git-pull.sh:186 +#, sh-format +msgid "" +"You asked me to pull without telling me which branch you\n" +"want to merge with, and 'branch.${curr_branch}.merge' in\n" +"your configuration file does not tell me, either. Please\n" +"specify which branch you want to use on the command line and\n" +"try again (e.g. 'git pull ').\n" +"See git-pull(1) for details.\n" +"\n" +"If you often merge with the same branch, you may want to\n" +"use something like the following in your configuration file:\n" +"\n" +" [branch \"${curr_branch}\"]\n" +" remote = \n" +" merge = \n" +"\n" +" [remote \"\"]\n" +" url = \n" +" fetch = \n" +"\n" +"See git-config(1) for details." +msgstr "" + +#: git-pull.sh:210 +#, sh-format +msgid "" +"Your configuration specifies to rebase against the ref '$upstream_branch'\n" +"from the remote, but no such ref was fetched." +msgstr "" + +#: git-pull.sh:213 +#, sh-format +msgid "" +"Your configuration specifies to merge with the ref '$upstream_branch'\n" +"from the remote, but no such ref was fetched." +msgstr "" + +#: git-pull.sh:226 +msgid "updating an unborn branch with changes added to the index" +msgstr "" + +#: git-pull.sh:232 +msgid "refusing to pull with rebase: your working tree is not up-to-date" +msgstr "" + +#. The fetch involved updating the current branch. +#. The working tree and the index file is still based on the +#. $orig_head commit, but we are merging into $curr_head. +#. First update the working tree to match $curr_head. +#: git-pull.sh:260 +#, sh-format +msgid "" +"Warning: fetch updated the current branch head.\n" +"Warning: fast-forwarding your working tree from\n" +"Warning: commit $orig_head." +msgstr "" + +#: git-pull.sh:285 +#, fuzzy +msgid "Cannot merge multiple branches into empty head" +msgstr "Kan endast slå ihop en enda incheckning i ett tomt huvud." + +#: git-pull.sh:289 +msgid "Cannot rebase onto multiple branches" +msgstr "" + +#: git-stash.sh:41 +msgid "git stash clear with parameters is unimplemented" +msgstr "" + +#: git-stash.sh:63 +#, fuzzy +msgid "You do not have the initial commit yet" +msgstr "Du har ingen giltig HEAD" + +#: git-stash.sh:78 +#, fuzzy +msgid "Cannot save the current index state" +msgstr "Kan inte komma åt aktuell arbetskatalog" + +#: git-stash.sh:94 git-stash.sh:107 +#, fuzzy +msgid "Cannot save the current worktree state" +msgstr "Kan inte komma åt aktuell arbetskatalog" + +#: git-stash.sh:111 +#, fuzzy +msgid "No changes selected" +msgstr "# Inga ändringar\n" + +#: git-stash.sh:114 +msgid "Cannot remove temporary index (can't happen)" +msgstr "" + +#: git-stash.sh:127 +#, fuzzy +msgid "Cannot record working tree state" +msgstr "Kan inte komma åt arbetskatalogen \"%s\"" + +#: git-stash.sh:176 +msgid "No local changes to save" +msgstr "" + +#: git-stash.sh:180 +msgid "Cannot initialize stash" +msgstr "" + +#: git-stash.sh:188 +msgid "Cannot save the current status" +msgstr "" + +#: git-stash.sh:201 +#, fuzzy +msgid "Cannot remove worktree changes" +msgstr "Kan inte komma åt arbetskatalogen \"%s\"" + +#: git-stash.sh:303 +msgid "No stash found." +msgstr "" + +#: git-stash.sh:310 +#, fuzzy, sh-format +msgid "Too many revisions specified: $REV" +msgstr "För många flaggor angavs" + +#: git-stash.sh:316 +#, fuzzy, sh-format +msgid "$reference is not valid reference" +msgstr "referensen är inte ett träd: %s" + +#. maintainers: it would be better if git rev-parse indicated +#. this condition with a non-zero status code but as of 1.7.2.1 it +#. it did not. So, we use non-empty stderr output as a proxy for the +#. condition of interest. +#: git-stash.sh:337 +#, sh-format +msgid "$REV does not exist in the stash log" +msgstr "" + +#: git-stash.sh:351 +#, fuzzy, sh-format +msgid "'$args' is not a stash-like commit" +msgstr "\"%s\" är inte en incheckning" + +#: git-stash.sh:362 +#, sh-format +msgid "'$args' is not a stash reference" +msgstr "" + +#: git-stash.sh:372 +msgid "Cannot apply to a dirty working tree, please stage your changes" +msgstr "" + +#: git-stash.sh:376 +#, fuzzy +msgid "Cannot apply a stash in the middle of a merge" +msgstr "Kan inte utföra en %s återställning mitt i en sammanslagning." + +#: git-stash.sh:384 +msgid "Conflicts in index. Try without --index." +msgstr "" + +#: git-stash.sh:386 +#, fuzzy +msgid "Could not save index tree" +msgstr "Kunde inte läsa indexet" + +#: git-stash.sh:412 +msgid "Cannot unstage modified files" +msgstr "" + +#: git-stash.sh:426 +#, fuzzy +msgid "Index was not unstashed." +msgstr "kunde köra stash." + +#: git-stash.sh:443 +#, sh-format +msgid "Dropped ${REV} ($s)" +msgstr "" + +#: git-stash.sh:444 +#, sh-format +msgid "${REV}: Could not drop stash entry" +msgstr "" + +#: git-stash.sh:451 +#, fuzzy +msgid "No branch name specified" +msgstr "Misslyckades byta namn på gren" + +#: git-stash.sh:522 +msgid "(To restore them type \"git stash apply\")" +msgstr "" + +#: git-submodule.sh:38 +#, sh-format +msgid "remote ($remote) does not have a url defined in .git/config" +msgstr "" + +#: git-submodule.sh:79 +#, sh-format +msgid "No submodule mapping found in .gitmodules for path '$path'" +msgstr "" + +#: git-submodule.sh:105 +#, sh-format +msgid "Directory '$path' exists, but is neither empty nor a git repository" +msgstr "" + +#: git-submodule.sh:109 +#, sh-format +msgid "A file already exist at path '$path'" +msgstr "" + +#: git-submodule.sh:117 +#, sh-format +msgid "Clone of '$url' into submodule path '$path' failed" +msgstr "" + +#: git-submodule.sh:190 +#, sh-format +msgid "repo URL: '$repo' must be absolute or begin with ./|../" +msgstr "" + +#: git-submodule.sh:207 +#, fuzzy, sh-format +msgid "'$path' already exists in the index" +msgstr "kan inte läsa indexet" + +#: git-submodule.sh:211 +#, sh-format +msgid "" +"The following path is ignored by one of your .gitignore files:\n" +"$path\n" +"Use -f if you really want to add it." +msgstr "" + +#: git-submodule.sh:222 +#, sh-format +msgid "Adding existing repo at '$path' to the index" +msgstr "" + +#: git-submodule.sh:224 +#, fuzzy, sh-format +msgid "'$path' already exists and is not a valid git repo" +msgstr "destinationssökvägen \"%s\" finns redan och är inte en tom katalog." + +#: git-submodule.sh:247 +#, sh-format +msgid "Unable to checkout submodule '$path'" +msgstr "" + +#: git-submodule.sh:251 +#, fuzzy, sh-format +msgid "Failed to add submodule '$path'" +msgstr "Kunde inte läsa objektet \"%s\"." + +#: git-submodule.sh:256 +#, sh-format +msgid "Failed to register submodule '$path'" +msgstr "" + +#: git-submodule.sh:294 +#, sh-format +msgid "Entering '$prefix$path'" +msgstr "" + +#: git-submodule.sh:306 +#, sh-format +msgid "Stopping at '$path'; script returned non-zero status." +msgstr "" + +#: git-submodule.sh:349 +#, sh-format +msgid "No url found for submodule path '$path' in .gitmodules" +msgstr "" + +#: git-submodule.sh:359 +#, sh-format +msgid "Failed to register url for submodule path '$path'" +msgstr "" + +#: git-submodule.sh:364 +#, sh-format +msgid "Failed to register update mode for submodule path '$path'" +msgstr "" + +#: git-submodule.sh:366 +#, sh-format +msgid "Submodule '$name' ($url) registered for path '$path'" +msgstr "" + +#: git-submodule.sh:444 +#, sh-format +msgid "" +"Submodule path '$path' not initialized\n" +"Maybe you want to use 'update --init'?" +msgstr "" + +#: git-submodule.sh:456 +#, sh-format +msgid "Unable to find current revision in submodule path '$path'" +msgstr "" + +#: git-submodule.sh:476 +#, sh-format +msgid "Unable to fetch in submodule path '$path'" +msgstr "" + +#: git-submodule.sh:482 git-submodule.sh:487 git-submodule.sh:492 +#, sh-format +msgid "Unable to rebase '$sha1' in submodule path '$path'" +msgstr "" + +#: git-submodule.sh:483 +#, sh-format +msgid "Submodule path '$path': rebased into '$sha1'" +msgstr "" + +#: git-submodule.sh:488 +#, sh-format +msgid "Submodule path '$path': merged in '$sha1'" +msgstr "" + +#: git-submodule.sh:493 +#, sh-format +msgid "Submodule path '$path': checked out '$sha1'" +msgstr "" + +#: git-submodule.sh:504 git-submodule.sh:797 +#, sh-format +msgid "Failed to recurse into submodule path '$path'" +msgstr "" + +#: git-submodule.sh:588 +msgid "--" +msgstr "" + +#. unexpected type +#: git-submodule.sh:628 +#, fuzzy, sh-format +msgid "unexpected mode $mod_dst" +msgstr "diff-status %c förväntades inte" + +#: git-submodule.sh:646 +#, sh-format +msgid " Warn: $name doesn't contain commit $sha1_src" +msgstr "" + +#: git-submodule.sh:649 +#, sh-format +msgid " Warn: $name doesn't contain commit $sha1_dst" +msgstr "" + +#: git-submodule.sh:652 +#, sh-format +msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst" +msgstr "" + +#: git-submodule.sh:677 +msgid "blob" +msgstr "" + +#: git-submodule.sh:678 +msgid "submodule" +msgstr "" + +#: git-submodule.sh:715 +#, fuzzy +msgid "# Submodules changed but not updated:" +msgstr "# Ändrade men inte uppdaterade:" + +#: git-submodule.sh:717 +#, fuzzy +msgid "# Submodule changes to be committed:" +msgstr "# Ändringar att checka in:" + +#: git-submodule.sh:844 +#, sh-format +msgid "Synchronizing submodule url for '$name'" +msgstr "" From 3fc43c11a270bd7bb0c91ba27b7077cf8aab2cca Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 7 Oct 2010 20:52:26 +0200 Subject: [PATCH 07/15] po/de.po: complete German translation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Translate all 689 currently translatable messages in Git into German. Making the German translation 100% complete. [Ævar Arnfjörð Bjarmason: Modified by running msgmerge(1) on it to normalize the line wrapping, and squashed two of Jan's commits together] Signed-off-by: Jan Engelhardt Signed-off-by: Ævar Arnfjörð Bjarmason --- po/de.po | 1806 +++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 1246 insertions(+), 560 deletions(-) diff --git a/po/de.po b/po/de.po index f82f62f7180a97..c044b55987a8eb 100644 --- a/po/de.po +++ b/po/de.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List \n" -"POT-Creation-Date: 2010-09-20 15:03+0000\n" -"PO-Revision-Date: 2010-09-05 19:09 +0000\n" -"Last-Translator: Jan Krüger \n" +"POT-Creation-Date: 2010-10-30 07:35+0000\n" +"PO-Revision-Date: 2010-10-29 15:20+0100\n" +"Last-Translator: Jan Engelhardt \n" "Language-Team: Git Mailing List \n" "Language: de\n" "MIME-Version: 1.0\n" @@ -25,20 +25,18 @@ msgstr "# Verbleibende Konflikte in Pfaden:" #, c-format msgid "# (use \"git reset %s ...\" to unstage)" msgstr "" -"# (benutze \"git reset %s \", um die Änderungen nicht mehr " +"# (verwende `git reset %s `, um die Änderungen nicht mehr " "vorzumerken)" #: wt-status.c:64 wt-status.c:81 msgid "# (use \"git rm --cached ...\" to unstage)" msgstr "" -"# (benutze \"git rm --cached \", um die Datei nicht mehr " -"vorzumerken)" +"# (verwende `git rm --cached `, um die Datei nicht mehr vorzumerken)" #: wt-status.c:65 msgid "# (use \"git add/rm ...\" as appropriate to mark resolution)" msgstr "" -"# (benutze \"git add/rm ...\", um den Konflikt als gelöst zu " -"markieren)" +"# (verwende `git add/rm ...`, um Konflikte als gelöst zu markieren)" #: wt-status.c:73 msgid "# Changes to be committed:" @@ -51,12 +49,12 @@ msgstr "# Geändert, aber nicht für den nächsten Commit vorgemerkt:" #: wt-status.c:95 msgid "# (use \"git add ...\" to update what will be committed)" msgstr "" -"# (benutze \"git add ...\", um den aktuellen Stand vorzumerken)" +"# (verwende `git add ...`, um den aktuellen Stand vorzumerken)" #: wt-status.c:97 msgid "# (use \"git add/rm ...\" to update what will be committed)" msgstr "" -"# (benutze entsprechend \"git add/rm ...\", um den aktuellen Stand " +"# (verwende entsprechend `git add/rm ...`, um den aktuellen Stand " "vorzumerken)" #: wt-status.c:98 @@ -64,14 +62,14 @@ msgid "" "# (use \"git checkout -- ...\" to discard changes in working " "directory)" msgstr "" -"# (benutze \"git checkout -- ...\", um Änderungen in der Datei zu " +"# (verwende `git checkout -- ...`, um Änderungen in der Datei zu " "verwerfen)" #: wt-status.c:100 msgid "# (commit or discard the untracked or modified content in submodules)" msgstr "" "# (committe oder verwerfe die unberücksichtigten Dateien oder Änderungen " -"in Submodules)" +"in Submodulen)" #: wt-status.c:109 #, c-format @@ -82,7 +80,7 @@ msgstr "# %s Dateien:" #, c-format msgid "# (use \"git %s ...\" to include in what will be committed)" msgstr "" -"# (benutze \"git %s ...\", um zu vorgemerkten Dateien hinzuzufügen)" +"# (verwende `git %s ...`, um zu vorgemerkten Dateien hinzuzufügen)" #: wt-status.c:129 msgid "bug" @@ -173,96 +171,96 @@ msgstr "Konflikt: %s" msgid "bug: unhandled diff status %c" msgstr "Bug: nicht behandelter Diff-Status %c" -#: wt-status.c:635 +#: wt-status.c:631 msgid "On branch " -msgstr "Aktueller Branch: " +msgstr "Auf Branch: " -#: wt-status.c:642 +#: wt-status.c:638 msgid "Not currently on any branch." -msgstr "Aktuell ist kein Branch aktiv." +msgstr "Gegenwärtig auf keiner Branch." -#: wt-status.c:652 +#: wt-status.c:648 msgid "# Initial commit" msgstr "# Erster Commit" -#: wt-status.c:666 +#: wt-status.c:662 msgid "Untracked" msgstr "Unberücksichtigte" -#: wt-status.c:668 +#: wt-status.c:664 msgid "Ignored" msgstr "Ignorierte" -#: wt-status.c:670 +#: wt-status.c:666 #, c-format msgid "# Untracked files not listed%s\n" msgstr "# Unberücksichtigte Dateien werden nicht aufgeführt%s\n" -#: wt-status.c:672 +#: wt-status.c:668 msgid " (use -u option to show untracked files)" -msgstr " (benutze die Option -u, um sie anzuzeigen)" +msgstr " (verwende die Option -u, um unberücksichtigte Dateien anzuzeigen)" -#: wt-status.c:678 +#: wt-status.c:674 #, c-format msgid "# No changes\n" msgstr "# Keine Änderungen\n" -#: wt-status.c:682 +#: wt-status.c:678 #, c-format msgid "no changes added to commit%s\n" msgstr "keine Änderungen für den Commit vorgemerkt%s\n" -#: wt-status.c:684 +#: wt-status.c:680 msgid " (use \"git add\" and/or \"git commit -a\")" -msgstr " (benutze \"git add\" und/oder \"git commit -a\")" +msgstr " (verwende `git add` und/oder `git commit -a`)" -#: wt-status.c:686 +#: wt-status.c:682 #, c-format msgid "nothing added to commit but untracked files present%s\n" msgstr "" "keine Änderungen für den Commit vorgemerkt, aber unberücksichtigte Dateien " "vorhanden%s\n" -#: wt-status.c:688 +#: wt-status.c:684 msgid " (use \"git add\" to track)" -msgstr " (benutze \"git add\", um sie zu berücksichtigen)" +msgstr " (verwende `git add`, um sie zu berücksichtigen)" -#: wt-status.c:690 wt-status.c:693 wt-status.c:696 +#: wt-status.c:686 wt-status.c:689 wt-status.c:692 #, c-format msgid "nothing to commit%s\n" msgstr "nichts zu committen%s\n" -#: wt-status.c:691 +#: wt-status.c:687 msgid " (create/copy files and use \"git add\" to track)" -msgstr " (erstelle Dateien und benutze \"git add\", um sie zu berücksichtigen)" +msgstr " (erstelle Dateien und verwende `git add`, um sie zu berücksichtigen)" -#: wt-status.c:694 +#: wt-status.c:690 msgid " (use -u to show untracked files)" -msgstr " (benutze -u, um unberücksichtigte Datei anzuzeigen)" +msgstr " (verwende -u, um unberücksichtigte Datei anzuzeigen)" -#: wt-status.c:697 +#: wt-status.c:693 msgid " (working directory clean)" msgstr " (Arbeitsverzeichnis sauber)" -#: wt-status.c:795 +#: wt-status.c:791 msgid "HEAD (no branch)" -msgstr "HEAD (kein Branch)" +msgstr "HEAD (keine Branch)" -#: wt-status.c:801 +#: wt-status.c:797 msgid "Initial commit on " -msgstr "Erster Commit in " +msgstr "Erster Commit auf " -#: wt-status.c:816 +#: wt-status.c:812 msgid "behind " -msgstr "nur dort " +msgstr "hinterher um " -#: wt-status.c:819 wt-status.c:822 +#: wt-status.c:815 wt-status.c:818 msgid "ahead " -msgstr "nur hier " +msgstr "voraus um " -#: wt-status.c:824 +#: wt-status.c:820 msgid ", behind " -msgstr "nur dort " +msgstr ", hinterher um" #: builtin/add.c:41 #, c-format @@ -276,26 +274,26 @@ msgstr "Aktualisieren der Dateien ist fehlgeschlagen" #: builtin/add.c:77 #, c-format msgid "remove '%s'\n" -msgstr "entferne '%s'\n" +msgstr "entferne \"%s\"\n" #: builtin/add.c:175 #, c-format msgid "Path '%s' is in submodule '%.*s'" -msgstr "Pfad '%s' ist im Submodule '%.*s'" +msgstr "Pfad \"%s\" ist im Submodul \"%.*s\"" #: builtin/add.c:191 msgid "Unstaged changes after refreshing the index:" -msgstr "Nicht vorgemerkte Änderungen nach Aktualisieren des Indexes:" +msgstr "Nicht vorgemerkte Änderungen nach Aktualisierung des Index:" #: builtin/add.c:194 builtin/add.c:452 builtin/rm.c:194 #, c-format msgid "pathspec '%s' did not match any files" -msgstr "Pfadangabe '%s' passt auf keine Dateien" +msgstr "Pfadangabe \"%s\" passt auf keine Dateien" #: builtin/add.c:208 #, c-format msgid "'%s' is beyond a symbolic link" -msgstr "'%s' befindet sich jenseits eines symbolischen Links" +msgstr "\"%s\" befindet sich jenseits eines symbolischen Links" #: builtin/add.c:275 msgid "Could not read the index" @@ -304,17 +302,16 @@ msgstr "Konnte den Index nicht auslesen" #: builtin/add.c:284 #, c-format msgid "Could not open '%s' for writing." -msgstr "Konnte '%s' nicht zum Schreiben öffnen." +msgstr "Konnte \"%s\" nicht zum Schreiben öffnen." #: builtin/add.c:288 msgid "Could not write patch" -msgstr "Konnte keinen Patch erstellen" +msgstr "Konnte Patch nicht erstellen" -# Keine genaue Übersetzung, aber IMO im Kontext passend --jk@jk.gs #: builtin/add.c:293 #, c-format msgid "Could not stat '%s'" -msgstr "Konnte '%s' nicht mehr finden" +msgstr "Konnte \"%s\" nicht finden/prüfen" #: builtin/add.c:295 msgid "Empty patch. Aborted." @@ -323,12 +320,12 @@ msgstr "Leerer Patch. Breche ab." #: builtin/add.c:301 #, c-format msgid "Could not apply '%s'" -msgstr "Konnte '%s' nicht anwenden" +msgstr "Konnte \"%s\" nicht anwenden" #: builtin/add.c:349 #, c-format msgid "Use -f if you really want to add them.\n" -msgstr "Benutze -f, wenn du sie wirklich hinzufügen willst.\n" +msgstr "Benutze -f, wenn sie wirklich hinzufügt werden sollen.\n" #: builtin/add.c:350 msgid "no files added" @@ -340,7 +337,7 @@ msgstr "Das Hinzufügen der Dateien ist fehlgeschlagen" #: builtin/add.c:388 msgid "-A and -u are mutually incompatible" -msgstr "-A und -u vertragen sich nicht" +msgstr "-A kann nicht mit -u kombiniert werden" #: builtin/add.c:390 msgid "Option --ignore-missing can only be used together with --dry-run" @@ -354,7 +351,7 @@ msgstr "Nichts angegeben, nichts hinzugefügt.\n" #: builtin/add.c:411 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" -msgstr "Vielleicht wolltest du 'git add .' benutzen?\n" +msgstr "Vielleicht war `git add .` gewollt?\n" #: builtin/add.c:417 builtin/clean.c:95 builtin/commit.c:301 #: builtin/commit.c:310 builtin/mv.c:77 builtin/rm.c:171 @@ -363,38 +360,37 @@ msgstr "Indexdatei beschädigt" #: builtin/add.c:468 builtin/mv.c:223 builtin/rm.c:268 msgid "Unable to write new index file" -msgstr "Konnte keine neue Indexdatei anlegen" +msgstr "Konnte neue Indexdatei nicht anlegen" #: builtin/archive.c:17 -#, fuzzy, c-format +#, c-format msgid "could not create archive file '%s'" -msgstr "konnte Datei '%s' nicht anlegen" +msgstr "konnte Archivdatei \"%s\" nicht anlegen" #: builtin/archive.c:20 -#, fuzzy msgid "could not redirect output" -msgstr "konnte Kommentarvorlage nicht anlegen" +msgstr "konnte Ausgabe nicht umleiten" #: builtin/archive.c:36 msgid "git archive: Remote with no URL" -msgstr "" +msgstr "git archive: Remote ohne URL" #: builtin/archive.c:46 msgid "git archive: expected ACK/NAK, got EOF" -msgstr "" +msgstr "git archive: ACK/NAK erwartet, bekam aber EOF" #: builtin/archive.c:51 #, c-format msgid "git archive: NACK %s" -msgstr "" +msgstr "get archive: NACK %s" #: builtin/archive.c:52 msgid "git archive: protocol error" -msgstr "" +msgstr "git archive: Protokollfehler" #: builtin/archive.c:57 msgid "git archive: expected a flush" -msgstr "" +msgstr "git archive: Flush erwartet" #: builtin/branch.c:136 #, c-format @@ -402,8 +398,8 @@ msgid "" "deleting branch '%s' that has been merged to\n" " '%s', but it is not yet merged to HEAD." msgstr "" -"lösche Branch '%s', der nach '%s' gemerged wurde,\n" -" aber er ist noch nicht nach HEAD gemerged." +"lösche Branch \"%s\", die zwar bereits in \"%s\" gemerged wurde, aber noch " +"nicht in HEAD ist." #: builtin/branch.c:140 #, c-format @@ -411,8 +407,8 @@ msgid "" "not deleting branch '%s' that is not yet merged to\n" " '%s', even though it is merged to HEAD." msgstr "" -"lösche Branch '%s' nicht, der noch nicht nach '%s' gemerged\n" -"wurde, auch wenn er schon nach HEAD gemerged wurde." +"Branch \"%s\" wird nicht gelöscht, da noch nicht in \"%s\" gemerged, obwohl " +"bereits in HEAD gemerged." #. TRANSLATORS: This is "remote " in "remote branch '%s' not found" #: builtin/branch.c:161 @@ -421,7 +417,7 @@ msgstr "Remote-" #: builtin/branch.c:169 msgid "cannot use -a with -d" -msgstr "du kannst -a und -d nicht zusammen benutzen" +msgstr "-a kann nicht mit -d kombiniert werden" #: builtin/branch.c:175 msgid "Couldn't look up commit object for HEAD" @@ -430,17 +426,17 @@ msgstr "Konnte Commit-Objekt für HEAD nicht finden" #: builtin/branch.c:180 #, c-format msgid "Cannot delete the branch '%s' which you are currently on." -msgstr "Du kannst den aktiven Branch '%s' nicht löschen." +msgstr "Aktive Branch \"%s\" nicht löschbar." #: builtin/branch.c:190 #, c-format msgid "%sbranch '%s' not found." -msgstr "%sBranch '%s' nicht gefunden." +msgstr "%sBranch \"%s\" nicht gefunden." #: builtin/branch.c:198 #, c-format msgid "Couldn't look up commit object for '%s'" -msgstr "Konnte Commit-Objekt für '%s' nicht finden" +msgstr "Konnte Commit-Objekt für \"%s\" nicht finden" #: builtin/branch.c:204 #, c-format @@ -448,18 +444,18 @@ msgid "" "The branch '%s' is not fully merged.\n" "If you are sure you want to delete it, run 'git branch -D %s'." msgstr "" -"Der Branch '%s' ist nicht komplett gemerged.\n" -"Wenn du ihn trotzdem löschen willst, benutze 'git branch -D %s'." +"Die Branch \"%s\" ist nicht komplett gemerged.\n" +"Löschung mittels `git branch -D %s` erzwingbar." #: builtin/branch.c:212 #, c-format msgid "Error deleting %sbranch '%s'" -msgstr "Fehler beim Löschen von %sBranch '%s'" +msgstr "Fehler beim Löschen von %sBranch \"%s\"" #: builtin/branch.c:217 #, c-format msgid "Deleted %sbranch %s (was %s).\n" -msgstr "%sBranch '%s' gelöscht (war %s).\n" +msgstr "%sBranch \"%s\" gelöscht (war %s).\n" #: builtin/branch.c:222 msgid "Update of config-file failed" @@ -468,26 +464,26 @@ msgstr "Konfigurationsdatei konnte nicht aktualisiert werden" #: builtin/branch.c:304 #, c-format msgid "branch '%s' does not point at a commit" -msgstr "Branch '%s' zeigt nicht auf einen Commit" +msgstr "Branch \"%s\" zeigt nicht auf einen Commit" #: builtin/branch.c:381 #, c-format msgid "behind %d] " -msgstr "nur dort %d] " +msgstr "um %d hinterher] " #: builtin/branch.c:383 #, c-format msgid "ahead %d] " -msgstr "nur hier %d] " +msgstr "um %d voraus] " #: builtin/branch.c:385 #, c-format msgid "ahead %d, behind %d] " -msgstr "nur hier %d, nur dort %d] " +msgstr "um %d voraus, um %d hinterher] " #: builtin/branch.c:484 msgid "(no branch)" -msgstr "(kein Branch)" +msgstr "(keine Branch)" #: builtin/branch.c:544 msgid "some refs could not be read" @@ -495,33 +491,31 @@ msgstr "einige Einträge konnten nicht gelesen werden" #: builtin/branch.c:557 msgid "cannot rename the current branch while not on any." -msgstr "" -"kann den aktuellen Branch nicht umbenennen, wenn es keinen aktuellen Branch " -"gibt." +msgstr "kann die aktuelle Branch nicht umbenennen, wenn man auf keiner ist" #: builtin/branch.c:567 builtin/branch.c:571 #, c-format msgid "Invalid branch name: '%s'" -msgstr "Ungültiger Name für Branch: '%s'" +msgstr "Ungültiger Name für Branch: \"%s\"" #: builtin/branch.c:574 #, c-format msgid "A branch named '%s' already exists." -msgstr "Einen Branch namens '%s' gibt es schon." +msgstr "Eine Branch namens \"%s\" gibt es bereits." #: builtin/branch.c:580 msgid "Branch rename failed" -msgstr "Umbenennung des Branches fehlgeschlagen" +msgstr "Umbenennung der Branch fehlgeschlagen" #: builtin/branch.c:584 #, c-format msgid "Renamed a misnamed branch '%s' away" -msgstr "Ungültigen Branchnamen '%s' durch Umbenennen in Ordnung gebracht" +msgstr "Ungültiger Branchname \"%s\" durch Umbenennen in Ordnung gebracht" #: builtin/branch.c:588 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" -msgstr "Branch umbenannt nach %s, aber HEAD nicht aktualisiert!" +msgstr "Branch in %s umbenannt, aber HEAD nicht aktualisiert!" #: builtin/branch.c:595 msgid "Branch is renamed, but update of config-file failed" @@ -545,57 +539,56 @@ msgstr "HEAD zeigt nicht auf eine Referenz unter refs/heads!" #: builtin/branch.c:706 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" -"Die Optionen -a und -r für 'git branch' ergeben keinen Sinn zusammen mit " -"einem Branchnamen" +"Die Optionen -a und -r für `git branch` ergeben zusammen mit einem " +"Branchnamen keinen Sinn" #: builtin/bundle.c:47 #, c-format msgid "%s is okay\n" -msgstr "" +msgstr "%s ist in Ordnung\n" #: builtin/bundle.c:56 msgid "Need a repository to create a bundle." -msgstr "" +msgstr "Benötige Repository, um Bundle zu erstellen" #: builtin/bundle.c:60 -#, fuzzy msgid "Need a repository to unbundle." -msgstr "Du musst ein Quell-Repository angeben." +msgstr "Benötige ein Repository zum Entpacken." #: builtin/checkout.c:107 builtin/checkout.c:135 #, c-format msgid "path '%s' does not have our version" -msgstr "Pfad '%s' hat keine Version 'von uns' im Index" +msgstr "Pfad \"%s\" hat keine Version \"von uns\" im Index" #: builtin/checkout.c:109 builtin/checkout.c:137 #, c-format msgid "path '%s' does not have their version" -msgstr "Pfad '%s' hat keine Version 'von denen' im Index" +msgstr "Pfad \"%s\" hat keine Version \"von denen\" im Index" #: builtin/checkout.c:120 #, c-format msgid "path '%s' does not have all three versions" -msgstr "Pfad '%s' hat keine drei verschiedenen Versionen im Index" +msgstr "Pfad \"%s\" hat keine drei verschiedenen Versionen im Index" #: builtin/checkout.c:155 #, c-format msgid "path '%s' does not have all 3 versions" -msgstr "Pfad '%s' hat keine drei verschiedenen Versionen im Index" +msgstr "Pfad \"%s\" hat keine drei verschiedenen Versionen im Index" #: builtin/checkout.c:172 #, c-format msgid "path '%s': cannot merge" -msgstr "Pfad '%s': kann nicht mergen" +msgstr "Pfad \"%s\": kann nicht mergen" #: builtin/checkout.c:189 #, c-format msgid "Unable to add merge result for '%s'" -msgstr "Kann Merge-Ergebnis für '%s' nicht hinzufügen" +msgstr "Kann Merge-Ergebnis für \"%s\" nicht hinzufügen" #: builtin/checkout.c:194 builtin/reset.c:170 #, c-format msgid "make_cache_entry failed for path '%s'" -msgstr "make_cache_entry fehlgeschlagen für Pfad '%s'" +msgstr "make_cache_entry für Pfad \"%s\" fehlgeschlagen" #: builtin/checkout.c:216 builtin/checkout.c:371 msgid "corrupt index file" @@ -604,45 +597,45 @@ msgstr "beschädigte Indexdatei" #: builtin/checkout.c:244 builtin/checkout.c:251 #, c-format msgid "path '%s' is unmerged" -msgstr "Pfad '%s' enthält Konflikte" +msgstr "Pfad \"%s\" enthält Konflikte" #: builtin/checkout.c:280 builtin/checkout.c:475 builtin/clone.c:658 -#: builtin/merge.c:737 +#: builtin/merge.c:729 msgid "unable to write new index file" msgstr "kann keine neue Indexdatei anlegen" -#: builtin/checkout.c:297 builtin/diff.c:307 builtin/merge.c:367 +#: builtin/checkout.c:297 builtin/diff.c:307 builtin/merge.c:368 msgid "diff_setup_done failed" msgstr "diff_setup_done fehlgeschlagen" #: builtin/checkout.c:393 msgid "you need to resolve your current index first" -msgstr "du musst zuerst Konflikte im aktuellen Index auflösen" +msgstr "Zuerst müssen Konflikte im aktuellen Index aufgelöst werden" #: builtin/checkout.c:524 #, c-format msgid "Can not do reflog for '%s'\n" -msgstr "Kann Reflog für '%s' nicht einrichten\n" +msgstr "Kann Reflog für \"%s\" nicht einrichten\n" #: builtin/checkout.c:550 #, c-format msgid "Already on '%s'\n" -msgstr "'%s' ist schon aktiv\n" +msgstr "Bereits auf Branch \"%s\"\n" #: builtin/checkout.c:554 #, c-format msgid "Switched to and reset branch '%s'\n" -msgstr "Zu Branch '%s' gewechselt und Inhalt überschrieben\n" +msgstr "Zu Branch \"%s\" gewechselt und Inhalt überschrieben\n" #: builtin/checkout.c:556 #, c-format msgid "Switched to a new branch '%s'\n" -msgstr "Zu neuem Branch '%s' gewechselt\n" +msgstr "Zu neuer Branch \"%s\" gewechselt\n" #: builtin/checkout.c:558 #, c-format msgid "Switched to branch '%s'\n" -msgstr "Zu Branch '%s' gewechselt\n" +msgstr "Zu Branch \"%s\" gewechselt\n" #: builtin/checkout.c:575 msgid "HEAD is now at" @@ -650,7 +643,7 @@ msgstr "HEAD zeigt jetzt auf" #: builtin/checkout.c:603 msgid "You are on a branch yet to be born" -msgstr "Der aktive Branch ist noch nicht angelegt" +msgstr "Die aktive Branch ist noch nicht angelegt" #: builtin/checkout.c:617 msgid "Previous HEAD position was" @@ -662,11 +655,11 @@ msgstr "-B kann nicht mit -b kombiniert werden" #: builtin/checkout.c:738 msgid "--patch is incompatible with all other options" -msgstr "--patch verträgt sich nicht mit allen anderen Optionen" +msgstr "--patch kann mit keinen weiteren Optionen kombiniert werden" #: builtin/checkout.c:744 msgid "--track needs a branch name" -msgstr "--track braucht einen Branchnamen" +msgstr "--track benötigt einen Branchnamen" #: builtin/checkout.c:751 msgid "Missing branch name; try -b" @@ -674,7 +667,7 @@ msgstr "Fehlender Branchname; versuch's mit -b" #: builtin/checkout.c:757 msgid "--orphan and -b|-B are mutually exclusive" -msgstr "--orphan und -b|-B vertragen sich nicht" +msgstr "--orphan kann nicht mit -b/-B kombiniert werden" #: builtin/checkout.c:759 msgid "--orphan cannot be used with -t" @@ -682,7 +675,7 @@ msgstr "--orphan kann nicht mit -t kombiniert werden" #: builtin/checkout.c:769 msgid "git checkout: -f and -m are incompatible" -msgstr "git checkout: -f und -m sind nicht kompatibel" +msgstr "git checkout: -f kann nicht mit -m kombiniert werden" #. case (1) #: builtin/checkout.c:815 @@ -694,7 +687,7 @@ msgstr "ungültige Referenz: %s" #: builtin/checkout.c:852 #, c-format msgid "reference is not a tree: %s" -msgstr "Referenz ist kein Tree: %s" +msgstr "Referenz ist kein Baum: %s" #: builtin/checkout.c:878 msgid "invalid path specification" @@ -706,15 +699,15 @@ 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: Pfade aktualisieren und den Branch wechseln kann nicht\n" -"kombiniert werden. Wolltest du '%s' (das wir nicht als Commit\n" -"finden können) auschecken?" +"git checkout: Pfade aktualisieren und Branchwechsel kann nicht\n" +"kombiniert werden. Sollte \"%s\" (das aber nicht als Commit\n" +"gefunden werden konnte) ausgecheckt werden?" #: builtin/checkout.c:888 msgid "git checkout: updating paths is incompatible with switching branches." msgstr "" -"git checkout: Pfade aktualisieren und den Branch wechseln kann nicht " -"kombiniert werden." +"git checkout: Pfade aktualisieren kann nicht mit Branchwechsel kombiniert " +"werden." #: builtin/checkout.c:893 msgid "" @@ -728,81 +721,84 @@ msgstr "" #: builtin/checkout.c:904 #, c-format msgid "git checkout: we do not like '%s' as a branch name." -msgstr "git checkout: '%s' ist kein gültiger Branchname." +msgstr "git checkout: \"%s\" ist kein gültiger Branchname." #: builtin/checkout.c:909 #, c-format msgid "git checkout: branch %s already exists" -msgstr "git checkout: den Branch '%s' gibt es schon" +msgstr "git checkout: Branch \"%s\" existiert bereits" #: builtin/checkout.c:916 msgid "Cannot switch branch to a non-commit." -msgstr "Kann einen Branch nicht auf etwas anderes als einen Commit umbiegen." +msgstr "Kann Branch nicht auf etwas anderes als einen Commit umsetzen." #: builtin/checkout.c:919 msgid "--ours/--theirs is incompatible with switching branches." -msgstr "--ours/--theirs können nicht beim Branch-wechseln benutzt werden." +msgstr "--ours/--theirs können nicht beim Branchwechsel benutzt werden." #: builtin/clean.c:78 -#, fuzzy msgid "-x and -X cannot be used together" -msgstr "--orphan kann nicht mit -t kombiniert werden" +msgstr "-x und -X können nicht zusammen verwendet werden" #: builtin/clean.c:82 msgid "" "clean.requireForce set to true and neither -n nor -f given; refusing to clean" msgstr "" +"clean.requireForce steht auf \"true\", aber weder Option -n noch -f " +"angegeben; Säuberung verweigert" #: builtin/clean.c:85 msgid "" "clean.requireForce defaults to true and neither -n nor -f given; refusing to " "clean" msgstr "" +"clean.requireForce steht per Default auf \"true\", aber weder die Option -n " +"noch -f wurden angegeben; verweigere Säuberung" #: builtin/clean.c:154 builtin/clean.c:175 -#, fuzzy, c-format +#, c-format msgid "Would remove %s\n" -msgstr "entferne '%s'\n" +msgstr "Würde \"%s\" entfernen\n" #: builtin/clean.c:158 builtin/clean.c:178 -#, fuzzy, c-format +#, c-format msgid "Removing %s\n" -msgstr "Hole %s\n" +msgstr "Entferne %s\n" #: builtin/clean.c:161 builtin/clean.c:181 -#, fuzzy, c-format +#, c-format msgid "failed to remove '%s'" -msgstr "konnte '%s' nicht öffnen" +msgstr "konnte \"%s\" nicht entfernen" #: builtin/clean.c:165 -#, fuzzy, c-format +#, c-format msgid "Would not remove %s\n" -msgstr "Konnte Objekt %s nicht lesen" +msgstr "Würde %s nicht entfernen\n" #: builtin/clean.c:167 -#, fuzzy, c-format +#, c-format msgid "Not removing %s\n" -msgstr "entferne '%s'\n" +msgstr "Lasse %s bestehen\n" #: builtin/clone.c:208 #, c-format msgid "reference repository '%s' is not a local directory." -msgstr "Referenz-Repository '%s' ist kein lokales Verzeichnis." +msgstr "Referenz-Repository \"%s\" ist kein lokales Verzeichnis." #: builtin/clone.c:235 #, c-format msgid "failed to open '%s'" -msgstr "konnte '%s' nicht öffnen" +msgstr "konnte \"%s\" nicht öffnen" #: builtin/clone.c:239 #, c-format msgid "failed to create directory '%s'" -msgstr "konnte Verzeichnis '%s' nicht anlegen" +msgstr "konnte Verzeichnis '\"%s\" nicht anlegen" #: builtin/clone.c:241 builtin/diff.c:74 #, c-format msgid "failed to stat '%s'" -msgstr "konnte '%s' nicht finden/prüfen" +msgstr "konnte \"%s\" nicht finden/prüfen" #: builtin/clone.c:243 #, c-format @@ -812,22 +808,22 @@ msgstr "%s existiert und ist kein Verzeichnis" #: builtin/clone.c:257 #, c-format msgid "failed to stat %s\n" -msgstr "konnte '%s' nicht finden/prüfen\n" +msgstr "konnte \"%s\" nicht finden/prüfen\n" #: builtin/clone.c:267 #, c-format msgid "failed to unlink '%s'" -msgstr "konnte '%s' nicht entfernen" +msgstr "konnte \"%s\" nicht entfernen" #: builtin/clone.c:272 #, c-format msgid "failed to create link '%s'" -msgstr "konnte Link '%s' nicht anlegen" +msgstr "konnte Link \"%s\" nicht anlegen" #: builtin/clone.c:276 #, c-format msgid "failed to copy file to '%s'" -msgstr "konnte Datei nicht nach '%s' kopieren" +msgstr "konnte Datei nicht nach \"%s\" kopieren" #: builtin/clone.c:305 #, c-format @@ -840,37 +836,37 @@ msgstr "Zu viele Parameter." #: builtin/clone.c:391 msgid "You must specify a repository to clone." -msgstr "Du musst ein Quell-Repository angeben." +msgstr "Ein Quell-Repository zum Klonen muss angegeben werden." #: builtin/clone.c:399 #, c-format msgid "--bare and --origin %s options are incompatible." -msgstr "--bare und --origin %s sind nicht kombinierbar." +msgstr "--bare kann nicht mit --origin %s kombiniert werden." #: builtin/clone.c:428 #, c-format msgid "destination path '%s' already exists and is not an empty directory." -msgstr "Zielfpad '%s' existiert schon und ist kein leeres Verzeichnis." +msgstr "Zielpfad \"%s\" existiert bereits und ist kein leeres Verzeichnis." #: builtin/clone.c:438 #, c-format msgid "working tree '%s' already exists." -msgstr "Arbeitsverzeichnis '%s' existiert schon." +msgstr "Arbeitsverzeichnis \"%s\" existiert bereits." #: builtin/clone.c:451 builtin/clone.c:465 #, c-format msgid "could not create leading directories of '%s'" -msgstr "konnte übergeordnete Verzeichnisse für '%s' nicht anlegen" +msgstr "konnte übergeordnete Verzeichnisse für \"%s\" nicht anlegen" #: builtin/clone.c:454 #, c-format msgid "could not create work tree dir '%s'." -msgstr "konnte Verzeichnis '%s' im Arbeitsverzeichnis nicht anlegen." +msgstr "konnte Verzeichnis \"%s\" im Arbeitsverzeichnis nicht anlegen." #: builtin/clone.c:470 #, c-format msgid "Cloning into bare repository %s\n" -msgstr "Klone in Lager-Repository %s\n" +msgstr "Klone nach Lager-Repository %s\n" #: builtin/clone.c:472 #, c-format @@ -880,22 +876,23 @@ msgstr "Klone nach %s\n" #: builtin/clone.c:530 #, c-format msgid "Don't know how to clone %s" -msgstr "Ich weiß nicht, wie man %s klonen kann" +msgstr "Keine Ahnung, wie man %s klont" #: builtin/clone.c:569 #, c-format msgid "Remote branch %s not found in upstream %s, using HEAD instead" msgstr "" -"Remote-branch %s nicht in Ursprung %s gefunden, benutze stattdessen HEAD" +"Remote-Branch %s nicht in Ursprung %s gefunden, verwende stattdessen HEAD" #: builtin/clone.c:579 msgid "You appear to have cloned an empty repository." -msgstr "Du hast anscheinend ein leeres Repository geklont." +msgstr "Anscheinend wurde ein leeres Repository geklont." #: builtin/clone.c:621 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" -"Ursprungs-HEAD verweist auf fehlende Referenz, kann keinen Checkout machen.\n" +"Ursprungs-HEAD verweist auf fehlende Referenz, kann keinen Checkout " +"vornehmen.\n" #: builtin/commit.c:41 msgid "" @@ -910,17 +907,18 @@ msgid "" "\n" " git commit --amend --author='Your Name '\n" msgstr "" -"Dein Name und deine E-Mail-Adresse wurden automatisch übernommen aus\n" -"deinem Benutzernamen und Hostnamen. Bitte prüfe, ob sie korrekt sind.\n" -"Du kannst diese Nachricht loswerden, indem du sie ausdrücklich einstellst:\n" +"Name und E-Mail-Adresse wurden automatisch aus deinem Benutzernamen und " +"Hostnamen übernommen. Prüfe, ob diese korrekt sind.\n" +"Diese Nachricht kann mittels expliziter Konfiguration unterdrückt werden:\n" +"\n" +" git config --global user.name \"Vorname Nachname\"\n" +" git config --global user.email ich@example.de\n" "\n" -" git config --global user.name \"Dein Name\"\n" -" git config --global user.email du@example.com\n" +"Falls die Angaben für diesen Commit falsch sind, können sie mittels\n" "\n" -"Falls die Angaben nicht stimmten, kannst du sie im angelegten Commit\n" -"nachträglich korrigieren mit:\n" +" git commit --amend --author=\"Vorname Nachname \"\n" "\n" -" git commit --amend --author='Dein Name '\n" +"nachträglich korrigiert werden.\n" #: builtin/commit.c:53 msgid "" @@ -930,15 +928,15 @@ msgid "" msgstr "" "Du willst den neuesten Commit nachbearbeiten, aber dadurch würde er leer\n" "werden. Du kannst deinen Befehl mit --allow-empty wiederholen oder den\n" -"Commit mit \"git reset HEAD^\" komplett entfernen.\n" +"Commit mit `git reset HEAD^` komplett entfernen.\n" #: builtin/commit.c:271 msgid "failed to unpack HEAD tree object" -msgstr "konnte das HEAD-Tree-Objekt nicht entpacken" +msgstr "konnte das HEAD-Baum-Objekt nicht entpacken" #: builtin/commit.c:299 msgid "interactive add failed" -msgstr "Interaktives 'add' fehlgeschlagen" +msgstr "Interaktives Hinzufügen fehlgeschlagen" #: builtin/commit.c:330 builtin/commit.c:350 builtin/commit.c:396 msgid "unable to write new_index file" @@ -946,9 +944,7 @@ msgstr "konnte new_index-Datei nicht anlegen" #: builtin/commit.c:380 msgid "cannot do a partial commit during a merge." -msgstr "" -"während eines Merges kannst du keinen Commit anlegen, der\n" -"vorgemerkte Änderungen ignoriert." +msgstr "kann keinen partiellen Commit während eines Merges durchführen." #: builtin/commit.c:389 msgid "cannot read the index" @@ -969,7 +965,7 @@ msgstr "ungültiger Commit: %s" #: builtin/commit.c:499 msgid "malformed --author parameter" -msgstr "ungültiger '--author'-Parameter" +msgstr "ungültiger --author-Parameter" #: builtin/commit.c:573 builtin/shortlog.c:299 #, c-format @@ -983,7 +979,7 @@ msgstr "konnte Kommentar nicht von der Standardeingabe lesen" #: builtin/commit.c:579 #, c-format msgid "could not read log file '%s'" -msgstr "konnte Kommentardatei '%s' nicht lesen" +msgstr "konnte Kommentardatei \"%s\" nicht lesen" #: builtin/commit.c:585 msgid "commit has empty message" @@ -1000,12 +996,12 @@ msgstr "konnte SQUASH_MSG nicht lesen" #: builtin/commit.c:599 #, c-format msgid "could not read '%s'" -msgstr "konnte '%s' nicht lesen" +msgstr "konnte \"%s\" nicht lesen" #: builtin/commit.c:612 #, c-format msgid "could not open '%s'" -msgstr "konnte '%s' nicht öffnen" +msgstr "konnte \"%s\" nicht öffnen" #: builtin/commit.c:636 msgid "could not write commit template" @@ -1022,10 +1018,10 @@ msgid "" "#\n" msgstr "" "#\n" -"# Es sieht so aus, als ob du einen MERGE committen willst.\n" -"# Falls das nicht stimmt, entferne bitte die Datei\n" +"# Es scheint, als ob ein MERGE committet wird.\n" +"# Falls das nicht stimmt, entferne die Datei\n" "#\t%s\n" -"# und versuch's noch einmal.\n" +"# und versuche es nochmal.\n" "#\n" #: builtin/commit.c:659 @@ -1035,7 +1031,7 @@ msgid "" "# Please enter the commit message for your changes." msgstr "" "\n" -"# Bitte gib einen Commit-Kommentar für deine Änderungen an." +"# Gib einen Commit-Kommentar für die Änderungen an." #: builtin/commit.c:663 #, c-format @@ -1055,8 +1051,9 @@ msgid "" "# An empty message aborts the commit.\n" msgstr "" " Zeilen, die mit '#'\n" -"# anfangen, werden beibehalten; du kannst sie selbst entfernen, wenn du\n" -"willst. Ein leerer Kommentar bricht den Commit ab.\n" +"# anfangen, werden beibehalten; sie können entfernen werden, wenn " +"gewünscht.\n" +"# Ein leerer Kommentar bricht den Commit ab.\n" #: builtin/commit.c:680 #, c-format @@ -1074,7 +1071,7 @@ msgstr "Kann Index nicht auslesen" #: builtin/commit.c:737 msgid "Error building trees" -msgstr "Fehler beim Anlegen der Trees" +msgstr "Fehler beim Anlegen der Bäume" #: builtin/commit.c:752 builtin/tag.c:321 #, c-format @@ -1084,32 +1081,32 @@ msgstr "Bitte gib den Kommentar mit der Option -m oder -F an.\n" #: builtin/commit.c:832 #, c-format msgid "No existing author found with '%s'" -msgstr "Kein bekannter Autor gefunden mit '%s'" +msgstr "Kein bekannter Autor gefunden mit \"%s\"" #: builtin/commit.c:847 builtin/commit.c:1039 #, c-format msgid "Invalid untracked files mode '%s'" -msgstr "Ungültiger Modus für unberücksichtigte Dateien: '%s'" +msgstr "Ungültiger Modus für unberücksichtigte Dateien: \"%s\"" #: builtin/commit.c:864 msgid "Using both --reset-author and --author does not make sense" -msgstr "Es ist unsinnig, --reset-author und --author zusammen zu benutzen" +msgstr "Es ist unsinnig, --reset-author und --author zusammen zu verwenden" #: builtin/commit.c:878 msgid "You have nothing to amend." -msgstr "Da ist nichts, was du nachbearbeiten könntest." +msgstr "Es gibt nichts zum Nachbearbeiten." #: builtin/commit.c:880 msgid "You are in the middle of a merge -- cannot amend." -msgstr "Du bist mitten in einem Merge; da kannst du nichts nachbearbeiten." +msgstr "Du bist mitten in einem Merge; Nachbearbeitung nicht möglich." #: builtin/commit.c:889 msgid "Only one of -c/-C/-F can be used." -msgstr "Nur eine der Optionen -c/-C/-F kann auf einmal benutzt werden." +msgstr "Nur eine der Optionen -c, -C und -F kann auf einmal benutzt werden." #: builtin/commit.c:891 msgid "Option -m cannot be combined with -c/-C/-F." -msgstr "Option -m kann nicht kombiniert werden mit -c/-C/-F." +msgstr "Option -m kann nicht mit -c, -C oder -F kombiniert werden." #: builtin/commit.c:897 msgid "--reset-author can be used only with -C, -c or --amend." @@ -1128,12 +1125,12 @@ msgstr "konnte Commit %s nicht analysieren" #: builtin/commit.c:937 msgid "Only one of --include/--only/--all/--interactive can be used." msgstr "" -"Nur eins von --include/--only/--all/--interactive kann auf einmal benutzt " -"werden." +"Nur eine der Optionen --include, --only, --all und --interactive kann auf " +"einmal benutzt werden." #: builtin/commit.c:939 msgid "No paths with --include/--only does not make sense." -msgstr "Für --include/--only musst du Pfade angeben." +msgstr "Für --include/--only müssen Pfade angeben werden." #: builtin/commit.c:941 msgid "Clever... amending the last one with dirty index." @@ -1143,7 +1140,8 @@ msgstr "" #: builtin/commit.c:943 msgid "Explicit paths specified without -i nor -o; assuming --only paths..." msgstr "" -"Pfade angegeben ohne ausdrückliches -i oder -o angegeben, ich nehme -o an..." +"Explizite Pfade ohne -i noch -o angegeben; Annahme, dass --only gemeint " +"ist..." #: builtin/commit.c:953 #, c-format @@ -1152,11 +1150,11 @@ msgstr "Ungültiger Aufräummodus (--cleanup=%s) für den Commit-Kommentar" #: builtin/commit.c:958 msgid "Paths with -a does not make sense." -msgstr "Es ist unsinnig, mit -a Pfade anzugeben." +msgstr "Es ist unsinnig, Pfade zusammen mit -a anzugeben." #: builtin/commit.c:960 msgid "Paths with --interactive does not make sense." -msgstr "Es ist unsinnig, Pfade mit --interactive anzugeben." +msgstr "Es ist unsinnig, Pfade zusammen mit --interactive anzugeben." #: builtin/commit.c:1142 msgid "couldn't look up newly created commit" @@ -1168,16 +1166,16 @@ msgstr "konnte neu angelegten Commit nicht analysieren" #: builtin/commit.c:1185 msgid "detached HEAD" -msgstr "von HEAD abgetrennt" +msgstr "freistehender HEAD" #: builtin/commit.c:1187 msgid " (root-commit)" -msgstr " (erster Commit)" +msgstr " (Wurzel-Commit)" -#: builtin/commit.c:1307 builtin/merge.c:461 +#: builtin/commit.c:1307 builtin/merge.c:462 #, c-format msgid "could not open '%s' for reading" -msgstr "konnte '%s' nicht zum Lesen öffnen" +msgstr "konnte \"%s\" nicht zum Lesen öffnen" #: builtin/commit.c:1312 #, c-format @@ -1196,15 +1194,15 @@ msgstr "konnte Commit-Kommentar nicht lesen: %s" #: builtin/commit.c:1350 #, c-format msgid "Aborting commit due to empty commit message.\n" -msgstr "Commit abgebrochen wegen leerem Kommentar.\n" +msgstr "Commit wegen leerem Kommentar abgebrochen.\n" #: builtin/commit.c:1358 msgid "failed to write commit object" -msgstr "konnte Commit-Objekt nicht anlegen" +msgstr "konnte Commit-Objekt nicht schreiben" #: builtin/commit.c:1375 msgid "cannot lock HEAD ref" -msgstr "kann kein Lock für HEAD-Referenz anfordern" +msgstr "kann HEAD-Referenz nicht sperren" #: builtin/commit.c:1379 msgid "cannot update HEAD ref" @@ -1216,49 +1214,50 @@ msgid "" "new_index file. Check that disk is not full or quota is\n" "not exceeded, and then \"git reset HEAD\" to recover." msgstr "" -"Repository wurde aktualisiert, aber ich kann die new_index-Datei nicht\n" -"anlegen. Stelle sicher, dass der Datenträger nicht voll ist und du deine\n" -"Limits nicht überschreitest, und benutze \"git reset HEAD\" zum Reparieren." +"Repository wurde aktualisiert, aber die new_index-Datei kann nicht\n" +"anlegt werden. Stelle sicher, dass der Datenträger nicht voll ist und\n" +"Limits nicht überschritten werden, und verwende dann `git reset HEAD` zum " +"Reparieren." #: builtin/describe.c:205 #, c-format msgid "annotated tag %s not available" -msgstr "" +msgstr "Kommentierter Tag %s nicht verfügbar" #: builtin/describe.c:209 -#, fuzzy, c-format +#, c-format msgid "annotated tag %s has no embedded name" -msgstr "Kann keinen '%s'-Reset mitten in einem Merge machen." +msgstr "Kommentierter Tag %s hat keinen eingebetteten Namen" #: builtin/describe.c:211 #, c-format msgid "tag '%s' is really '%s' here" -msgstr "" +msgstr "Tag '%s' ist hier eher '%s'" #: builtin/describe.c:238 -#, fuzzy, c-format +#, c-format msgid "Not a valid object name %s" -msgstr "kein gültiges Object: %s" +msgstr "Kein gültiger Objektname %s" #: builtin/describe.c:241 -#, fuzzy, c-format +#, c-format msgid "%s is not a valid '%s' object" -msgstr "kein gültiges Object: %s" +msgstr "%s ist kein gültiges \"%s\"-Objekt" #: builtin/describe.c:258 -#, fuzzy, c-format +#, c-format msgid "no tag exactly matches '%s'" -msgstr "kann Vorlage '%s' nicht anlegen/prüfen" +msgstr "Kein Tag passt genau auf \"%s\"" #: builtin/describe.c:260 -#, fuzzy, c-format +#, c-format msgid "searching to describe %s\n" -msgstr "Übertrag zu %s\n" +msgstr "Suche, was %s beschreibt\n" #: builtin/describe.c:295 -#, fuzzy, c-format +#, c-format msgid "finished search at %s\n" -msgstr "konnte '%s' nicht finden/prüfen\n" +msgstr "Suche bei %s beendet\n" #: builtin/describe.c:319 #, c-format @@ -1266,6 +1265,8 @@ msgid "" "No annotated tags can describe '%s'.\n" "However, there were unannotated tags: try --tags." msgstr "" +"Keine kommentierten Tags können '%s' beschreiben.\n" +"Es gab aber kommentarlose Tags: probiere --tags." #: builtin/describe.c:323 #, c-format @@ -1273,11 +1274,13 @@ msgid "" "No tags can describe '%s'.\n" "Try --always, or create some tags." msgstr "" +"Keine Tags können '%s' beschreiben.\n" +"Versuche --always, oder erstelle Tags." #: builtin/describe.c:344 #, c-format msgid "traversed %lu commits\n" -msgstr "" +msgstr "%lu Commits durchlaufen\n" #: builtin/describe.c:347 #, c-format @@ -1285,25 +1288,25 @@ msgid "" "more than %i tags found; listed %i most recent\n" "gave up search at %s\n" msgstr "" +"Mehr als %d Tags gefunden; die %d aktuellsten wurden angezeigt\n" +"Suche aufgegeben ab %s\n" #: builtin/describe.c:398 -#, fuzzy msgid "--long is incompatible with --abbrev=0" -msgstr "--patch verträgt sich nicht mit --{hard,mixed,soft}" +msgstr "--long kann nicht mit --abrev=0 kombiniert werden" #: builtin/describe.c:423 msgid "No names found, cannot describe anything." -msgstr "" +msgstr "Keine Namen gefunden, kann nichts beschreiben." #: builtin/describe.c:430 -#, fuzzy msgid "--dirty is incompatible with committishes" -msgstr "--patch verträgt sich nicht mit allen anderen Optionen" +msgstr "--dirty kann nicht mit Commitishes kombiniert werden" #: builtin/diff.c:76 #, c-format msgid "'%s': not a regular file or symlink" -msgstr "'%s': weder normale Datei noch Symlink" +msgstr "\"%s\": weder normale Datei noch Symlink" #: builtin/diff.c:225 #, c-format @@ -1316,27 +1319,27 @@ msgstr "Kein git-Repository" #: builtin/diff.c:334 msgid "No HEAD commit to compare with (yet)" -msgstr "Es gibt (noch) keinen HEAD-Commit als Vergleich" +msgstr "Es gibt (noch) keinen HEAD-Commit zum Vergleich" #: builtin/diff.c:349 #, c-format msgid "invalid object '%s' given." -msgstr "ungültiges Objekt '%s' angegeben." +msgstr "ungültiges Objekt \"%s\" angegeben." #: builtin/diff.c:354 #, c-format msgid "more than %d trees given: '%s'" -msgstr "mehr als %d Trees angegeben: '%s'" +msgstr "mehr als %d Bäume angegeben: \"%s\"" #: builtin/diff.c:364 #, c-format msgid "more than two blobs given: '%s'" -msgstr "mehr als zwei Blobs angegeben: '%s'" +msgstr "mehr als zwei Blobs angegeben: \"%s\"" #: builtin/diff.c:372 #, c-format msgid "unhandled object '%s' given." -msgstr "nicht unterstütztes Objekt '%s' angegeben." +msgstr "nicht unterstütztes Objekt \"%s\" angegeben." #: builtin/fetch.c:175 msgid "Couldn't find remote ref HEAD" @@ -1358,7 +1361,7 @@ msgstr "[aktuell]" #: builtin/fetch.c:246 #, c-format msgid "! %-*s %-*s -> %s (can't fetch in current branch)" -msgstr "! %-*s %-*s -> %s (kann nicht den aktuellen Branch überschreiben)" +msgstr "! %-*s %-*s -> %s (kann aktuelle Branch nicht überschreiben)" #: builtin/fetch.c:247 builtin/fetch.c:309 msgid "[rejected]" @@ -1374,27 +1377,23 @@ msgstr " (kann lokale Referenz nicht aktualisieren)" #: builtin/fetch.c:270 msgid "[new tag]" -msgstr "" +msgstr "[neuer Tag]" #: builtin/fetch.c:274 -#, fuzzy msgid "[new branch]" -msgstr "Aktueller Branch: " +msgstr "[neue Branch]" #: builtin/fetch.c:305 -#, fuzzy msgid "unable to update local ref" -msgstr " (kann lokale Referenz nicht aktualisieren)" +msgstr "kann lokale Referenz nicht aktualisieren" #: builtin/fetch.c:305 -#, fuzzy msgid "forced update" -msgstr "Bereits aktuell." +msgstr "Update erzwungen" #: builtin/fetch.c:310 -#, fuzzy msgid "(non-fast-forward)" -msgstr "Update ohne Merge" +msgstr "(Update ohne Merge)" #: builtin/fetch.c:328 builtin/fetch.c:651 #, c-format @@ -1412,8 +1411,8 @@ msgid "" "some local refs could not be updated; try running\n" " 'git remote prune %s' to remove any old, conflicting branches" msgstr "" -"ein paar lokale Referenzen konnten nicht aktualisiert werden; versuche,\n" -"alte Branches, die evtl. im Weg sind, mit 'git remote prune %s' zu entfernen" +"einige lokale Referenzen konnten nicht aktualisiert werden; versuche,\n" +"alte kollidierende Branches mit `git remote prune %s` zu entfernen" #: builtin/fetch.c:467 msgid "could not run rev-list" @@ -1429,19 +1428,23 @@ msgstr "konnte Daten nicht an rev-list übergeben: %s" msgid "failed to close rev-list's stdin: %s" msgstr "konnte Standardeingabe von rev-list nicht schließen: %s" +# dangling ist nicht gerade "nichts". +# Ein dangling Symlink zeigt immer noch auf etwas, aber auf etwas das nicht mehr existiert. #: builtin/fetch.c:515 #, c-format msgid " (%s will become dangling)\n" -msgstr " (%s wird auf nichts mehr zeigen)\n" +msgstr " (%s wird auf nichts existentes mehr zeigen)\n" +# dangling ist nicht gerade "nichts". +# Ein dangling Symlink zeigt immer noch auf etwas, aber auf etwas das nicht mehr existiert. #: builtin/fetch.c:516 #, c-format msgid " (%s has become dangling)\n" -msgstr " (%s zeigt auf nichts mehr)\n" +msgstr " (%s zeigt auf nichts existentes mehr)\n" #: builtin/fetch.c:523 msgid "[deleted]" -msgstr "[entfernt]" +msgstr "[gelöscht]" #: builtin/fetch.c:524 msgid "(none)" @@ -1450,13 +1453,12 @@ msgstr "(nichts)" #: builtin/fetch.c:641 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" -msgstr "" -"Überschreiben des aktuellen Branches %s in Arbeits-Repository verweigert" +msgstr "Überschreiben der aktuellen Branch %s im Lager-Repository verweigert" #: builtin/fetch.c:675 #, c-format msgid "Don't know how to fetch from %s" -msgstr "Ich weiß nicht, wie man von %s fetchen kann" +msgstr "Keine Ahnung, wie man von %s runterlädt" #: builtin/fetch.c:729 #, c-format @@ -1483,17 +1485,17 @@ msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." msgstr "" -"Kein Ursprungs-Repository angebene. Bitte gib entweder eine URL oder einen\n" -"Remote-Namen an, um die Quelle für neu geholte Revisionen festzulegen." +"Kein Ursprungs-Repository angegeben. Gib entweder eine URL oder einen\n" +"Remote-Namen an, um die Quelle für neu zu holende Revisionen festzulegen." #: builtin/fetch.c:859 msgid "You need to specify a tag name." -msgstr "Du musst einen Tagnamen angeben." +msgstr "Ein Tagname muss angegeben werden." #: builtin/fetch.c:899 msgid "fetch --all does not take a repository argument" msgstr "" -"fetch --all akzeptiert keine ausdrückliche Angabe eines Ursprungs-Repositorys" +"fetch --all akzeptiert keine explizite Angabe eines Ursprungs-Repositorys" #: builtin/fetch.c:901 msgid "fetch --all does not make sense with refspecs" @@ -1502,30 +1504,31 @@ msgstr "fetch --all ergibt keinen Sinn mit Refspecs" #: builtin/fetch.c:912 #, c-format msgid "No such remote or remote group: %s" -msgstr "Es gibt keinen Remote %s und auch keine entsprechende Remote-Grouppe" +msgstr "Es gibt kein Remote und auch keine Remote-Gruppe \"%s\"" #: builtin/fetch.c:920 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Das Holen einer Gruppe unter Angabe von Refspecs ergibt keinen Sinn" #: builtin/gc.c:63 -#, fuzzy, c-format +#, c-format msgid "Invalid %s: '%s'" -msgstr "Ungültiger Name für Branch: '%s'" +msgstr "Ungültiger Wert für %s: \"%s\"" #: builtin/gc.c:78 msgid "Too many options specified" -msgstr "" +msgstr "Zuviele Optionen angegeben" #: builtin/gc.c:103 -#, fuzzy, c-format +#, c-format msgid "insanely long object directory %.*s" -msgstr "irrsinniges git-Verzeichnis %s" +msgstr "irrsinniges langes Objektverzeichnis %.*s" #: builtin/gc.c:220 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "" +"Automatische Komprimierung des Repositories für optimale Performance.\n" #: builtin/gc.c:223 #, c-format @@ -1533,32 +1536,36 @@ msgid "" "Auto packing the repository for optimum performance. You may also\n" "run \"git gc\" manually. See \"git help gc\" for more information." msgstr "" +"Automatische Komprimierung des Repositories für optimale Performance. `git " +"gc` kann auch manuell ausgeführt werden. Siehe `git help gc` für weitere " +"Informationen." #: builtin/gc.c:251 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" +"Es gibt zu viele unerreichbare lose Objekte; führe `git prune` aus, um sie " +"zu entfernen." #: builtin/grep.c:252 #, c-format msgid "grep: failed to create thread: %s" -msgstr "grep: konnte Thread nicht anlegen: %s" +msgstr "grep: konnte Thread nicht erstellen: %s" #: builtin/grep.c:457 #, c-format msgid "'%s': unable to read %s" -msgstr "'%s': kann %s nicht lesen" +msgstr "\"%s\": kann %s nicht lesen" #: builtin/grep.c:508 #, c-format msgid "'%s': %s" -msgstr "'%s': %s" +msgstr "\"%s\": %s" -# FIXME: ich hab keine Ahnung, worum es hier geht #: builtin/grep.c:519 #, c-format msgid "'%s': short read %s" -msgstr "'%s': short read %s" +msgstr "\"%s\": zu wenig gelesen: %s" #: builtin/grep.c:581 #, c-format @@ -1568,7 +1575,7 @@ msgstr "Konnte Verzeichnis nicht wechseln: %s" #: builtin/grep.c:671 builtin/grep.c:697 #, c-format msgid "unable to read tree (%s)" -msgstr "kann Tree nicht lesen (%s)" +msgstr "kann Baum nicht lesen (%s)" #: builtin/grep.c:703 #, c-format @@ -1578,12 +1585,12 @@ msgstr "kann Objekte des Typs %s nicht greppen" #: builtin/grep.c:755 #, c-format msgid "switch `%c' expects a numerical value" -msgstr "Option `%c' benötigt einen numerischen Wert" +msgstr "Option '%c' benötigt einen numerischen Wert" #: builtin/grep.c:771 #, c-format msgid "cannot open '%s'" -msgstr "kann '%s' nicht öffnen" +msgstr "kann \"%s\" nicht öffnen" #: builtin/grep.c:1012 msgid "no pattern given." @@ -1591,7 +1598,7 @@ msgstr "kein Suchmuster angegeben." #: builtin/grep.c:1016 msgid "cannot mix --fixed-strings and regexp" -msgstr "kann --fixed-strings nicht mit regulärem Ausdruck kombinieren" +msgstr "--fixed-strings kann nicht mit regulärem Ausdruck kombiniert werden" #: builtin/grep.c:1041 #, c-format @@ -1608,16 +1615,16 @@ msgstr "--cached kann nicht mit --no-index kombiniert werden." #: builtin/grep.c:1095 msgid "--no-index cannot be used with revs." -msgstr "--no-index kann nicht mit der Angabe von Revisionen kombiniert werden." +msgstr "--no-index kann nicht mit Revisionen kombiniert werden." #: builtin/grep.c:1104 msgid "both --cached and trees are given." -msgstr "Du hast sowohl --cached als auch Trees angegeben." +msgstr "Sowohl --cached als auch Baum wurden angegeben." #: builtin/init-db.c:34 #, c-format msgid "Could not make %s writable by group" -msgstr "Konnte %s nicht für die Gruppe beschreibbar machen" +msgstr "Konnte %s nicht für die Gruppe schreibbar machen" #: builtin/init-db.c:61 #, c-format @@ -1627,37 +1634,37 @@ msgstr "irrsinnig langer Vorlagen-Name %s" #: builtin/init-db.c:66 #, c-format msgid "cannot stat '%s'" -msgstr "kann '%s' nicht finden/prüfen" +msgstr "kann \"%s\" nicht finden/prüfen" #: builtin/init-db.c:72 #, c-format msgid "cannot stat template '%s'" -msgstr "kann Vorlage '%s' nicht anlegen/prüfen" +msgstr "kann Vorlage \"%s\" nicht finden/prüfen" #: builtin/init-db.c:79 #, c-format msgid "cannot opendir '%s'" -msgstr "kann Verzeichnis '%s' nicht auslesen" +msgstr "kann Verzeichnis \"%s\" nicht öffnen" #: builtin/init-db.c:96 #, c-format msgid "cannot readlink '%s'" -msgstr "kann Linkziel für '%s' nicht ermitteln" +msgstr "kann Linkziel für \"%s\" nicht ermitteln" #: builtin/init-db.c:98 #, c-format msgid "insanely long symlink %s" -msgstr "irrsinnig langer Symlink '%s'" +msgstr "irrsinnig langer Symlink \"%s\"" #: builtin/init-db.c:101 #, c-format msgid "cannot symlink '%s' '%s'" -msgstr "kann '%s' nicht von '%s' aus symlinken" +msgstr "kann \"%s\" nicht nach \"%s\" symbolisch verlinken" #: builtin/init-db.c:105 #, c-format msgid "cannot copy '%s' to '%s'" -msgstr "kann '%s' nicht nach '%s' kopieren" +msgstr "kann \"%s\" nicht nach \"%s\" kopieren" #: builtin/init-db.c:109 #, c-format @@ -1677,7 +1684,7 @@ msgstr "Vorlagen nicht gefunden: %s" #: builtin/init-db.c:153 #, c-format msgid "not copying templates of a wrong format version %d from '%s'" -msgstr "kopiere keine Vorlage in einer falschen Formatversion %d von '%s'" +msgstr "kopiere keine Vorlagen einer falschen Formatversion %d aus \"%s\"" #: builtin/init-db.c:191 #, c-format @@ -1687,72 +1694,72 @@ msgstr "irrsinniges git-Verzeichnis %s" #. 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:355 +#: builtin/init-db.c:361 #, c-format msgid "%s%s Git repository in %s%s\n" -msgstr "%s%s git-Repository in %s%s\n" +msgstr "%s%s Git-Repository in %s%s\n" -#: builtin/init-db.c:356 +#: builtin/init-db.c:362 msgid "Reinitialized existing" -msgstr "Noch einmal neu initialisiert:" +msgstr "Bereits bestehend und neuinitialisierte" -#: builtin/init-db.c:356 +#: builtin/init-db.c:362 msgid "Initialized empty" -msgstr "Neu angelegt:" +msgstr "Neu angelegte" -#: builtin/init-db.c:357 +#: builtin/init-db.c:363 msgid " shared" msgstr " gemeinsam benutztes" -#: builtin/init-db.c:376 +#: builtin/init-db.c:382 msgid "cannot tell cwd" msgstr "kann aktuelles Verzeichnis nicht ermitteln" -#: builtin/init-db.c:450 builtin/init-db.c:457 +#: builtin/init-db.c:456 builtin/init-db.c:463 #, c-format msgid "cannot mkdir %s" -msgstr "cann Verzeichnis %s nicht anlegen" +msgstr "kann Verzeichnis %s nicht anlegen" -#: builtin/init-db.c:461 +#: builtin/init-db.c:467 #, c-format msgid "cannot chdir to %s" msgstr "kann nicht in Verzeichnis %s wechseln" -#: builtin/init-db.c:483 +#: builtin/init-db.c:489 #, c-format msgid "" "%s (or --work-tree=) not allowed without specifying %s (or --git-" "dir=)" msgstr "" -"%s (oder --work-tree=) nicht erlaubt ohne %s (oder --git-" -"dir=) ohne Angabe von %s nicht erlaubt (oder --" +"git-dir=)" -#: builtin/init-db.c:509 +#: builtin/init-db.c:515 msgid "Cannot access current working directory" msgstr "Kann auf aktuelles Verzeichnis nicht zugreifen" -#: builtin/init-db.c:512 +#: builtin/init-db.c:518 #, c-format msgid "Cannot access work tree '%s'" -msgstr "Kann auf Arbeitsverzeichnis '%s' nicht zugreifen" +msgstr "Kann auf Arbeitsverzeichnis \"%s\" nicht zugreifen" #: builtin/log.c:104 #, c-format msgid "invalid --decorate option: %s" -msgstr "ungültige '--decorate'-Option: %s" +msgstr "ungültige --decorate-Option: %s" -#: builtin/log.c:113 builtin/log.c:1138 builtin/shortlog.c:287 +#: builtin/log.c:113 builtin/log.c:1137 builtin/shortlog.c:287 #, c-format msgid "unrecognized argument: %s" -msgstr "ungültiger Parameter: %s" +msgstr "unbekannter Parameter: %s" #: builtin/log.c:156 #, c-format msgid "Final output: %d %s\n" msgstr "Endgültige Ausgabe: %d %s\n" -#: builtin/log.c:255 builtin/log.c:674 builtin/log.c:1222 builtin/log.c:1428 -#: builtin/merge.c:310 builtin/revert.c:556 builtin/shortlog.c:184 +#: builtin/log.c:255 builtin/log.c:674 builtin/log.c:1221 builtin/log.c:1423 +#: builtin/merge.c:311 builtin/revert.c:556 builtin/shortlog.c:184 msgid "revision walk setup failed" msgstr "Einrichtung der Revisionsverfolgung fehlgeschlagen" @@ -1777,15 +1784,15 @@ msgstr "Name des Ausgabeverzeichnisses ist zu lang" #: builtin/log.c:641 #, c-format msgid "Cannot open patch file %s" -msgstr "Kann Patch-Datei %s nicht öffnen" +msgstr "Kann Patch-Datei \"%s\" nicht öffnen" #: builtin/log.c:655 msgid "Need exactly one range." -msgstr "Brauche genau eine Bereichsangabe." +msgstr "Benötige genau eine Bereichsangabe." #: builtin/log.c:663 msgid "Not a range." -msgstr "Keine gültige Bereichsangabe." +msgstr "Keine Bereichsangabe." #: builtin/log.c:700 msgid "Could not extract email from committer identity." @@ -1804,274 +1811,276 @@ msgstr "irrsinniges in-reply-to: %s" msgid "Two output directories?" msgstr "Zwei Ausgabeverzeichnisse?" -#: builtin/log.c:1087 +#: builtin/log.c:1086 #, c-format msgid "bogus committer info %s" msgstr "merkwürdige Committer-Angabe %s" -#: builtin/log.c:1132 +#: builtin/log.c:1131 msgid "-n and -k are mutually exclusive." -msgstr "-n und -k vertragen sich nicht." +msgstr "-n kann nicht mit -k kombiniert werden." -#: builtin/log.c:1134 +#: builtin/log.c:1133 msgid "--subject-prefix and -k are mutually exclusive." -msgstr "--subject-prefix und -k vertragen sich nicht." +msgstr "--subject-prefix kann nicht mit -k kombiniert werden." -#: builtin/log.c:1141 +#: builtin/log.c:1140 msgid "--name-only does not make sense" msgstr "--name-only ergibt keinen Sinn" -#: builtin/log.c:1143 +#: builtin/log.c:1142 msgid "--name-status does not make sense" msgstr "--name-status ergibt keinen Sinn" -#: builtin/log.c:1145 +#: builtin/log.c:1144 msgid "--check does not make sense" msgstr "--check ergibt keinen Sinn" -#: builtin/log.c:1166 +#: builtin/log.c:1165 msgid "standard output, or directory, which one?" -msgstr "Standardausgabe oder Verzeichnis... entscheide dich!" +msgstr "Standardausgabe oder Verzeichnis... welches nun?" -#: builtin/log.c:1168 +#: builtin/log.c:1167 #, c-format msgid "Could not create directory '%s'" -msgstr "Konnte Verzeichnis '%s' nicht anlegen" +msgstr "Konnte Verzeichnis \"%s\" nicht anlegen" -#: builtin/log.c:1307 +#: builtin/log.c:1302 msgid "Failed to create output files" msgstr "Konnte Ausgabedateien nicht anlegen" -#: builtin/log.c:1394 +#: builtin/log.c:1389 #, c-format msgid "" "Could not find a tracked remote branch, please specify manually.\n" msgstr "" -"Konnte keinen verfolgten Remote-Branch finden, bitte gib selbst " +"Konnte keine verfolgte Remote-Branch finden, bitte gib selbst " "an.\n" -#: builtin/log.c:1410 builtin/log.c:1412 builtin/log.c:1424 +#: builtin/log.c:1405 builtin/log.c:1407 builtin/log.c:1419 #, c-format msgid "Unknown commit %s" msgstr "Unbekannter Commit %s" #: builtin/merge.c:82 msgid "switch `m' requires a value" -msgstr "Option `m' benötigt einen Wert" +msgstr "Option 'm' benötigt einen Wert" #: builtin/merge.c:119 #, c-format msgid "Could not find merge strategy '%s'.\n" -msgstr "Konnte Merge-Strategie '%s' nicht finden.\n" +msgstr "Konnte Merge-Strategie \"%s\" nicht finden.\n" #: builtin/merge.c:120 #, c-format msgid "Available strategies are:" -msgstr "Verfügbare Strategien sind:" +msgstr "Verfügbare Strategien:" #: builtin/merge.c:125 #, c-format msgid "Available custom strategies are:" -msgstr "Verfügbare benutzerdefinierte Strategien sind:" +msgstr "Verfügbare benutzerdefinierte Strategien:" -#: builtin/merge.c:223 +#: builtin/merge.c:224 msgid "could not run stash." -msgstr "konnte 'stash' nicht ausführen." +msgstr "konnte \"stash\" nicht ausführen." -#: builtin/merge.c:228 +#: builtin/merge.c:229 msgid "stash failed" -msgstr "'stash' fehlgeschlagen" +msgstr "\"stash\" fehlgeschlagen" -#: builtin/merge.c:233 +#: builtin/merge.c:234 #, c-format msgid "not a valid object: %s" -msgstr "kein gültiges Object: %s" +msgstr "kein gültiges Objekt: %s" -#: builtin/merge.c:250 +#: builtin/merge.c:251 msgid "read-tree failed" msgstr "read-tree fehlgeschlagen" -#: builtin/merge.c:279 +#: builtin/merge.c:280 msgid " (nothing to squash)" msgstr " (nichts zu kombinieren (--squash))" -#: builtin/merge.c:292 +#: builtin/merge.c:293 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Squash-Commit -- HEAD wird nicht aktualisiert\n" -#: builtin/merge.c:295 builtin/merge.c:1290 builtin/merge.c:1299 -#: builtin/merge.c:1309 +#: builtin/merge.c:296 builtin/merge.c:1280 builtin/merge.c:1289 +#: builtin/merge.c:1299 #, c-format msgid "Could not write to '%s'" -msgstr "Konnte '%s' nicht beschreiben" +msgstr "Konnte nicht nach \"%s\" schreiben" -#: builtin/merge.c:323 +#: builtin/merge.c:324 msgid "Writing SQUASH_MSG" msgstr "Schreibe SQUASH_MSG" -#: builtin/merge.c:325 +#: builtin/merge.c:326 msgid "Finishing SQUASH_MSG" msgstr "Schließe SQUASH_MSG ab" -#: builtin/merge.c:345 +#: builtin/merge.c:346 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "Kein Merge-Kommentar -- HEAD wird nicht aktualisiert\n" -#: builtin/merge.c:396 +#: builtin/merge.c:397 #, c-format msgid "'%s' does not point to a commit" -msgstr "'%s' zeigt nicht auf einen Commit" +msgstr "\"%s\" zeigt nicht auf einen Commit" -#: builtin/merge.c:491 +#: builtin/merge.c:492 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" -msgstr "Ungültiger Wert für branch.%s.mergeoptions: %s" +msgstr "Ungültige Branch.%s.mergeoptions string: %s" -#: builtin/merge.c:553 +#: builtin/merge.c:561 msgid "git write-tree failed to write a tree" -msgstr "'git write-tree' konnte keinen Tree anlegen" +msgstr "`git write-tree` konnte keinen Baum anlegen" -#: builtin/merge.c:594 +#: builtin/merge.c:602 msgid "failed to read the cache" msgstr "konnte den Index nicht auslesen" -#: builtin/merge.c:611 +#: builtin/merge.c:619 msgid "Unable to write index." msgstr "Konnte den Index nicht anlegen." -#: builtin/merge.c:624 +#: builtin/merge.c:632 msgid "Not handling anything other than two heads merge." -msgstr "Ich erledige ausschließlich Merges mit zwei Quellen." +msgstr "Dieser Befehl erledigt ausschließlich Merges mit zwei Quellen." -#: builtin/merge.c:651 +#: builtin/merge.c:644 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Unbekannte Option für merge-recursive: -X%s" -#: builtin/merge.c:666 +#: builtin/merge.c:658 #, c-format msgid "unable to write %s" -msgstr "konnte %s nicht beschreiben" +msgstr "konnte %s nicht schreiben" -#: builtin/merge.c:791 +#: builtin/merge.c:783 #, c-format msgid "Wonderful.\n" msgstr "Wunderbar.\n" -#: builtin/merge.c:840 builtin/merge.c:1287 builtin/merge.c:1295 -#: builtin/merge.c:1303 +#: builtin/merge.c:832 builtin/merge.c:1277 builtin/merge.c:1285 +#: builtin/merge.c:1293 #, c-format msgid "Could not open '%s' for writing" -msgstr "Konnte '%s' nicht zum Schreiben öffnen" +msgstr "Konnte \"%s\" nicht zum Schreiben öffnen" -#: builtin/merge.c:856 +#: builtin/merge.c:848 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" "Automatischer Merge fehlgeschlagen; behebe die Konflikte und committe das " "Ergebnis.\n" -#: builtin/merge.c:871 +#: builtin/merge.c:863 #, c-format msgid "'%s' is not a commit" -msgstr "'%s' ist kein Commit" +msgstr "\"%s\" ist kein Commit" -#: builtin/merge.c:921 +#: builtin/merge.c:913 git-pull.sh:31 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you can merge." msgstr "" "Du hast deinen Merge nicht abgeschlossen (MERGE_HEAD existiert).\n" -"Bitte committe deine Änderungen, bevor du einen weiteren Merge startest." +"Committe die Änderungen, bevor du einen weiteren Merge startest." -#: builtin/merge.c:924 +#: builtin/merge.c:916 git-pull.sh:34 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Du hast deinen Merge nicht abgeschlossen (MERGE_HEAD existiert)." -#: builtin/merge.c:951 +#: builtin/merge.c:943 msgid "You cannot combine --squash with --no-ff." -msgstr "Du kannst --squash nicht mit --no-ff kombinieren." +msgstr "--squash kann nicht mit --no-ff kombiniert werden." -#: builtin/merge.c:956 +#: builtin/merge.c:948 msgid "You cannot combine --no-ff with --ff-only." -msgstr "Du kannst --no-ff nicht mit --ff-only kombinieren (wirklich wahr)." +msgstr "--no-ff kann nicht mit --ff-only kombiniert werden." # Die Originalumschreibung "exactly one commit" ist irreführend; es geht # natürlich um die gesamte History hinter diesem Commit -#: builtin/merge.c:984 +#: builtin/merge.c:976 msgid "Can merge only exactly one commit into empty head" -msgstr "Kann nur exakt eine Historie in einen leeren Branch mergen" +msgstr "Kann nur exakt eine Historie in einen leeren HEAD mergen" -#: builtin/merge.c:987 +#: builtin/merge.c:979 msgid "Squash commit into empty head not supported yet" -msgstr "Squash-Commit in leeren Branch wird noch nicht unterstützt" +msgstr "" +"Zusammenführen von Commits in einen leeren HEAD wird noch nicht unterstützt" -#: builtin/merge.c:989 +#: builtin/merge.c:981 msgid "Non-fast-forward commit does not make sense into an empty head" -msgstr "Das Erzwingen eines Merge-Commits in einem leeren Branch ist unsinnig" +msgstr "Das Erzwingen eines Merge-Commits in einem leeren HEAD ist unsinnig" -#: builtin/merge.c:993 builtin/merge.c:1041 +#: builtin/merge.c:985 builtin/merge.c:1031 #, c-format msgid "%s - not something we can merge" -msgstr "%s ist etwas, das wir nicht mergen können" +msgstr "%s - nicht etwas, das wir mergen könnten" -#: builtin/merge.c:1099 +#: builtin/merge.c:1089 #, c-format msgid "Updating %s..%s\n" msgstr "Aktualisiere %s..%s\n" -#: builtin/merge.c:1133 +#: builtin/merge.c:1123 #, c-format msgid "Trying really trivial in-index merge...\n" -msgstr "Probiere simplen Merge im Index...\n" +msgstr "Probiere total simplen Inner-Index Merge...\n" -#: builtin/merge.c:1137 +#: builtin/merge.c:1127 #, c-format msgid "Nope.\n" msgstr "Nö.\n" -#: builtin/merge.c:1170 +#: builtin/merge.c:1160 msgid "Not possible to fast-forward, aborting." msgstr "Kann nicht ohne Merge-Commit aktualisieren, breche ab." -#: builtin/merge.c:1196 builtin/merge.c:1269 +#: builtin/merge.c:1186 builtin/merge.c:1259 #, c-format msgid "Rewinding the tree to pristine...\n" -msgstr "Räume auf...\n" +msgstr "Baum wird auf Ursprung zurückgesetzt...\n" -#: builtin/merge.c:1200 +#: builtin/merge.c:1190 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Probiere Merge-Strategie %s...\n" -#: builtin/merge.c:1261 +#: builtin/merge.c:1251 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Keine Merge-Strategie hat den Merge erledigt.\n" -#: builtin/merge.c:1263 +#: builtin/merge.c:1253 #, c-format msgid "Merge with strategy %s failed.\n" -msgstr "Merge mit Strategie '%s' fehlgeschlagen.\n" +msgstr "Merge mit Strategie \"%s\" fehlgeschlagen.\n" -#: builtin/merge.c:1271 +#: builtin/merge.c:1261 #, c-format msgid "Using the %s to prepare resolving by hand.\n" -msgstr "Benutze Strategie '%s', um auf manuelle Auflösung vorzubereiten.\n" +msgstr "" +"Strategie %s wird verwendet, um auf manuelle Auflösung vorzubereiten.\n" -#: builtin/merge.c:1314 +#: builtin/merge.c:1304 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" -"Automatischer Merge hat gut funktioniert; warte wie gewünscht vor dem " +"Automatisches Merge hat gut funktioniert; warte wie gewünscht vor dem " "Commit\n" #: builtin/mv.c:103 #, c-format msgid "Checking rename of '%s' to '%s'\n" -msgstr "Prüfe Umbenennen von '%s' nach '%s'\n" +msgstr "Prüfe Umbenennen von \"%s\" nach \"%s\"\n" #: builtin/mv.c:107 msgid "bad source" @@ -2100,7 +2109,7 @@ msgstr "nicht unter Versionskontrolle" #: builtin/mv.c:168 msgid "destination exists" -msgstr "Ziel existiert schon" +msgstr "Ziel existiert bereits" #: builtin/mv.c:175 #, c-format @@ -2123,66 +2132,64 @@ msgstr "%s, Quelle=%s, Ziel=%s" #: builtin/mv.c:206 #, c-format msgid "Renaming %s to %s\n" -msgstr "Benenne %s um nach %s\n" +msgstr "Benenne %s nach %s um\n" #: builtin/mv.c:209 #, c-format msgid "renaming '%s' failed" -msgstr "Umbenennen von '%s' fehlgeschlagen" +msgstr "Umbenennen von \"%s\" fehlgeschlagen" #: builtin/notes.c:122 -#, fuzzy, c-format +#, c-format msgid "unable to start 'show' for object '%s'" -msgstr "kann Objekte des Typs %s nicht greppen" +msgstr "kann \"show\" für Objekt \"%s\" nicht starten" #: builtin/notes.c:128 msgid "can't fdopen 'show' output fd" -msgstr "" +msgstr "\"show\"-Ausgabenfiledeskriptor nicht fdopen-öffenbar" #: builtin/notes.c:138 -#, fuzzy, c-format +#, c-format msgid "failed to close pipe to 'show' for object '%s'" -msgstr "konnte Datei nicht nach '%s' kopieren" +msgstr "konnte Pipe zu \"show\" für Objekt \"%s\" nicht schließen" #: builtin/notes.c:141 -#, fuzzy, c-format +#, c-format msgid "failed to finish 'show' for object '%s'" -msgstr "Übertragen einiger Referenzen zu '%s' fehlgeschlagen" +msgstr "konnte \"show\" für Objekt \"%s\" nicht beenden" #: builtin/notes.c:158 builtin/tag.c:311 #, c-format msgid "could not create file '%s'" -msgstr "konnte Datei '%s' nicht anlegen" +msgstr "konnte Datei \"%s\" nicht anlegen" #: builtin/notes.c:172 -#, fuzzy msgid "Please supply the note contents using either -m or -F option" -msgstr "Bitte gib den Kommentar mit der Option -m oder -F an.\n" +msgstr "Gib den Inhalt der Notiz entweder mit der Option -m oder -F an" #: builtin/notes.c:193 builtin/notes.c:797 -#, fuzzy, c-format +#, c-format msgid "Removing note for object %s\n" -msgstr "Konnte Objekt %s nicht lesen" +msgstr "Entferne Notiz für Objekt %s\n" #: builtin/notes.c:198 -#, fuzzy msgid "unable to write note object" -msgstr "konnte Commit-Objekt nicht anlegen" +msgstr "konnte Notizobjekt nicht schreiben" #: builtin/notes.c:200 -#, fuzzy, c-format +#, c-format msgid "The note contents has been left in %s" -msgstr "Der Tag-Kommentar wurde nach %s gesichert\n" +msgstr "Der Inhalt der Notiz wurde nach \"%s\" gesichert" #: builtin/notes.c:234 builtin/tag.c:445 #, c-format msgid "cannot read '%s'" -msgstr "kann '%s' nicht auslesen" +msgstr "kann \"%s\" nicht auslesen" #: builtin/notes.c:236 builtin/tag.c:448 #, c-format msgid "could not open or read '%s'" -msgstr "kann '%s' nicht öffnen oder auslesen" +msgstr "Konnte \"%s\" nicht öffnen oder auslesen" #: builtin/notes.c:255 builtin/notes.c:444 builtin/notes.c:446 #: builtin/notes.c:508 builtin/notes.c:560 builtin/notes.c:631 @@ -2190,79 +2197,79 @@ msgstr "kann '%s' nicht öffnen oder auslesen" #: builtin/notes.c:789 builtin/reset.c:303 builtin/tag.c:461 #, c-format msgid "Failed to resolve '%s' as a valid ref." -msgstr "Konnte '%s' nicht als gültige Referenz auflösen." +msgstr "Konnte \"%s\" nicht als gültige Referenz auflösen." #: builtin/notes.c:258 -#, fuzzy, c-format +#, c-format msgid "Failed to read object '%s'." -msgstr "Konnte Objekt %s nicht lesen" +msgstr "Konnte Objekt \"%s\" nicht lesen." #: builtin/notes.c:283 msgid "Cannot commit uninitialized/unreferenced notes tree" msgstr "" +"Kann nicht-initialisierten/nicht-referenzierten Notizenbaum nicht committen" #: builtin/notes.c:295 msgid "Failed to write current notes tree to database" msgstr "" +"Fehler beim Versuch, aktuellen Notizenbaum in die Datenbank zu schreiben" #: builtin/notes.c:307 -#, fuzzy msgid "Failed to commit notes tree to database" -msgstr "Konnte Tree von %s nicht finden." +msgstr "Konnte Notizenbaum nicht in Datenbank schreiben." #: builtin/notes.c:339 #, c-format msgid "Bad notes.rewriteMode value: '%s'" -msgstr "" +msgstr "Ungültiger Wert für notes.rewriteMode: \"%s\"" #: builtin/notes.c:349 #, c-format msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" -msgstr "" +msgstr "Überschreiben von Notizen in %s (außerhalb von refs/notes/) verweigert" #. TRANSLATORS: The first %s is the name of the #. environment variable, the second %s is its value #: builtin/notes.c:376 #, c-format msgid "Bad %s value: '%s'" -msgstr "" +msgstr "Ungültiger Wert für %s: \"%s\"" #: builtin/notes.c:440 -#, fuzzy, c-format +#, c-format msgid "Malformed input line: '%s'." -msgstr "ungültiger Objektname %s" +msgstr "Ungültige Eingabezeile: \"%s\"." #: builtin/notes.c:455 -#, fuzzy, c-format +#, c-format msgid "Failed to copy notes from '%s' to '%s'" -msgstr "konnte Datei nicht nach '%s' kopieren" +msgstr "Fehler beim Kopieren der Notizen von \"%s\" nach \"%s\"" #. TRANSLATORS: The first %s is one of "git notes ACTION", #. e.g. "add", "copy", "append" etc. #: builtin/notes.c:481 #, c-format msgid "Refusing to %s notes in %s (outside of refs/notes/)" -msgstr "" +msgstr "%s von Notizen in %s (außerhalb von refs/notes/) verweigert" #: builtin/notes.c:501 builtin/notes.c:553 builtin/notes.c:614 #: builtin/notes.c:626 builtin/notes.c:698 builtin/notes.c:745 #: builtin/notes.c:782 builtin/notes.c:821 -#, fuzzy msgid "too many parameters" msgstr "zu viele Parameter" #: builtin/notes.c:505 msgid "list" -msgstr "" +msgstr "Auflistung" #: builtin/notes.c:514 builtin/notes.c:758 -#, fuzzy, c-format +#, c-format msgid "No note found for object %s." -msgstr "Konnte Objekt %s nicht lesen" +msgstr "Keine Notiz für Objekt %s gefunden." #: builtin/notes.c:562 msgid "add" -msgstr "add" +msgstr "füge hinzu" #: builtin/notes.c:567 #, c-format @@ -2270,20 +2277,21 @@ msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "" +"Kann Notizen nicht hinzufügen. Es gibt bereits Notizen für Objekt %s. " +"Verwende Option -f zum Überschreiben." #: builtin/notes.c:572 builtin/notes.c:649 #, c-format msgid "Overwriting existing notes for object %s\n" -msgstr "" +msgstr "Überschreibe existierende Notizen für Objekt %s\n" #: builtin/notes.c:622 -#, fuzzy msgid "too few parameters" -msgstr "zu viele Parameter" +msgstr "zu wenige Parameter" #: builtin/notes.c:638 msgid "copy" -msgstr "" +msgstr "Kopie" #: builtin/notes.c:643 #, c-format @@ -2291,11 +2299,13 @@ msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "" +"Kann Notizen nicht kopieren. Es gibt bereits Notizen für Objekt %s. Verwende " +"Option -f zum Überschreiben." #: builtin/notes.c:655 #, c-format msgid "Missing notes on source object %s. Cannot copy." -msgstr "" +msgstr "Fehlende Notizen zum Quellobjekt %s. Kopie nicht erstellbar." #: builtin/notes.c:703 #, c-format @@ -2303,67 +2313,71 @@ 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 und -C für den \"edit\"-Unterbefehl sind veraltet.\n" +"Verwende stattdessen `git notes add -f -m/-F/-c/-C`.\n" +# "Refusing to %s notes" <-> "%s von Notizen" #: builtin/notes.c:754 msgid "show" -msgstr "" +msgstr "Anziegen" #: builtin/notes.c:791 -#, fuzzy msgid "remove" -msgstr "Remote-" +msgstr "Löschen" #: builtin/notes.c:795 -#, fuzzy, c-format +#, c-format msgid "Object %s has no note\n" -msgstr "Objekt %s nicht gefunden" +msgstr "Objekt %s hat keine Notiz\n" #: builtin/notes.c:825 msgid "prune" -msgstr "" +msgstr "Trimmen" #: builtin/notes.c:877 -#, fuzzy, c-format +#, c-format msgid "Unknown subcommand: %s" -msgstr "Unbekannter Commit %s" +msgstr "Unbekannter Unterbefehl: %s" #: builtin/push.c:43 msgid "tag shorthand without " -msgstr "'tag'-Kurzschreibweise ohne " +msgstr "Tag-Kurzschreibweise ohne " #: builtin/push.c:62 msgid "--delete only accepts plain target ref names" -msgstr "--delete akzeptiert nur einfache Referenzen, keine Refspecs" +msgstr "--delete akzeptiert nur einfache Referenzen (keine Refspecs)" #: builtin/push.c:72 msgid "You are not currently on a branch." -msgstr "Es ist momentan kein Branch aktiv." +msgstr "Gegenwärtig auf keiner Branch." #: builtin/push.c:74 #, c-format msgid "The current branch %s is not tracking anything." -msgstr "Der aktuelle Branch %s verfolgt keinen Branch." +msgstr "Die aktuelle Branch %s verfolgt nichts." #: builtin/push.c:77 #, c-format msgid "The current branch %s is tracking multiple branches, refusing to push." -msgstr "Der aktuelle Branch %s verfolgt mehrere Branches, 'push' verweigert." +msgstr "" +"Die aktuelle Branch %s verfolgt mehrere Branches, daher \"push\" verweigert." #: builtin/push.c:100 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "" -"Du hast keine Refspecs angegeben und push.default ist auf 'nothing' gesetzt." +"Es wurden keine Refspecs zur Übertragung angegeben, und push.default ist auf " +"\"nothing\" gesetzt." #: builtin/push.c:120 #, c-format msgid "Pushing to %s\n" -msgstr "Übertrag zu %s\n" +msgstr "Übertrage zu %s\n" #: builtin/push.c:124 #, c-format msgid "failed to push some refs to '%s'" -msgstr "Übertragen einiger Referenzen zu '%s' fehlgeschlagen" +msgstr "Übertragen einiger Referenzen nach \"%s\" fehlgeschlagen" # TODO: Verweis auf Manpage aktualisieren, sobald wir die auch übersetzen #: builtin/push.c:132 @@ -2373,24 +2387,24 @@ msgid "" "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 zu verhindern, dass du Daten verlierst, wurden Updates, die einen\n" +"Um zu verhindern, dass du Daten verloren gehen, wurden Updates, die einen\n" "Merge-Commit erfordern, zurückgewiesen. Merge die Änderungen im\n" -"im Ursprungs-Repository (z.B. 'git pull'), bevor du es nochmal versuchst.\n" -"Siehe den Abschnitt 'Note about fast-forwards' von 'git push --help' für\n" -"mehr Informationen.\n" +"Ursprungs-Repository (z.B. `git pull`), bevor du es nochmal versuchst.\n" +"Siehe Abschnitt \"Note about fast-forwards\" von `git push --help` für\n" +"weitere Informationen.\n" #: builtin/push.c:149 #, c-format msgid "bad repository '%s'" -msgstr "ungültiges Repository '%s'" +msgstr "ungültiges Repository \"%s\"" #: builtin/push.c:150 msgid "No destination configured to push to." -msgstr "Kein Ziel für 'push' festgelegt." +msgstr "Kein Ziel für Übertragung festgelegt." #: builtin/push.c:158 msgid "--all and --tags are incompatible" -msgstr "--all und --tags vertragen sich nicht" +msgstr "--all kann nicht mit --tags kombiniert werden" #: builtin/push.c:159 msgid "--all can't be combined with refspecs" @@ -2398,7 +2412,7 @@ msgstr "--all kann nicht mit Refspecs kombiniert werden" #: builtin/push.c:164 msgid "--mirror and --tags are incompatible" -msgstr "--mirror und --tags vertragen sich nicht" +msgstr "--mirror kann nicht mit --tags kombiniert werden" #: builtin/push.c:165 msgid "--mirror can't be combined with refspecs" @@ -2406,50 +2420,50 @@ msgstr "--mirror kann nicht mit Refspecs kombiniert werden" #: builtin/push.c:170 msgid "--all and --mirror are incompatible" -msgstr "--all und --mirror vertragen sich nicht" +msgstr "--all kann nicht mit --mirror kombiniert werden" #: builtin/push.c:235 msgid "--delete is incompatible with --all, --mirror and --tags" -msgstr "--delete verträgt sich nicht mit --all, --mirror und --tags" +msgstr "--delete kann weder mit --all, --mirror noch --tags kombiniert werden" #: builtin/push.c:237 msgid "--delete doesn't make sense without any refs" -msgstr "--delete ergibt keinen Sinn ohne Angabe von Referenzen" +msgstr "--delete ergibt ohne Angabe von Referenzen keinen Sinn" # Originalwerte für diese Strings belassen wg. Übereinstimmung mit # Optionsnamen #: builtin/reset.c:33 msgid "mixed" -msgstr "" +msgstr "Mixed" #: builtin/reset.c:33 msgid "soft" -msgstr "" +msgstr "Soft" #: builtin/reset.c:33 msgid "hard" -msgstr "" +msgstr "Hard" #: builtin/reset.c:33 msgid "merge" -msgstr "" +msgstr "Merge" #: builtin/reset.c:33 msgid "keep" -msgstr "" +msgstr "Keep" #: builtin/reset.c:95 msgid "You do not have a valid HEAD." -msgstr "Du hast kein gültiges HEAD." +msgstr "Du hast keinen gültigen HEAD." #: builtin/reset.c:97 msgid "Failed to find tree of HEAD." -msgstr "Konnte Tree von HEAD nicht finden." +msgstr "Konnte Baum von HEAD nicht finden." #: builtin/reset.c:103 #, c-format msgid "Failed to find tree of %s." -msgstr "Konnte Tree von %s nicht finden." +msgstr "Konnte Baum von %s nicht finden." #: builtin/reset.c:108 msgid "Could not write new index file." @@ -2458,11 +2472,11 @@ msgstr "Konnte neue Indexdatei nicht anlegen." #: builtin/reset.c:118 #, c-format msgid "HEAD is now at %s" -msgstr "HEAD ist jetzt bei %s" +msgstr "HEAD zeigt jetzt auf %s" #: builtin/reset.c:142 msgid "Could not read index" -msgstr "Konnte den Index nicht auslesen" +msgstr "Konnte den Index nicht lesen" #: builtin/reset.c:145 msgid "Unstaged changes after reset:" @@ -2476,169 +2490,167 @@ msgstr "Aktionsbeschreibung im Reflog zu lang: %.*s..." #: builtin/reset.c:231 #, c-format msgid "Cannot do a %s reset in the middle of a merge." -msgstr "Kann keinen '%s'-Reset mitten in einem Merge machen." +msgstr "Kann keinen %s-Reset mitten in einem Merge machen." #: builtin/reset.c:307 #, c-format msgid "Could not parse object '%s'." -msgstr "Konnte Objekt '%s' nicht einlesen." +msgstr "Konnte Objekt \"%s\" nicht verstehen." #: builtin/reset.c:312 msgid "--patch is incompatible with --{hard,mixed,soft}" -msgstr "--patch verträgt sich nicht mit --{hard,mixed,soft}" +msgstr "--patch kann nicht mit --{hard,mixed,soft} kombiniert werden" #: builtin/reset.c:321 msgid "--mixed with paths is deprecated; use 'git reset -- ' instead." msgstr "" -"--mixed mit Pfaden ist veraltet; benutze stattdessen 'git reset -- '." +"--mixed mit Pfaden ist veraltet; verwende stattdessen `git reset -- `." #: builtin/reset.c:323 #, c-format msgid "Cannot do %s reset with paths." -msgstr "Kann keinen '%s'-Reset mit Pfadangaben durchführen." +msgstr "Kann keinen %s-Reset mit Pfadangaben durchführen." #: builtin/reset.c:335 #, c-format msgid "%s reset is not allowed in a bare repository" -msgstr "'%s'-Reset ist in einem Lager-Repository nicht erlaubt" +msgstr "%s-Reset ist in einem Lager-Repository nicht erlaubt" #: builtin/reset.c:351 #, c-format msgid "Could not reset index file to revision '%s'." -msgstr "Konnte Indexdatei nicht auf Revision '%s' zurücksetzen." +msgstr "Konnte Indexdatei nicht auf Revision \"%s\" zurücksetzen." #: builtin/revert.c:82 msgid "program error" -msgstr "" +msgstr "Programmfehler" #: builtin/revert.c:154 builtin/revert.c:188 -#, fuzzy, c-format +#, c-format msgid "Could not read commit message of %s" msgstr "konnte Commit-Kommentar nicht lesen: %s" #: builtin/revert.c:202 -#, fuzzy, c-format +#, c-format msgid "Could not extract author email from %s" -msgstr "Konnte E-Mail-Adresse nicht aus der Committer-Angabe entnehmen." +msgstr "Konnte E-Mail-Adresse des Autors nicht aus %s entnehmen" #: builtin/revert.c:214 -#, fuzzy, c-format +#, c-format msgid "Could not extract author time from %s" -msgstr "konnte Verzeichnis '%s' im Arbeitsverzeichnis nicht anlegen." +msgstr "Konnte Erstelldatum nicht aus %s entnehmen" #: builtin/revert.c:230 #, c-format msgid "No author information found in %s" -msgstr "" +msgstr "Keine Autoreninformationen in %s gefunden" #: builtin/revert.c:267 -#, fuzzy, c-format +#, c-format msgid "Could not write to %s." -msgstr "Konnte '%s' nicht beschreiben" +msgstr "Konnte nicht nach \"%s\" schreiben" #: builtin/revert.c:270 #, c-format msgid "Error wrapping up %s" -msgstr "" +msgstr "Fehler beim Aufräumen von %s" #: builtin/revert.c:290 msgid "" "Your local changes would be overwritten by revert.\n" "Please, commit your changes or stash them to proceed." msgstr "" +"Lokale Änderungen würden durch revert überschrieben werden.\n" +"Committe oder stashe die Änderungen um fortzufahren." #: builtin/revert.c:293 msgid "" "Your local changes would be overwritten by cherry-pick.\n" "Please, commit your changes or stash them to proceed." msgstr "" +"Lokale Änderungen würden durch cherry-pick überschrieben werden.\n" +"Committe oder stashe die Änderungen um fortzufahren." #. TRANSLATORS: %s will be "revert" or "cherry-pick" #: builtin/revert.c:351 -#, fuzzy, c-format +#, c-format msgid "%s: Unable to write new index file" -msgstr "Konnte keine neue Indexdatei anlegen" +msgstr "%s: Konnte neue Indexdatei nicht schreiben" #: builtin/revert.c:417 msgid "Your index file is unmerged." -msgstr "" +msgstr "Der Index enthält Konflikte." #: builtin/revert.c:420 -#, fuzzy msgid "You do not have a valid HEAD" -msgstr "Du hast kein gültiges HEAD." +msgstr "Du hast keinen gültigen HEAD." #: builtin/revert.c:428 -#, fuzzy msgid "Cannot revert a root commit" -msgstr "Kann nicht überschreiben" +msgstr "Kann einen Wurzel-Commit nicht umkehren" #: builtin/revert.c:437 #, c-format msgid "Commit %s is a merge but no -m option was given." -msgstr "" +msgstr "Commit %s ist ein Merge, aber Option -m wurde nicht angegeben." #: builtin/revert.c:445 -#, fuzzy, c-format +#, c-format msgid "Commit %s does not have parent %d" -msgstr "Pfad '%s' hat keine Version 'von uns' im Index" +msgstr "Commit %s hat keinen Vorgänger %d" #: builtin/revert.c:449 #, c-format msgid "Mainline was specified but commit %s is not a merge." -msgstr "" +msgstr "Mainline wurde angegeben, aber Commit %s ist kein Merge." #. TRANSLATORS: The first %s will be "revert" or #. "cherry-pick", the second %s a SHA1 #: builtin/revert.c:460 -#, fuzzy, c-format +#, c-format msgid "%s: cannot parse parent commit %s" -msgstr "konnte Commit %s nicht analysieren" +msgstr "%s: konnte Vorgänger-Commit %s nicht analysieren" #: builtin/revert.c:464 -#, fuzzy, c-format +#, c-format msgid "Cannot get commit message for %s" -msgstr "konnte Commit-Kommentar nicht lesen: %s" +msgstr "konnte Commit-Kommentar für %s nicht lesen" #: builtin/revert.c:525 -#, fuzzy, c-format +#, c-format msgid "could not revert %s... %s" -msgstr "konnte '%s' nicht lesen" +msgstr "konnte \"%s\" nicht umkehren... %s" #: builtin/revert.c:526 -#, fuzzy, c-format +#, c-format msgid "could not apply %s... %s" -msgstr "Konnte '%s' nicht anwenden" +msgstr "Konnte \"%s\" nicht anwenden... %s" #: builtin/revert.c:559 msgid "empty commit set passed" -msgstr "" +msgstr "Leere Commitliste übergeben" #: builtin/revert.c:573 -#, fuzzy msgid "cherry-pick --ff cannot be used with --signoff" -msgstr "--cached kann nicht mit --no-index kombiniert werden." +msgstr "cherry-pick --ff kann nicht mit --signoff kombiniert werden" #: builtin/revert.c:575 -#, fuzzy msgid "cherry-pick --ff cannot be used with --no-commit" -msgstr "--cached kann nicht mit --no-index kombiniert werden." +msgstr "cherry-pick --ff kann nicht mit --no-commit kombiniert werden" #: builtin/revert.c:577 -#, fuzzy msgid "cherry-pick --ff cannot be used with -x" -msgstr "-B kann nicht mit -b kombiniert werden" +msgstr "cherry-pick --ff kann nicht mit -x kombiniert werden" #: builtin/revert.c:579 -#, fuzzy msgid "cherry-pick --ff cannot be used with --edit" -msgstr "-B kann nicht mit -b kombiniert werden" +msgstr "cherry-pick --ff kann nicht mit --edit kombiniert werden" #. TRANSLATORS: %s will be "revert" or "cherry-pick" #: builtin/revert.c:584 -#, fuzzy, c-format +#, c-format msgid "git %s: failed to read the index" -msgstr "konnte den Index nicht auslesen" +msgstr "git %s: konnte den Index nicht auslesen" #: builtin/rm.c:118 #, c-format @@ -2646,8 +2658,8 @@ msgid "" "'%s' has staged content different from both the file and the HEAD\n" "(use -f to force removal)" msgstr "" -"'%s' hat vorgemerkte Änderungen, die sich sowohl von der Datei\n" -"als auch vom letzten Commit unterscheiden (-f, um trotzdem zu löschen)" +"\"%s\" hat vorgemerkte Änderungen, die sich sowohl von der Datei als auch " +"vom letzten Commit unterscheiden (Verwende -f, um trotzdem zu löschen)" #: builtin/rm.c:124 #, c-format @@ -2655,8 +2667,9 @@ msgid "" "'%s' has changes staged in the index\n" "(use --cached to keep the file, or -f to force removal)" msgstr "" -"'%s' hat Änderungen im Index vorgemerkt\n" -"(--cached, um die Datei zu behalten, oder -f, um trotzdem zu löschen)" +"\"%s\" hat Änderungen im Index vorgemerkt\n" +"(Verwende --cached, um die Datei zu behalten, oder -f, um trotzdem zu " +"löschen)" #: builtin/rm.c:128 #, c-format @@ -2664,23 +2677,24 @@ msgid "" "'%s' has local modifications\n" "(use --cached to keep the file, or -f to force removal)" msgstr "" -"'%s' hat Änderungen im Arbeitsverzeichnis\n" -"(--cached, um die Datei zu behalten, oder -f, um trotzdem zu löschen)" +"\"%s\" hat lokale Änderungen\n" +"(Verwende --cached, um die Datei zu behalten, oder -f, um trotzdem zu " +"löschen)" #: builtin/rm.c:202 #, c-format msgid "not removing '%s' recursively without -r" -msgstr "entferne Verzeichnis '%s' nicht rekursiv ohne -r" +msgstr "Verzeichnis \"%s\" wird ohne -r nicht rekursiv gelöscht" #: builtin/rm.c:238 #, c-format msgid "git rm: unable to remove %s" -msgstr "git rm: kann %s nicht entfernen" +msgstr "git rm: kann \"%s\" nicht entfernen" #: builtin/shortlog.c:161 -#, fuzzy, c-format +#, c-format msgid "Missing author: %s" -msgstr "Übertrag zu %s\n" +msgstr "Fehlender Autor: %s" #: builtin/tag.c:123 builtin/tag.c:464 #, c-format @@ -2690,17 +2704,17 @@ msgstr "Tagname zu lang: %.*s..." #: builtin/tag.c:128 #, c-format msgid "tag '%s' not found." -msgstr "Tag '%s' nicht gefunden." +msgstr "Tag \"%s\" nicht gefunden." #: builtin/tag.c:143 #, c-format msgid "Deleted tag '%s' (was %s)\n" -msgstr "Tag '%s' gelöscht (war %s)\n" +msgstr "Tag \"%s\" gelöscht (war %s)\n" #: builtin/tag.c:155 #, c-format msgid "could not verify the tag '%s'" -msgstr "konnte den Tag '%s' nicht überprüfen" +msgstr "konnte den Tag \"%s\" nicht überprüfen" #: builtin/tag.c:170 msgid "committer info too long." @@ -2733,7 +2747,7 @@ msgstr "" #: builtin/tag.c:226 #, c-format msgid "signing key value too long (%.10s...)" -msgstr "Wert für Signatur-Key zu lang (%.10s...)" +msgstr "Signaturschlüsselwert zu lang (%.10s...)" #: builtin/tag.c:272 msgid "unable to sign the tag" @@ -2758,19 +2772,19 @@ msgstr "kein Tag-Kommentar?" #: builtin/tag.c:335 #, c-format msgid "The tag message has been left in %s\n" -msgstr "Der Tag-Kommentar wurde nach %s gesichert\n" +msgstr "Der Tag-Kommentar wurde in %s hinterlassen\n" #: builtin/tag.c:428 msgid "-n option is only allowed with -l." -msgstr "-n ist nur in Kombination mit -l erlaubt." +msgstr "-n ist nur in Verbindung mit -l erlaubt." #: builtin/tag.c:430 msgid "--contains option is only allowed with -l." -msgstr "--contains ist nur in Kombination mit -l erlaubt." +msgstr "--contains ist nur in Verbindung mit -l erlaubt." #: builtin/tag.c:438 msgid "only one -F or -m option is allowed." -msgstr "entweder -F oder -m -- entscheide dich." +msgstr "-F kann nicht mit -m kombiniert werden." #: builtin/tag.c:458 msgid "too many params" @@ -2784,12 +2798,12 @@ msgstr "'%s' ist kein gültiger Tagname." #: builtin/tag.c:471 #, c-format msgid "tag '%s' already exists" -msgstr "Tag '%s' existiert schon" +msgstr "Tag '%s' existiert bereits" #: builtin/tag.c:479 #, c-format msgid "%s: cannot lock the ref" -msgstr "%s: kann kein Lock für die Referenz anfordern" +msgstr "%s: kann die Referenz nicht sperren" #: builtin/tag.c:481 #, c-format @@ -2802,9 +2816,8 @@ msgid "Updated tag '%s' (was %s)\n" msgstr "Tag '%s' aktualisiert (war %s)\n" #: git-am.sh:47 -#, fuzzy msgid "You need to set your committer info first" -msgstr "du musst zuerst Konflikte im aktuellen Index auflösen" +msgstr "Committer-Info muss zunächst gesetzt werden" #: git-am.sh:80 #, sh-format @@ -2813,55 +2826,65 @@ msgid "" "If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n" "To restore the original branch and stop patching run \"$cmdline --abort\"." msgstr "" +"Sobald das Problem gelöst ist, führe \\`$cmdline --resolved``` aus.\n" +"Soll dieser Patch stattdessen übersprungen werden, verwende \\`$cmdline --" +"skip\\`.\n" +"Um die ursprüngliche Branch wiederherzustellen und den Patchvorgang zu " +"stoppen, verwende \\`$cmdline --abort\\`." #: git-am.sh:96 msgid "Cannot fall back to three-way merge." -msgstr "" +msgstr "Kann den 3-Wege-Merge auch nicht durchführen." #: git-am.sh:111 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" +"Dem Repository fehlen die nötigen Blobs um einen 3-Wege-Merge durchzuführen." #: git-am.sh:120 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." msgstr "" +"Wurde der Patch per Hand verändert?\n" +"Er passt nicht auf die in dessen Index angegebenen Blobs." #: git-am.sh:236 msgid "Only one StGIT patch series can be applied at once" -msgstr "" +msgstr "Es kann maximal eine StGIT-Patchserie auf einmal angewandt werden" #: git-am.sh:288 #, sh-format msgid "Patch format $patch_format is not supported." -msgstr "" +msgstr "Patchformat $patch_format wird nicht unterstützt." #: git-am.sh:290 msgid "Patch format detection failed." -msgstr "" +msgstr "Patchformaterkennung fehlgeschlagen." #: git-am.sh:340 msgid "-d option is no longer supported. Do not use." -msgstr "" +msgstr "Die Option -d wird nicht länger unterstützt." #: git-am.sh:403 #, sh-format msgid "previous rebase directory $dotest still exists but mbox given." msgstr "" +"vorheriges Rebase-Verzeichnis $dotest existiert noch, aber trotzdem wurde " +"eine mbox angegeben." #: git-am.sh:408 msgid "Please make up your mind. --skip or --abort?" -msgstr "" +msgstr "Entscheidungsprobleme? --skip oder --abort." #: git-am.sh:434 msgid "Resolve operation not in progress, we are not resuming." -msgstr "" +msgstr "Lösungsvorgang nicht aktiv, es wird auch nicht weitergemacht." #: git-am.sh:499 #, sh-format msgid "Dirty index: cannot apply patches (dirty: $files)" -msgstr "" +msgstr "Geänderter Index: kann Patches nicht anwenden (geändert: $files)" #: git-am.sh:595 #, sh-format @@ -2870,31 +2893,36 @@ msgid "" "If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n" "To restore the original branch and stop patching run \"$cmdline --abort\"." msgstr "" +"Der Patch ist leer. Wurde er falsch aufgeteilt?\n" +"Überspringen des Patches mittels \\\\`$cmdline --skip\\\\`.\n" +"Um die ursprüngle Branch wiederherstellen und den Patchvorgang zu stoppen, " +"verwendet \\\\`$cmdline --abort\\\\`." #: git-am.sh:632 -#, fuzzy msgid "Patch does not have a valid e-mail address." -msgstr "Pfad '%s' hat keine drei verschiedenen Versionen im Index" +msgstr "Pfad \"%s\" hat keine drei verschiedenen Versionen im Index" #: git-am.sh:679 msgid "cannot be interactive without stdin connected to a terminal." msgstr "" +"Für den Interaktivmodus muss die Standardeingabe mit einem Terminal " +"verbunden sein." #: git-am.sh:683 msgid "Commit Body is:" -msgstr "" +msgstr "Commitinhalt ist:" #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] #. in your translation. The program will only accept English #. input at this point. #: git-am.sh:690 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " -msgstr "" +msgstr "Anwenden? Ja(y)/(N)ein/B(e)arbeiten/Ansehen(v)/Alle (a)kzeptieren" #: git-am.sh:726 #, sh-format msgid "Applying: $FIRSTLINE" -msgstr "" +msgstr "Wende an: $FIRSTLINE" #: git-am.sh:747 msgid "" @@ -2902,22 +2930,680 @@ msgid "" "If there is nothing left to stage, chances are that something else\n" "already introduced the same changes; you might want to skip this patch." msgstr "" +"Keine Änderungen - vergessen, \\`git add\\` zu verwenden?\n" +"Gibt es nichts weiter zum Vormerken, so ist es möglich, dass bereits etwas " +"zuvor die Änderungen eingepflegt hat; überspringe ggf. diesen Patch." #: git-am.sh:755 msgid "" "You still have unmerged paths in your index\n" "did you forget to use 'git add'?" msgstr "" +"Es gibt noch kollidierende Änderungen im Index.\n" +"Vergessen, \\`git add\\` zu verwenden?" #: git-am.sh:771 msgid "No changes -- Patch already applied." -msgstr "" +msgstr "Keine Änderungen -- Patch bereits angewendet." #: git-am.sh:781 #, sh-format msgid "Patch failed at $msgnum $FIRSTLINE" -msgstr "" +msgstr "Patch fehlgeschlagen bei $msgnum $FIRSTLINE" #: git-am.sh:797 msgid "applying to an empty history" +msgstr "Anwenden auf leere History" + +#: git-bisect.sh:39 +msgid "You need to start by \"git bisect start\"" +msgstr "Bisect muss mittels \\`git bisect start\\` begonnen werden" + +#. TRANSLATORS: Make sure to include [Y] and [n] in your +#. translation. The program will only accept English input +#. at this point. +#: git-bisect.sh:45 +msgid "Do you want me to do it for you [Y/n]? " +msgstr "Soll dies nun ausgeführt werden [Y/n]?" + +#: git-bisect.sh:64 +msgid "Bad HEAD - I need a HEAD" +msgstr "Ungültiger HEAD - es wird ein HEAD benötigt" + +#: git-bisect.sh:83 +msgid "won't bisect on seeked tree" +msgstr "Bisektion auf gespultem Baum abgelehnt" + +#: git-bisect.sh:87 +msgid "Bad HEAD - strange symbolic ref" +msgstr "Ungültiger HEAD - komische symbolische Referenz" + +#: git-bisect.sh:117 +#, sh-format +msgid "'$arg' does not appear to be a valid revision" +msgstr "\\\"$arg\\\" scheint keine gültige Revision zu sein" + +#: git-bisect.sh:162 +#, sh-format +msgid "Bad bisect_write argument: $state" +msgstr "Ungültiger Parameter zu bisect_write: $state" + +#: git-bisect.sh:190 +#, sh-format +msgid "Bad rev input: $arg" +msgstr "Ungültige Revisions-Eingabe: $arg" + +#: git-bisect.sh:204 +msgid "Please call 'bisect_state' with at least one argument." +msgstr "Rufe \\\"bisect_state\\\" mit mindestens einem Argument auf." + +#: git-bisect.sh:207 +msgid "Bad rev input: HEAD" +msgstr "Ungültige Revisions-Eingabe: HEAD" + +#: git-bisect.sh:216 +#, sh-format +msgid "Bad rev input: $rev" +msgstr "Ungültige Revisions-Eingabe: $rev" + +#: git-bisect.sh:222 +msgid "'git bisect bad' can take only one argument." +msgstr "\\`git bisect bad\\` kann nur mit einem Argument verwendet werden." + +#. have bad but not good. we could bisect although +#. this is less optimum. +#: git-bisect.sh:245 +msgid "Warning: bisecting only with a bad commit." +msgstr "Warnung: Bisektion mit nur einem schlechten Commit." + +#. TRANSLATORS: Make sure to include [Y] and [n] in your +#. translation. The program will only accept English input +#. at this point. +#: git-bisect.sh:251 +msgid "Are you sure [Y/n]? " +msgstr "Sicher [Y/n]?" + +#: git-bisect.sh:261 +msgid "" +"You need to give me at least one good and one bad revisions.\n" +"(You can use \"git bisect bad\" and \"git bisect good\" for that.)" +msgstr "" +"Die Angabe von mindestens einer guten und einer schlechten Revision ist " +"erforderlich.\n" +"(Verwende \\`git bisect bad\\` und \\`git bisect good\\`.)" + +#: git-bisect.sh:264 +msgid "" +"You need to start by \"git bisect start\".\n" +"You then need to give me at least one good and one bad revisions.\n" +"(You can use \"git bisect bad\" and \"git bisect good\" for that.)" +msgstr "" +"Bisektion ist mittels \\`git bisect start\\` zu starten.\n" +"Danach ist mindestens eine gute und eine schlechte Revision anzugeben.\n" +"(Verwende dazu \\`git bisect good\\` und \\`git bisect bad\\`.)" + +#: git-bisect.sh:316 +msgid "We are not bisecting." +msgstr "Gegenwärtig läuft keine Bisektion." + +#: git-bisect.sh:323 +#, sh-format +msgid "'$invalid' is not a valid commit" +msgstr "\"$invalid\" ist kein gültiger Commit" + +#: git-bisect.sh:352 +#, sh-format +msgid "cannot read $file for replaying" +msgstr "kann Datei $file zur Wiederholung der Operation nicht lesen" + +#: git-bisect.sh:368 +msgid "?? what are you talking about?" +msgstr "Ungültiger Unterbefehl" + +#: git-bisect.sh:380 +#, sh-format +msgid "running $command" +msgstr "Ausführen von $command" + +#: git-bisect.sh:386 +#, sh-format +msgid "" +"bisect run failed:\n" +"exit code $res from '$command' is < 0 or >= 128" +msgstr "" +"bisect run fehlgeschlagen:\n" +"Fehlercode $res von \\`$command\\` ist < 0 oder >= 128" + +#: git-bisect.sh:409 +msgid "bisect run cannot continue any more" +msgstr "\\`bisect run\\` kann nicht mehr weitermachen" + +#: git-bisect.sh:414 +#, sh-format +msgid "" +"bisect run failed:\n" +"'bisect_state $state' exited with error code $res" +msgstr "" +"bisect run fehlgeschlagen:\n" +"\\`bisect_state $state\\` endete mit Fehlercode $res" + +#: git-bisect.sh:420 +msgid "bisect run success" +msgstr "bisect run success" + +#: git-pull.sh:21 +msgid "" +"Pull is not possible because you have unmerged files.\n" +"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, da noch Konflikte in Dateien bestehen.\n" +"Bereinige das Arbeitsverzeichnis und verwende zur Auflösung\n" +"entsprechend \\`git add/rm \\`, oder \\`git commit -a\\`." + +#: git-pull.sh:25 +msgid "Pull is not possible because you have unmerged files." +msgstr "Pull ist nicht möglich, da noch Konflikte in Dateien bestehen." + +#: git-pull.sh:141 +msgid "" +"There is no candidate for rebasing against among the refs that you just " +"fetched.\n" +"Generally this means that you provided a wildcard refspec which had no\n" +"matches on the remote end." +msgstr "" +"Entlang der soeben geholten Refs gibt es keinen Kandidat, auf den rebased\n" +"werden könnte. Generell bedeutet dies, dass eine Wildcard-Refspec angegeben\n" +"wurde, die auf der entfernten Seite keinen Treffer erzielte." + +#: git-pull.sh:145 +msgid "" +"There are no candidates for merging against among the refs that you just " +"fetched.\n" +"Generally this means that you provided a wildcard refspec which had no\n" +"matches on the remote end." +msgstr "" +"Entlang der soeben geholten Refs gibt es keine Kandidaten, mit denen " +"gemerged\n" +"werden könnte. Generell bedeutet dies, dass eine Wildcard-Refspec angegeben\n" +"wurde, die auf der entfernten Seite keinen Treffer erzielte." + +#. TRANSLATORS: $requested_remote will be a remote name, like +#. "origin" or "avar" +#: git-pull.sh:153 +#, sh-format +msgid "" +"You asked to pull from the remote '$requested_remote', but did not specify\n" +"a branch. Because this is not the default configured remote\n" +"for your current branch, you must specify a branch on the command line." +msgstr "" +"Da die gegenwärtige Branch nicht der für den Remote als Standard definierten " +"Branch entspricht, ist beim Pull von \"$requested_remote\" eine Branch " +"anzugeben." + +#: git-pull.sh:157 +msgid "" +"You are not currently on a branch, so I cannot use any\n" +"'branch..merge' in your configuration file.\n" +"Please specify which remote branch you want to use on the command\n" +"line and try again (e.g. 'git pull ').\n" +"See git-pull(1) for details." +msgstr "" +"Gegenwärtig ist keine Branch aktiv, weshalb keine in der Konfigurationsdatei " +"festgelegten \"branch..merge\" verwendet werden können.\n" +"Gib die zu verwendende Branch mit an (z.B. \\`git pull " +"\\`).\n" +"Siehe git-pull(1) für weiter Informationen." + +#: git-pull.sh:165 +#, sh-format +msgid "" +"You asked me to pull without telling me which branch you\n" +"want to rebase against, and 'branch.${curr_branch}.merge' in\n" +"your configuration file does not tell me, either. Please\n" +"specify which branch you want to use on the command line and\n" +"try again (e.g. 'git pull ').\n" +"See git-pull(1) for details.\n" +"\n" +"If you often rebase against the same branch, you may want to\n" +"use something like the following in your configuration file:\n" +"\n" +" [branch \"${curr_branch}\"]\n" +" remote = \n" +" merge = \n" +" rebase = true\n" +"\n" +" [remote \"\"]\n" +" url = \n" +" fetch = \n" +"\n" +"See git-config(1) for details." +msgstr "" +"Es wurde keine Branch, auf die rebased werden soll, angegeben; auch \"branch." +"$curr_branch.merge\" in der Konfigurationsdatei ist nicht gesetzt. Gib die " +"zu verwendende Branch mit an (z.B. \\`git pull \\`).\n" +"Siehe git-pull(1) für weitere Informationen.\n" +"\n" +"Falls oft auf die gleiche Branch rebased wird, kann folgendes Konstrukt in " +"der Konfigurationsdatei verwendet werden:\n" +"\n" +" [branch \"$curr_branch\"]\n" +" remote = \n" +" merge = \n" +" rebase = true\n" +"\n" +" [remote \"\"]\n" +" url = \n" +" fetch = \n" +"\n" +"Siehe git-config(1) für weitere Informationen." + +#: git-pull.sh:186 +#, sh-format +msgid "" +"You asked me to pull without telling me which branch you\n" +"want to merge with, and 'branch.${curr_branch}.merge' in\n" +"your configuration file does not tell me, either. Please\n" +"specify which branch you want to use on the command line and\n" +"try again (e.g. 'git pull ').\n" +"See git-pull(1) for details.\n" +"\n" +"If you often merge with the same branch, you may want to\n" +"use something like the following in your configuration file:\n" +"\n" +" [branch \"${curr_branch}\"]\n" +" remote = \n" +" merge = \n" +"\n" +" [remote \"\"]\n" +" url = \n" +" fetch = \n" +"\n" +"See git-config(1) for details." +msgstr "" +"Es wurde keine Branch, mit der gemerged werden soll, angegeben; auch " +"\"branch.$curr_branch.merge\" in der Konfigurationsdatei ist nicht gesetzt. " +"Gib die zu verwendende Branch mit an (z.B. \\`git pull " +"\\`).\n" +"Siehe git-pull(1) für weitere Informationen.\n" +"\n" +"Falls oft mit der gleichen Branch gemerged wird, kann folgendes Konstrukt in " +"der Konfigurationsdatei verwendet werden:\n" +"\n" +" [branch \"$curr_branch\"]\n" +" remote = \n" +" merge = \n" +"\n" +" [remote \"\"]\n" +" url = \n" +" fetch = \n" +"\n" +"Siehe git-config(1) für weitere Informationen." + +#: git-pull.sh:210 +#, sh-format +msgid "" +"Your configuration specifies to rebase against the ref '$upstream_branch'\n" +"from the remote, but no such ref was fetched." msgstr "" +"Die Konfiguration gibt an, dass die Referenz \"$upstream_branch\" des " +"Remotes zum Rebasen verwendet werden soll, aber keine solche Referenz wurde " +"geholt." + +#: git-pull.sh:213 +#, sh-format +msgid "" +"Your configuration specifies to merge with the ref '$upstream_branch'\n" +"from the remote, but no such ref was fetched." +msgstr "" +"Die Konfiguration gibt an, dass die Referenz \"$upstream_branch\" des " +"Remotes zu merge sei, aber keine solche Referenz wurde geholt." + +#: git-pull.sh:226 +msgid "updating an unborn branch with changes added to the index" +msgstr "Update eine ungeborene Branch mit Änderungen aus dem/in den(?) Index" + +#: git-pull.sh:232 +msgid "refusing to pull with rebase: your working tree is not up-to-date" +msgstr "Verweigerung des Pull mit Rebase: die Arbeitskopie ist nicht aktuell" + +#. The fetch involved updating the current branch. +#. The working tree and the index file is still based on the +#. $orig_head commit, but we are merging into $curr_head. +#. First update the working tree to match $curr_head. +#: git-pull.sh:260 +#, sh-format +msgid "" +"Warning: fetch updated the current branch head.\n" +"Warning: fast-forwarding your working tree from\n" +"Warning: commit $orig_head." +msgstr "" +"Warnung: fetch aktualisierte den aktuellen Branch-HEAD.\n" +"Warnung: Update der Arbeitskopie von Commit $orig_head aus ohne Merge." + +# Die Originalumschreibung "exactly one commit" ist irreführend; es geht +# natürlich um die gesamte History hinter diesem Commit +#: git-pull.sh:285 +msgid "Cannot merge multiple branches into empty head" +msgstr "Kann nur exakt eine Historie in einen leeren HEAD mergen" + +#: git-pull.sh:289 +msgid "Cannot rebase onto multiple branches" +msgstr "Kann nicht auf mehrere Branches rebasen" + +#: git-stash.sh:41 +msgid "git stash clear with parameters is unimplemented" +msgstr "" +"\\`git stash clear\\` ohne Angabe von Parametern wird nicht unterstützt" + +#: git-stash.sh:63 +msgid "You do not have the initial commit yet" +msgstr "Es gibt noch keinen Wurzel-Commit" + +#: git-stash.sh:78 +msgid "Cannot save the current index state" +msgstr "Kann den aktuellen Zustand des Index nicht speichern" + +#: git-stash.sh:94 git-stash.sh:107 +msgid "Cannot save the current worktree state" +msgstr "Kann den aktuellen Zustand des Arbeitsverzeichnisses nicht speichern" + +#: git-stash.sh:111 +msgid "No changes selected" +msgstr "Keine Änderungen ausgewählt" + +#: git-stash.sh:114 +msgid "Cannot remove temporary index (can't happen)" +msgstr "" +"Kann temporären Index nicht löschen (das sollte eigentlich nicht auftreten)" + +#: git-stash.sh:127 +msgid "Cannot record working tree state" +msgstr "Kann Zustand des Arbeitsverzeichnis nicht aufzeichnen" + +#: git-stash.sh:176 +msgid "No local changes to save" +msgstr "Keine lokalen Änderungen zum Abspeichern" + +#: git-stash.sh:180 +msgid "Cannot initialize stash" +msgstr "Kann den Stash nicht initialisieren" + +#: git-stash.sh:188 +msgid "Cannot save the current status" +msgstr "Kann den aktuellen Status nicht speichern" + +#: git-stash.sh:201 +msgid "Cannot remove worktree changes" +msgstr "Kann Änderungen im Arbeitsverzeichnis nicht entfernen" + +#: git-stash.sh:296 +msgid "No stash found." +msgstr "Keinen Stash gefunden." + +#: git-stash.sh:303 +#, sh-format +msgid "Too many revisions specified: $REV" +msgstr "Zuviele Revisionen angegeben: $REV" + +#: git-stash.sh:309 +#, sh-format +msgid "$reference is not valid reference" +msgstr "$reference ist keine gültige Referenz" + +#. maintainers: it would be better if git rev-parse indicated +#. this condition with a non-zero status code but as of 1.7.2.1 it +#. it did not. So, we use non-empty stderr output as a proxy for the +#. condition of interest. +#: git-stash.sh:330 +#, sh-format +msgid "$REV does not exist in the stash log" +msgstr "$REV existiert im Stash-Log nicht" + +#: git-stash.sh:344 +#, sh-format +msgid "'$args' is not a stash-like commit" +msgstr "\"$args\" ist kein Stash-Commit" + +#: git-stash.sh:355 +#, sh-format +msgid "'$args' is not a stash reference" +msgstr "\\\"$args\\\" ist keine Stash-Referenz" + +#: git-stash.sh:365 +msgid "Cannot apply to a dirty working tree, please stage your changes" +msgstr "" +"Kann Patch nicht auf eine geänderte Arbeitskopie anwenden; merke die " +"Änderungen zunächst vor" + +#: git-stash.sh:369 +msgid "Cannot apply a stash in the middle of a merge" +msgstr "Kann während eines Merges keinen Stash anwenden." + +#: git-stash.sh:377 +msgid "Conflicts in index. Try without --index." +msgstr "Es existieren Konflikte im Index. Versuche es ohne --index." + +#: git-stash.sh:379 +msgid "Could not save index tree" +msgstr "Konnte den Indexbaum nicht speichern" + +#: git-stash.sh:405 +msgid "Cannot unstage modified files" +msgstr "Kann geänderte Dateien nicht rückmerken" + +#: git-stash.sh:419 +msgid "Index was not unstashed." +msgstr "Es wurde kein Stash angewendet." + +#: git-stash.sh:436 +#, sh-format +msgid "Dropped ${REV} ($s)" +msgstr "$REV ($s) verworfen" + +#: git-stash.sh:437 +#, sh-format +msgid "${REV}: Could not drop stash entry" +msgstr "$REV: Konnte Stash-Eintrag nicht verwerfen" + +#: git-stash.sh:444 +msgid "No branch name specified" +msgstr "Kein Branchname angegeben" + +#: git-stash.sh:515 +msgid "(To restore them type \"git stash apply\")" +msgstr "(Zum Wiederherstellen \\`git stash apply\\` verwenden)" + +#: git-submodule.sh:38 +#, sh-format +msgid "remote ($remote) does not have a url defined in .git/config" +msgstr "Für Remote ($remote) ist in .git/config keine URL definiert" + +#: git-submodule.sh:79 +#, sh-format +msgid "No submodule mapping found in .gitmodules for path '$path'" +msgstr "Kein Submodul-Eintrag für Pfad \"$path\" in .gitmodules gefunden" + +#: git-submodule.sh:105 +#, sh-format +msgid "Directory '$path' exists, but is neither empty nor a git repository" +msgstr "" +"Verzeichnis \"$path\" existiert, aber ist weder leer noch ein Git-Repository" + +#: git-submodule.sh:109 +#, sh-format +msgid "A file already exist at path '$path'" +msgstr "Es existiert bereits eine Datei am Pfad \"$path\"" + +#: git-submodule.sh:117 +#, sh-format +msgid "Clone of '$url' into submodule path '$path' failed" +msgstr "Clone von \"$url\" in Submodul-Pfad \"$path\" fehlgeschlagen" + +#: git-submodule.sh:190 +#, sh-format +msgid "repo URL: '$repo' must be absolute or begin with ./|../" +msgstr "Repo-URL: \"$repo\" muss absolut sein oder mit ./|../ beginnen" + +#: git-submodule.sh:207 +#, sh-format +msgid "'$path' already exists in the index" +msgstr "\"$path\" existiert bereits im Index" + +#: git-submodule.sh:211 +#, sh-format +msgid "" +"The following path is ignored by one of your .gitignore files:\n" +"$path\n" +"Use -f if you really want to add it." +msgstr "" +"Der folgende Pfad ist mittels einer der .gitignore-Dateien ignoriert:\n" +"$path\n" +"Verwende -f um Hinzufügen zu erzwingen." + +#: git-submodule.sh:222 +#, sh-format +msgid "Adding existing repo at '$path' to the index" +msgstr "Füge bereits bestehendes Repository bei \"$path\" dem Index hinzu" + +#: git-submodule.sh:224 +#, sh-format +msgid "'$path' already exists and is not a valid git repo" +msgstr "" +"Zielpfad \"$path\" existiert bereits und ist kein gültiges Git-Repository" + +#: git-submodule.sh:247 +#, sh-format +msgid "Unable to checkout submodule '$path'" +msgstr "Kann Submodul \"$path\" nicht auschecken" + +#: git-submodule.sh:251 +#, sh-format +msgid "Failed to add submodule '$path'" +msgstr "Konnte Submodul \"$path\" nicht hinzufügen" + +#: git-submodule.sh:256 +#, sh-format +msgid "Failed to register submodule '$path'" +msgstr "Registrierung des Submoduls \"$path\" fehlgeschlagen" + +#: git-submodule.sh:294 +#, sh-format +msgid "Entering '$prefix$path'" +msgstr "Wechsle nach \"$prefix$path\"" + +#: git-submodule.sh:306 +#, sh-format +msgid "Stopping at '$path'; script returned non-zero status." +msgstr "Angehalten bei \"$path\"; Skript gab nicht-Null Status zurück." + +#: git-submodule.sh:349 +#, sh-format +msgid "No url found for submodule path '$path' in .gitmodules" +msgstr "Keine URL für Submodul-Pfad \"$path\" in .gitmodules gefunden" + +#: git-submodule.sh:359 +#, sh-format +msgid "Failed to register url for submodule path '$path'" +msgstr "Registrierung der URL für Submodul-Pfad \"$path\" fehlgeschlagen" + +#: git-submodule.sh:364 +#, sh-format +msgid "Failed to register update mode for submodule path '$path'" +msgstr "" +"Registrierung des Update-Modus für Submodul-Pfad \"$path\" fehlgeschlagen" + +#: git-submodule.sh:366 +#, sh-format +msgid "Submodule '$name' ($url) registered for path '$path'" +msgstr "Submodul \"$name\" ($url) für Pfad \"$path\" registriert" + +#: git-submodule.sh:444 +#, sh-format +msgid "" +"Submodule path '$path' not initialized\n" +"Maybe you want to use 'update --init'?" +msgstr "" +"Submodul-Pfad \"$path\" ist nicht initialisiert\n" +"War vielleicht \\`update --init\\` gewollt?" + +#: git-submodule.sh:456 +#, sh-format +msgid "Unable to find current revision in submodule path '$path'" +msgstr "Kann aktuelle Revision im Submodul-Pfad \"$path\" nicht finden" + +#: git-submodule.sh:476 +#, sh-format +msgid "Unable to fetch in submodule path '$path'" +msgstr "Kann im Submodul-Pfad \"$path\" nicht holen" + +#: git-submodule.sh:482 git-submodule.sh:487 git-submodule.sh:492 +#, sh-format +msgid "Unable to rebase '$sha1' in submodule path '$path'" +msgstr "Kann nicht auf \"$sha1\" im Submodul-Pfad \"$path\" rebasen" + +#: git-submodule.sh:483 +#, sh-format +msgid "Submodule path '$path': rebased into '$sha1'" +msgstr "Submodul-Pfad \"$path\": auf \"$sha1\" rebased" + +#: git-submodule.sh:488 +#, sh-format +msgid "Submodule path '$path': merged in '$sha1'" +msgstr "Submodul-Pfad \"$path\": \"$sha1\" wurde gemerged" + +#: git-submodule.sh:493 +#, sh-format +msgid "Submodule path '$path': checked out '$sha1'" +msgstr "Submodul-Pfad \"$path\": \"$sha1\" wurde ausgecheckt" + +#: git-submodule.sh:504 git-submodule.sh:797 +#, sh-format +msgid "Failed to recurse into submodule path '$path'" +msgstr "Konnte nicht in den Submodul-Pfad \"$path\" wechseln" + +#: git-submodule.sh:588 +msgid "--" +msgstr "--" + +#. unexpected type +#: git-submodule.sh:628 +#, sh-format +msgid "unexpected mode $mod_dst" +msgstr "unerwarteter Modus $mod_dst" + +#: git-submodule.sh:646 +#, sh-format +msgid " Warn: $name doesn't contain commit $sha1_src" +msgstr " Warnung: $name enthält nicht Commit $sha1_src" + +#: git-submodule.sh:649 +#, sh-format +msgid " Warn: $name doesn't contain commit $sha1_dst" +msgstr " Warnung: $name enthält nicht Commit $sha1_dst" + +#: git-submodule.sh:652 +#, sh-format +msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst" +msgstr " Warnung: $name enthält nicht Commit $sha1_src und $sha1_dst" + +#: git-submodule.sh:677 +msgid "blob" +msgstr "Blob" + +#: git-submodule.sh:678 +msgid "submodule" +msgstr "Submodul" + +#: git-submodule.sh:715 +msgid "# Submodules changed but not updated:" +msgstr "# Geändert, aber nicht für den nächsten Commit vorgemerkte Submodule:" + +#: git-submodule.sh:717 +msgid "# Submodule changes to be committed:" +msgstr "# Vorgemerkte Änderungen im Submodul für den nächsten Commit:" + +#: git-submodule.sh:844 +#, sh-format +msgid "Synchronizing submodule url for '$name'" +msgstr "Synchronisiere Submodul-URL für \"$name\"" From c248a8fd4a8ce92664d8a7de126ead1842d1581b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Date: Wed, 6 Jul 2011 19:22:54 +0000 Subject: [PATCH 08/15] de.po: msgmerge --- po/de.po | 2132 ++++++++++++++++++++++++++++++------------------------ 1 file changed, 1189 insertions(+), 943 deletions(-) diff --git a/po/de.po b/po/de.po index c044b55987a8eb..d802bfdf27dcfc 100644 --- a/po/de.po +++ b/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List \n" -"POT-Creation-Date: 2010-10-30 07:35+0000\n" +"POT-Creation-Date: 2011-07-06 19:20+0000\n" "PO-Revision-Date: 2010-10-29 15:20+0100\n" "Last-Translator: Jan Engelhardt \n" "Language-Team: Git Mailing List \n" @@ -17,261 +17,294 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: wt-status.c:56 -msgid "# Unmerged paths:" -msgstr "# Verbleibende Konflikte in Pfaden:" +#: diff.c:104 +#, c-format +msgid " Failed to parse dirstat cut-off percentage '%.*s'\n" +msgstr "" -#: wt-status.c:62 wt-status.c:79 +#: diff.c:109 +#, fuzzy, c-format +msgid " Unknown dirstat parameter '%.*s'\n" +msgstr "kann Vorlage \"%s\" nicht finden/prüfen" + +#: diff.c:205 #, c-format -msgid "# (use \"git reset %s ...\" to unstage)" +msgid "" +"Found errors in 'diff.dirstat' config variable:\n" +"%s" +msgstr "" + +#: diff.c:3295 +#, c-format +msgid "" +"Failed to parse --dirstat/-X option parameter:\n" +"%s" +msgstr "" + +#: wt-status.c:134 +#, fuzzy +msgid "Unmerged paths:" +msgstr "# Verbleibende Konflikte in Pfaden:" + +#: wt-status.c:140 wt-status.c:157 +#, fuzzy, c-format +msgid " (use \"git reset %s ...\" to unstage)" msgstr "" "# (verwende `git reset %s `, um die Änderungen nicht mehr " "vorzumerken)" -#: wt-status.c:64 wt-status.c:81 -msgid "# (use \"git rm --cached ...\" to unstage)" +#: wt-status.c:142 wt-status.c:159 +#, fuzzy +msgid " (use \"git rm --cached ...\" to unstage)" msgstr "" "# (verwende `git rm --cached `, um die Datei nicht mehr vorzumerken)" -#: wt-status.c:65 -msgid "# (use \"git add/rm ...\" as appropriate to mark resolution)" +#: wt-status.c:143 +#, fuzzy +msgid " (use \"git add/rm ...\" as appropriate to mark resolution)" msgstr "" "# (verwende `git add/rm ...`, um Konflikte als gelöst zu markieren)" -#: wt-status.c:73 -msgid "# Changes to be committed:" +#: wt-status.c:151 +#, fuzzy +msgid "Changes to be committed:" msgstr "# Vorgemerkte Änderungen für den nächsten Commit:" -#: wt-status.c:91 -msgid "# Changed but not updated:" -msgstr "# Geändert, aber nicht für den nächsten Commit vorgemerkt:" +#: wt-status.c:169 +#, fuzzy +msgid "Changes not staged for commit:" +msgstr "# Vorgemerkte Änderungen für den nächsten Commit:" -#: wt-status.c:95 -msgid "# (use \"git add ...\" to update what will be committed)" +#: wt-status.c:173 +#, fuzzy +msgid " (use \"git add ...\" to update what will be committed)" msgstr "" "# (verwende `git add ...`, um den aktuellen Stand vorzumerken)" -#: wt-status.c:97 -msgid "# (use \"git add/rm ...\" to update what will be committed)" +#: wt-status.c:175 +#, fuzzy +msgid " (use \"git add/rm ...\" to update what will be committed)" msgstr "" "# (verwende entsprechend `git add/rm ...`, um den aktuellen Stand " "vorzumerken)" -#: wt-status.c:98 +#: wt-status.c:176 +#, fuzzy msgid "" -"# (use \"git checkout -- ...\" to discard changes in working " -"directory)" +" (use \"git checkout -- ...\" to discard changes in working directory)" msgstr "" "# (verwende `git checkout -- ...`, um Änderungen in der Datei zu " "verwerfen)" -#: wt-status.c:100 -msgid "# (commit or discard the untracked or modified content in submodules)" +#: wt-status.c:178 +#, fuzzy +msgid " (commit or discard the untracked or modified content in submodules)" msgstr "" "# (committe oder verwerfe die unberücksichtigten Dateien oder Änderungen " "in Submodulen)" -#: wt-status.c:109 -#, c-format -msgid "# %s files:" +#: wt-status.c:187 +#, fuzzy, c-format +msgid "%s files:" msgstr "# %s Dateien:" -#: wt-status.c:112 -#, c-format -msgid "# (use \"git %s ...\" to include in what will be committed)" +#: wt-status.c:190 +#, fuzzy, c-format +msgid " (use \"git %s ...\" to include in what will be committed)" msgstr "" "# (verwende `git %s ...`, um zu vorgemerkten Dateien hinzuzufügen)" -#: wt-status.c:129 +#: wt-status.c:207 msgid "bug" msgstr "Bug" -#: wt-status.c:134 +#: wt-status.c:212 msgid "both deleted:" msgstr "beide gelöscht:" -#: wt-status.c:135 +#: wt-status.c:213 msgid "added by us:" msgstr "hier hinzugefügt:" -#: wt-status.c:136 +#: wt-status.c:214 msgid "deleted by them:" msgstr "dort gelöscht:" -#: wt-status.c:137 +#: wt-status.c:215 msgid "added by them:" msgstr "dort hinzugefügt:" -#: wt-status.c:138 +#: wt-status.c:216 msgid "deleted by us:" msgstr "hier gelöscht:" -#: wt-status.c:139 +#: wt-status.c:217 msgid "both added:" msgstr "bei beiden hinzugefügt:" -#: wt-status.c:140 +#: wt-status.c:218 msgid "both modified:" msgstr "bei beiden geändert:" -#: wt-status.c:170 +#: wt-status.c:248 msgid "new commits, " msgstr "neue Commits, " -#: wt-status.c:172 +#: wt-status.c:250 msgid "modified content, " msgstr "veränderte Dateien, " -#: wt-status.c:174 +#: wt-status.c:252 msgid "untracked content, " msgstr "unberücksichtigte Dateien, " -#: wt-status.c:188 +#: wt-status.c:266 #, c-format msgid "new file: %s" msgstr "neue Datei: %s" -#: wt-status.c:191 +#: wt-status.c:269 #, c-format msgid "copied: %s -> %s" msgstr "kopiert: %s -> %s" -#: wt-status.c:194 +#: wt-status.c:272 #, c-format msgid "deleted: %s" msgstr "gelöscht: %s" -#: wt-status.c:197 +#: wt-status.c:275 #, c-format msgid "modified: %s" msgstr "geändert: %s" -#: wt-status.c:200 +#: wt-status.c:278 #, c-format msgid "renamed: %s -> %s" msgstr "umbenannt: %s -> %s" -#: wt-status.c:203 +#: wt-status.c:281 #, c-format msgid "typechange: %s" msgstr "neuer Typ: %s" -#: wt-status.c:206 +#: wt-status.c:284 #, c-format msgid "unknown: %s" msgstr "unbekannt: %s" -#: wt-status.c:209 +#: wt-status.c:287 #, c-format msgid "unmerged: %s" msgstr "Konflikt: %s" -#: wt-status.c:212 +#: wt-status.c:290 #, c-format msgid "bug: unhandled diff status %c" msgstr "Bug: nicht behandelter Diff-Status %c" -#: wt-status.c:631 +#: wt-status.c:713 msgid "On branch " msgstr "Auf Branch: " -#: wt-status.c:638 +#: wt-status.c:720 msgid "Not currently on any branch." msgstr "Gegenwärtig auf keiner Branch." -#: wt-status.c:648 -msgid "# Initial commit" +#: wt-status.c:731 +#, fuzzy +msgid "Initial commit" msgstr "# Erster Commit" -#: wt-status.c:662 +#: wt-status.c:745 msgid "Untracked" msgstr "Unberücksichtigte" -#: wt-status.c:664 +#: wt-status.c:747 msgid "Ignored" msgstr "Ignorierte" -#: wt-status.c:666 -#, c-format -msgid "# Untracked files not listed%s\n" +#: wt-status.c:749 +#, fuzzy, c-format +msgid "Untracked files not listed%s" msgstr "# Unberücksichtigte Dateien werden nicht aufgeführt%s\n" -#: wt-status.c:668 +#: wt-status.c:751 msgid " (use -u option to show untracked files)" msgstr " (verwende die Option -u, um unberücksichtigte Dateien anzuzeigen)" -#: wt-status.c:674 -#, c-format -msgid "# No changes\n" +#: wt-status.c:757 +#, fuzzy +msgid "No changes" msgstr "# Keine Änderungen\n" -#: wt-status.c:678 +#: wt-status.c:761 #, c-format msgid "no changes added to commit%s\n" msgstr "keine Änderungen für den Commit vorgemerkt%s\n" -#: wt-status.c:680 +#: wt-status.c:763 msgid " (use \"git add\" and/or \"git commit -a\")" msgstr " (verwende `git add` und/oder `git commit -a`)" -#: wt-status.c:682 +#: wt-status.c:765 #, c-format msgid "nothing added to commit but untracked files present%s\n" msgstr "" "keine Änderungen für den Commit vorgemerkt, aber unberücksichtigte Dateien " "vorhanden%s\n" -#: wt-status.c:684 +#: wt-status.c:767 msgid " (use \"git add\" to track)" msgstr " (verwende `git add`, um sie zu berücksichtigen)" -#: wt-status.c:686 wt-status.c:689 wt-status.c:692 +#: wt-status.c:769 wt-status.c:772 wt-status.c:775 #, c-format msgid "nothing to commit%s\n" msgstr "nichts zu committen%s\n" -#: wt-status.c:687 +#: wt-status.c:770 msgid " (create/copy files and use \"git add\" to track)" msgstr " (erstelle Dateien und verwende `git add`, um sie zu berücksichtigen)" -#: wt-status.c:690 +#: wt-status.c:773 msgid " (use -u to show untracked files)" msgstr " (verwende -u, um unberücksichtigte Datei anzuzeigen)" -#: wt-status.c:693 +#: wt-status.c:776 msgid " (working directory clean)" msgstr " (Arbeitsverzeichnis sauber)" -#: wt-status.c:791 +#: wt-status.c:884 msgid "HEAD (no branch)" msgstr "HEAD (keine Branch)" -#: wt-status.c:797 +#: wt-status.c:890 msgid "Initial commit on " msgstr "Erster Commit auf " -#: wt-status.c:812 +#: wt-status.c:905 msgid "behind " msgstr "hinterher um " -#: wt-status.c:815 wt-status.c:818 +#: wt-status.c:908 wt-status.c:911 msgid "ahead " msgstr "voraus um " -#: wt-status.c:820 +#: wt-status.c:913 msgid ", behind " msgstr ", hinterher um" -#: builtin/add.c:41 +#: builtin/add.c:61 #, c-format msgid "unexpected diff status %c" msgstr "unerwarteter Diff-Status %c" -#: builtin/add.c:67 builtin/commit.c:244 +#: builtin/add.c:66 builtin/commit.c:291 msgid "updating files failed" msgstr "Aktualisieren der Dateien ist fehlgeschlagen" -#: builtin/add.c:77 +#: builtin/add.c:76 #, c-format msgid "remove '%s'\n" msgstr "entferne \"%s\"\n" @@ -285,7 +318,7 @@ msgstr "Pfad \"%s\" ist im Submodul \"%.*s\"" msgid "Unstaged changes after refreshing the index:" msgstr "Nicht vorgemerkte Änderungen nach Aktualisierung des Index:" -#: builtin/add.c:194 builtin/add.c:452 builtin/rm.c:194 +#: builtin/add.c:194 builtin/add.c:454 builtin/rm.c:186 #, c-format msgid "pathspec '%s' did not match any files" msgstr "Pfadangabe \"%s\" passt auf keine Dateien" @@ -322,43 +355,51 @@ msgstr "Leerer Patch. Breche ab." msgid "Could not apply '%s'" msgstr "Konnte \"%s\" nicht anwenden" -#: builtin/add.c:349 +#: builtin/add.c:310 +#, fuzzy +msgid "The following paths are ignored by one of your .gitignore files:\n" +msgstr "" +"Der folgende Pfad ist mittels einer der .gitignore-Dateien ignoriert:\n" +"$path\n" +"Verwende -f um Hinzufügen zu erzwingen." + +#: builtin/add.c:350 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "Benutze -f, wenn sie wirklich hinzufügt werden sollen.\n" -#: builtin/add.c:350 +#: builtin/add.c:351 msgid "no files added" msgstr "keine Dateien hinzugefügt" -#: builtin/add.c:356 +#: builtin/add.c:357 msgid "adding files failed" msgstr "Das Hinzufügen der Dateien ist fehlgeschlagen" -#: builtin/add.c:388 +#: builtin/add.c:389 msgid "-A and -u are mutually incompatible" msgstr "-A kann nicht mit -u kombiniert werden" -#: builtin/add.c:390 +#: builtin/add.c:391 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "Option --ignore-missing kann nur zusammen mit --dry-run benutzt werden" -#: builtin/add.c:410 +#: builtin/add.c:411 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "Nichts angegeben, nichts hinzugefügt.\n" -#: builtin/add.c:411 +#: builtin/add.c:412 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Vielleicht war `git add .` gewollt?\n" -#: builtin/add.c:417 builtin/clean.c:95 builtin/commit.c:301 -#: builtin/commit.c:310 builtin/mv.c:77 builtin/rm.c:171 +#: builtin/add.c:418 builtin/clean.c:95 builtin/commit.c:350 builtin/mv.c:77 +#: builtin/rm.c:162 msgid "index file corrupt" msgstr "Indexdatei beschädigt" -#: builtin/add.c:468 builtin/mv.c:223 builtin/rm.c:268 +#: builtin/add.c:470 builtin/mv.c:223 builtin/rm.c:260 msgid "Unable to write new index file" msgstr "Konnte neue Indexdatei nicht anlegen" @@ -393,10 +434,10 @@ msgid "git archive: expected a flush" msgstr "git archive: Flush erwartet" #: builtin/branch.c:136 -#, c-format +#, fuzzy, c-format msgid "" "deleting branch '%s' that has been merged to\n" -" '%s', but it is not yet merged to HEAD." +" '%s', but not yet merged to HEAD." msgstr "" "lösche Branch \"%s\", die zwar bereits in \"%s\" gemerged wurde, aber noch " "nicht in HEAD ist." @@ -466,77 +507,77 @@ msgstr "Konfigurationsdatei konnte nicht aktualisiert werden" msgid "branch '%s' does not point at a commit" msgstr "Branch \"%s\" zeigt nicht auf einen Commit" -#: builtin/branch.c:381 +#: builtin/branch.c:376 #, c-format msgid "behind %d] " msgstr "um %d hinterher] " -#: builtin/branch.c:383 +#: builtin/branch.c:378 #, c-format msgid "ahead %d] " msgstr "um %d voraus] " -#: builtin/branch.c:385 +#: builtin/branch.c:380 #, c-format msgid "ahead %d, behind %d] " msgstr "um %d voraus, um %d hinterher] " -#: builtin/branch.c:484 +#: builtin/branch.c:483 msgid "(no branch)" msgstr "(keine Branch)" -#: builtin/branch.c:544 +#: builtin/branch.c:543 msgid "some refs could not be read" msgstr "einige Einträge konnten nicht gelesen werden" -#: builtin/branch.c:557 +#: builtin/branch.c:556 msgid "cannot rename the current branch while not on any." msgstr "kann die aktuelle Branch nicht umbenennen, wenn man auf keiner ist" -#: builtin/branch.c:567 builtin/branch.c:571 +#: builtin/branch.c:566 builtin/branch.c:570 #, c-format msgid "Invalid branch name: '%s'" msgstr "Ungültiger Name für Branch: \"%s\"" -#: builtin/branch.c:574 +#: builtin/branch.c:573 #, c-format msgid "A branch named '%s' already exists." msgstr "Eine Branch namens \"%s\" gibt es bereits." -#: builtin/branch.c:580 +#: builtin/branch.c:579 msgid "Branch rename failed" msgstr "Umbenennung der Branch fehlgeschlagen" -#: builtin/branch.c:584 +#: builtin/branch.c:583 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "Ungültiger Branchname \"%s\" durch Umbenennen in Ordnung gebracht" -#: builtin/branch.c:588 +#: builtin/branch.c:587 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "Branch in %s umbenannt, aber HEAD nicht aktualisiert!" -#: builtin/branch.c:595 +#: builtin/branch.c:594 msgid "Branch is renamed, but update of config-file failed" msgstr "" "Branch wurde umbenannt, aber die Konfigurationsdatei konnte nicht " "aktualisiert werden" -#: builtin/branch.c:610 +#: builtin/branch.c:609 #, c-format msgid "malformed object name %s" msgstr "ungültiger Objektname %s" -#: builtin/branch.c:680 +#: builtin/branch.c:683 msgid "Failed to resolve HEAD as a valid ref." msgstr "Konnte HEAD nicht als gültige Referenze auflösen." -#: builtin/branch.c:686 +#: builtin/branch.c:689 msgid "HEAD not found below refs/heads!" msgstr "HEAD zeigt nicht auf eine Referenz unter refs/heads!" -#: builtin/branch.c:706 +#: builtin/branch.c:709 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" "Die Optionen -a und -r für `git branch` ergeben zusammen mit einem " @@ -555,145 +596,194 @@ msgstr "Benötige Repository, um Bundle zu erstellen" msgid "Need a repository to unbundle." msgstr "Benötige ein Repository zum Entpacken." -#: builtin/checkout.c:107 builtin/checkout.c:135 +#: builtin/checkout.c:111 builtin/checkout.c:139 #, c-format msgid "path '%s' does not have our version" msgstr "Pfad \"%s\" hat keine Version \"von uns\" im Index" -#: builtin/checkout.c:109 builtin/checkout.c:137 +#: builtin/checkout.c:113 builtin/checkout.c:141 #, c-format msgid "path '%s' does not have their version" msgstr "Pfad \"%s\" hat keine Version \"von denen\" im Index" -#: builtin/checkout.c:120 +#: builtin/checkout.c:124 #, c-format msgid "path '%s' does not have all three versions" msgstr "Pfad \"%s\" hat keine drei verschiedenen Versionen im Index" -#: builtin/checkout.c:155 +#: builtin/checkout.c:159 #, c-format msgid "path '%s' does not have all 3 versions" msgstr "Pfad \"%s\" hat keine drei verschiedenen Versionen im Index" -#: builtin/checkout.c:172 +#: builtin/checkout.c:176 #, c-format msgid "path '%s': cannot merge" msgstr "Pfad \"%s\": kann nicht mergen" -#: builtin/checkout.c:189 +#: builtin/checkout.c:193 #, c-format msgid "Unable to add merge result for '%s'" msgstr "Kann Merge-Ergebnis für \"%s\" nicht hinzufügen" -#: builtin/checkout.c:194 builtin/reset.c:170 +#: builtin/checkout.c:198 builtin/reset.c:170 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "make_cache_entry für Pfad \"%s\" fehlgeschlagen" -#: builtin/checkout.c:216 builtin/checkout.c:371 +#: builtin/checkout.c:220 builtin/checkout.c:374 msgid "corrupt index file" msgstr "beschädigte Indexdatei" -#: builtin/checkout.c:244 builtin/checkout.c:251 +#: builtin/checkout.c:248 builtin/checkout.c:255 #, c-format msgid "path '%s' is unmerged" msgstr "Pfad \"%s\" enthält Konflikte" -#: builtin/checkout.c:280 builtin/checkout.c:475 builtin/clone.c:658 -#: builtin/merge.c:729 +#: builtin/checkout.c:284 builtin/checkout.c:478 builtin/clone.c:668 +#: builtin/merge.c:789 msgid "unable to write new index file" msgstr "kann keine neue Indexdatei anlegen" -#: builtin/checkout.c:297 builtin/diff.c:307 builtin/merge.c:368 +#: builtin/checkout.c:301 builtin/diff.c:301 builtin/merge.c:396 msgid "diff_setup_done failed" msgstr "diff_setup_done fehlgeschlagen" -#: builtin/checkout.c:393 +#: builtin/checkout.c:396 msgid "you need to resolve your current index first" msgstr "Zuerst müssen Konflikte im aktuellen Index aufgelöst werden" -#: builtin/checkout.c:524 +#: builtin/checkout.c:527 #, c-format msgid "Can not do reflog for '%s'\n" msgstr "Kann Reflog für \"%s\" nicht einrichten\n" -#: builtin/checkout.c:550 +#: builtin/checkout.c:557 +msgid "HEAD is now at" +msgstr "HEAD zeigt jetzt auf" + +#: builtin/checkout.c:563 #, c-format msgid "Already on '%s'\n" msgstr "Bereits auf Branch \"%s\"\n" -#: builtin/checkout.c:554 +#: builtin/checkout.c:567 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Zu Branch \"%s\" gewechselt und Inhalt überschrieben\n" -#: builtin/checkout.c:556 +#: builtin/checkout.c:569 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Zu neuer Branch \"%s\" gewechselt\n" -#: builtin/checkout.c:558 +#: builtin/checkout.c:571 #, c-format msgid "Switched to branch '%s'\n" msgstr "Zu Branch \"%s\" gewechselt\n" -#: builtin/checkout.c:575 -msgid "HEAD is now at" -msgstr "HEAD zeigt jetzt auf" +#: builtin/checkout.c:651 +#, c-format +msgid " ... and %d more.\n" +msgstr "" -#: builtin/checkout.c:603 -msgid "You are on a branch yet to be born" -msgstr "Die aktive Branch ist noch nicht angelegt" +#. The singular version +#: builtin/checkout.c:657 +#, 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:675 +#, 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/checkout.c:700 +msgid "internal error: only -- alone should have been left" +msgstr "" + +#: builtin/checkout.c:702 +msgid "internal error in revision walk" +msgstr "" -#: builtin/checkout.c:617 +#: builtin/checkout.c:706 msgid "Previous HEAD position was" msgstr "HEAD zeigte vorher auf" -#: builtin/checkout.c:730 +#: builtin/checkout.c:731 +msgid "You are on a branch yet to be born" +msgstr "Die aktive Branch ist noch nicht angelegt" + +#. case (1) +#: builtin/checkout.c:859 +#, c-format +msgid "invalid reference: %s" +msgstr "ungültige Referenz: %s" + +#. case (1): want a tree +#: builtin/checkout.c:898 +#, c-format +msgid "reference is not a tree: %s" +msgstr "Referenz ist kein Baum: %s" + +#: builtin/checkout.c:965 msgid "-B cannot be used with -b" msgstr "-B kann nicht mit -b kombiniert werden" -#: builtin/checkout.c:738 +#: builtin/checkout.c:974 msgid "--patch is incompatible with all other options" msgstr "--patch kann mit keinen weiteren Optionen kombiniert werden" -#: builtin/checkout.c:744 +#: builtin/checkout.c:977 +#, fuzzy +msgid "--detach cannot be used with -b/-B/--orphan" +msgstr "--cached kann nicht mit --no-index kombiniert werden." + +#: builtin/checkout.c:979 +#, fuzzy +msgid "--detach cannot be used with -t" +msgstr "--orphan kann nicht mit -t kombiniert werden" + +#: builtin/checkout.c:985 msgid "--track needs a branch name" msgstr "--track benötigt einen Branchnamen" -#: builtin/checkout.c:751 +#: builtin/checkout.c:992 msgid "Missing branch name; try -b" msgstr "Fehlender Branchname; versuch's mit -b" -#: builtin/checkout.c:757 +#: builtin/checkout.c:998 msgid "--orphan and -b|-B are mutually exclusive" msgstr "--orphan kann nicht mit -b/-B kombiniert werden" -#: builtin/checkout.c:759 +#: builtin/checkout.c:1000 msgid "--orphan cannot be used with -t" msgstr "--orphan kann nicht mit -t kombiniert werden" -#: builtin/checkout.c:769 +#: builtin/checkout.c:1010 msgid "git checkout: -f and -m are incompatible" msgstr "git checkout: -f kann nicht mit -m kombiniert werden" -#. case (1) -#: builtin/checkout.c:815 -#, c-format -msgid "invalid reference: %s" -msgstr "ungültige Referenz: %s" - -#. case (1): want a tree -#: builtin/checkout.c:852 -#, c-format -msgid "reference is not a tree: %s" -msgstr "Referenz ist kein Baum: %s" - -#: builtin/checkout.c:878 +#: builtin/checkout.c:1044 msgid "invalid path specification" msgstr "ungültige Pfadangabe" -#: builtin/checkout.c:886 +#: builtin/checkout.c:1052 #, c-format msgid "" "git checkout: updating paths is incompatible with switching branches.\n" @@ -703,13 +793,19 @@ msgstr "" "kombiniert werden. Sollte \"%s\" (das aber nicht als Commit\n" "gefunden werden konnte) ausgecheckt werden?" -#: builtin/checkout.c:888 +#: builtin/checkout.c:1054 msgid "git checkout: updating paths is incompatible with switching branches." msgstr "" "git checkout: Pfade aktualisieren kann nicht mit Branchwechsel kombiniert " "werden." -#: builtin/checkout.c:893 +#: builtin/checkout.c:1059 +#, fuzzy +msgid "git checkout: --detach does not take a path argument" +msgstr "" +"fetch --all akzeptiert keine explizite Angabe eines Ursprungs-Repositorys" + +#: builtin/checkout.c:1062 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -718,21 +814,21 @@ msgstr "" "wenn\n" "Pfade aus dem Index ausgecheckt werden." -#: builtin/checkout.c:904 +#: builtin/checkout.c:1073 #, c-format msgid "git checkout: we do not like '%s' as a branch name." msgstr "git checkout: \"%s\" ist kein gültiger Branchname." -#: builtin/checkout.c:909 +#: builtin/checkout.c:1078 #, c-format msgid "git checkout: branch %s already exists" msgstr "git checkout: Branch \"%s\" existiert bereits" -#: builtin/checkout.c:916 +#: builtin/checkout.c:1085 msgid "Cannot switch branch to a non-commit." msgstr "Kann Branch nicht auf etwas anderes als einen Commit umsetzen." -#: builtin/checkout.c:919 +#: builtin/checkout.c:1088 msgid "--ours/--theirs is incompatible with switching branches." msgstr "--ours/--theirs können nicht beim Branchwechsel benutzt werden." @@ -766,8 +862,8 @@ msgid "Removing %s\n" msgstr "Entferne %s\n" #: builtin/clean.c:161 builtin/clean.c:181 -#, c-format -msgid "failed to remove '%s'" +#, fuzzy, c-format +msgid "failed to remove %s" msgstr "konnte \"%s\" nicht entfernen" #: builtin/clean.c:165 @@ -780,121 +876,131 @@ msgstr "Würde %s nicht entfernen\n" msgid "Not removing %s\n" msgstr "Lasse %s bestehen\n" -#: builtin/clone.c:208 +#: builtin/clone.c:214 #, c-format msgid "reference repository '%s' is not a local directory." msgstr "Referenz-Repository \"%s\" ist kein lokales Verzeichnis." -#: builtin/clone.c:235 +#: builtin/clone.c:241 #, c-format msgid "failed to open '%s'" msgstr "konnte \"%s\" nicht öffnen" -#: builtin/clone.c:239 +#: builtin/clone.c:245 #, c-format msgid "failed to create directory '%s'" msgstr "konnte Verzeichnis '\"%s\" nicht anlegen" -#: builtin/clone.c:241 builtin/diff.c:74 +#: builtin/clone.c:247 builtin/diff.c:74 #, c-format msgid "failed to stat '%s'" msgstr "konnte \"%s\" nicht finden/prüfen" -#: builtin/clone.c:243 +#: builtin/clone.c:249 #, c-format msgid "%s exists and is not a directory" msgstr "%s existiert und ist kein Verzeichnis" -#: builtin/clone.c:257 +#: builtin/clone.c:263 #, c-format msgid "failed to stat %s\n" msgstr "konnte \"%s\" nicht finden/prüfen\n" -#: builtin/clone.c:267 +#: builtin/clone.c:273 #, c-format msgid "failed to unlink '%s'" msgstr "konnte \"%s\" nicht entfernen" -#: builtin/clone.c:272 +#: builtin/clone.c:278 #, c-format msgid "failed to create link '%s'" msgstr "konnte Link \"%s\" nicht anlegen" -#: builtin/clone.c:276 +#: builtin/clone.c:282 #, c-format msgid "failed to copy file to '%s'" msgstr "konnte Datei nicht nach \"%s\" kopieren" -#: builtin/clone.c:305 +#: builtin/clone.c:311 #, c-format msgid "done.\n" msgstr "fertig.\n" -#: builtin/clone.c:387 +#: builtin/clone.c:394 msgid "Too many arguments." msgstr "Zu viele Parameter." -#: builtin/clone.c:391 +#: builtin/clone.c:398 msgid "You must specify a repository to clone." msgstr "Ein Quell-Repository zum Klonen muss angegeben werden." -#: builtin/clone.c:399 +#: builtin/clone.c:406 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "--bare kann nicht mit --origin %s kombiniert werden." -#: builtin/clone.c:428 +#: builtin/clone.c:420 +#, fuzzy, c-format +msgid "repository '%s' does not exist" +msgstr "ungültiges Repository \"%s\"" + +#: builtin/clone.c:425 +msgid "--depth is ignored in local clones; use file:// instead." +msgstr "" + +#: builtin/clone.c:435 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "Zielpfad \"%s\" existiert bereits und ist kein leeres Verzeichnis." -#: builtin/clone.c:438 +#: builtin/clone.c:445 #, c-format msgid "working tree '%s' already exists." msgstr "Arbeitsverzeichnis \"%s\" existiert bereits." -#: builtin/clone.c:451 builtin/clone.c:465 +#: builtin/clone.c:458 builtin/clone.c:472 #, c-format msgid "could not create leading directories of '%s'" msgstr "konnte übergeordnete Verzeichnisse für \"%s\" nicht anlegen" -#: builtin/clone.c:454 +#: builtin/clone.c:461 #, c-format msgid "could not create work tree dir '%s'." msgstr "konnte Verzeichnis \"%s\" im Arbeitsverzeichnis nicht anlegen." -#: builtin/clone.c:470 -#, c-format -msgid "Cloning into bare repository %s\n" +#: builtin/clone.c:480 +#, fuzzy, c-format +msgid "Cloning into bare repository %s...\n" msgstr "Klone nach Lager-Repository %s\n" -#: builtin/clone.c:472 -#, c-format -msgid "Cloning into %s\n" +#: builtin/clone.c:482 +#, fuzzy, c-format +msgid "Cloning into %s...\n" msgstr "Klone nach %s\n" -#: builtin/clone.c:530 +#: builtin/clone.c:540 #, c-format msgid "Don't know how to clone %s" msgstr "Keine Ahnung, wie man %s klont" -#: builtin/clone.c:569 +#: builtin/clone.c:579 #, c-format msgid "Remote branch %s not found in upstream %s, using HEAD instead" msgstr "" "Remote-Branch %s nicht in Ursprung %s gefunden, verwende stattdessen HEAD" -#: builtin/clone.c:579 +#: builtin/clone.c:589 msgid "You appear to have cloned an empty repository." msgstr "Anscheinend wurde ein leeres Repository geklont." -#: builtin/clone.c:621 +#: builtin/clone.c:631 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" "Ursprungs-HEAD verweist auf fehlende Referenz, kann keinen Checkout " "vornehmen.\n" #: builtin/commit.c:41 +#, fuzzy msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -903,9 +1009,9 @@ msgid "" " git config --global user.name \"Your Name\"\n" " git config --global user.email you@example.com\n" "\n" -"If the identity used for this commit is wrong, you can fix it with:\n" +"After doing this, you may fix the identity used for this commit with:\n" "\n" -" git commit --amend --author='Your Name '\n" +" git commit --amend --reset-author\n" msgstr "" "Name und E-Mail-Adresse wurden automatisch aus deinem Benutzernamen und " "Hostnamen übernommen. Prüfe, ob diese korrekt sind.\n" @@ -930,92 +1036,117 @@ msgstr "" "werden. Du kannst deinen Befehl mit --allow-empty wiederholen oder den\n" "Commit mit `git reset HEAD^` komplett entfernen.\n" -#: builtin/commit.c:271 +#: builtin/commit.c:58 +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" +msgstr "" + +#: builtin/commit.c:318 msgid "failed to unpack HEAD tree object" msgstr "konnte das HEAD-Baum-Objekt nicht entpacken" -#: builtin/commit.c:299 +#: builtin/commit.c:359 +#, fuzzy +msgid "unable to create temporary index" +msgstr "kann keine temporäre Indexdatei anlegen" + +#: builtin/commit.c:365 msgid "interactive add failed" msgstr "Interaktives Hinzufügen fehlgeschlagen" -#: builtin/commit.c:330 builtin/commit.c:350 builtin/commit.c:396 +#: builtin/commit.c:397 builtin/commit.c:417 builtin/commit.c:463 msgid "unable to write new_index file" msgstr "konnte new_index-Datei nicht anlegen" -#: builtin/commit.c:380 -msgid "cannot do a partial commit during a merge." +#: builtin/commit.c:447 +#, fuzzy, c-format +msgid "cannot do a partial commit during a %s." msgstr "kann keinen partiellen Commit während eines Merges durchführen." -#: builtin/commit.c:389 +#: builtin/commit.c:456 msgid "cannot read the index" msgstr "kann den Index nicht auslesen" -#: builtin/commit.c:409 +#: builtin/commit.c:476 msgid "unable to write temporary index file" msgstr "kann keine temporäre Indexdatei anlegen" -#: builtin/commit.c:456 builtin/commit.c:1294 +#: builtin/commit.c:523 builtin/commit.c:1428 msgid "could not parse HEAD commit" msgstr "konnte HEAD-Commit nicht analysieren" -#: builtin/commit.c:475 builtin/commit.c:481 +#: builtin/commit.c:542 builtin/commit.c:548 #, c-format msgid "invalid commit: %s" msgstr "ungültiger Commit: %s" -#: builtin/commit.c:499 +#: builtin/commit.c:566 msgid "malformed --author parameter" msgstr "ungültiger --author-Parameter" -#: builtin/commit.c:573 builtin/shortlog.c:299 +#: builtin/commit.c:622 +#, fuzzy, c-format +msgid "Malformed ident string: '%s'" +msgstr "Ungültige Eingabezeile: \"%s\"." + +#: builtin/commit.c:656 builtin/commit.c:689 builtin/commit.c:989 +#, c-format +msgid "could not lookup commit %s" +msgstr "konnte Commit %s nicht finden" + +#: builtin/commit.c:668 builtin/shortlog.c:296 #, c-format msgid "(reading log message from standard input)\n" msgstr "(Commit-Kommentar wird von der Standardeingabe gelesen)\n" -#: builtin/commit.c:575 +#: builtin/commit.c:670 msgid "could not read log from standard input" msgstr "konnte Kommentar nicht von der Standardeingabe lesen" -#: builtin/commit.c:579 +#: builtin/commit.c:674 #, c-format msgid "could not read log file '%s'" msgstr "konnte Kommentardatei \"%s\" nicht lesen" -#: builtin/commit.c:585 +#: builtin/commit.c:680 msgid "commit has empty message" msgstr "der Commit-Kommentar ist leer" -#: builtin/commit.c:591 +#: builtin/commit.c:696 msgid "could not read MERGE_MSG" msgstr "konnte MERGE_MSG nicht lesen" -#: builtin/commit.c:595 +#: builtin/commit.c:700 msgid "could not read SQUASH_MSG" msgstr "konnte SQUASH_MSG nicht lesen" -#: builtin/commit.c:599 +#: builtin/commit.c:704 #, c-format msgid "could not read '%s'" msgstr "konnte \"%s\" nicht lesen" -#: builtin/commit.c:612 +#: builtin/commit.c:732 #, c-format msgid "could not open '%s'" msgstr "konnte \"%s\" nicht öffnen" -#: builtin/commit.c:636 +#: builtin/commit.c:756 msgid "could not write commit template" msgstr "konnte Kommentarvorlage nicht anlegen" -#: builtin/commit.c:650 -#, c-format +#: builtin/commit.c:769 +#, fuzzy, 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" -"#\n" +"\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" msgstr "" "#\n" "# Es scheint, als ob ein MERGE committet wird.\n" @@ -1024,191 +1155,184 @@ msgstr "" "# und versuche es nochmal.\n" "#\n" -#: builtin/commit.c:659 -#, c-format -msgid "" -"\n" -"# Please enter the commit message for your changes." +#: builtin/commit.c:782 +#, fuzzy +msgid "Please enter the commit message for your changes." msgstr "" "\n" "# Gib einen Commit-Kommentar für die Änderungen an." -#: builtin/commit.c:663 -#, c-format +#: builtin/commit.c:785 +#, fuzzy msgid "" " Lines starting\n" -"# with '#' will be ignored, and an empty message aborts the commit.\n" +"with '#' will be ignored, and an empty message aborts the commit.\n" msgstr "" " Zeilen, die mit '#'\n" "# anfangen, werden ignoriert, und ein leerer Kommentar bricht den Commit " "ab.\n" -#: builtin/commit.c:668 -#, c-format +#: builtin/commit.c:790 +#, fuzzy 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" +"with '#' will be kept; you may remove them yourself if you want to.\n" +"An empty message aborts the commit.\n" msgstr "" " Zeilen, die mit '#'\n" "# anfangen, werden beibehalten; sie können entfernen werden, wenn " "gewünscht.\n" "# Ein leerer Kommentar bricht den Commit ab.\n" -#: builtin/commit.c:680 -#, c-format -msgid "%s# Author: %s\n" +#: builtin/commit.c:802 +#, fuzzy, c-format +msgid "%sAuthor: %s" msgstr "%s# Autor: %s\n" -#: builtin/commit.c:688 -#, c-format -msgid "%s# Committer: %s\n" +#: builtin/commit.c:809 +#, fuzzy, c-format +msgid "%sCommitter: %s" msgstr "%s# Committer: %s\n" -#: builtin/commit.c:705 +#: builtin/commit.c:829 msgid "Cannot read index" msgstr "Kann Index nicht auslesen" -#: builtin/commit.c:737 +#: builtin/commit.c:869 msgid "Error building trees" msgstr "Fehler beim Anlegen der Bäume" -#: builtin/commit.c:752 builtin/tag.c:321 +#: builtin/commit.c:884 builtin/tag.c:313 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Bitte gib den Kommentar mit der Option -m oder -F an.\n" -#: builtin/commit.c:832 +#: builtin/commit.c:964 #, c-format msgid "No existing author found with '%s'" msgstr "Kein bekannter Autor gefunden mit \"%s\"" -#: builtin/commit.c:847 builtin/commit.c:1039 +#: builtin/commit.c:979 builtin/commit.c:1173 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Ungültiger Modus für unberücksichtigte Dateien: \"%s\"" -#: builtin/commit.c:864 +#: builtin/commit.c:1018 msgid "Using both --reset-author and --author does not make sense" msgstr "Es ist unsinnig, --reset-author und --author zusammen zu verwenden" -#: builtin/commit.c:878 +#: builtin/commit.c:1032 msgid "You have nothing to amend." msgstr "Es gibt nichts zum Nachbearbeiten." -#: builtin/commit.c:880 -msgid "You are in the middle of a merge -- cannot amend." +#: builtin/commit.c:1034 +#, fuzzy, c-format +msgid "You are in the middle of a %s -- cannot amend." msgstr "Du bist mitten in einem Merge; Nachbearbeitung nicht möglich." -#: builtin/commit.c:889 -msgid "Only one of -c/-C/-F can be used." +#: builtin/commit.c:1036 +#, fuzzy +msgid "Options --squash and --fixup cannot be used together" +msgstr "-x und -X können nicht zusammen verwendet werden" + +#: builtin/commit.c:1046 +#, fuzzy +msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Nur eine der Optionen -c, -C und -F kann auf einmal benutzt werden." -#: builtin/commit.c:891 -msgid "Option -m cannot be combined with -c/-C/-F." +#: builtin/commit.c:1048 +#, fuzzy +msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "Option -m kann nicht mit -c, -C oder -F kombiniert werden." -#: builtin/commit.c:897 +#: builtin/commit.c:1054 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author kann nur mit -C, -c oder --amend benutzt werden." -#: builtin/commit.c:906 -#, c-format -msgid "could not lookup commit %s" -msgstr "konnte Commit %s nicht finden" - -#: builtin/commit.c:909 -#, c-format -msgid "could not parse commit %s" -msgstr "konnte Commit %s nicht analysieren" - -#: builtin/commit.c:937 -msgid "Only one of --include/--only/--all/--interactive can be used." +#: builtin/commit.c:1071 +#, fuzzy +msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" "Nur eine der Optionen --include, --only, --all und --interactive kann auf " "einmal benutzt werden." -#: builtin/commit.c:939 +#: builtin/commit.c:1073 msgid "No paths with --include/--only does not make sense." msgstr "Für --include/--only müssen Pfade angeben werden." -#: builtin/commit.c:941 +#: builtin/commit.c:1075 msgid "Clever... amending the last one with dirty index." msgstr "" "Bearbeite letzten Commit nach, ohne Änderungen an Dateien zu übernehmen." -#: builtin/commit.c:943 +#: builtin/commit.c:1077 msgid "Explicit paths specified without -i nor -o; assuming --only paths..." msgstr "" "Explizite Pfade ohne -i noch -o angegeben; Annahme, dass --only gemeint " "ist..." -#: builtin/commit.c:953 +#: builtin/commit.c:1087 #, c-format msgid "Invalid cleanup mode %s" msgstr "Ungültiger Aufräummodus (--cleanup=%s) für den Commit-Kommentar" -#: builtin/commit.c:958 +#: builtin/commit.c:1092 msgid "Paths with -a does not make sense." msgstr "Es ist unsinnig, Pfade zusammen mit -a anzugeben." -#: builtin/commit.c:960 -msgid "Paths with --interactive does not make sense." -msgstr "Es ist unsinnig, Pfade zusammen mit --interactive anzugeben." - -#: builtin/commit.c:1142 +#: builtin/commit.c:1274 msgid "couldn't look up newly created commit" msgstr "konnte neu angelegten Commit nicht finden" -#: builtin/commit.c:1144 +#: builtin/commit.c:1276 msgid "could not parse newly created commit" msgstr "konnte neu angelegten Commit nicht analysieren" -#: builtin/commit.c:1185 +#: builtin/commit.c:1316 msgid "detached HEAD" msgstr "freistehender HEAD" -#: builtin/commit.c:1187 +#: builtin/commit.c:1318 msgid " (root-commit)" msgstr " (Wurzel-Commit)" -#: builtin/commit.c:1307 builtin/merge.c:462 +#: builtin/commit.c:1441 builtin/merge.c:490 #, c-format msgid "could not open '%s' for reading" msgstr "konnte \"%s\" nicht zum Lesen öffnen" -#: builtin/commit.c:1312 +#: builtin/commit.c:1446 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Beschädigte MERGE_HEAD-Datei (%s)" -#: builtin/commit.c:1319 +#: builtin/commit.c:1453 msgid "could not read MERGE_MODE" msgstr "konnte MERGE_MODE nicht auslesen" -#: builtin/commit.c:1336 +#: builtin/commit.c:1472 #, c-format msgid "could not read commit message: %s" msgstr "konnte Commit-Kommentar nicht lesen: %s" -#: builtin/commit.c:1350 +#: builtin/commit.c:1486 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Commit wegen leerem Kommentar abgebrochen.\n" -#: builtin/commit.c:1358 +#: builtin/commit.c:1493 msgid "failed to write commit object" msgstr "konnte Commit-Objekt nicht schreiben" -#: builtin/commit.c:1375 +#: builtin/commit.c:1511 msgid "cannot lock HEAD ref" msgstr "kann HEAD-Referenz nicht sperren" -#: builtin/commit.c:1379 +#: builtin/commit.c:1515 msgid "cannot update HEAD ref" msgstr "kann HEAD-Referenz nicht aktualisieren" -#: builtin/commit.c:1388 +#: builtin/commit.c:1525 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full or quota is\n" @@ -1219,47 +1343,47 @@ msgstr "" "Limits nicht überschritten werden, und verwende dann `git reset HEAD` zum " "Reparieren." -#: builtin/describe.c:205 +#: builtin/describe.c:234 #, c-format msgid "annotated tag %s not available" msgstr "Kommentierter Tag %s nicht verfügbar" -#: builtin/describe.c:209 +#: builtin/describe.c:238 #, c-format msgid "annotated tag %s has no embedded name" msgstr "Kommentierter Tag %s hat keinen eingebetteten Namen" -#: builtin/describe.c:211 +#: builtin/describe.c:240 #, c-format msgid "tag '%s' is really '%s' here" msgstr "Tag '%s' ist hier eher '%s'" -#: builtin/describe.c:238 +#: builtin/describe.c:267 #, c-format msgid "Not a valid object name %s" msgstr "Kein gültiger Objektname %s" -#: builtin/describe.c:241 +#: builtin/describe.c:270 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s ist kein gültiges \"%s\"-Objekt" -#: builtin/describe.c:258 +#: builtin/describe.c:287 #, c-format msgid "no tag exactly matches '%s'" msgstr "Kein Tag passt genau auf \"%s\"" -#: builtin/describe.c:260 +#: builtin/describe.c:289 #, c-format msgid "searching to describe %s\n" msgstr "Suche, was %s beschreibt\n" -#: builtin/describe.c:295 +#: builtin/describe.c:329 #, c-format msgid "finished search at %s\n" msgstr "Suche bei %s beendet\n" -#: builtin/describe.c:319 +#: builtin/describe.c:353 #, c-format msgid "" "No annotated tags can describe '%s'.\n" @@ -1268,7 +1392,7 @@ msgstr "" "Keine kommentierten Tags können '%s' beschreiben.\n" "Es gab aber kommentarlose Tags: probiere --tags." -#: builtin/describe.c:323 +#: builtin/describe.c:357 #, c-format msgid "" "No tags can describe '%s'.\n" @@ -1277,12 +1401,12 @@ msgstr "" "Keine Tags können '%s' beschreiben.\n" "Versuche --always, oder erstelle Tags." -#: builtin/describe.c:344 +#: builtin/describe.c:378 #, c-format msgid "traversed %lu commits\n" msgstr "%lu Commits durchlaufen\n" -#: builtin/describe.c:347 +#: builtin/describe.c:381 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" @@ -1291,15 +1415,15 @@ msgstr "" "Mehr als %d Tags gefunden; die %d aktuellsten wurden angezeigt\n" "Suche aufgegeben ab %s\n" -#: builtin/describe.c:398 +#: builtin/describe.c:436 msgid "--long is incompatible with --abbrev=0" msgstr "--long kann nicht mit --abrev=0 kombiniert werden" -#: builtin/describe.c:423 +#: builtin/describe.c:462 msgid "No names found, cannot describe anything." msgstr "Keine Namen gefunden, kann nichts beschreiben." -#: builtin/describe.c:430 +#: builtin/describe.c:469 msgid "--dirty is incompatible with committishes" msgstr "--dirty kann nicht mit Commitishes kombiniert werden" @@ -1308,49 +1432,45 @@ msgstr "--dirty kann nicht mit Commitishes kombiniert werden" msgid "'%s': not a regular file or symlink" msgstr "\"%s\": weder normale Datei noch Symlink" -#: builtin/diff.c:225 +#: builtin/diff.c:220 #, c-format msgid "invalid option: %s" msgstr "ungültige Option: %s" -#: builtin/diff.c:302 +#: builtin/diff.c:296 msgid "Not a git repository" msgstr "Kein git-Repository" -#: builtin/diff.c:334 -msgid "No HEAD commit to compare with (yet)" -msgstr "Es gibt (noch) keinen HEAD-Commit zum Vergleich" - -#: builtin/diff.c:349 +#: builtin/diff.c:346 #, c-format msgid "invalid object '%s' given." msgstr "ungültiges Objekt \"%s\" angegeben." -#: builtin/diff.c:354 +#: builtin/diff.c:351 #, c-format msgid "more than %d trees given: '%s'" msgstr "mehr als %d Bäume angegeben: \"%s\"" -#: builtin/diff.c:364 +#: builtin/diff.c:361 #, c-format msgid "more than two blobs given: '%s'" msgstr "mehr als zwei Blobs angegeben: \"%s\"" -#: builtin/diff.c:372 +#: builtin/diff.c:369 #, c-format msgid "unhandled object '%s' given." msgstr "nicht unterstütztes Objekt \"%s\" angegeben." -#: builtin/fetch.c:175 +#: builtin/fetch.c:199 msgid "Couldn't find remote ref HEAD" msgstr "Konnte Remote-Referenz HEAD nicht finden" -#: builtin/fetch.c:228 +#: builtin/fetch.c:252 #, c-format msgid "object %s not found" msgstr "Objekt %s nicht gefunden" -#: builtin/fetch.c:233 +#: builtin/fetch.c:257 msgid "[up to date]" msgstr "[aktuell]" @@ -1358,54 +1478,54 @@ msgstr "[aktuell]" #. * If this is the head, and it's not okay to update #. * the head, and the old value of the head isn't empty... #. -#: builtin/fetch.c:246 +#: builtin/fetch.c:270 #, c-format msgid "! %-*s %-*s -> %s (can't fetch in current branch)" msgstr "! %-*s %-*s -> %s (kann aktuelle Branch nicht überschreiben)" -#: builtin/fetch.c:247 builtin/fetch.c:309 +#: builtin/fetch.c:271 builtin/fetch.c:342 msgid "[rejected]" msgstr "[abgewiesen]" -#: builtin/fetch.c:257 +#: builtin/fetch.c:281 msgid "[tag update]" msgstr "[Tag-Update]" -#: builtin/fetch.c:258 builtin/fetch.c:280 builtin/fetch.c:293 +#: builtin/fetch.c:282 builtin/fetch.c:307 builtin/fetch.c:323 msgid " (unable to update local ref)" msgstr " (kann lokale Referenz nicht aktualisieren)" -#: builtin/fetch.c:270 +#: builtin/fetch.c:294 msgid "[new tag]" msgstr "[neuer Tag]" -#: builtin/fetch.c:274 +#: builtin/fetch.c:298 msgid "[new branch]" msgstr "[neue Branch]" -#: builtin/fetch.c:305 +#: builtin/fetch.c:338 msgid "unable to update local ref" msgstr "kann lokale Referenz nicht aktualisieren" -#: builtin/fetch.c:305 +#: builtin/fetch.c:338 msgid "forced update" msgstr "Update erzwungen" -#: builtin/fetch.c:310 +#: builtin/fetch.c:343 msgid "(non-fast-forward)" msgstr "(Update ohne Merge)" -#: builtin/fetch.c:328 builtin/fetch.c:651 +#: builtin/fetch.c:361 builtin/fetch.c:684 #, c-format msgid "cannot open %s: %s\n" msgstr "kann %s nicht öffnen: %s\n" -#: builtin/fetch.c:406 +#: builtin/fetch.c:439 #, c-format msgid "From %.*s\n" msgstr "Von %.*s\n" -#: builtin/fetch.c:417 +#: builtin/fetch.c:450 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -1414,73 +1534,73 @@ msgstr "" "einige lokale Referenzen konnten nicht aktualisiert werden; versuche,\n" "alte kollidierende Branches mit `git remote prune %s` zu entfernen" -#: builtin/fetch.c:467 +#: builtin/fetch.c:500 msgid "could not run rev-list" msgstr "konnte rev-list nicht ausführen" -#: builtin/fetch.c:481 +#: builtin/fetch.c:514 #, c-format msgid "failed write to rev-list: %s" msgstr "konnte Daten nicht an rev-list übergeben: %s" -#: builtin/fetch.c:488 +#: builtin/fetch.c:521 #, c-format msgid "failed to close rev-list's stdin: %s" msgstr "konnte Standardeingabe von rev-list nicht schließen: %s" # dangling ist nicht gerade "nichts". # Ein dangling Symlink zeigt immer noch auf etwas, aber auf etwas das nicht mehr existiert. -#: builtin/fetch.c:515 +#: builtin/fetch.c:548 #, c-format msgid " (%s will become dangling)\n" msgstr " (%s wird auf nichts existentes mehr zeigen)\n" # dangling ist nicht gerade "nichts". # Ein dangling Symlink zeigt immer noch auf etwas, aber auf etwas das nicht mehr existiert. -#: builtin/fetch.c:516 +#: builtin/fetch.c:549 #, c-format msgid " (%s has become dangling)\n" msgstr " (%s zeigt auf nichts existentes mehr)\n" -#: builtin/fetch.c:523 +#: builtin/fetch.c:556 msgid "[deleted]" msgstr "[gelöscht]" -#: builtin/fetch.c:524 +#: builtin/fetch.c:557 msgid "(none)" msgstr "(nichts)" -#: builtin/fetch.c:641 +#: builtin/fetch.c:674 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "Überschreiben der aktuellen Branch %s im Lager-Repository verweigert" -#: builtin/fetch.c:675 +#: builtin/fetch.c:708 #, c-format msgid "Don't know how to fetch from %s" msgstr "Keine Ahnung, wie man von %s runterlädt" -#: builtin/fetch.c:729 +#: builtin/fetch.c:762 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "Option \"%s\" (Wert \"%s\") ist nicht gültig für %s" -#: builtin/fetch.c:732 +#: builtin/fetch.c:765 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Option \"%s\" wird für %s ignoriert\n" -#: builtin/fetch.c:821 +#: builtin/fetch.c:864 #, c-format msgid "Fetching %s\n" msgstr "Hole %s\n" -#: builtin/fetch.c:823 +#: builtin/fetch.c:866 #, c-format msgid "Could not fetch %s" msgstr "Konnte %s nicht holen" -#: builtin/fetch.c:839 +#: builtin/fetch.c:883 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -1488,25 +1608,25 @@ msgstr "" "Kein Ursprungs-Repository angegeben. Gib entweder eine URL oder einen\n" "Remote-Namen an, um die Quelle für neu zu holende Revisionen festzulegen." -#: builtin/fetch.c:859 +#: builtin/fetch.c:903 msgid "You need to specify a tag name." msgstr "Ein Tagname muss angegeben werden." -#: builtin/fetch.c:899 +#: builtin/fetch.c:946 msgid "fetch --all does not take a repository argument" msgstr "" "fetch --all akzeptiert keine explizite Angabe eines Ursprungs-Repositorys" -#: builtin/fetch.c:901 +#: builtin/fetch.c:948 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all ergibt keinen Sinn mit Refspecs" -#: builtin/fetch.c:912 +#: builtin/fetch.c:959 #, c-format msgid "No such remote or remote group: %s" msgstr "Es gibt kein Remote und auch keine Remote-Gruppe \"%s\"" -#: builtin/fetch.c:920 +#: builtin/fetch.c:967 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Das Holen einer Gruppe unter Angabe von Refspecs ergibt keinen Sinn" @@ -1524,208 +1644,226 @@ msgstr "Zuviele Optionen angegeben" msgid "insanely long object directory %.*s" msgstr "irrsinniges langes Objektverzeichnis %.*s" -#: builtin/gc.c:220 +#: builtin/gc.c:223 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "" "Automatische Komprimierung des Repositories für optimale Performance.\n" -#: builtin/gc.c:223 -#, c-format +#: builtin/gc.c:226 +#, fuzzy, 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." +"run \"git gc\" manually. See \"git help gc\" for more information.\n" msgstr "" "Automatische Komprimierung des Repositories für optimale Performance. `git " "gc` kann auch manuell ausgeführt werden. Siehe `git help gc` für weitere " "Informationen." -#: builtin/gc.c:251 +#: builtin/gc.c:254 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" "Es gibt zu viele unerreichbare lose Objekte; führe `git prune` aus, um sie " "zu entfernen." -#: builtin/grep.c:252 +#: builtin/grep.c:256 #, c-format msgid "grep: failed to create thread: %s" msgstr "grep: konnte Thread nicht erstellen: %s" -#: builtin/grep.c:457 +#: builtin/grep.c:374 #, c-format msgid "'%s': unable to read %s" msgstr "\"%s\": kann %s nicht lesen" -#: builtin/grep.c:508 +#: builtin/grep.c:425 #, c-format msgid "'%s': %s" msgstr "\"%s\": %s" -#: builtin/grep.c:519 +#: builtin/grep.c:436 #, c-format msgid "'%s': short read %s" msgstr "\"%s\": zu wenig gelesen: %s" -#: builtin/grep.c:581 +#: builtin/grep.c:498 #, c-format msgid "Failed to chdir: %s" msgstr "Konnte Verzeichnis nicht wechseln: %s" -#: builtin/grep.c:671 builtin/grep.c:697 +#: builtin/grep.c:573 builtin/grep.c:604 #, c-format msgid "unable to read tree (%s)" msgstr "kann Baum nicht lesen (%s)" -#: builtin/grep.c:703 +#: builtin/grep.c:618 #, c-format msgid "unable to grep from object of type %s" msgstr "kann Objekte des Typs %s nicht greppen" -#: builtin/grep.c:755 +#: builtin/grep.c:674 #, c-format msgid "switch `%c' expects a numerical value" msgstr "Option '%c' benötigt einen numerischen Wert" -#: builtin/grep.c:771 +#: builtin/grep.c:691 #, c-format msgid "cannot open '%s'" msgstr "kann \"%s\" nicht öffnen" -#: builtin/grep.c:1012 +#: builtin/grep.c:974 msgid "no pattern given." msgstr "kein Suchmuster angegeben." -#: builtin/grep.c:1016 -msgid "cannot mix --fixed-strings and regexp" -msgstr "--fixed-strings kann nicht mit regulärem Ausdruck kombiniert werden" - -#: builtin/grep.c:1041 +#: builtin/grep.c:1001 #, c-format msgid "bad object %s" msgstr "ungültiges Objekt %s" -#: builtin/grep.c:1068 +#: builtin/grep.c:1025 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager funktioniert nur im Arbeitsverzeichnis" -#: builtin/grep.c:1093 +#: builtin/grep.c:1050 msgid "--cached cannot be used with --no-index." msgstr "--cached kann nicht mit --no-index kombiniert werden." -#: builtin/grep.c:1095 +#: builtin/grep.c:1052 msgid "--no-index cannot be used with revs." msgstr "--no-index kann nicht mit Revisionen kombiniert werden." -#: builtin/grep.c:1104 +#: builtin/grep.c:1061 msgid "both --cached and trees are given." msgstr "Sowohl --cached als auch Baum wurden angegeben." -#: builtin/init-db.c:34 +#: builtin/init-db.c:35 #, c-format msgid "Could not make %s writable by group" msgstr "Konnte %s nicht für die Gruppe schreibbar machen" -#: builtin/init-db.c:61 +#: builtin/init-db.c:62 #, c-format msgid "insanely long template name %s" msgstr "irrsinnig langer Vorlagen-Name %s" -#: builtin/init-db.c:66 +#: builtin/init-db.c:67 #, c-format msgid "cannot stat '%s'" msgstr "kann \"%s\" nicht finden/prüfen" -#: builtin/init-db.c:72 +#: builtin/init-db.c:73 #, c-format msgid "cannot stat template '%s'" msgstr "kann Vorlage \"%s\" nicht finden/prüfen" -#: builtin/init-db.c:79 +#: builtin/init-db.c:80 #, c-format msgid "cannot opendir '%s'" msgstr "kann Verzeichnis \"%s\" nicht öffnen" -#: builtin/init-db.c:96 +#: builtin/init-db.c:97 #, c-format msgid "cannot readlink '%s'" msgstr "kann Linkziel für \"%s\" nicht ermitteln" -#: builtin/init-db.c:98 +#: builtin/init-db.c:99 #, c-format msgid "insanely long symlink %s" msgstr "irrsinnig langer Symlink \"%s\"" -#: builtin/init-db.c:101 +#: builtin/init-db.c:102 #, c-format msgid "cannot symlink '%s' '%s'" msgstr "kann \"%s\" nicht nach \"%s\" symbolisch verlinken" -#: builtin/init-db.c:105 +#: builtin/init-db.c:106 #, c-format msgid "cannot copy '%s' to '%s'" msgstr "kann \"%s\" nicht nach \"%s\" kopieren" -#: builtin/init-db.c:109 +#: builtin/init-db.c:110 #, c-format msgid "ignoring template %s" msgstr "ignoriere Vorlage %s" -#: builtin/init-db.c:132 +#: builtin/init-db.c:133 #, c-format msgid "insanely long template path %s" msgstr "irrsinnig langer Vorlagen-Pfad %s" -#: builtin/init-db.c:140 +#: builtin/init-db.c:141 #, c-format msgid "templates not found %s" msgstr "Vorlagen nicht gefunden: %s" -#: builtin/init-db.c:153 +#: builtin/init-db.c:154 #, c-format msgid "not copying templates of a wrong format version %d from '%s'" msgstr "kopiere keine Vorlagen einer falschen Formatversion %d aus \"%s\"" -#: builtin/init-db.c:191 +#: builtin/init-db.c:192 #, c-format msgid "insane git directory %s" msgstr "irrsinniges git-Verzeichnis %s" -#. 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:361 +#: builtin/init-db.c:322 builtin/init-db.c:325 +#, fuzzy, c-format +msgid "%s already exists" +msgstr "Tag '%s' existiert bereits" + +#: builtin/init-db.c:354 +#, fuzzy, c-format +msgid "unable to handle file type %d" +msgstr "kann Baum nicht lesen (%s)" + +#: builtin/init-db.c:357 +#, fuzzy, c-format +msgid "unable to move %s to %s" +msgstr "konnte %s nicht schreiben" + +#: builtin/init-db.c:362 +#, fuzzy, c-format +msgid "Could not create git link %s" +msgstr "konnte Datei \"%s\" nicht anlegen" + +#. +#. * 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 "%s%s Git-Repository in %s%s\n" -#: builtin/init-db.c:362 +#: builtin/init-db.c:420 msgid "Reinitialized existing" msgstr "Bereits bestehend und neuinitialisierte" -#: builtin/init-db.c:362 +#: builtin/init-db.c:420 msgid "Initialized empty" msgstr "Neu angelegte" -#: builtin/init-db.c:363 +#: builtin/init-db.c:421 msgid " shared" msgstr " gemeinsam benutztes" -#: builtin/init-db.c:382 +#: builtin/init-db.c:440 msgid "cannot tell cwd" msgstr "kann aktuelles Verzeichnis nicht ermitteln" -#: builtin/init-db.c:456 builtin/init-db.c:463 +#: builtin/init-db.c:521 builtin/init-db.c:528 #, c-format msgid "cannot mkdir %s" msgstr "kann Verzeichnis %s nicht anlegen" -#: builtin/init-db.c:467 +#: builtin/init-db.c:532 #, c-format msgid "cannot chdir to %s" msgstr "kann nicht in Verzeichnis %s wechseln" -#: builtin/init-db.c:489 +#: builtin/init-db.c:554 #, c-format msgid "" "%s (or --work-tree=) not allowed without specifying %s (or --git-" @@ -1734,122 +1872,117 @@ msgstr "" "%s (oder --work-tree=) ohne Angabe von %s nicht erlaubt (oder --" "git-dir=)" -#: builtin/init-db.c:515 +#: builtin/init-db.c:578 msgid "Cannot access current working directory" msgstr "Kann auf aktuelles Verzeichnis nicht zugreifen" -#: builtin/init-db.c:518 +#: builtin/init-db.c:585 #, c-format msgid "Cannot access work tree '%s'" msgstr "Kann auf Arbeitsverzeichnis \"%s\" nicht zugreifen" -#: builtin/log.c:104 -#, c-format -msgid "invalid --decorate option: %s" -msgstr "ungültige --decorate-Option: %s" - -#: builtin/log.c:113 builtin/log.c:1137 builtin/shortlog.c:287 -#, c-format -msgid "unrecognized argument: %s" -msgstr "unbekannter Parameter: %s" - -#: builtin/log.c:156 +#: builtin/log.c:186 #, c-format msgid "Final output: %d %s\n" msgstr "Endgültige Ausgabe: %d %s\n" -#: builtin/log.c:255 builtin/log.c:674 builtin/log.c:1221 builtin/log.c:1423 -#: builtin/merge.c:311 builtin/revert.c:556 builtin/shortlog.c:184 +#: builtin/log.c:287 builtin/log.c:721 builtin/log.c:1274 builtin/log.c:1492 +#: builtin/merge.c:338 builtin/revert.c:539 builtin/shortlog.c:181 msgid "revision walk setup failed" msgstr "Einrichtung der Revisionsverfolgung fehlgeschlagen" -#: builtin/log.c:347 builtin/log.c:434 +#: builtin/log.c:397 builtin/log.c:486 #, c-format msgid "Could not read object %s" msgstr "Konnte Objekt %s nicht lesen" -#: builtin/log.c:458 +#: builtin/log.c:510 #, c-format msgid "Unknown type: %d" msgstr "Unbekannter Typ: %d" -#: builtin/log.c:558 +#: builtin/log.c:605 msgid "format.headers without value" msgstr "format.headers ohne Wert" -#: builtin/log.c:630 +#: builtin/log.c:677 msgid "name of output directory is too long" msgstr "Name des Ausgabeverzeichnisses ist zu lang" -#: builtin/log.c:641 +#: builtin/log.c:688 #, c-format msgid "Cannot open patch file %s" msgstr "Kann Patch-Datei \"%s\" nicht öffnen" -#: builtin/log.c:655 +#: builtin/log.c:702 msgid "Need exactly one range." msgstr "Benötige genau eine Bereichsangabe." -#: builtin/log.c:663 +#: builtin/log.c:710 msgid "Not a range." msgstr "Keine Bereichsangabe." -#: builtin/log.c:700 +#: builtin/log.c:747 msgid "Could not extract email from committer identity." msgstr "Konnte E-Mail-Adresse nicht aus der Committer-Angabe entnehmen." -#: builtin/log.c:732 +#: builtin/log.c:779 msgid "Cover letter needs email format" msgstr "Begleittext muss im E-Mail-Format sein" -#: builtin/log.c:825 +#: builtin/log.c:872 #, c-format msgid "insane in-reply-to: %s" msgstr "irrsinniges in-reply-to: %s" -#: builtin/log.c:898 +#: builtin/log.c:945 msgid "Two output directories?" msgstr "Zwei Ausgabeverzeichnisse?" -#: builtin/log.c:1086 +#: builtin/log.c:1136 #, c-format msgid "bogus committer info %s" msgstr "merkwürdige Committer-Angabe %s" -#: builtin/log.c:1131 +#: builtin/log.c:1181 msgid "-n and -k are mutually exclusive." msgstr "-n kann nicht mit -k kombiniert werden." -#: builtin/log.c:1133 +#: builtin/log.c:1183 msgid "--subject-prefix and -k are mutually exclusive." msgstr "--subject-prefix kann nicht mit -k kombiniert werden." -#: builtin/log.c:1140 +#: builtin/log.c:1188 builtin/shortlog.c:284 +#, c-format +msgid "unrecognized argument: %s" +msgstr "unbekannter Parameter: %s" + +#: builtin/log.c:1191 msgid "--name-only does not make sense" msgstr "--name-only ergibt keinen Sinn" -#: builtin/log.c:1142 +#: builtin/log.c:1193 msgid "--name-status does not make sense" msgstr "--name-status ergibt keinen Sinn" -#: builtin/log.c:1144 +#: builtin/log.c:1195 msgid "--check does not make sense" msgstr "--check ergibt keinen Sinn" -#: builtin/log.c:1165 +#: builtin/log.c:1218 msgid "standard output, or directory, which one?" msgstr "Standardausgabe oder Verzeichnis... welches nun?" -#: builtin/log.c:1167 +#: builtin/log.c:1220 #, c-format msgid "Could not create directory '%s'" msgstr "Konnte Verzeichnis \"%s\" nicht anlegen" -#: builtin/log.c:1302 +#: builtin/log.c:1355 msgid "Failed to create output files" msgstr "Konnte Ausgabedateien nicht anlegen" -#: builtin/log.c:1389 +#: builtin/log.c:1458 #, c-format msgid "" "Could not find a tracked remote branch, please specify manually.\n" @@ -1857,135 +1990,168 @@ msgstr "" "Konnte keine verfolgte Remote-Branch finden, bitte gib selbst " "an.\n" -#: builtin/log.c:1405 builtin/log.c:1407 builtin/log.c:1419 +#: builtin/log.c:1474 builtin/log.c:1476 builtin/log.c:1488 #, c-format msgid "Unknown commit %s" msgstr "Unbekannter Commit %s" -#: builtin/merge.c:82 +#: builtin/merge.c:88 msgid "switch `m' requires a value" msgstr "Option 'm' benötigt einen Wert" -#: builtin/merge.c:119 +#: builtin/merge.c:125 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "Konnte Merge-Strategie \"%s\" nicht finden.\n" -#: builtin/merge.c:120 +#: builtin/merge.c:126 #, c-format msgid "Available strategies are:" msgstr "Verfügbare Strategien:" -#: builtin/merge.c:125 +#: builtin/merge.c:131 #, c-format msgid "Available custom strategies are:" msgstr "Verfügbare benutzerdefinierte Strategien:" -#: builtin/merge.c:224 +#: builtin/merge.c:233 msgid "could not run stash." msgstr "konnte \"stash\" nicht ausführen." -#: builtin/merge.c:229 +#: builtin/merge.c:238 msgid "stash failed" msgstr "\"stash\" fehlgeschlagen" -#: builtin/merge.c:234 +#: builtin/merge.c:243 #, c-format msgid "not a valid object: %s" msgstr "kein gültiges Objekt: %s" -#: builtin/merge.c:251 +#: builtin/merge.c:261 builtin/merge.c:278 msgid "read-tree failed" msgstr "read-tree fehlgeschlagen" -#: builtin/merge.c:280 +#: builtin/merge.c:307 msgid " (nothing to squash)" msgstr " (nichts zu kombinieren (--squash))" -#: builtin/merge.c:293 +#: builtin/merge.c:320 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Squash-Commit -- HEAD wird nicht aktualisiert\n" -#: builtin/merge.c:296 builtin/merge.c:1280 builtin/merge.c:1289 -#: builtin/merge.c:1299 +#: builtin/merge.c:323 builtin/merge.c:844 builtin/merge.c:1430 +#: builtin/merge.c:1442 builtin/revert.c:213 #, c-format msgid "Could not write to '%s'" msgstr "Konnte nicht nach \"%s\" schreiben" -#: builtin/merge.c:324 +#: builtin/merge.c:352 msgid "Writing SQUASH_MSG" msgstr "Schreibe SQUASH_MSG" -#: builtin/merge.c:326 +#: builtin/merge.c:354 msgid "Finishing SQUASH_MSG" msgstr "Schließe SQUASH_MSG ab" -#: builtin/merge.c:346 +#: builtin/merge.c:374 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "Kein Merge-Kommentar -- HEAD wird nicht aktualisiert\n" -#: builtin/merge.c:397 +#: builtin/merge.c:425 #, c-format msgid "'%s' does not point to a commit" msgstr "\"%s\" zeigt nicht auf einen Commit" -#: builtin/merge.c:492 +#: builtin/merge.c:517 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Ungültige Branch.%s.mergeoptions string: %s" -#: builtin/merge.c:561 +#: builtin/merge.c:550 +#, c-format +msgid "%s: negative length %s" +msgstr "" + +#: builtin/merge.c:609 msgid "git write-tree failed to write a tree" msgstr "`git write-tree` konnte keinen Baum anlegen" -#: builtin/merge.c:602 +#: builtin/merge.c:659 msgid "failed to read the cache" msgstr "konnte den Index nicht auslesen" -#: builtin/merge.c:619 +#: builtin/merge.c:676 msgid "Unable to write index." msgstr "Konnte den Index nicht anlegen." -#: builtin/merge.c:632 +#: builtin/merge.c:689 msgid "Not handling anything other than two heads merge." msgstr "Dieser Befehl erledigt ausschließlich Merges mit zwei Quellen." -#: builtin/merge.c:644 +#: builtin/merge.c:703 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Unbekannte Option für merge-recursive: -X%s" -#: builtin/merge.c:658 +#: builtin/merge.c:717 #, c-format msgid "unable to write %s" msgstr "konnte %s nicht schreiben" -#: builtin/merge.c:783 -#, c-format -msgid "Wonderful.\n" -msgstr "Wunderbar.\n" - -#: builtin/merge.c:832 builtin/merge.c:1277 builtin/merge.c:1285 -#: builtin/merge.c:1293 +#: builtin/merge.c:841 builtin/merge.c:920 builtin/merge.c:1427 +#: builtin/merge.c:1436 builtin/revert.c:210 #, c-format msgid "Could not open '%s' for writing" msgstr "Konnte \"%s\" nicht zum Schreiben öffnen" -#: builtin/merge.c:848 +#: builtin/merge.c:852 +#, fuzzy, c-format +msgid "Could not read from '%s'" +msgstr "konnte \"%s\" nicht lesen" + +#: builtin/merge.c:869 +#, c-format +msgid "Wonderful.\n" +msgstr "Wunderbar.\n" + +#: builtin/merge.c:936 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" "Automatischer Merge fehlgeschlagen; behebe die Konflikte und committe das " "Ergebnis.\n" -#: builtin/merge.c:863 +#: builtin/merge.c:951 #, c-format msgid "'%s' is not a commit" msgstr "\"%s\" ist kein Commit" -#: builtin/merge.c:913 git-pull.sh:31 +#: builtin/merge.c:992 +#, fuzzy +msgid "No current branch." +msgstr "Gegenwärtig auf keiner Branch." + +#: builtin/merge.c:994 +#, fuzzy +msgid "No remote for the current branch." +msgstr "Gegenwärtig auf keiner Branch." + +#: builtin/merge.c:996 +msgid "No default upstream defined for the current branch." +msgstr "" + +#: builtin/merge.c:1001 +#, c-format +msgid "No remote tracking branch for %s from %s" +msgstr "" + +#: builtin/merge.c:1053 +msgid "There is no merge to abort (MERGE_HEAD missing)." +msgstr "" + +#: builtin/merge.c:1068 git-pull.sh:31 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you can merge." @@ -1993,84 +2159,98 @@ msgstr "" "Du hast deinen Merge nicht abgeschlossen (MERGE_HEAD existiert).\n" "Committe die Änderungen, bevor du einen weiteren Merge startest." -#: builtin/merge.c:916 git-pull.sh:34 +#: builtin/merge.c:1071 git-pull.sh:34 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Du hast deinen Merge nicht abgeschlossen (MERGE_HEAD existiert)." -#: builtin/merge.c:943 +#: builtin/merge.c:1075 +#, fuzzy +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 Merge nicht abgeschlossen (MERGE_HEAD existiert).\n" +"Committe die Änderungen, bevor du einen weiteren Merge startest." + +#: builtin/merge.c:1078 +#, fuzzy +msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." +msgstr "Du hast deinen Merge nicht abgeschlossen (MERGE_HEAD existiert)." + +#: builtin/merge.c:1087 msgid "You cannot combine --squash with --no-ff." msgstr "--squash kann nicht mit --no-ff kombiniert werden." -#: builtin/merge.c:948 +#: builtin/merge.c:1092 msgid "You cannot combine --no-ff with --ff-only." msgstr "--no-ff kann nicht mit --ff-only kombiniert werden." # Die Originalumschreibung "exactly one commit" ist irreführend; es geht # natürlich um die gesamte History hinter diesem Commit -#: builtin/merge.c:976 +#: builtin/merge.c:1126 msgid "Can merge only exactly one commit into empty head" msgstr "Kann nur exakt eine Historie in einen leeren HEAD mergen" -#: builtin/merge.c:979 +#: builtin/merge.c:1129 msgid "Squash commit into empty head not supported yet" msgstr "" "Zusammenführen von Commits in einen leeren HEAD wird noch nicht unterstützt" -#: builtin/merge.c:981 +#: builtin/merge.c:1131 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "Das Erzwingen eines Merge-Commits in einem leeren HEAD ist unsinnig" -#: builtin/merge.c:985 builtin/merge.c:1031 +#: builtin/merge.c:1135 builtin/merge.c:1181 #, c-format msgid "%s - not something we can merge" msgstr "%s - nicht etwas, das wir mergen könnten" -#: builtin/merge.c:1089 +#: builtin/merge.c:1239 #, c-format msgid "Updating %s..%s\n" msgstr "Aktualisiere %s..%s\n" -#: builtin/merge.c:1123 +#: builtin/merge.c:1273 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Probiere total simplen Inner-Index Merge...\n" -#: builtin/merge.c:1127 +#: builtin/merge.c:1277 #, c-format msgid "Nope.\n" msgstr "Nö.\n" -#: builtin/merge.c:1160 +#: builtin/merge.c:1310 msgid "Not possible to fast-forward, aborting." msgstr "Kann nicht ohne Merge-Commit aktualisieren, breche ab." -#: builtin/merge.c:1186 builtin/merge.c:1259 +#: builtin/merge.c:1336 builtin/merge.c:1409 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Baum wird auf Ursprung zurückgesetzt...\n" -#: builtin/merge.c:1190 +#: builtin/merge.c:1340 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Probiere Merge-Strategie %s...\n" -#: builtin/merge.c:1251 +#: builtin/merge.c:1401 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Keine Merge-Strategie hat den Merge erledigt.\n" -#: builtin/merge.c:1253 +#: builtin/merge.c:1403 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Merge mit Strategie \"%s\" fehlgeschlagen.\n" -#: builtin/merge.c:1261 +#: builtin/merge.c:1411 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "" "Strategie %s wird verwendet, um auf manuelle Auflösung vorzubereiten.\n" -#: builtin/merge.c:1304 +#: builtin/merge.c:1447 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -2139,139 +2319,115 @@ msgstr "Benenne %s nach %s um\n" msgid "renaming '%s' failed" msgstr "Umbenennen von \"%s\" fehlgeschlagen" -#: builtin/notes.c:122 +#: builtin/notes.c:139 #, c-format msgid "unable to start 'show' for object '%s'" msgstr "kann \"show\" für Objekt \"%s\" nicht starten" -#: builtin/notes.c:128 +#: builtin/notes.c:145 msgid "can't fdopen 'show' output fd" msgstr "\"show\"-Ausgabenfiledeskriptor nicht fdopen-öffenbar" -#: builtin/notes.c:138 +#: builtin/notes.c:155 #, c-format msgid "failed to close pipe to 'show' for object '%s'" msgstr "konnte Pipe zu \"show\" für Objekt \"%s\" nicht schließen" -#: builtin/notes.c:141 +#: builtin/notes.c:158 #, c-format msgid "failed to finish 'show' for object '%s'" msgstr "konnte \"show\" für Objekt \"%s\" nicht beenden" -#: builtin/notes.c:158 builtin/tag.c:311 +#: builtin/notes.c:175 builtin/tag.c:303 #, c-format msgid "could not create file '%s'" msgstr "konnte Datei \"%s\" nicht anlegen" -#: builtin/notes.c:172 +#: builtin/notes.c:189 msgid "Please supply the note contents using either -m or -F option" msgstr "Gib den Inhalt der Notiz entweder mit der Option -m oder -F an" -#: builtin/notes.c:193 builtin/notes.c:797 +#: builtin/notes.c:210 builtin/notes.c:968 #, c-format msgid "Removing note for object %s\n" msgstr "Entferne Notiz für Objekt %s\n" -#: builtin/notes.c:198 +#: builtin/notes.c:215 msgid "unable to write note object" msgstr "konnte Notizobjekt nicht schreiben" -#: builtin/notes.c:200 +#: builtin/notes.c:217 #, c-format msgid "The note contents has been left in %s" msgstr "Der Inhalt der Notiz wurde nach \"%s\" gesichert" -#: builtin/notes.c:234 builtin/tag.c:445 +#: builtin/notes.c:251 builtin/tag.c:448 #, c-format msgid "cannot read '%s'" msgstr "kann \"%s\" nicht auslesen" -#: builtin/notes.c:236 builtin/tag.c:448 +#: builtin/notes.c:253 builtin/tag.c:451 #, c-format msgid "could not open or read '%s'" msgstr "Konnte \"%s\" nicht öffnen oder auslesen" -#: builtin/notes.c:255 builtin/notes.c:444 builtin/notes.c:446 -#: builtin/notes.c:508 builtin/notes.c:560 builtin/notes.c:631 -#: builtin/notes.c:636 builtin/notes.c:710 builtin/notes.c:752 -#: builtin/notes.c:789 builtin/reset.c:303 builtin/tag.c:461 +#: 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:963 builtin/reset.c:303 builtin/tag.c:464 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "Konnte \"%s\" nicht als gültige Referenz auflösen." -#: builtin/notes.c:258 +#: builtin/notes.c:275 #, c-format msgid "Failed to read object '%s'." msgstr "Konnte Objekt \"%s\" nicht lesen." -#: builtin/notes.c:283 +#: builtin/notes.c:299 msgid "Cannot commit uninitialized/unreferenced notes tree" msgstr "" "Kann nicht-initialisierten/nicht-referenzierten Notizenbaum nicht committen" -#: builtin/notes.c:295 -msgid "Failed to write current notes tree to database" -msgstr "" -"Fehler beim Versuch, aktuellen Notizenbaum in die Datenbank zu schreiben" - -#: builtin/notes.c:307 -msgid "Failed to commit notes tree to database" -msgstr "Konnte Notizenbaum nicht in Datenbank schreiben." - -#: builtin/notes.c:339 +#: builtin/notes.c:340 #, c-format msgid "Bad notes.rewriteMode value: '%s'" msgstr "Ungültiger Wert für notes.rewriteMode: \"%s\"" -#: builtin/notes.c:349 +#: builtin/notes.c:350 #, c-format msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" msgstr "Überschreiben von Notizen in %s (außerhalb von refs/notes/) verweigert" #. TRANSLATORS: The first %s is the name of the #. environment variable, the second %s is its value -#: builtin/notes.c:376 +#: builtin/notes.c:377 #, c-format msgid "Bad %s value: '%s'" msgstr "Ungültiger Wert für %s: \"%s\"" -#: builtin/notes.c:440 +#: builtin/notes.c:441 #, c-format msgid "Malformed input line: '%s'." msgstr "Ungültige Eingabezeile: \"%s\"." -#: builtin/notes.c:455 +#: builtin/notes.c:456 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "Fehler beim Kopieren der Notizen von \"%s\" nach \"%s\"" -#. TRANSLATORS: The first %s is one of "git notes ACTION", -#. e.g. "add", "copy", "append" etc. -#: builtin/notes.c:481 -#, c-format -msgid "Refusing to %s notes in %s (outside of refs/notes/)" -msgstr "%s von Notizen in %s (außerhalb von refs/notes/) verweigert" - -#: builtin/notes.c:501 builtin/notes.c:553 builtin/notes.c:614 -#: builtin/notes.c:626 builtin/notes.c:698 builtin/notes.c:745 -#: builtin/notes.c:782 builtin/notes.c:821 +#: 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:1028 msgid "too many parameters" msgstr "zu viele Parameter" -#: builtin/notes.c:505 -msgid "list" -msgstr "Auflistung" - -#: builtin/notes.c:514 builtin/notes.c:758 +#: builtin/notes.c:513 builtin/notes.c:772 #, c-format msgid "No note found for object %s." msgstr "Keine Notiz für Objekt %s gefunden." -#: builtin/notes.c:562 -msgid "add" -msgstr "füge hinzu" - -#: builtin/notes.c:567 +#: builtin/notes.c:580 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -2280,20 +2436,16 @@ msgstr "" "Kann Notizen nicht hinzufügen. Es gibt bereits Notizen für Objekt %s. " "Verwende Option -f zum Überschreiben." -#: builtin/notes.c:572 builtin/notes.c:649 +#: builtin/notes.c:585 builtin/notes.c:662 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "Überschreibe existierende Notizen für Objekt %s\n" -#: builtin/notes.c:622 +#: builtin/notes.c:635 msgid "too few parameters" msgstr "zu wenige Parameter" -#: builtin/notes.c:638 -msgid "copy" -msgstr "Kopie" - -#: builtin/notes.c:643 +#: builtin/notes.c:656 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -2302,12 +2454,12 @@ msgstr "" "Kann Notizen nicht kopieren. Es gibt bereits Notizen für Objekt %s. Verwende " "Option -f zum Überschreiben." -#: builtin/notes.c:655 +#: builtin/notes.c:668 #, c-format msgid "Missing notes on source object %s. Cannot copy." msgstr "Fehlende Notizen zum Quellobjekt %s. Kopie nicht erstellbar." -#: builtin/notes.c:703 +#: builtin/notes.c:717 #, c-format msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" @@ -2316,25 +2468,12 @@ msgstr "" "Die Optionen -m, -F, -c und -C für den \"edit\"-Unterbefehl sind veraltet.\n" "Verwende stattdessen `git notes add -f -m/-F/-c/-C`.\n" -# "Refusing to %s notes" <-> "%s von Notizen" -#: builtin/notes.c:754 -msgid "show" -msgstr "Anziegen" - -#: builtin/notes.c:791 -msgid "remove" -msgstr "Löschen" - -#: builtin/notes.c:795 +#: builtin/notes.c:966 #, c-format msgid "Object %s has no note\n" msgstr "Objekt %s hat keine Notiz\n" -#: builtin/notes.c:825 -msgid "prune" -msgstr "Trimmen" - -#: builtin/notes.c:877 +#: builtin/notes.c:1098 #, c-format msgid "Unknown subcommand: %s" msgstr "Unbekannter Unterbefehl: %s" @@ -2348,39 +2487,49 @@ msgid "--delete only accepts plain target ref names" msgstr "--delete akzeptiert nur einfache Referenzen (keine Refspecs)" #: builtin/push.c:72 -msgid "You are not currently on a branch." -msgstr "Gegenwärtig auf keiner Branch." - -#: builtin/push.c:74 #, c-format -msgid "The current branch %s is not tracking anything." -msgstr "Die aktuelle Branch %s verfolgt nichts." +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:77 +#: builtin/push.c:79 #, c-format -msgid "The current branch %s is tracking multiple branches, refusing to push." +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:87 +#, fuzzy, c-format +msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "" "Die aktuelle Branch %s verfolgt mehrere Branches, daher \"push\" verweigert." -#: builtin/push.c:100 +#: builtin/push.c:110 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "" "Es wurden keine Refspecs zur Übertragung angegeben, und push.default ist auf " "\"nothing\" gesetzt." -#: builtin/push.c:120 +#: builtin/push.c:130 #, c-format msgid "Pushing to %s\n" msgstr "Übertrage zu %s\n" -#: builtin/push.c:124 +#: builtin/push.c:134 #, c-format msgid "failed to push some refs to '%s'" msgstr "Übertragen einiger Referenzen nach \"%s\" fehlgeschlagen" # TODO: Verweis auf Manpage aktualisieren, sobald wir die auch übersetzen -#: builtin/push.c:132 +#: builtin/push.c:142 #, c-format msgid "" "To prevent you from losing history, non-fast-forward updates were rejected\n" @@ -2393,40 +2542,49 @@ msgstr "" "Siehe Abschnitt \"Note about fast-forwards\" von `git push --help` für\n" "weitere Informationen.\n" -#: builtin/push.c:149 +#: builtin/push.c:159 #, c-format msgid "bad repository '%s'" msgstr "ungültiges Repository \"%s\"" -#: builtin/push.c:150 -msgid "No destination configured to push to." -msgstr "Kein Ziel für Übertragung festgelegt." +#: builtin/push.c:160 +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:158 +#: builtin/push.c:175 msgid "--all and --tags are incompatible" msgstr "--all kann nicht mit --tags kombiniert werden" -#: builtin/push.c:159 +#: builtin/push.c:176 msgid "--all can't be combined with refspecs" msgstr "--all kann nicht mit Refspecs kombiniert werden" -#: builtin/push.c:164 +#: builtin/push.c:181 msgid "--mirror and --tags are incompatible" msgstr "--mirror kann nicht mit --tags kombiniert werden" -#: builtin/push.c:165 +#: builtin/push.c:182 msgid "--mirror can't be combined with refspecs" msgstr "--mirror kann nicht mit Refspecs kombiniert werden" -#: builtin/push.c:170 +#: builtin/push.c:187 msgid "--all and --mirror are incompatible" msgstr "--all kann nicht mit --mirror kombiniert werden" -#: builtin/push.c:235 +#: builtin/push.c:253 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete kann weder mit --all, --mirror noch --tags kombiniert werden" -#: builtin/push.c:237 +#: builtin/push.c:255 msgid "--delete doesn't make sense without any refs" msgstr "--delete ergibt ohne Angabe von Referenzen keinen Sinn" @@ -2521,41 +2679,26 @@ msgstr "%s-Reset ist in einem Lager-Repository nicht erlaubt" msgid "Could not reset index file to revision '%s'." msgstr "Konnte Indexdatei nicht auf Revision \"%s\" zurücksetzen." -#: builtin/revert.c:82 +#: builtin/revert.c:99 msgid "program error" msgstr "Programmfehler" -#: builtin/revert.c:154 builtin/revert.c:188 +#: builtin/revert.c:171 #, c-format msgid "Could not read commit message of %s" msgstr "konnte Commit-Kommentar nicht lesen: %s" -#: builtin/revert.c:202 -#, c-format -msgid "Could not extract author email from %s" -msgstr "Konnte E-Mail-Adresse des Autors nicht aus %s entnehmen" - -#: builtin/revert.c:214 -#, c-format -msgid "Could not extract author time from %s" -msgstr "Konnte Erstelldatum nicht aus %s entnehmen" - -#: builtin/revert.c:230 -#, c-format -msgid "No author information found in %s" -msgstr "Keine Autoreninformationen in %s gefunden" - -#: builtin/revert.c:267 +#: builtin/revert.c:253 #, c-format msgid "Could not write to %s." msgstr "Konnte nicht nach \"%s\" schreiben" -#: builtin/revert.c:270 +#: builtin/revert.c:256 #, c-format msgid "Error wrapping up %s" msgstr "Fehler beim Aufräumen von %s" -#: builtin/revert.c:290 +#: builtin/revert.c:276 msgid "" "Your local changes would be overwritten by revert.\n" "Please, commit your changes or stash them to proceed." @@ -2563,7 +2706,7 @@ msgstr "" "Lokale Änderungen würden durch revert überschrieben werden.\n" "Committe oder stashe die Änderungen um fortzufahren." -#: builtin/revert.c:293 +#: builtin/revert.c:279 msgid "" "Your local changes would be overwritten by cherry-pick.\n" "Please, commit your changes or stash them to proceed." @@ -2571,88 +2714,102 @@ msgstr "" "Lokale Änderungen würden durch cherry-pick überschrieben werden.\n" "Committe oder stashe die Änderungen um fortzufahren." +#: builtin/revert.c:283 +#, fuzzy +msgid "Your local changes would be overwritten by revert.\n" +msgstr "" +"Lokale Änderungen würden durch revert überschrieben werden.\n" +"Committe oder stashe die Änderungen um fortzufahren." + +#: builtin/revert.c:285 +#, fuzzy +msgid "Your local changes would be overwritten by cherry-pick.\n" +msgstr "" +"Lokale Änderungen würden durch cherry-pick überschrieben werden.\n" +"Committe oder stashe die Änderungen um fortzufahren." + #. TRANSLATORS: %s will be "revert" or "cherry-pick" -#: builtin/revert.c:351 +#: builtin/revert.c:335 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: Konnte neue Indexdatei nicht schreiben" -#: builtin/revert.c:417 +#: builtin/revert.c:401 msgid "Your index file is unmerged." msgstr "Der Index enthält Konflikte." -#: builtin/revert.c:420 +#: builtin/revert.c:404 msgid "You do not have a valid HEAD" msgstr "Du hast keinen gültigen HEAD." -#: builtin/revert.c:428 -msgid "Cannot revert a root commit" -msgstr "Kann einen Wurzel-Commit nicht umkehren" - -#: builtin/revert.c:437 +#: builtin/revert.c:419 #, c-format msgid "Commit %s is a merge but no -m option was given." msgstr "Commit %s ist ein Merge, aber Option -m wurde nicht angegeben." -#: builtin/revert.c:445 +#: builtin/revert.c:427 #, c-format msgid "Commit %s does not have parent %d" msgstr "Commit %s hat keinen Vorgänger %d" -#: builtin/revert.c:449 +#: builtin/revert.c:431 #, c-format msgid "Mainline was specified but commit %s is not a merge." msgstr "Mainline wurde angegeben, aber Commit %s ist kein Merge." #. TRANSLATORS: The first %s will be "revert" or #. "cherry-pick", the second %s a SHA1 -#: builtin/revert.c:460 +#: builtin/revert.c:442 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: konnte Vorgänger-Commit %s nicht analysieren" -#: builtin/revert.c:464 +#: builtin/revert.c:446 #, c-format msgid "Cannot get commit message for %s" msgstr "konnte Commit-Kommentar für %s nicht lesen" -#: builtin/revert.c:525 +#: builtin/revert.c:508 #, c-format msgid "could not revert %s... %s" msgstr "konnte \"%s\" nicht umkehren... %s" -#: builtin/revert.c:526 +#: builtin/revert.c:509 #, c-format msgid "could not apply %s... %s" msgstr "Konnte \"%s\" nicht anwenden... %s" -#: builtin/revert.c:559 +#: builtin/revert.c:542 msgid "empty commit set passed" msgstr "Leere Commitliste übergeben" -#: builtin/revert.c:573 +#: builtin/revert.c:550 +#, c-format +msgid "git %s: failed to read the index" +msgstr "git %s: konnte den Index nicht auslesen" + +#: builtin/revert.c:555 +#, fuzzy, c-format +msgid "git %s: failed to refresh the index" +msgstr "git %s: konnte den Index nicht auslesen" + +#: builtin/revert.c:571 msgid "cherry-pick --ff cannot be used with --signoff" msgstr "cherry-pick --ff kann nicht mit --signoff kombiniert werden" -#: builtin/revert.c:575 +#: builtin/revert.c:573 msgid "cherry-pick --ff cannot be used with --no-commit" msgstr "cherry-pick --ff kann nicht mit --no-commit kombiniert werden" -#: builtin/revert.c:577 +#: builtin/revert.c:575 msgid "cherry-pick --ff cannot be used with -x" msgstr "cherry-pick --ff kann nicht mit -x kombiniert werden" -#: builtin/revert.c:579 +#: builtin/revert.c:577 msgid "cherry-pick --ff cannot be used with --edit" msgstr "cherry-pick --ff kann nicht mit --edit kombiniert werden" -#. TRANSLATORS: %s will be "revert" or "cherry-pick" -#: builtin/revert.c:584 -#, c-format -msgid "git %s: failed to read the index" -msgstr "git %s: konnte den Index nicht auslesen" - -#: builtin/rm.c:118 +#: builtin/rm.c:109 #, c-format msgid "" "'%s' has staged content different from both the file and the HEAD\n" @@ -2661,7 +2818,7 @@ msgstr "" "\"%s\" hat vorgemerkte Änderungen, die sich sowohl von der Datei als auch " "vom letzten Commit unterscheiden (Verwende -f, um trotzdem zu löschen)" -#: builtin/rm.c:124 +#: builtin/rm.c:115 #, c-format msgid "" "'%s' has changes staged in the index\n" @@ -2671,7 +2828,7 @@ msgstr "" "(Verwende --cached, um die Datei zu behalten, oder -f, um trotzdem zu " "löschen)" -#: builtin/rm.c:128 +#: builtin/rm.c:119 #, c-format msgid "" "'%s' has local modifications\n" @@ -2681,58 +2838,58 @@ msgstr "" "(Verwende --cached, um die Datei zu behalten, oder -f, um trotzdem zu " "löschen)" -#: builtin/rm.c:202 +#: builtin/rm.c:194 #, c-format msgid "not removing '%s' recursively without -r" msgstr "Verzeichnis \"%s\" wird ohne -r nicht rekursiv gelöscht" -#: builtin/rm.c:238 +#: builtin/rm.c:230 #, c-format msgid "git rm: unable to remove %s" msgstr "git rm: kann \"%s\" nicht entfernen" -#: builtin/shortlog.c:161 +#: builtin/shortlog.c:157 #, c-format msgid "Missing author: %s" msgstr "Fehlender Autor: %s" -#: builtin/tag.c:123 builtin/tag.c:464 +#: builtin/tag.c:121 #, c-format msgid "tag name too long: %.*s..." msgstr "Tagname zu lang: %.*s..." -#: builtin/tag.c:128 +#: builtin/tag.c:126 #, c-format msgid "tag '%s' not found." msgstr "Tag \"%s\" nicht gefunden." -#: builtin/tag.c:143 +#: builtin/tag.c:141 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "Tag \"%s\" gelöscht (war %s)\n" -#: builtin/tag.c:155 +#: builtin/tag.c:153 #, c-format msgid "could not verify the tag '%s'" msgstr "konnte den Tag \"%s\" nicht überprüfen" -#: builtin/tag.c:170 +#: builtin/tag.c:168 msgid "committer info too long." msgstr "Committer-Angabe zu lang." -#: builtin/tag.c:190 +#: builtin/tag.c:188 msgid "could not run gpg." msgstr "konnte gpg nicht ausführen." -#: builtin/tag.c:196 +#: builtin/tag.c:194 msgid "gpg did not accept the tag data" msgstr "gpg hat die Tag-Daten nicht angenommen" -#: builtin/tag.c:203 +#: builtin/tag.c:201 msgid "gpg failed to sign the tag" msgstr "gpg konnte den Tag nicht signieren" -#: builtin/tag.c:218 +#: builtin/tag.c:216 msgid "" "\n" "#\n" @@ -2744,73 +2901,73 @@ msgstr "" "# Schreibe einen Tag-Kommentar\n" "#\n" -#: builtin/tag.c:226 +#: builtin/tag.c:224 #, c-format msgid "signing key value too long (%.10s...)" msgstr "Signaturschlüsselwert zu lang (%.10s...)" -#: builtin/tag.c:272 +#: builtin/tag.c:264 msgid "unable to sign the tag" msgstr "kann den Tag nicht signieren" -#: builtin/tag.c:274 +#: builtin/tag.c:266 msgid "unable to write tag file" msgstr "kann die Tag-Datei nicht anlegen" -#: builtin/tag.c:289 +#: builtin/tag.c:281 msgid "bad object type." msgstr "ungültiger Objekttyp." -#: builtin/tag.c:302 +#: builtin/tag.c:294 msgid "tag header too big." msgstr "Tag-Header zu groß." -#: builtin/tag.c:329 +#: builtin/tag.c:321 msgid "no tag message?" msgstr "kein Tag-Kommentar?" -#: builtin/tag.c:335 +#: builtin/tag.c:327 #, c-format msgid "The tag message has been left in %s\n" msgstr "Der Tag-Kommentar wurde in %s hinterlassen\n" -#: builtin/tag.c:428 +#: builtin/tag.c:431 msgid "-n option is only allowed with -l." msgstr "-n ist nur in Verbindung mit -l erlaubt." -#: builtin/tag.c:430 +#: builtin/tag.c:433 msgid "--contains option is only allowed with -l." msgstr "--contains ist nur in Verbindung mit -l erlaubt." -#: builtin/tag.c:438 +#: builtin/tag.c:441 msgid "only one -F or -m option is allowed." msgstr "-F kann nicht mit -m kombiniert werden." -#: builtin/tag.c:458 +#: builtin/tag.c:461 msgid "too many params" msgstr "zu viele Parameter" -#: builtin/tag.c:466 +#: builtin/tag.c:467 #, c-format msgid "'%s' is not a valid tag name." msgstr "'%s' ist kein gültiger Tagname." -#: builtin/tag.c:471 +#: builtin/tag.c:472 #, c-format msgid "tag '%s' already exists" msgstr "Tag '%s' existiert bereits" -#: builtin/tag.c:479 +#: builtin/tag.c:480 #, c-format msgid "%s: cannot lock the ref" msgstr "%s: kann die Referenz nicht sperren" -#: builtin/tag.c:481 +#: builtin/tag.c:482 #, c-format msgid "%s: cannot update the ref" msgstr "%s: kann die Referenz nicht aktualisieren" -#: builtin/tag.c:483 +#: builtin/tag.c:484 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "Tag '%s' aktualisiert (war %s)\n" @@ -2819,7 +2976,13 @@ msgstr "Tag '%s' aktualisiert (war %s)\n" msgid "You need to set your committer info first" msgstr "Committer-Info muss zunächst gesetzt werden" -#: git-am.sh:80 +#: git-am.sh:93 +msgid "" +"You seem to have moved HEAD since the last 'am' failure.\n" +"Not rewinding to ORIG_HEAD" +msgstr "" + +#: git-am.sh:105 #, sh-format msgid "" "When you have resolved this problem run \"$cmdline --resolved\".\n" @@ -2832,16 +2995,16 @@ msgstr "" "Um die ursprüngliche Branch wiederherzustellen und den Patchvorgang zu " "stoppen, verwende \\`$cmdline --abort\\`." -#: git-am.sh:96 +#: git-am.sh:121 msgid "Cannot fall back to three-way merge." msgstr "Kann den 3-Wege-Merge auch nicht durchführen." -#: git-am.sh:111 +#: git-am.sh:136 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" "Dem Repository fehlen die nötigen Blobs um einen 3-Wege-Merge durchzuführen." -#: git-am.sh:120 +#: git-am.sh:145 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -2849,44 +3012,49 @@ msgstr "" "Wurde der Patch per Hand verändert?\n" "Er passt nicht auf die in dessen Index angegebenen Blobs." -#: git-am.sh:236 +#: git-am.sh:154 +#, fuzzy +msgid "Falling back to patching base and 3-way merge..." +msgstr "Kann den 3-Wege-Merge auch nicht durchführen." + +#: git-am.sh:261 msgid "Only one StGIT patch series can be applied at once" msgstr "Es kann maximal eine StGIT-Patchserie auf einmal angewandt werden" -#: git-am.sh:288 +#: git-am.sh:313 #, sh-format msgid "Patch format $patch_format is not supported." msgstr "Patchformat $patch_format wird nicht unterstützt." -#: git-am.sh:290 +#: git-am.sh:315 msgid "Patch format detection failed." msgstr "Patchformaterkennung fehlgeschlagen." -#: git-am.sh:340 +#: git-am.sh:365 msgid "-d option is no longer supported. Do not use." msgstr "Die Option -d wird nicht länger unterstützt." -#: git-am.sh:403 +#: git-am.sh:428 #, sh-format msgid "previous rebase directory $dotest still exists but mbox given." msgstr "" "vorheriges Rebase-Verzeichnis $dotest existiert noch, aber trotzdem wurde " "eine mbox angegeben." -#: git-am.sh:408 +#: git-am.sh:433 msgid "Please make up your mind. --skip or --abort?" msgstr "Entscheidungsprobleme? --skip oder --abort." -#: git-am.sh:434 +#: git-am.sh:460 msgid "Resolve operation not in progress, we are not resuming." msgstr "Lösungsvorgang nicht aktiv, es wird auch nicht weitergemacht." -#: git-am.sh:499 +#: git-am.sh:525 #, sh-format msgid "Dirty index: cannot apply patches (dirty: $files)" msgstr "Geänderter Index: kann Patches nicht anwenden (geändert: $files)" -#: git-am.sh:595 +#: git-am.sh:614 #, sh-format msgid "" "Patch is empty. Was it split wrong?\n" @@ -2898,33 +3066,33 @@ msgstr "" "Um die ursprüngle Branch wiederherstellen und den Patchvorgang zu stoppen, " "verwendet \\\\`$cmdline --abort\\\\`." -#: git-am.sh:632 +#: git-am.sh:651 msgid "Patch does not have a valid e-mail address." msgstr "Pfad \"%s\" hat keine drei verschiedenen Versionen im Index" -#: git-am.sh:679 +#: git-am.sh:698 msgid "cannot be interactive without stdin connected to a terminal." msgstr "" "Für den Interaktivmodus muss die Standardeingabe mit einem Terminal " "verbunden sein." -#: git-am.sh:683 +#: git-am.sh:702 msgid "Commit Body is:" msgstr "Commitinhalt ist:" #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] #. in your translation. The program will only accept English #. input at this point. -#: git-am.sh:690 +#: git-am.sh:709 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " msgstr "Anwenden? Ja(y)/(N)ein/B(e)arbeiten/Ansehen(v)/Alle (a)kzeptieren" -#: git-am.sh:726 +#: git-am.sh:745 #, sh-format msgid "Applying: $FIRSTLINE" msgstr "Wende an: $FIRSTLINE" -#: git-am.sh:747 +#: git-am.sh:766 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -2934,7 +3102,7 @@ msgstr "" "Gibt es nichts weiter zum Vormerken, so ist es möglich, dass bereits etwas " "zuvor die Änderungen eingepflegt hat; überspringe ggf. diesen Patch." -#: git-am.sh:755 +#: git-am.sh:774 msgid "" "You still have unmerged paths in your index\n" "did you forget to use 'git add'?" @@ -2942,88 +3110,88 @@ msgstr "" "Es gibt noch kollidierende Änderungen im Index.\n" "Vergessen, \\`git add\\` zu verwenden?" -#: git-am.sh:771 +#: git-am.sh:790 msgid "No changes -- Patch already applied." msgstr "Keine Änderungen -- Patch bereits angewendet." -#: git-am.sh:781 +#: git-am.sh:800 #, sh-format msgid "Patch failed at $msgnum $FIRSTLINE" msgstr "Patch fehlgeschlagen bei $msgnum $FIRSTLINE" -#: git-am.sh:797 +#: git-am.sh:816 msgid "applying to an empty history" msgstr "Anwenden auf leere History" -#: git-bisect.sh:39 +#: git-bisect.sh:40 msgid "You need to start by \"git bisect start\"" msgstr "Bisect muss mittels \\`git bisect start\\` begonnen werden" #. TRANSLATORS: Make sure to include [Y] and [n] in your #. translation. The program will only accept English input #. at this point. -#: git-bisect.sh:45 +#: git-bisect.sh:48 msgid "Do you want me to do it for you [Y/n]? " msgstr "Soll dies nun ausgeführt werden [Y/n]?" -#: git-bisect.sh:64 +#: git-bisect.sh:67 msgid "Bad HEAD - I need a HEAD" msgstr "Ungültiger HEAD - es wird ein HEAD benötigt" -#: git-bisect.sh:83 +#: git-bisect.sh:86 msgid "won't bisect on seeked tree" msgstr "Bisektion auf gespultem Baum abgelehnt" -#: git-bisect.sh:87 +#: git-bisect.sh:90 msgid "Bad HEAD - strange symbolic ref" msgstr "Ungültiger HEAD - komische symbolische Referenz" -#: git-bisect.sh:117 +#: git-bisect.sh:120 #, sh-format msgid "'$arg' does not appear to be a valid revision" msgstr "\\\"$arg\\\" scheint keine gültige Revision zu sein" -#: git-bisect.sh:162 +#: git-bisect.sh:165 #, sh-format msgid "Bad bisect_write argument: $state" msgstr "Ungültiger Parameter zu bisect_write: $state" -#: git-bisect.sh:190 +#: git-bisect.sh:193 #, sh-format msgid "Bad rev input: $arg" msgstr "Ungültige Revisions-Eingabe: $arg" -#: git-bisect.sh:204 +#: git-bisect.sh:207 msgid "Please call 'bisect_state' with at least one argument." msgstr "Rufe \\\"bisect_state\\\" mit mindestens einem Argument auf." -#: git-bisect.sh:207 +#: git-bisect.sh:210 msgid "Bad rev input: HEAD" msgstr "Ungültige Revisions-Eingabe: HEAD" -#: git-bisect.sh:216 +#: git-bisect.sh:219 #, sh-format msgid "Bad rev input: $rev" msgstr "Ungültige Revisions-Eingabe: $rev" -#: git-bisect.sh:222 +#: git-bisect.sh:225 msgid "'git bisect bad' can take only one argument." msgstr "\\`git bisect bad\\` kann nur mit einem Argument verwendet werden." #. have bad but not good. we could bisect although #. this is less optimum. -#: git-bisect.sh:245 +#: git-bisect.sh:249 msgid "Warning: bisecting only with a bad commit." msgstr "Warnung: Bisektion mit nur einem schlechten Commit." #. TRANSLATORS: Make sure to include [Y] and [n] in your #. translation. The program will only accept English input #. at this point. -#: git-bisect.sh:251 +#: git-bisect.sh:257 msgid "Are you sure [Y/n]? " msgstr "Sicher [Y/n]?" -#: git-bisect.sh:261 +#: git-bisect.sh:268 msgid "" "You need to give me at least one good and one bad revisions.\n" "(You can use \"git bisect bad\" and \"git bisect good\" for that.)" @@ -3032,7 +3200,7 @@ msgstr "" "erforderlich.\n" "(Verwende \\`git bisect bad\\` und \\`git bisect good\\`.)" -#: git-bisect.sh:264 +#: git-bisect.sh:274 msgid "" "You need to start by \"git bisect start\".\n" "You then need to give me at least one good and one bad revisions.\n" @@ -3042,30 +3210,41 @@ msgstr "" "Danach ist mindestens eine gute und eine schlechte Revision anzugeben.\n" "(Verwende dazu \\`git bisect good\\` und \\`git bisect bad\\`.)" -#: git-bisect.sh:316 +#: git-bisect.sh:330 git-bisect.sh:457 msgid "We are not bisecting." msgstr "Gegenwärtig läuft keine Bisektion." -#: git-bisect.sh:323 +#: git-bisect.sh:337 #, sh-format msgid "'$invalid' is not a valid commit" msgstr "\"$invalid\" ist kein gültiger Commit" -#: git-bisect.sh:352 +#: git-bisect.sh:346 +#, sh-format +msgid "" +"Could not check out original HEAD '$branch'.\n" +"Try 'git bisect reset '." +msgstr "" + +#: git-bisect.sh:371 +msgid "No logfile given" +msgstr "" + +#: git-bisect.sh:372 #, sh-format msgid "cannot read $file for replaying" msgstr "kann Datei $file zur Wiederholung der Operation nicht lesen" -#: git-bisect.sh:368 +#: git-bisect.sh:388 msgid "?? what are you talking about?" msgstr "Ungültiger Unterbefehl" -#: git-bisect.sh:380 +#: git-bisect.sh:400 #, sh-format msgid "running $command" msgstr "Ausführen von $command" -#: git-bisect.sh:386 +#: git-bisect.sh:407 #, sh-format msgid "" "bisect run failed:\n" @@ -3074,11 +3253,11 @@ msgstr "" "bisect run fehlgeschlagen:\n" "Fehlercode $res von \\`$command\\` ist < 0 oder >= 128" -#: git-bisect.sh:409 +#: git-bisect.sh:433 msgid "bisect run cannot continue any more" msgstr "\\`bisect run\\` kann nicht mehr weitermachen" -#: git-bisect.sh:414 +#: git-bisect.sh:441 #, sh-format msgid "" "bisect run failed:\n" @@ -3087,7 +3266,7 @@ msgstr "" "bisect run fehlgeschlagen:\n" "\\`bisect_state $state\\` endete mit Fehlercode $res" -#: git-bisect.sh:420 +#: git-bisect.sh:449 msgid "bisect run success" msgstr "bisect run success" @@ -3105,173 +3284,15 @@ msgstr "" msgid "Pull is not possible because you have unmerged files." msgstr "Pull ist nicht möglich, da noch Konflikte in Dateien bestehen." -#: git-pull.sh:141 -msgid "" -"There is no candidate for rebasing against among the refs that you just " -"fetched.\n" -"Generally this means that you provided a wildcard refspec which had no\n" -"matches on the remote end." -msgstr "" -"Entlang der soeben geholten Refs gibt es keinen Kandidat, auf den rebased\n" -"werden könnte. Generell bedeutet dies, dass eine Wildcard-Refspec angegeben\n" -"wurde, die auf der entfernten Seite keinen Treffer erzielte." - -#: git-pull.sh:145 -msgid "" -"There are no candidates for merging against among the refs that you just " -"fetched.\n" -"Generally this means that you provided a wildcard refspec which had no\n" -"matches on the remote end." -msgstr "" -"Entlang der soeben geholten Refs gibt es keine Kandidaten, mit denen " -"gemerged\n" -"werden könnte. Generell bedeutet dies, dass eine Wildcard-Refspec angegeben\n" -"wurde, die auf der entfernten Seite keinen Treffer erzielte." - -#. TRANSLATORS: $requested_remote will be a remote name, like -#. "origin" or "avar" -#: git-pull.sh:153 -#, sh-format -msgid "" -"You asked to pull from the remote '$requested_remote', but did not specify\n" -"a branch. Because this is not the default configured remote\n" -"for your current branch, you must specify a branch on the command line." -msgstr "" -"Da die gegenwärtige Branch nicht der für den Remote als Standard definierten " -"Branch entspricht, ist beim Pull von \"$requested_remote\" eine Branch " -"anzugeben." - -#: git-pull.sh:157 -msgid "" -"You are not currently on a branch, so I cannot use any\n" -"'branch..merge' in your configuration file.\n" -"Please specify which remote branch you want to use on the command\n" -"line and try again (e.g. 'git pull ').\n" -"See git-pull(1) for details." -msgstr "" -"Gegenwärtig ist keine Branch aktiv, weshalb keine in der Konfigurationsdatei " -"festgelegten \"branch..merge\" verwendet werden können.\n" -"Gib die zu verwendende Branch mit an (z.B. \\`git pull " -"\\`).\n" -"Siehe git-pull(1) für weiter Informationen." - -#: git-pull.sh:165 -#, sh-format -msgid "" -"You asked me to pull without telling me which branch you\n" -"want to rebase against, and 'branch.${curr_branch}.merge' in\n" -"your configuration file does not tell me, either. Please\n" -"specify which branch you want to use on the command line and\n" -"try again (e.g. 'git pull ').\n" -"See git-pull(1) for details.\n" -"\n" -"If you often rebase against the same branch, you may want to\n" -"use something like the following in your configuration file:\n" -"\n" -" [branch \"${curr_branch}\"]\n" -" remote = \n" -" merge = \n" -" rebase = true\n" -"\n" -" [remote \"\"]\n" -" url = \n" -" fetch = \n" -"\n" -"See git-config(1) for details." -msgstr "" -"Es wurde keine Branch, auf die rebased werden soll, angegeben; auch \"branch." -"$curr_branch.merge\" in der Konfigurationsdatei ist nicht gesetzt. Gib die " -"zu verwendende Branch mit an (z.B. \\`git pull \\`).\n" -"Siehe git-pull(1) für weitere Informationen.\n" -"\n" -"Falls oft auf die gleiche Branch rebased wird, kann folgendes Konstrukt in " -"der Konfigurationsdatei verwendet werden:\n" -"\n" -" [branch \"$curr_branch\"]\n" -" remote = \n" -" merge = \n" -" rebase = true\n" -"\n" -" [remote \"\"]\n" -" url = \n" -" fetch = \n" -"\n" -"Siehe git-config(1) für weitere Informationen." - -#: git-pull.sh:186 -#, sh-format -msgid "" -"You asked me to pull without telling me which branch you\n" -"want to merge with, and 'branch.${curr_branch}.merge' in\n" -"your configuration file does not tell me, either. Please\n" -"specify which branch you want to use on the command line and\n" -"try again (e.g. 'git pull ').\n" -"See git-pull(1) for details.\n" -"\n" -"If you often merge with the same branch, you may want to\n" -"use something like the following in your configuration file:\n" -"\n" -" [branch \"${curr_branch}\"]\n" -" remote = \n" -" merge = \n" -"\n" -" [remote \"\"]\n" -" url = \n" -" fetch = \n" -"\n" -"See git-config(1) for details." -msgstr "" -"Es wurde keine Branch, mit der gemerged werden soll, angegeben; auch " -"\"branch.$curr_branch.merge\" in der Konfigurationsdatei ist nicht gesetzt. " -"Gib die zu verwendende Branch mit an (z.B. \\`git pull " -"\\`).\n" -"Siehe git-pull(1) für weitere Informationen.\n" -"\n" -"Falls oft mit der gleichen Branch gemerged wird, kann folgendes Konstrukt in " -"der Konfigurationsdatei verwendet werden:\n" -"\n" -" [branch \"$curr_branch\"]\n" -" remote = \n" -" merge = \n" -"\n" -" [remote \"\"]\n" -" url = \n" -" fetch = \n" -"\n" -"Siehe git-config(1) für weitere Informationen." - -#: git-pull.sh:210 -#, sh-format -msgid "" -"Your configuration specifies to rebase against the ref '$upstream_branch'\n" -"from the remote, but no such ref was fetched." -msgstr "" -"Die Konfiguration gibt an, dass die Referenz \"$upstream_branch\" des " -"Remotes zum Rebasen verwendet werden soll, aber keine solche Referenz wurde " -"geholt." - -#: git-pull.sh:213 -#, sh-format -msgid "" -"Your configuration specifies to merge with the ref '$upstream_branch'\n" -"from the remote, but no such ref was fetched." -msgstr "" -"Die Konfiguration gibt an, dass die Referenz \"$upstream_branch\" des " -"Remotes zu merge sei, aber keine solche Referenz wurde geholt." - -#: git-pull.sh:226 +#: git-pull.sh:189 msgid "updating an unborn branch with changes added to the index" msgstr "Update eine ungeborene Branch mit Änderungen aus dem/in den(?) Index" -#: git-pull.sh:232 -msgid "refusing to pull with rebase: your working tree is not up-to-date" -msgstr "Verweigerung des Pull mit Rebase: die Arbeitskopie ist nicht aktuell" - #. The fetch involved updating the current branch. #. The working tree and the index file is still based on the #. $orig_head commit, but we are merging into $curr_head. #. First update the working tree to match $curr_head. -#: git-pull.sh:260 +#: git-pull.sh:221 #, sh-format msgid "" "Warning: fetch updated the current branch head.\n" @@ -3283,24 +3304,24 @@ msgstr "" # Die Originalumschreibung "exactly one commit" ist irreführend; es geht # natürlich um die gesamte History hinter diesem Commit -#: git-pull.sh:285 +#: git-pull.sh:248 msgid "Cannot merge multiple branches into empty head" msgstr "Kann nur exakt eine Historie in einen leeren HEAD mergen" -#: git-pull.sh:289 +#: git-pull.sh:252 msgid "Cannot rebase onto multiple branches" msgstr "Kann nicht auf mehrere Branches rebasen" -#: git-stash.sh:41 +#: git-stash.sh:43 msgid "git stash clear with parameters is unimplemented" msgstr "" "\\`git stash clear\\` ohne Angabe von Parametern wird nicht unterstützt" -#: git-stash.sh:63 +#: git-stash.sh:65 msgid "You do not have the initial commit yet" msgstr "Es gibt noch keinen Wurzel-Commit" -#: git-stash.sh:78 +#: git-stash.sh:80 msgid "Cannot save the current index state" msgstr "Kann den aktuellen Zustand des Index nicht speichern" @@ -3321,96 +3342,86 @@ msgstr "" msgid "Cannot record working tree state" msgstr "Kann Zustand des Arbeitsverzeichnis nicht aufzeichnen" -#: git-stash.sh:176 +#: git-stash.sh:182 msgid "No local changes to save" msgstr "Keine lokalen Änderungen zum Abspeichern" -#: git-stash.sh:180 +#: git-stash.sh:186 msgid "Cannot initialize stash" msgstr "Kann den Stash nicht initialisieren" -#: git-stash.sh:188 +#: git-stash.sh:194 msgid "Cannot save the current status" msgstr "Kann den aktuellen Status nicht speichern" -#: git-stash.sh:201 +#: git-stash.sh:207 msgid "Cannot remove worktree changes" msgstr "Kann Änderungen im Arbeitsverzeichnis nicht entfernen" -#: git-stash.sh:296 +#: git-stash.sh:302 msgid "No stash found." msgstr "Keinen Stash gefunden." -#: git-stash.sh:303 +#: git-stash.sh:309 #, sh-format msgid "Too many revisions specified: $REV" msgstr "Zuviele Revisionen angegeben: $REV" -#: git-stash.sh:309 +#: git-stash.sh:315 #, sh-format msgid "$reference is not valid reference" msgstr "$reference ist keine gültige Referenz" -#. maintainers: it would be better if git rev-parse indicated -#. this condition with a non-zero status code but as of 1.7.2.1 it -#. it did not. So, we use non-empty stderr output as a proxy for the -#. condition of interest. -#: git-stash.sh:330 -#, sh-format -msgid "$REV does not exist in the stash log" -msgstr "$REV existiert im Stash-Log nicht" - -#: git-stash.sh:344 +#: git-stash.sh:340 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "\"$args\" ist kein Stash-Commit" -#: git-stash.sh:355 +#: git-stash.sh:351 #, sh-format msgid "'$args' is not a stash reference" msgstr "\\\"$args\\\" ist keine Stash-Referenz" -#: git-stash.sh:365 -msgid "Cannot apply to a dirty working tree, please stage your changes" -msgstr "" -"Kann Patch nicht auf eine geänderte Arbeitskopie anwenden; merke die " -"Änderungen zunächst vor" +#: git-stash.sh:359 +#, fuzzy +msgid "unable to refresh index" +msgstr "Konnte den Index nicht anlegen." -#: git-stash.sh:369 +#: git-stash.sh:363 msgid "Cannot apply a stash in the middle of a merge" msgstr "Kann während eines Merges keinen Stash anwenden." -#: git-stash.sh:377 +#: git-stash.sh:371 msgid "Conflicts in index. Try without --index." msgstr "Es existieren Konflikte im Index. Versuche es ohne --index." -#: git-stash.sh:379 +#: git-stash.sh:373 msgid "Could not save index tree" msgstr "Konnte den Indexbaum nicht speichern" -#: git-stash.sh:405 +#: git-stash.sh:399 msgid "Cannot unstage modified files" msgstr "Kann geänderte Dateien nicht rückmerken" -#: git-stash.sh:419 +#: git-stash.sh:414 msgid "Index was not unstashed." msgstr "Es wurde kein Stash angewendet." -#: git-stash.sh:436 +#: git-stash.sh:433 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "$REV ($s) verworfen" -#: git-stash.sh:437 +#: git-stash.sh:434 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "$REV: Konnte Stash-Eintrag nicht verwerfen" -#: git-stash.sh:444 +#: git-stash.sh:441 msgid "No branch name specified" msgstr "Kein Branchname angegeben" -#: git-stash.sh:515 +#: git-stash.sh:512 msgid "(To restore them type \"git stash apply\")" msgstr "(Zum Wiederherstellen \\`git stash apply\\` verwenden)" @@ -3419,38 +3430,32 @@ msgstr "(Zum Wiederherstellen \\`git stash apply\\` verwenden)" msgid "remote ($remote) does not have a url defined in .git/config" msgstr "Für Remote ($remote) ist in .git/config keine URL definiert" -#: git-submodule.sh:79 +#: git-submodule.sh:56 #, sh-format -msgid "No submodule mapping found in .gitmodules for path '$path'" -msgstr "Kein Submodul-Eintrag für Pfad \"$path\" in .gitmodules gefunden" - -#: git-submodule.sh:105 -#, sh-format -msgid "Directory '$path' exists, but is neither empty nor a git repository" +msgid "cannot strip one component off url '$remoteurl'" msgstr "" -"Verzeichnis \"$path\" existiert, aber ist weder leer noch ein Git-Repository" -#: git-submodule.sh:109 +#: git-submodule.sh:108 #, sh-format -msgid "A file already exist at path '$path'" -msgstr "Es existiert bereits eine Datei am Pfad \"$path\"" +msgid "No submodule mapping found in .gitmodules for path '$path'" +msgstr "Kein Submodul-Eintrag für Pfad \"$path\" in .gitmodules gefunden" -#: git-submodule.sh:117 +#: git-submodule.sh:132 #, sh-format msgid "Clone of '$url' into submodule path '$path' failed" msgstr "Clone von \"$url\" in Submodul-Pfad \"$path\" fehlgeschlagen" -#: git-submodule.sh:190 +#: git-submodule.sh:205 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "Repo-URL: \"$repo\" muss absolut sein oder mit ./|../ beginnen" -#: git-submodule.sh:207 +#: git-submodule.sh:222 #, sh-format msgid "'$path' already exists in the index" msgstr "\"$path\" existiert bereits im Index" -#: git-submodule.sh:211 +#: git-submodule.sh:227 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -3461,64 +3466,64 @@ msgstr "" "$path\n" "Verwende -f um Hinzufügen zu erzwingen." -#: git-submodule.sh:222 +#: git-submodule.sh:240 #, sh-format msgid "Adding existing repo at '$path' to the index" msgstr "Füge bereits bestehendes Repository bei \"$path\" dem Index hinzu" -#: git-submodule.sh:224 +#: git-submodule.sh:242 #, sh-format msgid "'$path' already exists and is not a valid git repo" msgstr "" "Zielpfad \"$path\" existiert bereits und ist kein gültiges Git-Repository" -#: git-submodule.sh:247 +#: git-submodule.sh:265 #, sh-format msgid "Unable to checkout submodule '$path'" msgstr "Kann Submodul \"$path\" nicht auschecken" -#: git-submodule.sh:251 +#: git-submodule.sh:269 #, sh-format msgid "Failed to add submodule '$path'" msgstr "Konnte Submodul \"$path\" nicht hinzufügen" -#: git-submodule.sh:256 +#: git-submodule.sh:274 #, sh-format msgid "Failed to register submodule '$path'" msgstr "Registrierung des Submoduls \"$path\" fehlgeschlagen" -#: git-submodule.sh:294 +#: git-submodule.sh:312 #, sh-format msgid "Entering '$prefix$path'" msgstr "Wechsle nach \"$prefix$path\"" -#: git-submodule.sh:306 +#: git-submodule.sh:324 #, sh-format msgid "Stopping at '$path'; script returned non-zero status." msgstr "Angehalten bei \"$path\"; Skript gab nicht-Null Status zurück." -#: git-submodule.sh:349 +#: git-submodule.sh:367 #, sh-format msgid "No url found for submodule path '$path' in .gitmodules" msgstr "Keine URL für Submodul-Pfad \"$path\" in .gitmodules gefunden" -#: git-submodule.sh:359 +#: git-submodule.sh:377 #, sh-format msgid "Failed to register url for submodule path '$path'" msgstr "Registrierung der URL für Submodul-Pfad \"$path\" fehlgeschlagen" -#: git-submodule.sh:364 +#: git-submodule.sh:382 #, sh-format msgid "Failed to register update mode for submodule path '$path'" msgstr "" "Registrierung des Update-Modus für Submodul-Pfad \"$path\" fehlgeschlagen" -#: git-submodule.sh:366 +#: git-submodule.sh:384 #, sh-format msgid "Submodule '$name' ($url) registered for path '$path'" msgstr "Submodul \"$name\" ($url) für Pfad \"$path\" registriert" -#: git-submodule.sh:444 +#: git-submodule.sh:467 #, sh-format msgid "" "Submodule path '$path' not initialized\n" @@ -3527,83 +3532,324 @@ msgstr "" "Submodul-Pfad \"$path\" ist nicht initialisiert\n" "War vielleicht \\`update --init\\` gewollt?" -#: git-submodule.sh:456 +#: git-submodule.sh:480 #, sh-format msgid "Unable to find current revision in submodule path '$path'" msgstr "Kann aktuelle Revision im Submodul-Pfad \"$path\" nicht finden" -#: git-submodule.sh:476 +#: git-submodule.sh:504 #, sh-format msgid "Unable to fetch in submodule path '$path'" msgstr "Kann im Submodul-Pfad \"$path\" nicht holen" -#: git-submodule.sh:482 git-submodule.sh:487 git-submodule.sh:492 +#: git-submodule.sh:517 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$path'" msgstr "Kann nicht auf \"$sha1\" im Submodul-Pfad \"$path\" rebasen" -#: git-submodule.sh:483 +#: git-submodule.sh:518 #, sh-format msgid "Submodule path '$path': rebased into '$sha1'" msgstr "Submodul-Pfad \"$path\": auf \"$sha1\" rebased" -#: git-submodule.sh:488 +#: git-submodule.sh:522 +#, fuzzy, sh-format +msgid "Unable to merge '$sha1' in submodule path '$path'" +msgstr "Kann nicht auf \"$sha1\" im Submodul-Pfad \"$path\" rebasen" + +#: git-submodule.sh:523 #, sh-format msgid "Submodule path '$path': merged in '$sha1'" msgstr "Submodul-Pfad \"$path\": \"$sha1\" wurde gemerged" -#: git-submodule.sh:493 +#: git-submodule.sh:527 +#, fuzzy, sh-format +msgid "Unable to checkout '$sha1' in submodule path '$path'" +msgstr "Kann nicht auf \"$sha1\" im Submodul-Pfad \"$path\" rebasen" + +#: git-submodule.sh:528 #, sh-format msgid "Submodule path '$path': checked out '$sha1'" msgstr "Submodul-Pfad \"$path\": \"$sha1\" wurde ausgecheckt" -#: git-submodule.sh:504 git-submodule.sh:797 +#: git-submodule.sh:539 git-submodule.sh:841 #, sh-format msgid "Failed to recurse into submodule path '$path'" msgstr "Konnte nicht in den Submodul-Pfad \"$path\" wechseln" -#: git-submodule.sh:588 +#: git-submodule.sh:623 msgid "--" msgstr "--" #. unexpected type -#: git-submodule.sh:628 +#: git-submodule.sh:664 #, sh-format msgid "unexpected mode $mod_dst" msgstr "unerwarteter Modus $mod_dst" -#: git-submodule.sh:646 +#: git-submodule.sh:684 #, sh-format msgid " Warn: $name doesn't contain commit $sha1_src" msgstr " Warnung: $name enthält nicht Commit $sha1_src" -#: git-submodule.sh:649 +#: git-submodule.sh:687 #, sh-format msgid " Warn: $name doesn't contain commit $sha1_dst" msgstr " Warnung: $name enthält nicht Commit $sha1_dst" -#: git-submodule.sh:652 +#: git-submodule.sh:690 #, sh-format msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst" msgstr " Warnung: $name enthält nicht Commit $sha1_src und $sha1_dst" -#: git-submodule.sh:677 +#: git-submodule.sh:715 msgid "blob" msgstr "Blob" -#: git-submodule.sh:678 +#: git-submodule.sh:716 msgid "submodule" msgstr "Submodul" -#: git-submodule.sh:715 +#: git-submodule.sh:753 msgid "# Submodules changed but not updated:" msgstr "# Geändert, aber nicht für den nächsten Commit vorgemerkte Submodule:" -#: git-submodule.sh:717 +#: git-submodule.sh:755 msgid "# Submodule changes to be committed:" msgstr "# Vorgemerkte Änderungen im Submodul für den nächsten Commit:" -#: git-submodule.sh:844 +#: git-submodule.sh:885 #, sh-format msgid "Synchronizing submodule url for '$name'" msgstr "Synchronisiere Submodul-URL für \"$name\"" + +#~ msgid "# Changed but not updated:" +#~ msgstr "# Geändert, aber nicht für den nächsten Commit vorgemerkt:" + +#~ msgid "could not parse commit %s" +#~ msgstr "konnte Commit %s nicht analysieren" + +#~ msgid "Paths with --interactive does not make sense." +#~ msgstr "Es ist unsinnig, Pfade zusammen mit --interactive anzugeben." + +#~ msgid "No HEAD commit to compare with (yet)" +#~ msgstr "Es gibt (noch) keinen HEAD-Commit zum Vergleich" + +#~ msgid "cannot mix --fixed-strings and regexp" +#~ msgstr "--fixed-strings kann nicht mit regulärem Ausdruck kombiniert werden" + +#~ msgid "invalid --decorate option: %s" +#~ msgstr "ungültige --decorate-Option: %s" + +#~ msgid "Failed to write current notes tree to database" +#~ msgstr "" +#~ "Fehler beim Versuch, aktuellen Notizenbaum in die Datenbank zu schreiben" + +#~ msgid "Failed to commit notes tree to database" +#~ msgstr "Konnte Notizenbaum nicht in Datenbank schreiben." + +#~ msgid "Refusing to %s notes in %s (outside of refs/notes/)" +#~ msgstr "%s von Notizen in %s (außerhalb von refs/notes/) verweigert" + +#~ msgid "list" +#~ msgstr "Auflistung" + +#~ msgid "add" +#~ msgstr "füge hinzu" + +#~ msgid "copy" +#~ msgstr "Kopie" + +# "Refusing to %s notes" <-> "%s von Notizen" +#~ msgid "show" +#~ msgstr "Anziegen" + +#~ msgid "remove" +#~ msgstr "Löschen" + +#~ msgid "prune" +#~ msgstr "Trimmen" + +#~ msgid "The current branch %s is not tracking anything." +#~ msgstr "Die aktuelle Branch %s verfolgt nichts." + +#~ msgid "No destination configured to push to." +#~ msgstr "Kein Ziel für Übertragung festgelegt." + +#~ msgid "Could not extract author email from %s" +#~ msgstr "Konnte E-Mail-Adresse des Autors nicht aus %s entnehmen" + +#~ msgid "Could not extract author time from %s" +#~ msgstr "Konnte Erstelldatum nicht aus %s entnehmen" + +#~ msgid "No author information found in %s" +#~ msgstr "Keine Autoreninformationen in %s gefunden" + +#~ msgid "Cannot revert a root commit" +#~ msgstr "Kann einen Wurzel-Commit nicht umkehren" + +#~ msgid "" +#~ "There is no candidate for rebasing against among the refs that you just " +#~ "fetched.\n" +#~ "Generally this means that you provided a wildcard refspec which had no\n" +#~ "matches on the remote end." +#~ msgstr "" +#~ "Entlang der soeben geholten Refs gibt es keinen Kandidat, auf den " +#~ "rebased\n" +#~ "werden könnte. Generell bedeutet dies, dass eine Wildcard-Refspec " +#~ "angegeben\n" +#~ "wurde, die auf der entfernten Seite keinen Treffer erzielte." + +#~ msgid "" +#~ "There are no candidates for merging against among the refs that you just " +#~ "fetched.\n" +#~ "Generally this means that you provided a wildcard refspec which had no\n" +#~ "matches on the remote end." +#~ msgstr "" +#~ "Entlang der soeben geholten Refs gibt es keine Kandidaten, mit denen " +#~ "gemerged\n" +#~ "werden könnte. Generell bedeutet dies, dass eine Wildcard-Refspec " +#~ "angegeben\n" +#~ "wurde, die auf der entfernten Seite keinen Treffer erzielte." + +#~ msgid "" +#~ "You asked to pull from the remote '$requested_remote', but did not " +#~ "specify\n" +#~ "a branch. Because this is not the default configured remote\n" +#~ "for your current branch, you must specify a branch on the command line." +#~ msgstr "" +#~ "Da die gegenwärtige Branch nicht der für den Remote als Standard " +#~ "definierten Branch entspricht, ist beim Pull von \"$requested_remote\" " +#~ "eine Branch anzugeben." + +#~ msgid "" +#~ "You are not currently on a branch, so I cannot use any\n" +#~ "'branch..merge' in your configuration file.\n" +#~ "Please specify which remote branch you want to use on the command\n" +#~ "line and try again (e.g. 'git pull ').\n" +#~ "See git-pull(1) for details." +#~ msgstr "" +#~ "Gegenwärtig ist keine Branch aktiv, weshalb keine in der " +#~ "Konfigurationsdatei festgelegten \"branch..merge\" verwendet " +#~ "werden können.\n" +#~ "Gib die zu verwendende Branch mit an (z.B. \\`git pull " +#~ "\\`).\n" +#~ "Siehe git-pull(1) für weiter Informationen." + +#~ msgid "" +#~ "You asked me to pull without telling me which branch you\n" +#~ "want to rebase against, and 'branch.${curr_branch}.merge' in\n" +#~ "your configuration file does not tell me, either. Please\n" +#~ "specify which branch you want to use on the command line and\n" +#~ "try again (e.g. 'git pull ').\n" +#~ "See git-pull(1) for details.\n" +#~ "\n" +#~ "If you often rebase against the same branch, you may want to\n" +#~ "use something like the following in your configuration file:\n" +#~ "\n" +#~ " [branch \"${curr_branch}\"]\n" +#~ " remote = \n" +#~ " merge = \n" +#~ " rebase = true\n" +#~ "\n" +#~ " [remote \"\"]\n" +#~ " url = \n" +#~ " fetch = \n" +#~ "\n" +#~ "See git-config(1) for details." +#~ msgstr "" +#~ "Es wurde keine Branch, auf die rebased werden soll, angegeben; auch " +#~ "\"branch.$curr_branch.merge\" in der Konfigurationsdatei ist nicht " +#~ "gesetzt. Gib die zu verwendende Branch mit an (z.B. \\`git pull " +#~ " \\`).\n" +#~ "Siehe git-pull(1) für weitere Informationen.\n" +#~ "\n" +#~ "Falls oft auf die gleiche Branch rebased wird, kann folgendes Konstrukt " +#~ "in der Konfigurationsdatei verwendet werden:\n" +#~ "\n" +#~ " [branch \"$curr_branch\"]\n" +#~ " remote = \n" +#~ " merge = \n" +#~ " rebase = true\n" +#~ "\n" +#~ " [remote \"\"]\n" +#~ " url = \n" +#~ " fetch = \n" +#~ "\n" +#~ "Siehe git-config(1) für weitere Informationen." + +#~ msgid "" +#~ "You asked me to pull without telling me which branch you\n" +#~ "want to merge with, and 'branch.${curr_branch}.merge' in\n" +#~ "your configuration file does not tell me, either. Please\n" +#~ "specify which branch you want to use on the command line and\n" +#~ "try again (e.g. 'git pull ').\n" +#~ "See git-pull(1) for details.\n" +#~ "\n" +#~ "If you often merge with the same branch, you may want to\n" +#~ "use something like the following in your configuration file:\n" +#~ "\n" +#~ " [branch \"${curr_branch}\"]\n" +#~ " remote = \n" +#~ " merge = \n" +#~ "\n" +#~ " [remote \"\"]\n" +#~ " url = \n" +#~ " fetch = \n" +#~ "\n" +#~ "See git-config(1) for details." +#~ msgstr "" +#~ "Es wurde keine Branch, mit der gemerged werden soll, angegeben; auch " +#~ "\"branch.$curr_branch.merge\" in der Konfigurationsdatei ist nicht " +#~ "gesetzt. Gib die zu verwendende Branch mit an (z.B. \\`git pull " +#~ " \\`).\n" +#~ "Siehe git-pull(1) für weitere Informationen.\n" +#~ "\n" +#~ "Falls oft mit der gleichen Branch gemerged wird, kann folgendes Konstrukt " +#~ "in der Konfigurationsdatei verwendet werden:\n" +#~ "\n" +#~ " [branch \"$curr_branch\"]\n" +#~ " remote = \n" +#~ " merge = \n" +#~ "\n" +#~ " [remote \"\"]\n" +#~ " url = \n" +#~ " fetch = \n" +#~ "\n" +#~ "Siehe git-config(1) für weitere Informationen." + +#~ msgid "" +#~ "Your configuration specifies to rebase against the ref " +#~ "'$upstream_branch'\n" +#~ "from the remote, but no such ref was fetched." +#~ msgstr "" +#~ "Die Konfiguration gibt an, dass die Referenz \"$upstream_branch\" des " +#~ "Remotes zum Rebasen verwendet werden soll, aber keine solche Referenz " +#~ "wurde geholt." + +#~ msgid "" +#~ "Your configuration specifies to merge with the ref '$upstream_branch'\n" +#~ "from the remote, but no such ref was fetched." +#~ msgstr "" +#~ "Die Konfiguration gibt an, dass die Referenz \"$upstream_branch\" des " +#~ "Remotes zu merge sei, aber keine solche Referenz wurde geholt." + +#~ msgid "refusing to pull with rebase: your working tree is not up-to-date" +#~ msgstr "" +#~ "Verweigerung des Pull mit Rebase: die Arbeitskopie ist nicht aktuell" + +#~ msgid "$REV does not exist in the stash log" +#~ msgstr "$REV existiert im Stash-Log nicht" + +#~ msgid "Cannot apply to a dirty working tree, please stage your changes" +#~ msgstr "" +#~ "Kann Patch nicht auf eine geänderte Arbeitskopie anwenden; merke die " +#~ "Änderungen zunächst vor" + +#~ msgid "Directory '$path' exists, but is neither empty nor a git repository" +#~ msgstr "" +#~ "Verzeichnis \"$path\" existiert, aber ist weder leer noch ein Git-" +#~ "Repository" + +#~ msgid "A file already exist at path '$path'" +#~ msgstr "Es existiert bereits eine Datei am Pfad \"$path\"" From 938237c1725c076231c11358a9616e0d04f312c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Date: Wed, 6 Jul 2011 19:22:54 +0000 Subject: [PATCH 09/15] en_GB.po: msgmerge --- po/en_GB.po | 1911 +++++++++++++++++++++++++++++++++------------------ 1 file changed, 1257 insertions(+), 654 deletions(-) diff --git a/po/en_GB.po b/po/en_GB.po index 4854e1ad580dd2..7447f908e8b10d 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List \n" -"POT-Creation-Date: 2010-09-20 15:07+0000\n" +"POT-Creation-Date: 2011-07-06 19:20+0000\n" "PO-Revision-Date: 2010-09-02 19:09 +0000\n" "Last-Translator: Sam Reed \n" "Language-Team: Git Mailing List \n" @@ -16,247 +16,270 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: wt-status.c:56 -msgid "# Unmerged paths:" +#: diff.c:104 +#, c-format +msgid " Failed to parse dirstat cut-off percentage '%.*s'\n" +msgstr "" + +#: diff.c:109 +#, c-format +msgid " Unknown dirstat parameter '%.*s'\n" +msgstr "" + +#: diff.c:205 +#, c-format +msgid "" +"Found errors in 'diff.dirstat' config variable:\n" +"%s" msgstr "" -#: wt-status.c:62 wt-status.c:79 +#: diff.c:3295 #, c-format -msgid "# (use \"git reset %s ...\" to unstage)" +msgid "" +"Failed to parse --dirstat/-X option parameter:\n" +"%s" +msgstr "" + +#: wt-status.c:134 +msgid "Unmerged paths:" msgstr "" -#: wt-status.c:64 wt-status.c:81 -msgid "# (use \"git rm --cached ...\" to unstage)" +#: wt-status.c:140 wt-status.c:157 +#, c-format +msgid " (use \"git reset %s ...\" to unstage)" +msgstr "" + +#: wt-status.c:142 wt-status.c:159 +msgid " (use \"git rm --cached ...\" to unstage)" msgstr "" -#: wt-status.c:65 -msgid "# (use \"git add/rm ...\" as appropriate to mark resolution)" +#: wt-status.c:143 +msgid " (use \"git add/rm ...\" as appropriate to mark resolution)" msgstr "" -#: wt-status.c:73 -msgid "# Changes to be committed:" +#: wt-status.c:151 +msgid "Changes to be committed:" msgstr "" -#: wt-status.c:91 -msgid "# Changed but not updated:" +#: wt-status.c:169 +msgid "Changes not staged for commit:" msgstr "" -#: wt-status.c:95 -msgid "# (use \"git add ...\" to update what will be committed)" +#: wt-status.c:173 +msgid " (use \"git add ...\" to update what will be committed)" msgstr "" -#: wt-status.c:97 -msgid "# (use \"git add/rm ...\" to update what will be committed)" +#: wt-status.c:175 +msgid " (use \"git add/rm ...\" to update what will be committed)" msgstr "" -#: wt-status.c:98 +#: wt-status.c:176 msgid "" -"# (use \"git checkout -- ...\" to discard changes in working " -"directory)" +" (use \"git checkout -- ...\" to discard changes in working directory)" msgstr "" -#: wt-status.c:100 -msgid "# (commit or discard the untracked or modified content in submodules)" +#: wt-status.c:178 +msgid " (commit or discard the untracked or modified content in submodules)" msgstr "" -#: wt-status.c:109 +#: wt-status.c:187 #, c-format -msgid "# %s files:" +msgid "%s files:" msgstr "" -#: wt-status.c:112 +#: wt-status.c:190 #, c-format -msgid "# (use \"git %s ...\" to include in what will be committed)" +msgid " (use \"git %s ...\" to include in what will be committed)" msgstr "" -#: wt-status.c:129 +#: wt-status.c:207 msgid "bug" msgstr "" -#: wt-status.c:134 +#: wt-status.c:212 msgid "both deleted:" msgstr "" -#: wt-status.c:135 +#: wt-status.c:213 msgid "added by us:" msgstr "" -#: wt-status.c:136 +#: wt-status.c:214 msgid "deleted by them:" msgstr "" -#: wt-status.c:137 +#: wt-status.c:215 msgid "added by them:" msgstr "" -#: wt-status.c:138 +#: wt-status.c:216 msgid "deleted by us:" msgstr "" -#: wt-status.c:139 +#: wt-status.c:217 msgid "both added:" msgstr "" -#: wt-status.c:140 +#: wt-status.c:218 msgid "both modified:" msgstr "" -#: wt-status.c:170 +#: wt-status.c:248 msgid "new commits, " msgstr "" -#: wt-status.c:172 +#: wt-status.c:250 msgid "modified content, " msgstr "" -#: wt-status.c:174 +#: wt-status.c:252 msgid "untracked content, " msgstr "" -#: wt-status.c:188 +#: wt-status.c:266 #, c-format msgid "new file: %s" msgstr "" -#: wt-status.c:191 +#: wt-status.c:269 #, c-format msgid "copied: %s -> %s" msgstr "" -#: wt-status.c:194 +#: wt-status.c:272 #, c-format msgid "deleted: %s" msgstr "" -#: wt-status.c:197 +#: wt-status.c:275 #, c-format msgid "modified: %s" msgstr "" -#: wt-status.c:200 +#: wt-status.c:278 #, c-format msgid "renamed: %s -> %s" msgstr "" -#: wt-status.c:203 +#: wt-status.c:281 #, c-format msgid "typechange: %s" msgstr "" -#: wt-status.c:206 +#: wt-status.c:284 #, c-format msgid "unknown: %s" msgstr "" -#: wt-status.c:209 +#: wt-status.c:287 #, c-format msgid "unmerged: %s" msgstr "" -#: wt-status.c:212 +#: wt-status.c:290 #, c-format msgid "bug: unhandled diff status %c" msgstr "" -#: wt-status.c:635 +#: wt-status.c:713 msgid "On branch " msgstr "" -#: wt-status.c:642 +#: wt-status.c:720 msgid "Not currently on any branch." msgstr "" -#: wt-status.c:652 -msgid "# Initial commit" -msgstr "" +#: wt-status.c:731 +#, fuzzy +msgid "Initial commit" +msgstr "Initialised empty" -#: wt-status.c:666 +#: wt-status.c:745 msgid "Untracked" msgstr "" -#: wt-status.c:668 +#: wt-status.c:747 msgid "Ignored" msgstr "" -#: wt-status.c:670 +#: wt-status.c:749 #, c-format -msgid "# Untracked files not listed%s\n" +msgid "Untracked files not listed%s" msgstr "" -#: wt-status.c:672 +#: wt-status.c:751 msgid " (use -u option to show untracked files)" msgstr "" -#: wt-status.c:678 -#, c-format -msgid "# No changes\n" +#: wt-status.c:757 +msgid "No changes" msgstr "" -#: wt-status.c:682 +#: wt-status.c:761 #, c-format msgid "no changes added to commit%s\n" msgstr "" -#: wt-status.c:684 +#: wt-status.c:763 msgid " (use \"git add\" and/or \"git commit -a\")" msgstr "" -#: wt-status.c:686 +#: wt-status.c:765 #, c-format msgid "nothing added to commit but untracked files present%s\n" msgstr "" -#: wt-status.c:688 +#: wt-status.c:767 msgid " (use \"git add\" to track)" msgstr "" -#: wt-status.c:690 wt-status.c:693 wt-status.c:696 +#: wt-status.c:769 wt-status.c:772 wt-status.c:775 #, c-format msgid "nothing to commit%s\n" msgstr "" -#: wt-status.c:691 +#: wt-status.c:770 msgid " (create/copy files and use \"git add\" to track)" msgstr "" -#: wt-status.c:694 +#: wt-status.c:773 msgid " (use -u to show untracked files)" msgstr "" -#: wt-status.c:697 +#: wt-status.c:776 msgid " (working directory clean)" msgstr "" -#: wt-status.c:795 +#: wt-status.c:884 msgid "HEAD (no branch)" msgstr "" -#: wt-status.c:801 +#: wt-status.c:890 msgid "Initial commit on " msgstr "" -#: wt-status.c:816 +#: wt-status.c:905 msgid "behind " msgstr "" -#: wt-status.c:819 wt-status.c:822 +#: wt-status.c:908 wt-status.c:911 msgid "ahead " msgstr "" -#: wt-status.c:824 +#: wt-status.c:913 msgid ", behind " msgstr "" -#: builtin/add.c:41 +#: builtin/add.c:61 #, c-format msgid "unexpected diff status %c" msgstr "" -#: builtin/add.c:67 builtin/commit.c:244 +#: builtin/add.c:66 builtin/commit.c:291 msgid "updating files failed" msgstr "" -#: builtin/add.c:77 +#: builtin/add.c:76 #, c-format msgid "remove '%s'\n" msgstr "" @@ -270,7 +293,7 @@ msgstr "" msgid "Unstaged changes after refreshing the index:" msgstr "" -#: builtin/add.c:194 builtin/add.c:452 builtin/rm.c:194 +#: builtin/add.c:194 builtin/add.c:454 builtin/rm.c:186 #, c-format msgid "pathspec '%s' did not match any files" msgstr "" @@ -307,43 +330,47 @@ msgstr "" msgid "Could not apply '%s'" msgstr "" -#: builtin/add.c:349 +#: builtin/add.c:310 +msgid "The following paths are ignored by one of your .gitignore files:\n" +msgstr "" + +#: builtin/add.c:350 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "" -#: builtin/add.c:350 +#: builtin/add.c:351 msgid "no files added" msgstr "" -#: builtin/add.c:356 +#: builtin/add.c:357 msgid "adding files failed" msgstr "" -#: builtin/add.c:388 +#: builtin/add.c:389 msgid "-A and -u are mutually incompatible" msgstr "" -#: builtin/add.c:390 +#: builtin/add.c:391 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "" -#: builtin/add.c:410 +#: builtin/add.c:411 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "" -#: builtin/add.c:411 +#: builtin/add.c:412 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "" -#: builtin/add.c:417 builtin/clean.c:95 builtin/commit.c:301 -#: builtin/commit.c:310 builtin/mv.c:77 builtin/rm.c:171 +#: builtin/add.c:418 builtin/clean.c:95 builtin/commit.c:350 builtin/mv.c:77 +#: builtin/rm.c:162 msgid "index file corrupt" msgstr "" -#: builtin/add.c:468 builtin/mv.c:223 builtin/rm.c:268 +#: builtin/add.c:470 builtin/mv.c:223 builtin/rm.c:260 msgid "Unable to write new index file" msgstr "" @@ -381,7 +408,7 @@ msgstr "" #, c-format msgid "" "deleting branch '%s' that has been merged to\n" -" '%s', but it is not yet merged to HEAD." +" '%s', but not yet merged to HEAD." msgstr "" #: builtin/branch.c:140 @@ -445,75 +472,75 @@ msgstr "" msgid "branch '%s' does not point at a commit" msgstr "" -#: builtin/branch.c:381 +#: builtin/branch.c:376 #, c-format msgid "behind %d] " msgstr "" -#: builtin/branch.c:383 +#: builtin/branch.c:378 #, c-format msgid "ahead %d] " msgstr "" -#: builtin/branch.c:385 +#: builtin/branch.c:380 #, c-format msgid "ahead %d, behind %d] " msgstr "" -#: builtin/branch.c:484 +#: builtin/branch.c:483 msgid "(no branch)" msgstr "" -#: builtin/branch.c:544 +#: builtin/branch.c:543 msgid "some refs could not be read" msgstr "" -#: builtin/branch.c:557 +#: builtin/branch.c:556 msgid "cannot rename the current branch while not on any." msgstr "" -#: builtin/branch.c:567 builtin/branch.c:571 +#: builtin/branch.c:566 builtin/branch.c:570 #, c-format msgid "Invalid branch name: '%s'" msgstr "" -#: builtin/branch.c:574 +#: builtin/branch.c:573 #, c-format msgid "A branch named '%s' already exists." msgstr "" -#: builtin/branch.c:580 +#: builtin/branch.c:579 msgid "Branch rename failed" msgstr "" -#: builtin/branch.c:584 +#: builtin/branch.c:583 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "" -#: builtin/branch.c:588 +#: builtin/branch.c:587 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "" -#: builtin/branch.c:595 +#: builtin/branch.c:594 msgid "Branch is renamed, but update of config-file failed" msgstr "" -#: builtin/branch.c:610 +#: builtin/branch.c:609 #, c-format msgid "malformed object name %s" msgstr "" -#: builtin/branch.c:680 +#: builtin/branch.c:683 msgid "Failed to resolve HEAD as a valid ref." msgstr "" -#: builtin/branch.c:686 +#: builtin/branch.c:689 msgid "HEAD not found below refs/heads!" msgstr "" -#: builtin/branch.c:706 +#: builtin/branch.c:709 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" @@ -530,176 +557,227 @@ msgstr "" msgid "Need a repository to unbundle." msgstr "" -#: builtin/checkout.c:107 builtin/checkout.c:135 +#: builtin/checkout.c:111 builtin/checkout.c:139 #, c-format msgid "path '%s' does not have our version" msgstr "" -#: builtin/checkout.c:109 builtin/checkout.c:137 +#: builtin/checkout.c:113 builtin/checkout.c:141 #, c-format msgid "path '%s' does not have their version" msgstr "" -#: builtin/checkout.c:120 +#: builtin/checkout.c:124 #, c-format msgid "path '%s' does not have all three versions" msgstr "" -#: builtin/checkout.c:155 +#: builtin/checkout.c:159 #, c-format msgid "path '%s' does not have all 3 versions" msgstr "" -#: builtin/checkout.c:172 +#: builtin/checkout.c:176 #, c-format msgid "path '%s': cannot merge" msgstr "" -#: builtin/checkout.c:189 +#: builtin/checkout.c:193 #, c-format msgid "Unable to add merge result for '%s'" msgstr "" -#: builtin/checkout.c:194 builtin/reset.c:170 +#: builtin/checkout.c:198 builtin/reset.c:170 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "" -#: builtin/checkout.c:216 builtin/checkout.c:371 +#: builtin/checkout.c:220 builtin/checkout.c:374 msgid "corrupt index file" msgstr "" -#: builtin/checkout.c:244 builtin/checkout.c:251 +#: builtin/checkout.c:248 builtin/checkout.c:255 #, c-format msgid "path '%s' is unmerged" msgstr "" -#: builtin/checkout.c:280 builtin/checkout.c:475 builtin/clone.c:658 -#: builtin/merge.c:737 +#: builtin/checkout.c:284 builtin/checkout.c:478 builtin/clone.c:668 +#: builtin/merge.c:789 msgid "unable to write new index file" msgstr "" -#: builtin/checkout.c:297 builtin/diff.c:307 builtin/merge.c:367 +#: builtin/checkout.c:301 builtin/diff.c:301 builtin/merge.c:396 msgid "diff_setup_done failed" msgstr "" -#: builtin/checkout.c:393 +#: builtin/checkout.c:396 msgid "you need to resolve your current index first" msgstr "" -#: builtin/checkout.c:524 +#: builtin/checkout.c:527 #, c-format msgid "Can not do reflog for '%s'\n" msgstr "" -#: builtin/checkout.c:550 +#: builtin/checkout.c:557 +msgid "HEAD is now at" +msgstr "" + +#: builtin/checkout.c:563 #, c-format msgid "Already on '%s'\n" msgstr "" -#: builtin/checkout.c:554 +#: builtin/checkout.c:567 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "" -#: builtin/checkout.c:556 +#: builtin/checkout.c:569 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "" -#: builtin/checkout.c:558 +#: builtin/checkout.c:571 #, c-format msgid "Switched to branch '%s'\n" msgstr "" -#: builtin/checkout.c:575 -msgid "HEAD is now at" +#: builtin/checkout.c:651 +#, c-format +msgid " ... and %d more.\n" msgstr "" -#: builtin/checkout.c:603 -msgid "You are on a branch yet to be born" +#. The singular version +#: builtin/checkout.c:657 +#, 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:675 +#, 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/checkout.c:700 +msgid "internal error: only -- alone should have been left" msgstr "" -#: builtin/checkout.c:617 +#: builtin/checkout.c:702 +msgid "internal error in revision walk" +msgstr "" + +#: builtin/checkout.c:706 msgid "Previous HEAD position was" msgstr "" -#: builtin/checkout.c:730 +#: builtin/checkout.c:731 +msgid "You are on a branch yet to be born" +msgstr "" + +#. case (1) +#: builtin/checkout.c:859 +#, c-format +msgid "invalid reference: %s" +msgstr "" + +#. case (1): want a tree +#: builtin/checkout.c:898 +#, c-format +msgid "reference is not a tree: %s" +msgstr "" + +#: builtin/checkout.c:965 msgid "-B cannot be used with -b" msgstr "" -#: builtin/checkout.c:738 +#: builtin/checkout.c:974 msgid "--patch is incompatible with all other options" msgstr "" -#: builtin/checkout.c:744 +#: builtin/checkout.c:977 +msgid "--detach cannot be used with -b/-B/--orphan" +msgstr "" + +#: builtin/checkout.c:979 +msgid "--detach cannot be used with -t" +msgstr "" + +#: builtin/checkout.c:985 msgid "--track needs a branch name" msgstr "" -#: builtin/checkout.c:751 +#: builtin/checkout.c:992 msgid "Missing branch name; try -b" msgstr "" -#: builtin/checkout.c:757 +#: builtin/checkout.c:998 msgid "--orphan and -b|-B are mutually exclusive" msgstr "" -#: builtin/checkout.c:759 +#: builtin/checkout.c:1000 msgid "--orphan cannot be used with -t" msgstr "" -#: builtin/checkout.c:769 +#: builtin/checkout.c:1010 msgid "git checkout: -f and -m are incompatible" msgstr "" -#. case (1) -#: builtin/checkout.c:815 -#, c-format -msgid "invalid reference: %s" -msgstr "" - -#. case (1): want a tree -#: builtin/checkout.c:852 -#, c-format -msgid "reference is not a tree: %s" -msgstr "" - -#: builtin/checkout.c:878 +#: builtin/checkout.c:1044 msgid "invalid path specification" msgstr "" -#: builtin/checkout.c:886 +#: builtin/checkout.c:1052 #, c-format msgid "" "git checkout: updating paths is incompatible with switching branches.\n" "Did you intend to checkout '%s' which can not be resolved as commit?" msgstr "" -#: builtin/checkout.c:888 +#: builtin/checkout.c:1054 msgid "git checkout: updating paths is incompatible with switching branches." msgstr "" -#: builtin/checkout.c:893 +#: builtin/checkout.c:1059 +msgid "git checkout: --detach does not take a path argument" +msgstr "" + +#: builtin/checkout.c:1062 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." msgstr "" -#: builtin/checkout.c:904 +#: builtin/checkout.c:1073 #, c-format msgid "git checkout: we do not like '%s' as a branch name." msgstr "" -#: builtin/checkout.c:909 +#: builtin/checkout.c:1078 #, c-format msgid "git checkout: branch %s already exists" msgstr "" -#: builtin/checkout.c:916 +#: builtin/checkout.c:1085 msgid "Cannot switch branch to a non-commit." msgstr "" -#: builtin/checkout.c:919 +#: builtin/checkout.c:1088 msgid "--ours/--theirs is incompatible with switching branches." msgstr "" @@ -730,7 +808,7 @@ msgstr "" #: builtin/clean.c:161 builtin/clean.c:181 #, c-format -msgid "failed to remove '%s'" +msgid "failed to remove %s" msgstr "" #: builtin/clean.c:165 @@ -743,114 +821,123 @@ msgstr "" msgid "Not removing %s\n" msgstr "" -#: builtin/clone.c:208 +#: builtin/clone.c:214 #, c-format msgid "reference repository '%s' is not a local directory." msgstr "" -#: builtin/clone.c:235 +#: builtin/clone.c:241 #, c-format msgid "failed to open '%s'" msgstr "" -#: builtin/clone.c:239 +#: builtin/clone.c:245 #, c-format msgid "failed to create directory '%s'" msgstr "" -#: builtin/clone.c:241 builtin/diff.c:74 +#: builtin/clone.c:247 builtin/diff.c:74 #, c-format msgid "failed to stat '%s'" msgstr "" -#: builtin/clone.c:243 +#: builtin/clone.c:249 #, c-format msgid "%s exists and is not a directory" msgstr "" -#: builtin/clone.c:257 +#: builtin/clone.c:263 #, c-format msgid "failed to stat %s\n" msgstr "" -#: builtin/clone.c:267 +#: builtin/clone.c:273 #, c-format msgid "failed to unlink '%s'" msgstr "" -#: builtin/clone.c:272 +#: builtin/clone.c:278 #, c-format msgid "failed to create link '%s'" msgstr "" -#: builtin/clone.c:276 +#: builtin/clone.c:282 #, c-format msgid "failed to copy file to '%s'" msgstr "" -#: builtin/clone.c:305 +#: builtin/clone.c:311 #, c-format msgid "done.\n" msgstr "" -#: builtin/clone.c:387 +#: builtin/clone.c:394 msgid "Too many arguments." msgstr "" -#: builtin/clone.c:391 +#: builtin/clone.c:398 msgid "You must specify a repository to clone." msgstr "" -#: builtin/clone.c:399 +#: builtin/clone.c:406 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "" -#: builtin/clone.c:428 +#: builtin/clone.c:420 +#, c-format +msgid "repository '%s' does not exist" +msgstr "" + +#: builtin/clone.c:425 +msgid "--depth is ignored in local clones; use file:// instead." +msgstr "" + +#: builtin/clone.c:435 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "" -#: builtin/clone.c:438 +#: builtin/clone.c:445 #, c-format msgid "working tree '%s' already exists." msgstr "" -#: builtin/clone.c:451 builtin/clone.c:465 +#: builtin/clone.c:458 builtin/clone.c:472 #, c-format msgid "could not create leading directories of '%s'" msgstr "" -#: builtin/clone.c:454 +#: builtin/clone.c:461 #, c-format msgid "could not create work tree dir '%s'." msgstr "" -#: builtin/clone.c:470 +#: builtin/clone.c:480 #, c-format -msgid "Cloning into bare repository %s\n" +msgid "Cloning into bare repository %s...\n" msgstr "" -#: builtin/clone.c:472 +#: builtin/clone.c:482 #, c-format -msgid "Cloning into %s\n" +msgid "Cloning into %s...\n" msgstr "" -#: builtin/clone.c:530 +#: builtin/clone.c:540 #, c-format msgid "Don't know how to clone %s" msgstr "" -#: builtin/clone.c:569 +#: builtin/clone.c:579 #, c-format msgid "Remote branch %s not found in upstream %s, using HEAD instead" msgstr "" -#: builtin/clone.c:579 +#: builtin/clone.c:589 msgid "You appear to have cloned an empty repository." msgstr "" -#: builtin/clone.c:621 +#: builtin/clone.c:631 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" @@ -863,9 +950,9 @@ msgid "" " git config --global user.name \"Your Name\"\n" " git config --global user.email you@example.com\n" "\n" -"If the identity used for this commit is wrong, you can fix it with:\n" +"After doing this, you may fix the identity used for this commit with:\n" "\n" -" git commit --amend --author='Your Name '\n" +" git commit --amend --reset-author\n" msgstr "" #: builtin/commit.c:53 @@ -875,346 +962,356 @@ msgid "" "remove the commit entirely with \"git reset HEAD^\".\n" msgstr "" -#: builtin/commit.c:271 +#: builtin/commit.c:58 +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" +msgstr "" + +#: builtin/commit.c:318 msgid "failed to unpack HEAD tree object" msgstr "" -#: builtin/commit.c:299 +#: builtin/commit.c:359 +msgid "unable to create temporary index" +msgstr "" + +#: builtin/commit.c:365 msgid "interactive add failed" msgstr "" -#: builtin/commit.c:330 builtin/commit.c:350 builtin/commit.c:396 +#: builtin/commit.c:397 builtin/commit.c:417 builtin/commit.c:463 msgid "unable to write new_index file" msgstr "" -#: builtin/commit.c:380 -msgid "cannot do a partial commit during a merge." +#: builtin/commit.c:447 +#, c-format +msgid "cannot do a partial commit during a %s." msgstr "" -#: builtin/commit.c:389 +#: builtin/commit.c:456 msgid "cannot read the index" msgstr "" -#: builtin/commit.c:409 +#: builtin/commit.c:476 msgid "unable to write temporary index file" msgstr "" -#: builtin/commit.c:456 builtin/commit.c:1294 +#: builtin/commit.c:523 builtin/commit.c:1428 msgid "could not parse HEAD commit" msgstr "" -#: builtin/commit.c:475 builtin/commit.c:481 +#: builtin/commit.c:542 builtin/commit.c:548 #, c-format msgid "invalid commit: %s" msgstr "" -#: builtin/commit.c:499 +#: builtin/commit.c:566 msgid "malformed --author parameter" msgstr "" -#: builtin/commit.c:573 builtin/shortlog.c:299 +#: builtin/commit.c:622 +#, c-format +msgid "Malformed ident string: '%s'" +msgstr "" + +#: builtin/commit.c:656 builtin/commit.c:689 builtin/commit.c:989 +#, c-format +msgid "could not lookup commit %s" +msgstr "" + +#: builtin/commit.c:668 builtin/shortlog.c:296 #, c-format msgid "(reading log message from standard input)\n" msgstr "" -#: builtin/commit.c:575 +#: builtin/commit.c:670 msgid "could not read log from standard input" msgstr "" -#: builtin/commit.c:579 +#: builtin/commit.c:674 #, c-format msgid "could not read log file '%s'" msgstr "" -#: builtin/commit.c:585 +#: builtin/commit.c:680 msgid "commit has empty message" msgstr "" -#: builtin/commit.c:591 +#: builtin/commit.c:696 msgid "could not read MERGE_MSG" msgstr "" -#: builtin/commit.c:595 +#: builtin/commit.c:700 msgid "could not read SQUASH_MSG" msgstr "" -#: builtin/commit.c:599 +#: builtin/commit.c:704 #, c-format msgid "could not read '%s'" msgstr "" -#: builtin/commit.c:612 +#: builtin/commit.c:732 #, c-format msgid "could not open '%s'" msgstr "" -#: builtin/commit.c:636 +#: builtin/commit.c:756 msgid "could not write commit template" msgstr "" -#: builtin/commit.c:650 +#: builtin/commit.c:769 #, 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" -"#\n" +"\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" msgstr "" -#: builtin/commit.c:659 -#, c-format -msgid "" -"\n" -"# Please enter the commit message for your changes." +#: builtin/commit.c:782 +msgid "Please enter the commit message for your changes." msgstr "" -#: builtin/commit.c:663 -#, c-format +#: builtin/commit.c:785 msgid "" " Lines starting\n" -"# with '#' will be ignored, and an empty message aborts the commit.\n" +"with '#' will be ignored, and an empty message aborts the commit.\n" msgstr "" -#: builtin/commit.c:668 -#, c-format +#: builtin/commit.c:790 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" +"with '#' will be kept; you may remove them yourself if you want to.\n" +"An empty message aborts the commit.\n" msgstr "" -#: builtin/commit.c:680 +#: builtin/commit.c:802 #, c-format -msgid "%s# Author: %s\n" +msgid "%sAuthor: %s" msgstr "" -#: builtin/commit.c:688 +#: builtin/commit.c:809 #, c-format -msgid "%s# Committer: %s\n" +msgid "%sCommitter: %s" msgstr "" -#: builtin/commit.c:705 +#: builtin/commit.c:829 msgid "Cannot read index" msgstr "" -#: builtin/commit.c:737 +#: builtin/commit.c:869 msgid "Error building trees" msgstr "" -#: builtin/commit.c:752 builtin/tag.c:321 +#: builtin/commit.c:884 builtin/tag.c:313 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "" -#: builtin/commit.c:832 +#: builtin/commit.c:964 #, c-format msgid "No existing author found with '%s'" msgstr "" -#: builtin/commit.c:847 builtin/commit.c:1039 +#: builtin/commit.c:979 builtin/commit.c:1173 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "" -#: builtin/commit.c:864 +#: builtin/commit.c:1018 msgid "Using both --reset-author and --author does not make sense" msgstr "" -#: builtin/commit.c:878 +#: builtin/commit.c:1032 msgid "You have nothing to amend." msgstr "" -#: builtin/commit.c:880 -msgid "You are in the middle of a merge -- cannot amend." -msgstr "" - -#: builtin/commit.c:889 -msgid "Only one of -c/-C/-F can be used." +#: builtin/commit.c:1034 +#, c-format +msgid "You are in the middle of a %s -- cannot amend." msgstr "" -#: builtin/commit.c:891 -msgid "Option -m cannot be combined with -c/-C/-F." +#: builtin/commit.c:1036 +msgid "Options --squash and --fixup cannot be used together" msgstr "" -#: builtin/commit.c:897 -msgid "--reset-author can be used only with -C, -c or --amend." +#: builtin/commit.c:1046 +msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "" -#: builtin/commit.c:906 -#, c-format -msgid "could not lookup commit %s" +#: builtin/commit.c:1048 +msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "" -#: builtin/commit.c:909 -#, c-format -msgid "could not parse commit %s" +#: builtin/commit.c:1054 +msgid "--reset-author can be used only with -C, -c or --amend." msgstr "" -#: builtin/commit.c:937 -msgid "Only one of --include/--only/--all/--interactive can be used." +#: builtin/commit.c:1071 +msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" -#: builtin/commit.c:939 +#: builtin/commit.c:1073 msgid "No paths with --include/--only does not make sense." msgstr "" -#: builtin/commit.c:941 +#: builtin/commit.c:1075 msgid "Clever... amending the last one with dirty index." msgstr "" -#: builtin/commit.c:943 +#: builtin/commit.c:1077 msgid "Explicit paths specified without -i nor -o; assuming --only paths..." msgstr "" -#: builtin/commit.c:953 +#: builtin/commit.c:1087 #, c-format msgid "Invalid cleanup mode %s" msgstr "" -#: builtin/commit.c:958 +#: builtin/commit.c:1092 msgid "Paths with -a does not make sense." msgstr "" -#: builtin/commit.c:960 -msgid "Paths with --interactive does not make sense." -msgstr "" - -#: builtin/commit.c:1142 +#: builtin/commit.c:1274 msgid "couldn't look up newly created commit" msgstr "" -#: builtin/commit.c:1144 +#: builtin/commit.c:1276 msgid "could not parse newly created commit" msgstr "" -#: builtin/commit.c:1185 +#: builtin/commit.c:1316 msgid "detached HEAD" msgstr "" -#: builtin/commit.c:1187 +#: builtin/commit.c:1318 msgid " (root-commit)" msgstr "" -#: builtin/commit.c:1307 builtin/merge.c:461 +#: builtin/commit.c:1441 builtin/merge.c:490 #, c-format msgid "could not open '%s' for reading" msgstr "" -#: builtin/commit.c:1312 +#: builtin/commit.c:1446 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "" -#: builtin/commit.c:1319 +#: builtin/commit.c:1453 msgid "could not read MERGE_MODE" msgstr "" -#: builtin/commit.c:1336 +#: builtin/commit.c:1472 #, c-format msgid "could not read commit message: %s" msgstr "" -#: builtin/commit.c:1350 +#: builtin/commit.c:1486 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "" -#: builtin/commit.c:1358 +#: builtin/commit.c:1493 msgid "failed to write commit object" msgstr "" -#: builtin/commit.c:1375 +#: builtin/commit.c:1511 msgid "cannot lock HEAD ref" msgstr "" -#: builtin/commit.c:1379 +#: builtin/commit.c:1515 msgid "cannot update HEAD ref" msgstr "" -#: builtin/commit.c:1388 +#: builtin/commit.c:1525 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/describe.c:205 +#: builtin/describe.c:234 #, c-format msgid "annotated tag %s not available" msgstr "" -#: builtin/describe.c:209 +#: builtin/describe.c:238 #, c-format msgid "annotated tag %s has no embedded name" msgstr "" -#: builtin/describe.c:211 +#: builtin/describe.c:240 #, c-format msgid "tag '%s' is really '%s' here" msgstr "" -#: builtin/describe.c:238 +#: builtin/describe.c:267 #, c-format msgid "Not a valid object name %s" msgstr "" -#: builtin/describe.c:241 +#: builtin/describe.c:270 #, c-format msgid "%s is not a valid '%s' object" msgstr "" -#: builtin/describe.c:258 +#: builtin/describe.c:287 #, c-format msgid "no tag exactly matches '%s'" msgstr "" -#: builtin/describe.c:260 +#: builtin/describe.c:289 #, c-format msgid "searching to describe %s\n" msgstr "" -#: builtin/describe.c:295 +#: builtin/describe.c:329 #, c-format msgid "finished search at %s\n" msgstr "" -#: builtin/describe.c:319 +#: builtin/describe.c:353 #, c-format msgid "" "No annotated tags can describe '%s'.\n" "However, there were unannotated tags: try --tags." msgstr "" -#: builtin/describe.c:323 +#: builtin/describe.c:357 #, c-format msgid "" "No tags can describe '%s'.\n" "Try --always, or create some tags." msgstr "" -#: builtin/describe.c:344 +#: builtin/describe.c:378 #, c-format msgid "traversed %lu commits\n" msgstr "" -#: builtin/describe.c:347 +#: builtin/describe.c:381 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" "gave up search at %s\n" msgstr "" -#: builtin/describe.c:398 +#: builtin/describe.c:436 msgid "--long is incompatible with --abbrev=0" msgstr "" -#: builtin/describe.c:423 +#: builtin/describe.c:462 msgid "No names found, cannot describe anything." msgstr "" -#: builtin/describe.c:430 +#: builtin/describe.c:469 msgid "--dirty is incompatible with committishes" msgstr "" @@ -1223,49 +1320,45 @@ msgstr "" msgid "'%s': not a regular file or symlink" msgstr "" -#: builtin/diff.c:225 +#: builtin/diff.c:220 #, c-format msgid "invalid option: %s" msgstr "" -#: builtin/diff.c:302 +#: builtin/diff.c:296 msgid "Not a git repository" msgstr "" -#: builtin/diff.c:334 -msgid "No HEAD commit to compare with (yet)" -msgstr "" - -#: builtin/diff.c:349 +#: builtin/diff.c:346 #, c-format msgid "invalid object '%s' given." msgstr "" -#: builtin/diff.c:354 +#: builtin/diff.c:351 #, c-format msgid "more than %d trees given: '%s'" msgstr "" -#: builtin/diff.c:364 +#: builtin/diff.c:361 #, c-format msgid "more than two blobs given: '%s'" msgstr "" -#: builtin/diff.c:372 +#: builtin/diff.c:369 #, c-format msgid "unhandled object '%s' given." msgstr "" -#: builtin/fetch.c:175 +#: builtin/fetch.c:199 msgid "Couldn't find remote ref HEAD" msgstr "" -#: builtin/fetch.c:228 +#: builtin/fetch.c:252 #, c-format msgid "object %s not found" msgstr "" -#: builtin/fetch.c:233 +#: builtin/fetch.c:257 msgid "[up to date]" msgstr "" @@ -1273,146 +1366,146 @@ msgstr "" #. * If this is the head, and it's not okay to update #. * the head, and the old value of the head isn't empty... #. -#: builtin/fetch.c:246 +#: builtin/fetch.c:270 #, c-format msgid "! %-*s %-*s -> %s (can't fetch in current branch)" msgstr "" -#: builtin/fetch.c:247 builtin/fetch.c:309 +#: builtin/fetch.c:271 builtin/fetch.c:342 msgid "[rejected]" msgstr "" -#: builtin/fetch.c:257 +#: builtin/fetch.c:281 msgid "[tag update]" msgstr "" -#: builtin/fetch.c:258 builtin/fetch.c:280 builtin/fetch.c:293 +#: builtin/fetch.c:282 builtin/fetch.c:307 builtin/fetch.c:323 msgid " (unable to update local ref)" msgstr "" -#: builtin/fetch.c:270 +#: builtin/fetch.c:294 msgid "[new tag]" msgstr "" -#: builtin/fetch.c:274 +#: builtin/fetch.c:298 msgid "[new branch]" msgstr "" -#: builtin/fetch.c:305 +#: builtin/fetch.c:338 msgid "unable to update local ref" msgstr "" -#: builtin/fetch.c:305 +#: builtin/fetch.c:338 msgid "forced update" msgstr "" -#: builtin/fetch.c:310 +#: builtin/fetch.c:343 msgid "(non-fast-forward)" msgstr "" -#: builtin/fetch.c:328 builtin/fetch.c:651 +#: builtin/fetch.c:361 builtin/fetch.c:684 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: builtin/fetch.c:406 +#: builtin/fetch.c:439 #, c-format msgid "From %.*s\n" msgstr "" -#: builtin/fetch.c:417 +#: builtin/fetch.c:450 #, c-format msgid "" "some local refs could not be updated; try running\n" " 'git remote prune %s' to remove any old, conflicting branches" msgstr "" -#: builtin/fetch.c:467 +#: builtin/fetch.c:500 msgid "could not run rev-list" msgstr "" -#: builtin/fetch.c:481 +#: builtin/fetch.c:514 #, c-format msgid "failed write to rev-list: %s" msgstr "" -#: builtin/fetch.c:488 +#: builtin/fetch.c:521 #, c-format msgid "failed to close rev-list's stdin: %s" msgstr "" -#: builtin/fetch.c:515 +#: builtin/fetch.c:548 #, c-format msgid " (%s will become dangling)\n" msgstr "" -#: builtin/fetch.c:516 +#: builtin/fetch.c:549 #, c-format msgid " (%s has become dangling)\n" msgstr "" -#: builtin/fetch.c:523 +#: builtin/fetch.c:556 msgid "[deleted]" msgstr "" -#: builtin/fetch.c:524 +#: builtin/fetch.c:557 msgid "(none)" msgstr "" -#: builtin/fetch.c:641 +#: builtin/fetch.c:674 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "" -#: builtin/fetch.c:675 +#: builtin/fetch.c:708 #, c-format msgid "Don't know how to fetch from %s" msgstr "" -#: builtin/fetch.c:729 +#: builtin/fetch.c:762 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "" -#: builtin/fetch.c:732 +#: builtin/fetch.c:765 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "" -#: builtin/fetch.c:821 +#: builtin/fetch.c:864 #, c-format msgid "Fetching %s\n" msgstr "" -#: builtin/fetch.c:823 +#: builtin/fetch.c:866 #, c-format msgid "Could not fetch %s" msgstr "" -#: builtin/fetch.c:839 +#: builtin/fetch.c:883 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." msgstr "" -#: builtin/fetch.c:859 +#: builtin/fetch.c:903 msgid "You need to specify a tag name." msgstr "" -#: builtin/fetch.c:899 +#: builtin/fetch.c:946 msgid "fetch --all does not take a repository argument" msgstr "" -#: builtin/fetch.c:901 +#: builtin/fetch.c:948 msgid "fetch --all does not make sense with refspecs" msgstr "" -#: builtin/fetch.c:912 +#: builtin/fetch.c:959 #, c-format msgid "No such remote or remote group: %s" msgstr "" -#: builtin/fetch.c:920 +#: builtin/fetch.c:967 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "" @@ -1430,535 +1523,589 @@ msgstr "" msgid "insanely long object directory %.*s" msgstr "" -#: builtin/gc.c:220 +#: builtin/gc.c:223 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "" -#: builtin/gc.c:223 +#: 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." +"run \"git gc\" manually. See \"git help gc\" for more information.\n" msgstr "" -#: builtin/gc.c:251 +#: builtin/gc.c:254 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" -#: builtin/grep.c:252 +#: builtin/grep.c:256 #, c-format msgid "grep: failed to create thread: %s" msgstr "" -#: builtin/grep.c:457 +#: builtin/grep.c:374 #, c-format msgid "'%s': unable to read %s" msgstr "" -#: builtin/grep.c:508 +#: builtin/grep.c:425 #, c-format msgid "'%s': %s" msgstr "" -#: builtin/grep.c:519 +#: builtin/grep.c:436 #, c-format msgid "'%s': short read %s" msgstr "" -#: builtin/grep.c:581 +#: builtin/grep.c:498 #, c-format msgid "Failed to chdir: %s" msgstr "" -#: builtin/grep.c:671 builtin/grep.c:697 +#: builtin/grep.c:573 builtin/grep.c:604 #, c-format msgid "unable to read tree (%s)" msgstr "" -#: builtin/grep.c:703 +#: builtin/grep.c:618 #, c-format msgid "unable to grep from object of type %s" msgstr "" -#: builtin/grep.c:755 +#: builtin/grep.c:674 #, c-format msgid "switch `%c' expects a numerical value" msgstr "" -#: builtin/grep.c:771 +#: builtin/grep.c:691 #, c-format msgid "cannot open '%s'" msgstr "" -#: builtin/grep.c:1012 +#: builtin/grep.c:974 msgid "no pattern given." msgstr "" -#: builtin/grep.c:1016 -msgid "cannot mix --fixed-strings and regexp" -msgstr "" - -#: builtin/grep.c:1041 +#: builtin/grep.c:1001 #, c-format msgid "bad object %s" msgstr "" -#: builtin/grep.c:1068 +#: builtin/grep.c:1025 msgid "--open-files-in-pager only works on the worktree" msgstr "" -#: builtin/grep.c:1093 +#: builtin/grep.c:1050 msgid "--cached cannot be used with --no-index." msgstr "" -#: builtin/grep.c:1095 +#: builtin/grep.c:1052 msgid "--no-index cannot be used with revs." msgstr "" -#: builtin/grep.c:1104 +#: builtin/grep.c:1061 msgid "both --cached and trees are given." msgstr "" -#: builtin/init-db.c:34 +#: builtin/init-db.c:35 #, c-format msgid "Could not make %s writable by group" msgstr "" -#: builtin/init-db.c:61 +#: builtin/init-db.c:62 #, c-format msgid "insanely long template name %s" msgstr "" -#: builtin/init-db.c:66 +#: builtin/init-db.c:67 #, c-format msgid "cannot stat '%s'" msgstr "" -#: builtin/init-db.c:72 +#: builtin/init-db.c:73 #, c-format msgid "cannot stat template '%s'" msgstr "" -#: builtin/init-db.c:79 +#: builtin/init-db.c:80 #, c-format msgid "cannot opendir '%s'" msgstr "" -#: builtin/init-db.c:96 +#: builtin/init-db.c:97 #, c-format msgid "cannot readlink '%s'" msgstr "" -#: builtin/init-db.c:98 +#: builtin/init-db.c:99 #, c-format msgid "insanely long symlink %s" msgstr "" -#: builtin/init-db.c:101 +#: builtin/init-db.c:102 #, c-format msgid "cannot symlink '%s' '%s'" msgstr "" -#: builtin/init-db.c:105 +#: builtin/init-db.c:106 #, c-format msgid "cannot copy '%s' to '%s'" msgstr "" -#: builtin/init-db.c:109 +#: builtin/init-db.c:110 #, c-format msgid "ignoring template %s" msgstr "" -#: builtin/init-db.c:132 +#: builtin/init-db.c:133 #, c-format msgid "insanely long template path %s" msgstr "" -#: builtin/init-db.c:140 +#: builtin/init-db.c:141 #, c-format msgid "templates not found %s" msgstr "" -#: builtin/init-db.c:153 +#: builtin/init-db.c:154 #, c-format msgid "not copying templates of a wrong format version %d from '%s'" msgstr "" -#: builtin/init-db.c:191 +#: builtin/init-db.c:192 #, c-format msgid "insane git directory %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:355 +#: 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:356 +#: builtin/init-db.c:420 msgid "Reinitialized existing" msgstr "Reinitialised existing" -#: builtin/init-db.c:356 +#: builtin/init-db.c:420 msgid "Initialized empty" msgstr "Initialised empty" -#: builtin/init-db.c:357 +#: builtin/init-db.c:421 msgid " shared" msgstr "" -#: builtin/init-db.c:376 +#: builtin/init-db.c:440 msgid "cannot tell cwd" msgstr "" -#: builtin/init-db.c:450 builtin/init-db.c:457 +#: builtin/init-db.c:521 builtin/init-db.c:528 #, c-format msgid "cannot mkdir %s" msgstr "" -#: builtin/init-db.c:461 +#: builtin/init-db.c:532 #, c-format msgid "cannot chdir to %s" msgstr "" -#: builtin/init-db.c:483 +#: 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:509 +#: builtin/init-db.c:578 msgid "Cannot access current working directory" msgstr "" -#: builtin/init-db.c:512 +#: builtin/init-db.c:585 #, c-format msgid "Cannot access work tree '%s'" msgstr "" -#: builtin/log.c:104 -#, c-format -msgid "invalid --decorate option: %s" -msgstr "" - -#: builtin/log.c:113 builtin/log.c:1138 builtin/shortlog.c:287 -#, c-format -msgid "unrecognized argument: %s" -msgstr "unrecognised argument: %s" - -#: builtin/log.c:156 +#: builtin/log.c:186 #, c-format msgid "Final output: %d %s\n" msgstr "" -#: builtin/log.c:255 builtin/log.c:674 builtin/log.c:1222 builtin/log.c:1428 -#: builtin/merge.c:310 builtin/revert.c:556 builtin/shortlog.c:184 +#: builtin/log.c:287 builtin/log.c:721 builtin/log.c:1274 builtin/log.c:1492 +#: builtin/merge.c:338 builtin/revert.c:539 builtin/shortlog.c:181 msgid "revision walk setup failed" msgstr "" -#: builtin/log.c:347 builtin/log.c:434 +#: builtin/log.c:397 builtin/log.c:486 #, c-format msgid "Could not read object %s" msgstr "" -#: builtin/log.c:458 +#: builtin/log.c:510 #, c-format msgid "Unknown type: %d" msgstr "" -#: builtin/log.c:558 +#: builtin/log.c:605 msgid "format.headers without value" msgstr "" -#: builtin/log.c:630 +#: builtin/log.c:677 msgid "name of output directory is too long" msgstr "" -#: builtin/log.c:641 +#: builtin/log.c:688 #, c-format msgid "Cannot open patch file %s" msgstr "" -#: builtin/log.c:655 +#: builtin/log.c:702 msgid "Need exactly one range." msgstr "" -#: builtin/log.c:663 +#: builtin/log.c:710 msgid "Not a range." msgstr "" -#: builtin/log.c:700 +#: builtin/log.c:747 msgid "Could not extract email from committer identity." msgstr "" -#: builtin/log.c:732 +#: builtin/log.c:779 msgid "Cover letter needs email format" msgstr "" -#: builtin/log.c:825 +#: builtin/log.c:872 #, c-format msgid "insane in-reply-to: %s" msgstr "" -#: builtin/log.c:898 +#: builtin/log.c:945 msgid "Two output directories?" msgstr "" -#: builtin/log.c:1087 +#: builtin/log.c:1136 #, c-format msgid "bogus committer info %s" msgstr "" -#: builtin/log.c:1132 +#: builtin/log.c:1181 msgid "-n and -k are mutually exclusive." msgstr "" -#: builtin/log.c:1134 +#: builtin/log.c:1183 msgid "--subject-prefix and -k are mutually exclusive." msgstr "" -#: builtin/log.c:1141 +#: builtin/log.c:1188 builtin/shortlog.c:284 +#, c-format +msgid "unrecognized argument: %s" +msgstr "unrecognised argument: %s" + +#: builtin/log.c:1191 msgid "--name-only does not make sense" msgstr "" -#: builtin/log.c:1143 +#: builtin/log.c:1193 msgid "--name-status does not make sense" msgstr "" -#: builtin/log.c:1145 +#: builtin/log.c:1195 msgid "--check does not make sense" msgstr "" -#: builtin/log.c:1166 +#: builtin/log.c:1218 msgid "standard output, or directory, which one?" msgstr "" -#: builtin/log.c:1168 +#: builtin/log.c:1220 #, c-format msgid "Could not create directory '%s'" msgstr "" -#: builtin/log.c:1307 +#: builtin/log.c:1355 msgid "Failed to create output files" msgstr "" -#: builtin/log.c:1394 +#: builtin/log.c:1458 #, c-format msgid "" "Could not find a tracked remote branch, please specify manually.\n" msgstr "" -#: builtin/log.c:1410 builtin/log.c:1412 builtin/log.c:1424 +#: builtin/log.c:1474 builtin/log.c:1476 builtin/log.c:1488 #, c-format msgid "Unknown commit %s" msgstr "" -#: builtin/merge.c:82 +#: builtin/merge.c:88 msgid "switch `m' requires a value" msgstr "" -#: builtin/merge.c:119 +#: builtin/merge.c:125 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "" -#: builtin/merge.c:120 +#: builtin/merge.c:126 #, c-format msgid "Available strategies are:" msgstr "" -#: builtin/merge.c:125 +#: builtin/merge.c:131 #, c-format msgid "Available custom strategies are:" msgstr "" -#: builtin/merge.c:223 +#: builtin/merge.c:233 msgid "could not run stash." msgstr "" -#: builtin/merge.c:228 +#: builtin/merge.c:238 msgid "stash failed" msgstr "" -#: builtin/merge.c:233 +#: builtin/merge.c:243 #, c-format msgid "not a valid object: %s" msgstr "" -#: builtin/merge.c:250 +#: builtin/merge.c:261 builtin/merge.c:278 msgid "read-tree failed" msgstr "" -#: builtin/merge.c:279 +#: builtin/merge.c:307 msgid " (nothing to squash)" msgstr "" -#: builtin/merge.c:292 +#: builtin/merge.c:320 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "" -#: builtin/merge.c:295 builtin/merge.c:1290 builtin/merge.c:1299 -#: builtin/merge.c:1309 +#: builtin/merge.c:323 builtin/merge.c:844 builtin/merge.c:1430 +#: builtin/merge.c:1442 builtin/revert.c:213 #, c-format msgid "Could not write to '%s'" msgstr "" -#: builtin/merge.c:323 +#: builtin/merge.c:352 msgid "Writing SQUASH_MSG" msgstr "" -#: builtin/merge.c:325 +#: builtin/merge.c:354 msgid "Finishing SQUASH_MSG" msgstr "" -#: builtin/merge.c:345 +#: builtin/merge.c:374 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "" -#: builtin/merge.c:396 +#: builtin/merge.c:425 #, c-format msgid "'%s' does not point to a commit" msgstr "" -#: builtin/merge.c:491 +#: builtin/merge.c:517 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "" -#: builtin/merge.c:553 +#: builtin/merge.c:550 +#, c-format +msgid "%s: negative length %s" +msgstr "" + +#: builtin/merge.c:609 msgid "git write-tree failed to write a tree" msgstr "" -#: builtin/merge.c:594 +#: builtin/merge.c:659 msgid "failed to read the cache" msgstr "" -#: builtin/merge.c:611 +#: builtin/merge.c:676 msgid "Unable to write index." msgstr "" -#: builtin/merge.c:624 +#: builtin/merge.c:689 msgid "Not handling anything other than two heads merge." msgstr "" -#: builtin/merge.c:651 +#: builtin/merge.c:703 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "" -#: builtin/merge.c:666 +#: builtin/merge.c:717 #, c-format msgid "unable to write %s" msgstr "" -#: builtin/merge.c:791 +#: builtin/merge.c:841 builtin/merge.c:920 builtin/merge.c:1427 +#: builtin/merge.c:1436 builtin/revert.c:210 #, c-format -msgid "Wonderful.\n" +msgid "Could not open '%s' for writing" msgstr "" -#: builtin/merge.c:840 builtin/merge.c:1287 builtin/merge.c:1295 -#: builtin/merge.c:1303 +#: builtin/merge.c:852 #, c-format -msgid "Could not open '%s' for writing" +msgid "Could not read from '%s'" +msgstr "" + +#: builtin/merge.c:869 +#, c-format +msgid "Wonderful.\n" msgstr "" -#: builtin/merge.c:856 +#: builtin/merge.c:936 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" -#: builtin/merge.c:871 +#: builtin/merge.c:951 #, c-format msgid "'%s' is not a commit" msgstr "" -#: builtin/merge.c:921 +#: builtin/merge.c:992 +msgid "No current branch." +msgstr "" + +#: builtin/merge.c:994 +msgid "No remote for the current branch." +msgstr "" + +#: builtin/merge.c:996 +msgid "No default upstream defined for the current branch." +msgstr "" + +#: builtin/merge.c:1001 +#, c-format +msgid "No remote tracking branch for %s from %s" +msgstr "" + +#: builtin/merge.c:1053 +msgid "There is no merge to abort (MERGE_HEAD missing)." +msgstr "" + +#: builtin/merge.c:1068 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:924 +#: builtin/merge.c:1071 git-pull.sh:34 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "" -#: builtin/merge.c:951 +#: builtin/merge.c:1075 +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:1078 +msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." +msgstr "" + +#: builtin/merge.c:1087 msgid "You cannot combine --squash with --no-ff." msgstr "" -#: builtin/merge.c:956 +#: builtin/merge.c:1092 msgid "You cannot combine --no-ff with --ff-only." msgstr "" -#: builtin/merge.c:984 +#: builtin/merge.c:1126 msgid "Can merge only exactly one commit into empty head" msgstr "" -#: builtin/merge.c:987 +#: builtin/merge.c:1129 msgid "Squash commit into empty head not supported yet" msgstr "" -#: builtin/merge.c:989 +#: builtin/merge.c:1131 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "" -#: builtin/merge.c:993 builtin/merge.c:1041 +#: builtin/merge.c:1135 builtin/merge.c:1181 #, c-format msgid "%s - not something we can merge" msgstr "" -#: builtin/merge.c:1099 +#: builtin/merge.c:1239 #, c-format msgid "Updating %s..%s\n" msgstr "" -#: builtin/merge.c:1133 +#: builtin/merge.c:1273 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "" -#: builtin/merge.c:1137 +#: builtin/merge.c:1277 #, c-format msgid "Nope.\n" msgstr "" -#: builtin/merge.c:1170 +#: builtin/merge.c:1310 msgid "Not possible to fast-forward, aborting." msgstr "" -#: builtin/merge.c:1196 builtin/merge.c:1269 +#: builtin/merge.c:1336 builtin/merge.c:1409 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "" -#: builtin/merge.c:1200 +#: builtin/merge.c:1340 #, c-format msgid "Trying merge strategy %s...\n" msgstr "" -#: builtin/merge.c:1261 +#: builtin/merge.c:1401 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "" -#: builtin/merge.c:1263 +#: builtin/merge.c:1403 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "" -#: builtin/merge.c:1271 +#: builtin/merge.c:1411 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "" -#: builtin/merge.c:1314 +#: builtin/merge.c:1447 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -2025,193 +2172,154 @@ msgstr "" msgid "renaming '%s' failed" msgstr "" -#: builtin/notes.c:122 +#: builtin/notes.c:139 #, c-format msgid "unable to start 'show' for object '%s'" msgstr "" -#: builtin/notes.c:128 +#: builtin/notes.c:145 msgid "can't fdopen 'show' output fd" msgstr "" -#: builtin/notes.c:138 +#: builtin/notes.c:155 #, c-format msgid "failed to close pipe to 'show' for object '%s'" msgstr "" -#: builtin/notes.c:141 +#: builtin/notes.c:158 #, c-format msgid "failed to finish 'show' for object '%s'" msgstr "" -#: builtin/notes.c:158 builtin/tag.c:311 +#: builtin/notes.c:175 builtin/tag.c:303 #, c-format msgid "could not create file '%s'" msgstr "" -#: builtin/notes.c:172 +#: builtin/notes.c:189 msgid "Please supply the note contents using either -m or -F option" msgstr "" -#: builtin/notes.c:193 builtin/notes.c:797 +#: builtin/notes.c:210 builtin/notes.c:968 #, c-format msgid "Removing note for object %s\n" msgstr "" -#: builtin/notes.c:198 +#: builtin/notes.c:215 msgid "unable to write note object" msgstr "" -#: builtin/notes.c:200 +#: builtin/notes.c:217 #, c-format msgid "The note contents has been left in %s" msgstr "" -#: builtin/notes.c:234 builtin/tag.c:445 +#: builtin/notes.c:251 builtin/tag.c:448 #, c-format msgid "cannot read '%s'" msgstr "" -#: builtin/notes.c:236 builtin/tag.c:448 +#: builtin/notes.c:253 builtin/tag.c:451 #, c-format msgid "could not open or read '%s'" msgstr "" -#: builtin/notes.c:255 builtin/notes.c:444 builtin/notes.c:446 -#: builtin/notes.c:508 builtin/notes.c:560 builtin/notes.c:631 -#: builtin/notes.c:636 builtin/notes.c:710 builtin/notes.c:752 -#: builtin/notes.c:789 builtin/reset.c:303 builtin/tag.c:461 +#: 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:963 builtin/reset.c:303 builtin/tag.c:464 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "" -#: builtin/notes.c:258 +#: builtin/notes.c:275 #, c-format msgid "Failed to read object '%s'." msgstr "" -#: builtin/notes.c:283 +#: builtin/notes.c:299 msgid "Cannot commit uninitialized/unreferenced notes tree" msgstr "" -#: builtin/notes.c:295 -msgid "Failed to write current notes tree to database" -msgstr "" - -#: builtin/notes.c:307 -msgid "Failed to commit notes tree to database" -msgstr "" - -#: builtin/notes.c:339 +#: builtin/notes.c:340 #, c-format msgid "Bad notes.rewriteMode value: '%s'" msgstr "" -#: builtin/notes.c:349 +#: 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:376 +#: builtin/notes.c:377 #, c-format msgid "Bad %s value: '%s'" msgstr "" -#: builtin/notes.c:440 +#: builtin/notes.c:441 #, c-format msgid "Malformed input line: '%s'." msgstr "" -#: builtin/notes.c:455 +#: builtin/notes.c:456 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "" -#. TRANSLATORS: The first %s is one of "git notes ACTION", -#. e.g. "add", "copy", "append" etc. -#: builtin/notes.c:481 -#, c-format -msgid "Refusing to %s notes in %s (outside of refs/notes/)" -msgstr "" - -#: builtin/notes.c:501 builtin/notes.c:553 builtin/notes.c:614 -#: builtin/notes.c:626 builtin/notes.c:698 builtin/notes.c:745 -#: builtin/notes.c:782 builtin/notes.c:821 +#: 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:1028 msgid "too many parameters" msgstr "" -#: builtin/notes.c:505 -msgid "list" -msgstr "" - -#: builtin/notes.c:514 builtin/notes.c:758 +#: builtin/notes.c:513 builtin/notes.c:772 #, c-format msgid "No note found for object %s." msgstr "" -#: builtin/notes.c:562 -msgid "add" -msgstr "" - -#: builtin/notes.c:567 +#: 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:572 builtin/notes.c:649 +#: builtin/notes.c:585 builtin/notes.c:662 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "" -#: builtin/notes.c:622 +#: builtin/notes.c:635 msgid "too few parameters" msgstr "" -#: builtin/notes.c:638 -msgid "copy" -msgstr "" - -#: builtin/notes.c:643 +#: 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:655 +#: builtin/notes.c:668 #, c-format msgid "Missing notes on source object %s. Cannot copy." msgstr "" -#: builtin/notes.c:703 +#: 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:754 -msgid "show" -msgstr "" - -#: builtin/notes.c:791 -msgid "remove" -msgstr "" - -#: builtin/notes.c:795 +#: builtin/notes.c:966 #, c-format msgid "Object %s has no note\n" msgstr "" -#: builtin/notes.c:825 -msgid "prune" -msgstr "" - -#: builtin/notes.c:877 +#: builtin/notes.c:1098 #, c-format msgid "Unknown subcommand: %s" msgstr "" @@ -2225,35 +2333,45 @@ msgid "--delete only accepts plain target ref names" msgstr "" #: builtin/push.c:72 -msgid "You are not currently on a branch." +#, 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:74 +#: builtin/push.c:79 #, c-format -msgid "The current branch %s is not tracking anything." +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:77 +#: builtin/push.c:87 #, c-format -msgid "The current branch %s is tracking multiple branches, refusing to push." +msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "" -#: builtin/push.c:100 +#: builtin/push.c:110 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "" -#: builtin/push.c:120 +#: builtin/push.c:130 #, c-format msgid "Pushing to %s\n" msgstr "" -#: builtin/push.c:124 +#: builtin/push.c:134 #, c-format msgid "failed to push some refs to '%s'" msgstr "" -#: builtin/push.c:132 +#: builtin/push.c:142 #, c-format msgid "" "To prevent you from losing history, non-fast-forward updates were rejected\n" @@ -2261,40 +2379,49 @@ msgid "" "'Note about fast-forwards' section of 'git push --help' for details.\n" msgstr "" -#: builtin/push.c:149 +#: builtin/push.c:159 #, c-format msgid "bad repository '%s'" msgstr "" -#: builtin/push.c:150 -msgid "No destination configured to push to." +#: builtin/push.c:160 +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:158 +#: builtin/push.c:175 msgid "--all and --tags are incompatible" msgstr "" -#: builtin/push.c:159 +#: builtin/push.c:176 msgid "--all can't be combined with refspecs" msgstr "" -#: builtin/push.c:164 +#: builtin/push.c:181 msgid "--mirror and --tags are incompatible" msgstr "" -#: builtin/push.c:165 +#: builtin/push.c:182 msgid "--mirror can't be combined with refspecs" msgstr "" -#: builtin/push.c:170 +#: builtin/push.c:187 msgid "--all and --mirror are incompatible" msgstr "" -#: builtin/push.c:235 +#: builtin/push.c:253 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "" -#: builtin/push.c:237 +#: builtin/push.c:255 msgid "--delete doesn't make sense without any refs" msgstr "" @@ -2386,206 +2513,199 @@ msgstr "" msgid "Could not reset index file to revision '%s'." msgstr "" -#: builtin/revert.c:82 +#: builtin/revert.c:99 msgid "program error" msgstr "" -#: builtin/revert.c:154 builtin/revert.c:188 +#: builtin/revert.c:171 #, c-format msgid "Could not read commit message of %s" msgstr "" -#: builtin/revert.c:202 -#, c-format -msgid "Could not extract author email from %s" -msgstr "" - -#: builtin/revert.c:214 -#, c-format -msgid "Could not extract author time from %s" -msgstr "" - -#: builtin/revert.c:230 -#, c-format -msgid "No author information found in %s" -msgstr "" - -#: builtin/revert.c:267 +#: builtin/revert.c:253 #, c-format msgid "Could not write to %s." msgstr "" -#: builtin/revert.c:270 +#: builtin/revert.c:256 #, c-format msgid "Error wrapping up %s" msgstr "" -#: builtin/revert.c:290 +#: builtin/revert.c:276 msgid "" "Your local changes would be overwritten by revert.\n" "Please, commit your changes or stash them to proceed." msgstr "" -#: builtin/revert.c:293 +#: builtin/revert.c:279 msgid "" "Your local changes would be overwritten by cherry-pick.\n" "Please, commit your changes or stash them to proceed." msgstr "" +#: builtin/revert.c:283 +msgid "Your local changes would be overwritten by revert.\n" +msgstr "" + +#: builtin/revert.c:285 +msgid "Your local changes would be overwritten by cherry-pick.\n" +msgstr "" + #. TRANSLATORS: %s will be "revert" or "cherry-pick" -#: builtin/revert.c:351 +#: builtin/revert.c:335 #, c-format msgid "%s: Unable to write new index file" msgstr "" -#: builtin/revert.c:417 +#: builtin/revert.c:401 msgid "Your index file is unmerged." msgstr "" -#: builtin/revert.c:420 +#: builtin/revert.c:404 msgid "You do not have a valid HEAD" msgstr "" -#: builtin/revert.c:428 -msgid "Cannot revert a root commit" -msgstr "" - -#: builtin/revert.c:437 +#: builtin/revert.c:419 #, c-format msgid "Commit %s is a merge but no -m option was given." msgstr "" -#: builtin/revert.c:445 +#: builtin/revert.c:427 #, c-format msgid "Commit %s does not have parent %d" msgstr "" -#: builtin/revert.c:449 +#: builtin/revert.c:431 #, 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 -#: builtin/revert.c:460 +#: builtin/revert.c:442 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "" -#: builtin/revert.c:464 +#: builtin/revert.c:446 #, c-format msgid "Cannot get commit message for %s" msgstr "" -#: builtin/revert.c:525 +#: builtin/revert.c:508 #, c-format msgid "could not revert %s... %s" msgstr "" -#: builtin/revert.c:526 +#: builtin/revert.c:509 #, c-format msgid "could not apply %s... %s" msgstr "" -#: builtin/revert.c:559 +#: builtin/revert.c:542 msgid "empty commit set passed" msgstr "" -#: builtin/revert.c:573 +#: builtin/revert.c:550 +#, c-format +msgid "git %s: failed to read the index" +msgstr "" + +#: builtin/revert.c:555 +#, c-format +msgid "git %s: failed to refresh the index" +msgstr "" + +#: builtin/revert.c:571 msgid "cherry-pick --ff cannot be used with --signoff" msgstr "" -#: builtin/revert.c:575 +#: builtin/revert.c:573 msgid "cherry-pick --ff cannot be used with --no-commit" msgstr "" -#: builtin/revert.c:577 +#: builtin/revert.c:575 msgid "cherry-pick --ff cannot be used with -x" msgstr "" -#: builtin/revert.c:579 +#: builtin/revert.c:577 msgid "cherry-pick --ff cannot be used with --edit" msgstr "" -#. TRANSLATORS: %s will be "revert" or "cherry-pick" -#: builtin/revert.c:584 -#, c-format -msgid "git %s: failed to read the index" -msgstr "" - -#: builtin/rm.c:118 +#: builtin/rm.c:109 #, c-format msgid "" "'%s' has staged content different from both the file and the HEAD\n" "(use -f to force removal)" msgstr "" -#: builtin/rm.c:124 +#: builtin/rm.c:115 #, c-format msgid "" "'%s' has changes staged in the index\n" "(use --cached to keep the file, or -f to force removal)" msgstr "" -#: builtin/rm.c:128 +#: builtin/rm.c:119 #, c-format msgid "" "'%s' has local modifications\n" "(use --cached to keep the file, or -f to force removal)" msgstr "" -#: builtin/rm.c:202 +#: builtin/rm.c:194 #, c-format msgid "not removing '%s' recursively without -r" msgstr "" -#: builtin/rm.c:238 +#: builtin/rm.c:230 #, c-format msgid "git rm: unable to remove %s" msgstr "" -#: builtin/shortlog.c:161 +#: builtin/shortlog.c:157 #, c-format msgid "Missing author: %s" msgstr "" -#: builtin/tag.c:123 builtin/tag.c:464 +#: builtin/tag.c:121 #, c-format msgid "tag name too long: %.*s..." msgstr "" -#: builtin/tag.c:128 +#: builtin/tag.c:126 #, c-format msgid "tag '%s' not found." msgstr "" -#: builtin/tag.c:143 +#: builtin/tag.c:141 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "" -#: builtin/tag.c:155 +#: builtin/tag.c:153 #, c-format msgid "could not verify the tag '%s'" msgstr "" -#: builtin/tag.c:170 +#: builtin/tag.c:168 msgid "committer info too long." msgstr "" -#: builtin/tag.c:190 +#: builtin/tag.c:188 msgid "could not run gpg." msgstr "" -#: builtin/tag.c:196 +#: builtin/tag.c:194 msgid "gpg did not accept the tag data" msgstr "" -#: builtin/tag.c:203 +#: builtin/tag.c:201 msgid "gpg failed to sign the tag" msgstr "" -#: builtin/tag.c:218 +#: builtin/tag.c:216 msgid "" "\n" "#\n" @@ -2593,73 +2713,73 @@ msgid "" "#\n" msgstr "" -#: builtin/tag.c:226 +#: builtin/tag.c:224 #, c-format msgid "signing key value too long (%.10s...)" msgstr "" -#: builtin/tag.c:272 +#: builtin/tag.c:264 msgid "unable to sign the tag" msgstr "" -#: builtin/tag.c:274 +#: builtin/tag.c:266 msgid "unable to write tag file" msgstr "" -#: builtin/tag.c:289 +#: builtin/tag.c:281 msgid "bad object type." msgstr "" -#: builtin/tag.c:302 +#: builtin/tag.c:294 msgid "tag header too big." msgstr "" -#: builtin/tag.c:329 +#: builtin/tag.c:321 msgid "no tag message?" msgstr "" -#: builtin/tag.c:335 +#: builtin/tag.c:327 #, c-format msgid "The tag message has been left in %s\n" msgstr "" -#: builtin/tag.c:428 +#: builtin/tag.c:431 msgid "-n option is only allowed with -l." msgstr "" -#: builtin/tag.c:430 +#: builtin/tag.c:433 msgid "--contains option is only allowed with -l." msgstr "" -#: builtin/tag.c:438 +#: builtin/tag.c:441 msgid "only one -F or -m option is allowed." msgstr "" -#: builtin/tag.c:458 +#: builtin/tag.c:461 msgid "too many params" msgstr "" -#: builtin/tag.c:466 +#: builtin/tag.c:467 #, c-format msgid "'%s' is not a valid tag name." msgstr "" -#: builtin/tag.c:471 +#: builtin/tag.c:472 #, c-format msgid "tag '%s' already exists" msgstr "" -#: builtin/tag.c:479 +#: builtin/tag.c:480 #, c-format msgid "%s: cannot lock the ref" msgstr "" -#: builtin/tag.c:481 +#: builtin/tag.c:482 #, c-format msgid "%s: cannot update the ref" msgstr "" -#: builtin/tag.c:483 +#: builtin/tag.c:484 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "" @@ -2668,7 +2788,13 @@ msgstr "" msgid "You need to set your committer info first" msgstr "" -#: git-am.sh:80 +#: git-am.sh:93 +msgid "" +"You seem to have moved HEAD since the last 'am' failure.\n" +"Not rewinding to ORIG_HEAD" +msgstr "" + +#: git-am.sh:105 #, sh-format msgid "" "When you have resolved this problem run \"$cmdline --resolved\".\n" @@ -2676,56 +2802,60 @@ msgid "" "To restore the original branch and stop patching run \"$cmdline --abort\"." msgstr "" -#: git-am.sh:96 +#: git-am.sh:121 msgid "Cannot fall back to three-way merge." msgstr "" -#: git-am.sh:111 +#: git-am.sh:136 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" -#: git-am.sh:120 +#: git-am.sh:145 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." msgstr "" -#: git-am.sh:236 +#: git-am.sh:154 +msgid "Falling back to patching base and 3-way merge..." +msgstr "" + +#: git-am.sh:261 msgid "Only one StGIT patch series can be applied at once" msgstr "" -#: git-am.sh:288 +#: git-am.sh:313 #, sh-format msgid "Patch format $patch_format is not supported." msgstr "" -#: git-am.sh:290 +#: git-am.sh:315 msgid "Patch format detection failed." msgstr "" -#: git-am.sh:340 +#: git-am.sh:365 msgid "-d option is no longer supported. Do not use." msgstr "" -#: git-am.sh:403 +#: git-am.sh:428 #, sh-format msgid "previous rebase directory $dotest still exists but mbox given." msgstr "" -#: git-am.sh:408 +#: git-am.sh:433 msgid "Please make up your mind. --skip or --abort?" msgstr "" -#: git-am.sh:434 +#: git-am.sh:460 msgid "Resolve operation not in progress, we are not resuming." msgstr "" -#: git-am.sh:499 +#: git-am.sh:525 #, sh-format msgid "Dirty index: cannot apply patches (dirty: $files)" msgstr "" -#: git-am.sh:595 +#: git-am.sh:614 #, sh-format msgid "" "Patch is empty. Was it split wrong?\n" @@ -2733,52 +2863,525 @@ msgid "" "To restore the original branch and stop patching run \"$cmdline --abort\"." msgstr "" -#: git-am.sh:632 +#: git-am.sh:651 msgid "Patch does not have a valid e-mail address." msgstr "" -#: git-am.sh:679 +#: git-am.sh:698 msgid "cannot be interactive without stdin connected to a terminal." msgstr "" -#: git-am.sh:683 +#: git-am.sh:702 msgid "Commit Body is:" msgstr "" #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] #. in your translation. The program will only accept English #. input at this point. -#: git-am.sh:690 +#: git-am.sh:709 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " msgstr "" -#: git-am.sh:726 +#: git-am.sh:745 #, sh-format msgid "Applying: $FIRSTLINE" msgstr "" -#: git-am.sh:747 +#: git-am.sh:766 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" "already introduced the same changes; you might want to skip this patch." msgstr "" -#: git-am.sh:755 +#: git-am.sh:774 msgid "" "You still have unmerged paths in your index\n" "did you forget to use 'git add'?" msgstr "" -#: git-am.sh:771 +#: git-am.sh:790 msgid "No changes -- Patch already applied." msgstr "" -#: git-am.sh:781 +#: git-am.sh:800 #, sh-format msgid "Patch failed at $msgnum $FIRSTLINE" msgstr "" -#: git-am.sh:797 +#: git-am.sh:816 msgid "applying to an empty history" msgstr "" + +#: git-bisect.sh:40 +msgid "You need to start by \"git bisect start\"" +msgstr "" + +#. TRANSLATORS: Make sure to include [Y] and [n] in your +#. translation. The program will only accept English input +#. at this point. +#: git-bisect.sh:48 +msgid "Do you want me to do it for you [Y/n]? " +msgstr "" + +#: git-bisect.sh:67 +msgid "Bad HEAD - I need a HEAD" +msgstr "" + +#: git-bisect.sh:86 +msgid "won't bisect on seeked tree" +msgstr "" + +#: git-bisect.sh:90 +msgid "Bad HEAD - strange symbolic ref" +msgstr "" + +#: git-bisect.sh:120 +#, sh-format +msgid "'$arg' does not appear to be a valid revision" +msgstr "" + +#: git-bisect.sh:165 +#, sh-format +msgid "Bad bisect_write argument: $state" +msgstr "" + +#: git-bisect.sh:193 +#, sh-format +msgid "Bad rev input: $arg" +msgstr "" + +#: git-bisect.sh:207 +msgid "Please call 'bisect_state' with at least one argument." +msgstr "" + +#: git-bisect.sh:210 +msgid "Bad rev input: HEAD" +msgstr "" + +#: git-bisect.sh:219 +#, sh-format +msgid "Bad rev input: $rev" +msgstr "" + +#: git-bisect.sh:225 +msgid "'git bisect bad' can take only one argument." +msgstr "" + +#. have bad but not good. we could bisect although +#. this is less optimum. +#: git-bisect.sh:249 +msgid "Warning: bisecting only with a bad commit." +msgstr "" + +#. TRANSLATORS: Make sure to include [Y] and [n] in your +#. translation. The program will only accept English input +#. at this point. +#: git-bisect.sh:257 +msgid "Are you sure [Y/n]? " +msgstr "" + +#: git-bisect.sh:268 +msgid "" +"You need to give me at least one good and one bad revisions.\n" +"(You can use \"git bisect bad\" and \"git bisect good\" for that.)" +msgstr "" + +#: git-bisect.sh:274 +msgid "" +"You need to start by \"git bisect start\".\n" +"You then need to give me at least one good and one bad revisions.\n" +"(You can use \"git bisect bad\" and \"git bisect good\" for that.)" +msgstr "" + +#: git-bisect.sh:330 git-bisect.sh:457 +msgid "We are not bisecting." +msgstr "" + +#: git-bisect.sh:337 +#, sh-format +msgid "'$invalid' is not a valid commit" +msgstr "" + +#: git-bisect.sh:346 +#, sh-format +msgid "" +"Could not check out original HEAD '$branch'.\n" +"Try 'git bisect reset '." +msgstr "" + +#: git-bisect.sh:371 +msgid "No logfile given" +msgstr "" + +#: git-bisect.sh:372 +#, sh-format +msgid "cannot read $file for replaying" +msgstr "" + +#: git-bisect.sh:388 +msgid "?? what are you talking about?" +msgstr "" + +#: git-bisect.sh:400 +#, sh-format +msgid "running $command" +msgstr "" + +#: git-bisect.sh:407 +#, sh-format +msgid "" +"bisect run failed:\n" +"exit code $res from '$command' is < 0 or >= 128" +msgstr "" + +#: git-bisect.sh:433 +msgid "bisect run cannot continue any more" +msgstr "" + +#: git-bisect.sh:441 +#, sh-format +msgid "" +"bisect run failed:\n" +"'bisect_state $state' exited with error code $res" +msgstr "" + +#: git-bisect.sh:449 +msgid "bisect run success" +msgstr "" + +#: git-pull.sh:21 +msgid "" +"Pull is not possible because you have unmerged files.\n" +"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 "" + +#: git-pull.sh:25 +msgid "Pull is not possible because you have unmerged files." +msgstr "" + +#: git-pull.sh:189 +msgid "updating an unborn branch with changes added to the index" +msgstr "" + +#. The fetch involved updating the current branch. +#. The working tree and the index file is still based on the +#. $orig_head commit, but we are merging into $curr_head. +#. First update the working tree to match $curr_head. +#: git-pull.sh:221 +#, sh-format +msgid "" +"Warning: fetch updated the current branch head.\n" +"Warning: fast-forwarding your working tree from\n" +"Warning: commit $orig_head." +msgstr "" + +#: git-pull.sh:248 +msgid "Cannot merge multiple branches into empty head" +msgstr "" + +#: git-pull.sh:252 +msgid "Cannot rebase onto multiple branches" +msgstr "" + +#: git-stash.sh:43 +msgid "git stash clear with parameters is unimplemented" +msgstr "" + +#: git-stash.sh:65 +msgid "You do not have the initial commit yet" +msgstr "" + +#: git-stash.sh:80 +msgid "Cannot save the current index state" +msgstr "" + +#: git-stash.sh:94 git-stash.sh:107 +msgid "Cannot save the current worktree state" +msgstr "" + +#: git-stash.sh:111 +msgid "No changes selected" +msgstr "" + +#: git-stash.sh:114 +msgid "Cannot remove temporary index (can't happen)" +msgstr "" + +#: git-stash.sh:127 +msgid "Cannot record working tree state" +msgstr "" + +#: git-stash.sh:182 +msgid "No local changes to save" +msgstr "" + +#: git-stash.sh:186 +msgid "Cannot initialize stash" +msgstr "" + +#: git-stash.sh:194 +msgid "Cannot save the current status" +msgstr "" + +#: git-stash.sh:207 +msgid "Cannot remove worktree changes" +msgstr "" + +#: git-stash.sh:302 +msgid "No stash found." +msgstr "" + +#: git-stash.sh:309 +#, sh-format +msgid "Too many revisions specified: $REV" +msgstr "" + +#: git-stash.sh:315 +#, sh-format +msgid "$reference is not valid reference" +msgstr "" + +#: git-stash.sh:340 +#, sh-format +msgid "'$args' is not a stash-like commit" +msgstr "" + +#: git-stash.sh:351 +#, sh-format +msgid "'$args' is not a stash reference" +msgstr "" + +#: git-stash.sh:359 +msgid "unable to refresh index" +msgstr "" + +#: git-stash.sh:363 +msgid "Cannot apply a stash in the middle of a merge" +msgstr "" + +#: git-stash.sh:371 +msgid "Conflicts in index. Try without --index." +msgstr "" + +#: git-stash.sh:373 +msgid "Could not save index tree" +msgstr "" + +#: git-stash.sh:399 +msgid "Cannot unstage modified files" +msgstr "" + +#: git-stash.sh:414 +msgid "Index was not unstashed." +msgstr "" + +#: git-stash.sh:433 +#, sh-format +msgid "Dropped ${REV} ($s)" +msgstr "" + +#: git-stash.sh:434 +#, sh-format +msgid "${REV}: Could not drop stash entry" +msgstr "" + +#: git-stash.sh:441 +msgid "No branch name specified" +msgstr "" + +#: git-stash.sh:512 +msgid "(To restore them type \"git stash apply\")" +msgstr "" + +#: git-submodule.sh:38 +#, sh-format +msgid "remote ($remote) does not have a url defined in .git/config" +msgstr "" + +#: git-submodule.sh:56 +#, sh-format +msgid "cannot strip one component off url '$remoteurl'" +msgstr "" + +#: git-submodule.sh:108 +#, sh-format +msgid "No submodule mapping found in .gitmodules for path '$path'" +msgstr "" + +#: git-submodule.sh:132 +#, sh-format +msgid "Clone of '$url' into submodule path '$path' failed" +msgstr "" + +#: git-submodule.sh:205 +#, sh-format +msgid "repo URL: '$repo' must be absolute or begin with ./|../" +msgstr "" + +#: git-submodule.sh:222 +#, sh-format +msgid "'$path' already exists in the index" +msgstr "" + +#: git-submodule.sh:227 +#, sh-format +msgid "" +"The following path is ignored by one of your .gitignore files:\n" +"$path\n" +"Use -f if you really want to add it." +msgstr "" + +#: git-submodule.sh:240 +#, sh-format +msgid "Adding existing repo at '$path' to the index" +msgstr "" + +#: git-submodule.sh:242 +#, sh-format +msgid "'$path' already exists and is not a valid git repo" +msgstr "" + +#: git-submodule.sh:265 +#, sh-format +msgid "Unable to checkout submodule '$path'" +msgstr "" + +#: git-submodule.sh:269 +#, sh-format +msgid "Failed to add submodule '$path'" +msgstr "" + +#: git-submodule.sh:274 +#, sh-format +msgid "Failed to register submodule '$path'" +msgstr "" + +#: git-submodule.sh:312 +#, sh-format +msgid "Entering '$prefix$path'" +msgstr "" + +#: git-submodule.sh:324 +#, sh-format +msgid "Stopping at '$path'; script returned non-zero status." +msgstr "" + +#: git-submodule.sh:367 +#, sh-format +msgid "No url found for submodule path '$path' in .gitmodules" +msgstr "" + +#: git-submodule.sh:377 +#, sh-format +msgid "Failed to register url for submodule path '$path'" +msgstr "" + +#: git-submodule.sh:382 +#, sh-format +msgid "Failed to register update mode for submodule path '$path'" +msgstr "" + +#: git-submodule.sh:384 +#, sh-format +msgid "Submodule '$name' ($url) registered for path '$path'" +msgstr "" + +#: git-submodule.sh:467 +#, sh-format +msgid "" +"Submodule path '$path' not initialized\n" +"Maybe you want to use 'update --init'?" +msgstr "" + +#: git-submodule.sh:480 +#, sh-format +msgid "Unable to find current revision in submodule path '$path'" +msgstr "" + +#: git-submodule.sh:504 +#, sh-format +msgid "Unable to fetch in submodule path '$path'" +msgstr "" + +#: git-submodule.sh:517 +#, sh-format +msgid "Unable to rebase '$sha1' in submodule path '$path'" +msgstr "" + +#: git-submodule.sh:518 +#, sh-format +msgid "Submodule path '$path': rebased into '$sha1'" +msgstr "" + +#: git-submodule.sh:522 +#, sh-format +msgid "Unable to merge '$sha1' in submodule path '$path'" +msgstr "" + +#: git-submodule.sh:523 +#, sh-format +msgid "Submodule path '$path': merged in '$sha1'" +msgstr "" + +#: git-submodule.sh:527 +#, sh-format +msgid "Unable to checkout '$sha1' in submodule path '$path'" +msgstr "" + +#: git-submodule.sh:528 +#, sh-format +msgid "Submodule path '$path': checked out '$sha1'" +msgstr "" + +#: git-submodule.sh:539 git-submodule.sh:841 +#, sh-format +msgid "Failed to recurse into submodule path '$path'" +msgstr "" + +#: git-submodule.sh:623 +msgid "--" +msgstr "" + +#. unexpected type +#: git-submodule.sh:664 +#, sh-format +msgid "unexpected mode $mod_dst" +msgstr "" + +#: git-submodule.sh:684 +#, sh-format +msgid " Warn: $name doesn't contain commit $sha1_src" +msgstr "" + +#: git-submodule.sh:687 +#, sh-format +msgid " Warn: $name doesn't contain commit $sha1_dst" +msgstr "" + +#: git-submodule.sh:690 +#, sh-format +msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst" +msgstr "" + +#: git-submodule.sh:715 +msgid "blob" +msgstr "" + +#: git-submodule.sh:716 +msgid "submodule" +msgstr "" + +#: git-submodule.sh:753 +msgid "# Submodules changed but not updated:" +msgstr "" + +#: git-submodule.sh:755 +msgid "# Submodule changes to be committed:" +msgstr "" + +#: git-submodule.sh:885 +#, sh-format +msgid "Synchronizing submodule url for '$name'" +msgstr "" From c61d73808e1bf3628dba3b846fa97fd017173c98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Date: Wed, 6 Jul 2011 19:22:54 +0000 Subject: [PATCH 10/15] hi.po: msgmerge --- po/hi.po | 1922 +++++++++++++++++++++++++++++++++++------------------- 1 file changed, 1265 insertions(+), 657 deletions(-) diff --git a/po/hi.po b/po/hi.po index 2bfa66ca4ac152..45221e0a0c6009 100644 --- a/po/hi.po +++ b/po/hi.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List \n" -"POT-Creation-Date: 2010-09-20 15:11+0000\n" +"POT-Creation-Date: 2011-07-06 19:20+0000\n" "PO-Revision-Date: 2010-09-09 20:55+0530\n" "Last-Translator: Ramkumar Ramachandra \n" "Language-Team: Git Mailing List \n" @@ -16,247 +16,269 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: wt-status.c:56 -msgid "# Unmerged paths:" +#: diff.c:104 +#, c-format +msgid " Failed to parse dirstat cut-off percentage '%.*s'\n" +msgstr "" + +#: diff.c:109 +#, fuzzy, c-format +msgid " Unknown dirstat parameter '%.*s'\n" +msgstr "टेम्पलेट '%s' को [stat] नहीं कर सके" + +#: diff.c:205 +#, c-format +msgid "" +"Found errors in 'diff.dirstat' config variable:\n" +"%s" msgstr "" -#: wt-status.c:62 wt-status.c:79 +#: diff.c:3295 #, c-format -msgid "# (use \"git reset %s ...\" to unstage)" +msgid "" +"Failed to parse --dirstat/-X option parameter:\n" +"%s" +msgstr "" + +#: wt-status.c:134 +msgid "Unmerged paths:" msgstr "" -#: wt-status.c:64 wt-status.c:81 -msgid "# (use \"git rm --cached ...\" to unstage)" +#: wt-status.c:140 wt-status.c:157 +#, c-format +msgid " (use \"git reset %s ...\" to unstage)" +msgstr "" + +#: wt-status.c:142 wt-status.c:159 +msgid " (use \"git rm --cached ...\" to unstage)" msgstr "" -#: wt-status.c:65 -msgid "# (use \"git add/rm ...\" as appropriate to mark resolution)" +#: wt-status.c:143 +msgid " (use \"git add/rm ...\" as appropriate to mark resolution)" msgstr "" -#: wt-status.c:73 -msgid "# Changes to be committed:" +#: wt-status.c:151 +msgid "Changes to be committed:" msgstr "" -#: wt-status.c:91 -msgid "# Changed but not updated:" +#: wt-status.c:169 +msgid "Changes not staged for commit:" msgstr "" -#: wt-status.c:95 -msgid "# (use \"git add ...\" to update what will be committed)" +#: wt-status.c:173 +msgid " (use \"git add ...\" to update what will be committed)" msgstr "" -#: wt-status.c:97 -msgid "# (use \"git add/rm ...\" to update what will be committed)" +#: wt-status.c:175 +msgid " (use \"git add/rm ...\" to update what will be committed)" msgstr "" -#: wt-status.c:98 +#: wt-status.c:176 msgid "" -"# (use \"git checkout -- ...\" to discard changes in working " -"directory)" +" (use \"git checkout -- ...\" to discard changes in working directory)" msgstr "" -#: wt-status.c:100 -msgid "# (commit or discard the untracked or modified content in submodules)" +#: wt-status.c:178 +msgid " (commit or discard the untracked or modified content in submodules)" msgstr "" -#: wt-status.c:109 +#: wt-status.c:187 #, c-format -msgid "# %s files:" +msgid "%s files:" msgstr "" -#: wt-status.c:112 +#: wt-status.c:190 #, c-format -msgid "# (use \"git %s ...\" to include in what will be committed)" +msgid " (use \"git %s ...\" to include in what will be committed)" msgstr "" -#: wt-status.c:129 +#: wt-status.c:207 msgid "bug" msgstr "" -#: wt-status.c:134 +#: wt-status.c:212 msgid "both deleted:" msgstr "" -#: wt-status.c:135 +#: wt-status.c:213 msgid "added by us:" msgstr "" -#: wt-status.c:136 +#: wt-status.c:214 msgid "deleted by them:" msgstr "" -#: wt-status.c:137 +#: wt-status.c:215 msgid "added by them:" msgstr "" -#: wt-status.c:138 +#: wt-status.c:216 msgid "deleted by us:" msgstr "" -#: wt-status.c:139 +#: wt-status.c:217 msgid "both added:" msgstr "" -#: wt-status.c:140 +#: wt-status.c:218 msgid "both modified:" msgstr "" -#: wt-status.c:170 +#: wt-status.c:248 msgid "new commits, " msgstr "" -#: wt-status.c:172 +#: wt-status.c:250 msgid "modified content, " msgstr "" -#: wt-status.c:174 +#: wt-status.c:252 msgid "untracked content, " msgstr "" -#: wt-status.c:188 +#: wt-status.c:266 #, c-format msgid "new file: %s" msgstr "" -#: wt-status.c:191 +#: wt-status.c:269 #, c-format msgid "copied: %s -> %s" msgstr "" -#: wt-status.c:194 +#: wt-status.c:272 #, c-format msgid "deleted: %s" msgstr "" -#: wt-status.c:197 +#: wt-status.c:275 #, c-format msgid "modified: %s" msgstr "" -#: wt-status.c:200 +#: wt-status.c:278 #, c-format msgid "renamed: %s -> %s" msgstr "" -#: wt-status.c:203 +#: wt-status.c:281 #, c-format msgid "typechange: %s" msgstr "" -#: wt-status.c:206 +#: wt-status.c:284 #, c-format msgid "unknown: %s" msgstr "" -#: wt-status.c:209 +#: wt-status.c:287 #, c-format msgid "unmerged: %s" msgstr "" -#: wt-status.c:212 +#: wt-status.c:290 #, c-format msgid "bug: unhandled diff status %c" msgstr "" -#: wt-status.c:635 +#: wt-status.c:713 msgid "On branch " msgstr "" -#: wt-status.c:642 +#: wt-status.c:720 msgid "Not currently on any branch." msgstr "" -#: wt-status.c:652 -msgid "# Initial commit" +#: wt-status.c:731 +msgid "Initial commit" msgstr "" -#: wt-status.c:666 +#: wt-status.c:745 msgid "Untracked" msgstr "" -#: wt-status.c:668 +#: wt-status.c:747 msgid "Ignored" msgstr "" -#: wt-status.c:670 +#: wt-status.c:749 #, c-format -msgid "# Untracked files not listed%s\n" +msgid "Untracked files not listed%s" msgstr "" -#: wt-status.c:672 +#: wt-status.c:751 msgid " (use -u option to show untracked files)" msgstr "" -#: wt-status.c:678 -#, c-format -msgid "# No changes\n" +#: wt-status.c:757 +msgid "No changes" msgstr "" -#: wt-status.c:682 +#: wt-status.c:761 #, c-format msgid "no changes added to commit%s\n" msgstr "" -#: wt-status.c:684 +#: wt-status.c:763 msgid " (use \"git add\" and/or \"git commit -a\")" msgstr "" -#: wt-status.c:686 +#: wt-status.c:765 #, c-format msgid "nothing added to commit but untracked files present%s\n" msgstr "" -#: wt-status.c:688 +#: wt-status.c:767 msgid " (use \"git add\" to track)" msgstr "" -#: wt-status.c:690 wt-status.c:693 wt-status.c:696 +#: wt-status.c:769 wt-status.c:772 wt-status.c:775 #, c-format msgid "nothing to commit%s\n" msgstr "" -#: wt-status.c:691 +#: wt-status.c:770 msgid " (create/copy files and use \"git add\" to track)" msgstr "" -#: wt-status.c:694 +#: wt-status.c:773 msgid " (use -u to show untracked files)" msgstr "" -#: wt-status.c:697 +#: wt-status.c:776 msgid " (working directory clean)" msgstr "" -#: wt-status.c:795 +#: wt-status.c:884 msgid "HEAD (no branch)" msgstr "" -#: wt-status.c:801 +#: wt-status.c:890 msgid "Initial commit on " msgstr "" -#: wt-status.c:816 +#: wt-status.c:905 msgid "behind " msgstr "" -#: wt-status.c:819 wt-status.c:822 +#: wt-status.c:908 wt-status.c:911 msgid "ahead " msgstr "" -#: wt-status.c:824 +#: wt-status.c:913 msgid ", behind " msgstr "" -#: builtin/add.c:41 +#: builtin/add.c:61 #, c-format msgid "unexpected diff status %c" msgstr "" -#: builtin/add.c:67 builtin/commit.c:244 +#: builtin/add.c:66 builtin/commit.c:291 msgid "updating files failed" msgstr "" -#: builtin/add.c:77 +#: builtin/add.c:76 #, c-format msgid "remove '%s'\n" msgstr "" @@ -270,7 +292,7 @@ msgstr "" msgid "Unstaged changes after refreshing the index:" msgstr "" -#: builtin/add.c:194 builtin/add.c:452 builtin/rm.c:194 +#: builtin/add.c:194 builtin/add.c:454 builtin/rm.c:186 #, c-format msgid "pathspec '%s' did not match any files" msgstr "" @@ -308,43 +330,47 @@ msgstr "" msgid "Could not apply '%s'" msgstr "" -#: builtin/add.c:349 +#: builtin/add.c:310 +msgid "The following paths are ignored by one of your .gitignore files:\n" +msgstr "" + +#: builtin/add.c:350 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "" -#: builtin/add.c:350 +#: builtin/add.c:351 msgid "no files added" msgstr "" -#: builtin/add.c:356 +#: builtin/add.c:357 msgid "adding files failed" msgstr "" -#: builtin/add.c:388 +#: builtin/add.c:389 msgid "-A and -u are mutually incompatible" msgstr "" -#: builtin/add.c:390 +#: builtin/add.c:391 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "" -#: builtin/add.c:410 +#: builtin/add.c:411 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "" -#: builtin/add.c:411 +#: builtin/add.c:412 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "" -#: builtin/add.c:417 builtin/clean.c:95 builtin/commit.c:301 -#: builtin/commit.c:310 builtin/mv.c:77 builtin/rm.c:171 +#: builtin/add.c:418 builtin/clean.c:95 builtin/commit.c:350 builtin/mv.c:77 +#: builtin/rm.c:162 msgid "index file corrupt" msgstr "" -#: builtin/add.c:468 builtin/mv.c:223 builtin/rm.c:268 +#: builtin/add.c:470 builtin/mv.c:223 builtin/rm.c:260 msgid "Unable to write new index file" msgstr "" @@ -382,7 +408,7 @@ msgstr "" #, c-format msgid "" "deleting branch '%s' that has been merged to\n" -" '%s', but it is not yet merged to HEAD." +" '%s', but not yet merged to HEAD." msgstr "" #: builtin/branch.c:140 @@ -446,75 +472,75 @@ msgstr "" msgid "branch '%s' does not point at a commit" msgstr "" -#: builtin/branch.c:381 +#: builtin/branch.c:376 #, c-format msgid "behind %d] " msgstr "" -#: builtin/branch.c:383 +#: builtin/branch.c:378 #, c-format msgid "ahead %d] " msgstr "" -#: builtin/branch.c:385 +#: builtin/branch.c:380 #, c-format msgid "ahead %d, behind %d] " msgstr "" -#: builtin/branch.c:484 +#: builtin/branch.c:483 msgid "(no branch)" msgstr "" -#: builtin/branch.c:544 +#: builtin/branch.c:543 msgid "some refs could not be read" msgstr "" -#: builtin/branch.c:557 +#: builtin/branch.c:556 msgid "cannot rename the current branch while not on any." msgstr "" -#: builtin/branch.c:567 builtin/branch.c:571 +#: builtin/branch.c:566 builtin/branch.c:570 #, c-format msgid "Invalid branch name: '%s'" msgstr "" -#: builtin/branch.c:574 +#: builtin/branch.c:573 #, c-format msgid "A branch named '%s' already exists." msgstr "" -#: builtin/branch.c:580 +#: builtin/branch.c:579 msgid "Branch rename failed" msgstr "" -#: builtin/branch.c:584 +#: builtin/branch.c:583 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "" -#: builtin/branch.c:588 +#: builtin/branch.c:587 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "" -#: builtin/branch.c:595 +#: builtin/branch.c:594 msgid "Branch is renamed, but update of config-file failed" msgstr "" -#: builtin/branch.c:610 +#: builtin/branch.c:609 #, c-format msgid "malformed object name %s" msgstr "" -#: builtin/branch.c:680 +#: builtin/branch.c:683 msgid "Failed to resolve HEAD as a valid ref." msgstr "" -#: builtin/branch.c:686 +#: builtin/branch.c:689 msgid "HEAD not found below refs/heads!" msgstr "" -#: builtin/branch.c:706 +#: builtin/branch.c:709 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" @@ -531,176 +557,227 @@ msgstr "" msgid "Need a repository to unbundle." msgstr "" -#: builtin/checkout.c:107 builtin/checkout.c:135 +#: builtin/checkout.c:111 builtin/checkout.c:139 #, c-format msgid "path '%s' does not have our version" msgstr "" -#: builtin/checkout.c:109 builtin/checkout.c:137 +#: builtin/checkout.c:113 builtin/checkout.c:141 #, c-format msgid "path '%s' does not have their version" msgstr "" -#: builtin/checkout.c:120 +#: builtin/checkout.c:124 #, c-format msgid "path '%s' does not have all three versions" msgstr "" -#: builtin/checkout.c:155 +#: builtin/checkout.c:159 #, c-format msgid "path '%s' does not have all 3 versions" msgstr "" -#: builtin/checkout.c:172 +#: builtin/checkout.c:176 #, c-format msgid "path '%s': cannot merge" msgstr "" -#: builtin/checkout.c:189 +#: builtin/checkout.c:193 #, c-format msgid "Unable to add merge result for '%s'" msgstr "" -#: builtin/checkout.c:194 builtin/reset.c:170 +#: builtin/checkout.c:198 builtin/reset.c:170 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "" -#: builtin/checkout.c:216 builtin/checkout.c:371 +#: builtin/checkout.c:220 builtin/checkout.c:374 msgid "corrupt index file" msgstr "" -#: builtin/checkout.c:244 builtin/checkout.c:251 +#: builtin/checkout.c:248 builtin/checkout.c:255 #, c-format msgid "path '%s' is unmerged" msgstr "" -#: builtin/checkout.c:280 builtin/checkout.c:475 builtin/clone.c:658 -#: builtin/merge.c:737 +#: builtin/checkout.c:284 builtin/checkout.c:478 builtin/clone.c:668 +#: builtin/merge.c:789 msgid "unable to write new index file" msgstr "" -#: builtin/checkout.c:297 builtin/diff.c:307 builtin/merge.c:367 +#: builtin/checkout.c:301 builtin/diff.c:301 builtin/merge.c:396 msgid "diff_setup_done failed" msgstr "" -#: builtin/checkout.c:393 +#: builtin/checkout.c:396 msgid "you need to resolve your current index first" msgstr "" -#: builtin/checkout.c:524 +#: builtin/checkout.c:527 #, fuzzy, c-format msgid "Can not do reflog for '%s'\n" msgstr "निर्देशिका '%s' नहीं खोल सके" -#: builtin/checkout.c:550 +#: builtin/checkout.c:557 +msgid "HEAD is now at" +msgstr "" + +#: builtin/checkout.c:563 #, c-format msgid "Already on '%s'\n" msgstr "" -#: builtin/checkout.c:554 +#: builtin/checkout.c:567 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "" -#: builtin/checkout.c:556 +#: builtin/checkout.c:569 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "" -#: builtin/checkout.c:558 +#: builtin/checkout.c:571 #, c-format msgid "Switched to branch '%s'\n" msgstr "" -#: builtin/checkout.c:575 -msgid "HEAD is now at" +#: builtin/checkout.c:651 +#, c-format +msgid " ... and %d more.\n" msgstr "" -#: builtin/checkout.c:603 -msgid "You are on a branch yet to be born" +#. The singular version +#: builtin/checkout.c:657 +#, 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:675 +#, 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/checkout.c:617 +#: builtin/checkout.c:700 +msgid "internal error: only -- alone should have been left" +msgstr "" + +#: builtin/checkout.c:702 +msgid "internal error in revision walk" +msgstr "" + +#: builtin/checkout.c:706 msgid "Previous HEAD position was" msgstr "" -#: builtin/checkout.c:730 +#: builtin/checkout.c:731 +msgid "You are on a branch yet to be born" +msgstr "" + +#. case (1) +#: builtin/checkout.c:859 +#, c-format +msgid "invalid reference: %s" +msgstr "" + +#. case (1): want a tree +#: builtin/checkout.c:898 +#, c-format +msgid "reference is not a tree: %s" +msgstr "" + +#: builtin/checkout.c:965 msgid "-B cannot be used with -b" msgstr "" -#: builtin/checkout.c:738 +#: builtin/checkout.c:974 msgid "--patch is incompatible with all other options" msgstr "" -#: builtin/checkout.c:744 +#: builtin/checkout.c:977 +msgid "--detach cannot be used with -b/-B/--orphan" +msgstr "" + +#: builtin/checkout.c:979 +msgid "--detach cannot be used with -t" +msgstr "" + +#: builtin/checkout.c:985 msgid "--track needs a branch name" msgstr "" -#: builtin/checkout.c:751 +#: builtin/checkout.c:992 msgid "Missing branch name; try -b" msgstr "" -#: builtin/checkout.c:757 +#: builtin/checkout.c:998 msgid "--orphan and -b|-B are mutually exclusive" msgstr "" -#: builtin/checkout.c:759 +#: builtin/checkout.c:1000 msgid "--orphan cannot be used with -t" msgstr "" -#: builtin/checkout.c:769 +#: builtin/checkout.c:1010 msgid "git checkout: -f and -m are incompatible" msgstr "" -#. case (1) -#: builtin/checkout.c:815 -#, c-format -msgid "invalid reference: %s" -msgstr "" - -#. case (1): want a tree -#: builtin/checkout.c:852 -#, c-format -msgid "reference is not a tree: %s" -msgstr "" - -#: builtin/checkout.c:878 +#: builtin/checkout.c:1044 msgid "invalid path specification" msgstr "" -#: builtin/checkout.c:886 +#: builtin/checkout.c:1052 #, c-format msgid "" "git checkout: updating paths is incompatible with switching branches.\n" "Did you intend to checkout '%s' which can not be resolved as commit?" msgstr "" -#: builtin/checkout.c:888 +#: builtin/checkout.c:1054 msgid "git checkout: updating paths is incompatible with switching branches." msgstr "" -#: builtin/checkout.c:893 +#: builtin/checkout.c:1059 +msgid "git checkout: --detach does not take a path argument" +msgstr "" + +#: builtin/checkout.c:1062 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." msgstr "" -#: builtin/checkout.c:904 +#: builtin/checkout.c:1073 #, c-format msgid "git checkout: we do not like '%s' as a branch name." msgstr "" -#: builtin/checkout.c:909 +#: builtin/checkout.c:1078 #, c-format msgid "git checkout: branch %s already exists" msgstr "" -#: builtin/checkout.c:916 +#: builtin/checkout.c:1085 msgid "Cannot switch branch to a non-commit." msgstr "" -#: builtin/checkout.c:919 +#: builtin/checkout.c:1088 msgid "--ours/--theirs is incompatible with switching branches." msgstr "" @@ -730,9 +807,9 @@ msgid "Removing %s\n" msgstr "" #: builtin/clean.c:161 builtin/clean.c:181 -#, c-format -msgid "failed to remove '%s'" -msgstr "" +#, fuzzy, c-format +msgid "failed to remove %s" +msgstr "निर्देशिका '%s' नहीं खोल सके" #: builtin/clean.c:165 #, c-format @@ -744,114 +821,123 @@ msgstr "" msgid "Not removing %s\n" msgstr "" -#: builtin/clone.c:208 +#: builtin/clone.c:214 #, c-format msgid "reference repository '%s' is not a local directory." msgstr "" -#: builtin/clone.c:235 +#: builtin/clone.c:241 #, fuzzy, c-format msgid "failed to open '%s'" msgstr "निर्देशिका '%s' नहीं खोल सके" -#: builtin/clone.c:239 +#: builtin/clone.c:245 #, fuzzy, c-format msgid "failed to create directory '%s'" msgstr "खराब गिट निर्देशिका %s" -#: builtin/clone.c:241 builtin/diff.c:74 +#: builtin/clone.c:247 builtin/diff.c:74 #, fuzzy, c-format msgid "failed to stat '%s'" msgstr "'%s' को [stat] नहीं कर सके" -#: builtin/clone.c:243 +#: builtin/clone.c:249 #, fuzzy, c-format msgid "%s exists and is not a directory" msgstr "खराब गिट निर्देशिका %s" -#: builtin/clone.c:257 +#: builtin/clone.c:263 #, c-format msgid "failed to stat %s\n" msgstr "" -#: builtin/clone.c:267 +#: builtin/clone.c:273 #, c-format msgid "failed to unlink '%s'" msgstr "" -#: builtin/clone.c:272 +#: builtin/clone.c:278 #, fuzzy, c-format msgid "failed to create link '%s'" msgstr "लिंक '%s' नहीं पढ़ सके" -#: builtin/clone.c:276 +#: builtin/clone.c:282 #, fuzzy, c-format msgid "failed to copy file to '%s'" msgstr "'%s' की अनुकृति '%s' में नहीं कर सके" -#: builtin/clone.c:305 +#: builtin/clone.c:311 #, c-format msgid "done.\n" msgstr "" -#: builtin/clone.c:387 +#: builtin/clone.c:394 msgid "Too many arguments." msgstr "" -#: builtin/clone.c:391 +#: builtin/clone.c:398 msgid "You must specify a repository to clone." msgstr "" -#: builtin/clone.c:399 +#: builtin/clone.c:406 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "" -#: builtin/clone.c:428 +#: builtin/clone.c:420 +#, c-format +msgid "repository '%s' does not exist" +msgstr "" + +#: builtin/clone.c:425 +msgid "--depth is ignored in local clones; use file:// instead." +msgstr "" + +#: builtin/clone.c:435 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "" -#: builtin/clone.c:438 +#: builtin/clone.c:445 #, c-format msgid "working tree '%s' already exists." msgstr "" -#: builtin/clone.c:451 builtin/clone.c:465 +#: builtin/clone.c:458 builtin/clone.c:472 #, c-format msgid "could not create leading directories of '%s'" msgstr "" -#: builtin/clone.c:454 +#: builtin/clone.c:461 #, c-format msgid "could not create work tree dir '%s'." msgstr "" -#: builtin/clone.c:470 +#: builtin/clone.c:480 #, c-format -msgid "Cloning into bare repository %s\n" +msgid "Cloning into bare repository %s...\n" msgstr "" -#: builtin/clone.c:472 +#: builtin/clone.c:482 #, c-format -msgid "Cloning into %s\n" +msgid "Cloning into %s...\n" msgstr "" -#: builtin/clone.c:530 +#: builtin/clone.c:540 #, c-format msgid "Don't know how to clone %s" msgstr "" -#: builtin/clone.c:569 +#: builtin/clone.c:579 #, c-format msgid "Remote branch %s not found in upstream %s, using HEAD instead" msgstr "" -#: builtin/clone.c:579 +#: builtin/clone.c:589 msgid "You appear to have cloned an empty repository." msgstr "" -#: builtin/clone.c:621 +#: builtin/clone.c:631 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" @@ -864,9 +950,9 @@ msgid "" " git config --global user.name \"Your Name\"\n" " git config --global user.email you@example.com\n" "\n" -"If the identity used for this commit is wrong, you can fix it with:\n" +"After doing this, you may fix the identity used for this commit with:\n" "\n" -" git commit --amend --author='Your Name '\n" +" git commit --amend --reset-author\n" msgstr "" #: builtin/commit.c:53 @@ -876,348 +962,359 @@ msgid "" "remove the commit entirely with \"git reset HEAD^\".\n" msgstr "" -#: builtin/commit.c:271 +#: builtin/commit.c:58 +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" +msgstr "" + +#: builtin/commit.c:318 msgid "failed to unpack HEAD tree object" msgstr "" -#: builtin/commit.c:299 +#: builtin/commit.c:359 +#, fuzzy +msgid "unable to create temporary index" +msgstr "खराब गिट निर्देशिका %s" + +#: builtin/commit.c:365 msgid "interactive add failed" msgstr "" -#: builtin/commit.c:330 builtin/commit.c:350 builtin/commit.c:396 +#: builtin/commit.c:397 builtin/commit.c:417 builtin/commit.c:463 msgid "unable to write new_index file" msgstr "" -#: builtin/commit.c:380 -msgid "cannot do a partial commit during a merge." +#: builtin/commit.c:447 +#, c-format +msgid "cannot do a partial commit during a %s." msgstr "" -#: builtin/commit.c:389 +#: builtin/commit.c:456 #, fuzzy msgid "cannot read the index" msgstr "लिंक '%s' नहीं पढ़ सके" -#: builtin/commit.c:409 +#: builtin/commit.c:476 msgid "unable to write temporary index file" msgstr "" -#: builtin/commit.c:456 builtin/commit.c:1294 +#: builtin/commit.c:523 builtin/commit.c:1428 msgid "could not parse HEAD commit" msgstr "" -#: builtin/commit.c:475 builtin/commit.c:481 +#: builtin/commit.c:542 builtin/commit.c:548 #, c-format msgid "invalid commit: %s" msgstr "" -#: builtin/commit.c:499 +#: builtin/commit.c:566 msgid "malformed --author parameter" msgstr "" -#: builtin/commit.c:573 builtin/shortlog.c:299 +#: builtin/commit.c:622 +#, c-format +msgid "Malformed ident string: '%s'" +msgstr "" + +#: builtin/commit.c:656 builtin/commit.c:689 builtin/commit.c:989 +#, c-format +msgid "could not lookup commit %s" +msgstr "" + +#: builtin/commit.c:668 builtin/shortlog.c:296 #, c-format msgid "(reading log message from standard input)\n" msgstr "" -#: builtin/commit.c:575 +#: builtin/commit.c:670 msgid "could not read log from standard input" msgstr "" -#: builtin/commit.c:579 +#: builtin/commit.c:674 #, fuzzy, c-format msgid "could not read log file '%s'" msgstr "लिंक '%s' नहीं पढ़ सके" -#: builtin/commit.c:585 +#: builtin/commit.c:680 msgid "commit has empty message" msgstr "" -#: builtin/commit.c:591 +#: builtin/commit.c:696 msgid "could not read MERGE_MSG" msgstr "" -#: builtin/commit.c:595 +#: builtin/commit.c:700 msgid "could not read SQUASH_MSG" msgstr "" -#: builtin/commit.c:599 +#: builtin/commit.c:704 #, fuzzy, c-format msgid "could not read '%s'" msgstr "लिंक '%s' नहीं पढ़ सके" -#: builtin/commit.c:612 +#: builtin/commit.c:732 #, fuzzy, c-format msgid "could not open '%s'" msgstr "निर्देशिका '%s' नहीं खोल सके" -#: builtin/commit.c:636 +#: builtin/commit.c:756 msgid "could not write commit template" msgstr "" -#: builtin/commit.c:650 +#: builtin/commit.c:769 #, 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" -"#\n" +"\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" msgstr "" -#: builtin/commit.c:659 -#, c-format -msgid "" -"\n" -"# Please enter the commit message for your changes." +#: builtin/commit.c:782 +msgid "Please enter the commit message for your changes." msgstr "" -#: builtin/commit.c:663 -#, c-format +#: builtin/commit.c:785 msgid "" " Lines starting\n" -"# with '#' will be ignored, and an empty message aborts the commit.\n" +"with '#' will be ignored, and an empty message aborts the commit.\n" msgstr "" -#: builtin/commit.c:668 -#, c-format +#: builtin/commit.c:790 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" +"with '#' will be kept; you may remove them yourself if you want to.\n" +"An empty message aborts the commit.\n" msgstr "" -#: builtin/commit.c:680 +#: builtin/commit.c:802 #, c-format -msgid "%s# Author: %s\n" +msgid "%sAuthor: %s" msgstr "" -#: builtin/commit.c:688 +#: builtin/commit.c:809 #, c-format -msgid "%s# Committer: %s\n" +msgid "%sCommitter: %s" msgstr "" -#: builtin/commit.c:705 +#: builtin/commit.c:829 #, fuzzy msgid "Cannot read index" msgstr "लिंक '%s' नहीं पढ़ सके" -#: builtin/commit.c:737 +#: builtin/commit.c:869 msgid "Error building trees" msgstr "" -#: builtin/commit.c:752 builtin/tag.c:321 +#: builtin/commit.c:884 builtin/tag.c:313 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "" -#: builtin/commit.c:832 +#: builtin/commit.c:964 #, c-format msgid "No existing author found with '%s'" msgstr "" -#: builtin/commit.c:847 builtin/commit.c:1039 +#: builtin/commit.c:979 builtin/commit.c:1173 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "" -#: builtin/commit.c:864 +#: builtin/commit.c:1018 msgid "Using both --reset-author and --author does not make sense" msgstr "" -#: builtin/commit.c:878 +#: builtin/commit.c:1032 msgid "You have nothing to amend." msgstr "" -#: builtin/commit.c:880 -msgid "You are in the middle of a merge -- cannot amend." -msgstr "" - -#: builtin/commit.c:889 -msgid "Only one of -c/-C/-F can be used." +#: builtin/commit.c:1034 +#, c-format +msgid "You are in the middle of a %s -- cannot amend." msgstr "" -#: builtin/commit.c:891 -msgid "Option -m cannot be combined with -c/-C/-F." +#: builtin/commit.c:1036 +msgid "Options --squash and --fixup cannot be used together" msgstr "" -#: builtin/commit.c:897 -msgid "--reset-author can be used only with -C, -c or --amend." +#: builtin/commit.c:1046 +msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "" -#: builtin/commit.c:906 -#, c-format -msgid "could not lookup commit %s" +#: builtin/commit.c:1048 +msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "" -#: builtin/commit.c:909 -#, c-format -msgid "could not parse commit %s" +#: builtin/commit.c:1054 +msgid "--reset-author can be used only with -C, -c or --amend." msgstr "" -#: builtin/commit.c:937 -msgid "Only one of --include/--only/--all/--interactive can be used." +#: builtin/commit.c:1071 +msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" -#: builtin/commit.c:939 +#: builtin/commit.c:1073 msgid "No paths with --include/--only does not make sense." msgstr "" -#: builtin/commit.c:941 +#: builtin/commit.c:1075 msgid "Clever... amending the last one with dirty index." msgstr "" -#: builtin/commit.c:943 +#: builtin/commit.c:1077 msgid "Explicit paths specified without -i nor -o; assuming --only paths..." msgstr "" -#: builtin/commit.c:953 +#: builtin/commit.c:1087 #, c-format msgid "Invalid cleanup mode %s" msgstr "" -#: builtin/commit.c:958 +#: builtin/commit.c:1092 msgid "Paths with -a does not make sense." msgstr "" -#: builtin/commit.c:960 -msgid "Paths with --interactive does not make sense." -msgstr "" - -#: builtin/commit.c:1142 +#: builtin/commit.c:1274 msgid "couldn't look up newly created commit" msgstr "" -#: builtin/commit.c:1144 +#: builtin/commit.c:1276 msgid "could not parse newly created commit" msgstr "" -#: builtin/commit.c:1185 +#: builtin/commit.c:1316 msgid "detached HEAD" msgstr "" -#: builtin/commit.c:1187 +#: builtin/commit.c:1318 msgid " (root-commit)" msgstr "" -#: builtin/commit.c:1307 builtin/merge.c:461 +#: builtin/commit.c:1441 builtin/merge.c:490 #, c-format msgid "could not open '%s' for reading" msgstr "" -#: builtin/commit.c:1312 +#: builtin/commit.c:1446 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "" -#: builtin/commit.c:1319 +#: builtin/commit.c:1453 msgid "could not read MERGE_MODE" msgstr "" -#: builtin/commit.c:1336 +#: builtin/commit.c:1472 #, c-format msgid "could not read commit message: %s" msgstr "" -#: builtin/commit.c:1350 +#: builtin/commit.c:1486 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "" -#: builtin/commit.c:1358 +#: builtin/commit.c:1493 msgid "failed to write commit object" msgstr "" -#: builtin/commit.c:1375 +#: builtin/commit.c:1511 msgid "cannot lock HEAD ref" msgstr "" -#: builtin/commit.c:1379 +#: builtin/commit.c:1515 msgid "cannot update HEAD ref" msgstr "" -#: builtin/commit.c:1388 +#: builtin/commit.c:1525 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/describe.c:205 +#: builtin/describe.c:234 #, c-format msgid "annotated tag %s not available" msgstr "" -#: builtin/describe.c:209 +#: builtin/describe.c:238 #, c-format msgid "annotated tag %s has no embedded name" msgstr "" -#: builtin/describe.c:211 +#: builtin/describe.c:240 #, c-format msgid "tag '%s' is really '%s' here" msgstr "" -#: builtin/describe.c:238 +#: builtin/describe.c:267 #, c-format msgid "Not a valid object name %s" msgstr "" -#: builtin/describe.c:241 +#: builtin/describe.c:270 #, c-format msgid "%s is not a valid '%s' object" msgstr "" -#: builtin/describe.c:258 +#: builtin/describe.c:287 #, fuzzy, c-format msgid "no tag exactly matches '%s'" msgstr "टेम्पलेट '%s' को [stat] नहीं कर सके" -#: builtin/describe.c:260 +#: builtin/describe.c:289 #, c-format msgid "searching to describe %s\n" msgstr "" -#: builtin/describe.c:295 +#: builtin/describe.c:329 #, c-format msgid "finished search at %s\n" msgstr "" -#: builtin/describe.c:319 +#: builtin/describe.c:353 #, c-format msgid "" "No annotated tags can describe '%s'.\n" "However, there were unannotated tags: try --tags." msgstr "" -#: builtin/describe.c:323 +#: builtin/describe.c:357 #, c-format msgid "" "No tags can describe '%s'.\n" "Try --always, or create some tags." msgstr "" -#: builtin/describe.c:344 +#: builtin/describe.c:378 #, c-format msgid "traversed %lu commits\n" msgstr "" -#: builtin/describe.c:347 +#: builtin/describe.c:381 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" "gave up search at %s\n" msgstr "" -#: builtin/describe.c:398 +#: builtin/describe.c:436 msgid "--long is incompatible with --abbrev=0" msgstr "" -#: builtin/describe.c:423 +#: builtin/describe.c:462 msgid "No names found, cannot describe anything." msgstr "" -#: builtin/describe.c:430 +#: builtin/describe.c:469 msgid "--dirty is incompatible with committishes" msgstr "" @@ -1226,49 +1323,45 @@ msgstr "" msgid "'%s': not a regular file or symlink" msgstr "" -#: builtin/diff.c:225 +#: builtin/diff.c:220 #, c-format msgid "invalid option: %s" msgstr "" -#: builtin/diff.c:302 +#: builtin/diff.c:296 msgid "Not a git repository" msgstr "" -#: builtin/diff.c:334 -msgid "No HEAD commit to compare with (yet)" -msgstr "" - -#: builtin/diff.c:349 +#: builtin/diff.c:346 #, c-format msgid "invalid object '%s' given." msgstr "" -#: builtin/diff.c:354 +#: builtin/diff.c:351 #, c-format msgid "more than %d trees given: '%s'" msgstr "" -#: builtin/diff.c:364 +#: builtin/diff.c:361 #, c-format msgid "more than two blobs given: '%s'" msgstr "" -#: builtin/diff.c:372 +#: builtin/diff.c:369 #, c-format msgid "unhandled object '%s' given." msgstr "" -#: builtin/fetch.c:175 +#: builtin/fetch.c:199 msgid "Couldn't find remote ref HEAD" msgstr "" -#: builtin/fetch.c:228 +#: builtin/fetch.c:252 #, fuzzy, c-format msgid "object %s not found" msgstr "टेम्पलेट्स नहीं मिले: %s" -#: builtin/fetch.c:233 +#: builtin/fetch.c:257 msgid "[up to date]" msgstr "" @@ -1276,146 +1369,146 @@ msgstr "" #. * If this is the head, and it's not okay to update #. * the head, and the old value of the head isn't empty... #. -#: builtin/fetch.c:246 +#: builtin/fetch.c:270 #, c-format msgid "! %-*s %-*s -> %s (can't fetch in current branch)" msgstr "" -#: builtin/fetch.c:247 builtin/fetch.c:309 +#: builtin/fetch.c:271 builtin/fetch.c:342 msgid "[rejected]" msgstr "" -#: builtin/fetch.c:257 +#: builtin/fetch.c:281 msgid "[tag update]" msgstr "" -#: builtin/fetch.c:258 builtin/fetch.c:280 builtin/fetch.c:293 +#: builtin/fetch.c:282 builtin/fetch.c:307 builtin/fetch.c:323 msgid " (unable to update local ref)" msgstr "" -#: builtin/fetch.c:270 +#: builtin/fetch.c:294 msgid "[new tag]" msgstr "" -#: builtin/fetch.c:274 +#: builtin/fetch.c:298 msgid "[new branch]" msgstr "" -#: builtin/fetch.c:305 +#: builtin/fetch.c:338 msgid "unable to update local ref" msgstr "" -#: builtin/fetch.c:305 +#: builtin/fetch.c:338 msgid "forced update" msgstr "" -#: builtin/fetch.c:310 +#: builtin/fetch.c:343 msgid "(non-fast-forward)" msgstr "" -#: builtin/fetch.c:328 builtin/fetch.c:651 +#: builtin/fetch.c:361 builtin/fetch.c:684 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "निर्देशिका '%s' नहीं खोल सके" -#: builtin/fetch.c:406 +#: builtin/fetch.c:439 #, c-format msgid "From %.*s\n" msgstr "" -#: builtin/fetch.c:417 +#: builtin/fetch.c:450 #, c-format msgid "" "some local refs could not be updated; try running\n" " 'git remote prune %s' to remove any old, conflicting branches" msgstr "" -#: builtin/fetch.c:467 +#: builtin/fetch.c:500 msgid "could not run rev-list" msgstr "" -#: builtin/fetch.c:481 +#: builtin/fetch.c:514 #, c-format msgid "failed write to rev-list: %s" msgstr "" -#: builtin/fetch.c:488 +#: builtin/fetch.c:521 #, c-format msgid "failed to close rev-list's stdin: %s" msgstr "" -#: builtin/fetch.c:515 +#: builtin/fetch.c:548 #, c-format msgid " (%s will become dangling)\n" msgstr "" -#: builtin/fetch.c:516 +#: builtin/fetch.c:549 #, c-format msgid " (%s has become dangling)\n" msgstr "" -#: builtin/fetch.c:523 +#: builtin/fetch.c:556 msgid "[deleted]" msgstr "" -#: builtin/fetch.c:524 +#: builtin/fetch.c:557 msgid "(none)" msgstr "" -#: builtin/fetch.c:641 +#: builtin/fetch.c:674 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "" -#: builtin/fetch.c:675 +#: builtin/fetch.c:708 #, c-format msgid "Don't know how to fetch from %s" msgstr "" -#: builtin/fetch.c:729 +#: builtin/fetch.c:762 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "" -#: builtin/fetch.c:732 +#: builtin/fetch.c:765 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "" -#: builtin/fetch.c:821 +#: builtin/fetch.c:864 #, c-format msgid "Fetching %s\n" msgstr "" -#: builtin/fetch.c:823 +#: builtin/fetch.c:866 #, c-format msgid "Could not fetch %s" msgstr "" -#: builtin/fetch.c:839 +#: builtin/fetch.c:883 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." msgstr "" -#: builtin/fetch.c:859 +#: builtin/fetch.c:903 msgid "You need to specify a tag name." msgstr "" -#: builtin/fetch.c:899 +#: builtin/fetch.c:946 msgid "fetch --all does not take a repository argument" msgstr "" -#: builtin/fetch.c:901 +#: builtin/fetch.c:948 msgid "fetch --all does not make sense with refspecs" msgstr "" -#: builtin/fetch.c:912 +#: builtin/fetch.c:959 #, c-format msgid "No such remote or remote group: %s" msgstr "" -#: builtin/fetch.c:920 +#: builtin/fetch.c:967 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "" @@ -1433,535 +1526,589 @@ msgstr "" msgid "insanely long object directory %.*s" msgstr "खराब गिट निर्देशिका %s" -#: builtin/gc.c:220 +#: builtin/gc.c:223 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "" -#: builtin/gc.c:223 +#: 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." +"run \"git gc\" manually. See \"git help gc\" for more information.\n" msgstr "" -#: builtin/gc.c:251 +#: builtin/gc.c:254 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" -#: builtin/grep.c:252 +#: builtin/grep.c:256 #, c-format msgid "grep: failed to create thread: %s" msgstr "" -#: builtin/grep.c:457 +#: builtin/grep.c:374 #, c-format msgid "'%s': unable to read %s" msgstr "" -#: builtin/grep.c:508 +#: builtin/grep.c:425 #, c-format msgid "'%s': %s" msgstr "" -#: builtin/grep.c:519 +#: builtin/grep.c:436 #, c-format msgid "'%s': short read %s" msgstr "" -#: builtin/grep.c:581 +#: builtin/grep.c:498 #, c-format msgid "Failed to chdir: %s" msgstr "" -#: builtin/grep.c:671 builtin/grep.c:697 +#: builtin/grep.c:573 builtin/grep.c:604 #, c-format msgid "unable to read tree (%s)" msgstr "" -#: builtin/grep.c:703 +#: builtin/grep.c:618 #, c-format msgid "unable to grep from object of type %s" msgstr "" -#: builtin/grep.c:755 +#: builtin/grep.c:674 #, c-format msgid "switch `%c' expects a numerical value" msgstr "" -#: builtin/grep.c:771 +#: builtin/grep.c:691 #, fuzzy, c-format msgid "cannot open '%s'" msgstr "निर्देशिका '%s' नहीं खोल सके" -#: builtin/grep.c:1012 +#: builtin/grep.c:974 msgid "no pattern given." msgstr "" -#: builtin/grep.c:1016 -msgid "cannot mix --fixed-strings and regexp" -msgstr "" - -#: builtin/grep.c:1041 +#: builtin/grep.c:1001 #, c-format msgid "bad object %s" msgstr "" -#: builtin/grep.c:1068 +#: builtin/grep.c:1025 msgid "--open-files-in-pager only works on the worktree" msgstr "" -#: builtin/grep.c:1093 +#: builtin/grep.c:1050 msgid "--cached cannot be used with --no-index." msgstr "" -#: builtin/grep.c:1095 +#: builtin/grep.c:1052 msgid "--no-index cannot be used with revs." msgstr "" -#: builtin/grep.c:1104 +#: builtin/grep.c:1061 msgid "both --cached and trees are given." msgstr "" -#: builtin/init-db.c:34 +#: builtin/init-db.c:35 #, c-format msgid "Could not make %s writable by group" msgstr "%s को समूह द्वारा लिखने की इजाज़त नही दे सके" -#: builtin/init-db.c:61 +#: builtin/init-db.c:62 #, c-format msgid "insanely long template name %s" msgstr "टेम्पलेट %s का नाम अत्यंत लंबा" -#: builtin/init-db.c:66 +#: builtin/init-db.c:67 #, c-format msgid "cannot stat '%s'" msgstr "'%s' को [stat] नहीं कर सके" -#: builtin/init-db.c:72 +#: builtin/init-db.c:73 #, c-format msgid "cannot stat template '%s'" msgstr "टेम्पलेट '%s' को [stat] नहीं कर सके" -#: builtin/init-db.c:79 +#: builtin/init-db.c:80 #, c-format msgid "cannot opendir '%s'" msgstr "निर्देशिका '%s' नहीं खोल सके" -#: builtin/init-db.c:96 +#: builtin/init-db.c:97 #, c-format msgid "cannot readlink '%s'" msgstr "लिंक '%s' नहीं पढ़ सके" -#: builtin/init-db.c:98 +#: builtin/init-db.c:99 #, c-format msgid "insanely long symlink %s" msgstr "प्रतीकात्मक लिंक %s अत्यंत लंबा" -#: builtin/init-db.c:101 +#: builtin/init-db.c:102 #, c-format msgid "cannot symlink '%s' '%s'" msgstr "'%s' का प्रतीकात्मक लिंक '%s' में नहीं बना सके" -#: builtin/init-db.c:105 +#: builtin/init-db.c:106 #, c-format msgid "cannot copy '%s' to '%s'" msgstr "'%s' की अनुकृति '%s' में नहीं कर सके" -#: builtin/init-db.c:109 +#: builtin/init-db.c:110 #, c-format msgid "ignoring template %s" msgstr "टेम्पलेट %s की उपेक्षा कर रहे हैं" -#: builtin/init-db.c:132 +#: builtin/init-db.c:133 #, c-format msgid "insanely long template path %s" msgstr "टेम्पलेट %s का [path] अत्यंत लंबा" -#: builtin/init-db.c:140 +#: builtin/init-db.c:141 #, c-format msgid "templates not found %s" msgstr "टेम्पलेट्स नहीं मिले: %s" -#: builtin/init-db.c:153 +#: builtin/init-db.c:154 #, c-format msgid "not copying templates of a wrong format version %d from '%s'" msgstr "'%2$s' से गलत स्वरूप संस्करण %1$d के टेम्पलेट्स की नकल नहीं कर रहे हैं" -#: builtin/init-db.c:191 +#: builtin/init-db.c:192 #, c-format msgid "insane git directory %s" msgstr "खराब गिट निर्देशिका %s" -#. 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:355 +#: 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 +#, fuzzy, c-format +msgid "unable to move %s to %s" +msgstr "'%s' की अनुकृति '%s' में नहीं कर सके" + +#: builtin/init-db.c:362 +#, fuzzy, c-format +msgid "Could not create git link %s" +msgstr "लिंक '%s' नहीं पढ़ सके" + +#. +#. * 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:356 +#: builtin/init-db.c:420 msgid "Reinitialized existing" msgstr "" -#: builtin/init-db.c:356 +#: builtin/init-db.c:420 msgid "Initialized empty" msgstr "" -#: builtin/init-db.c:357 +#: builtin/init-db.c:421 msgid " shared" msgstr "" -#: builtin/init-db.c:376 +#: builtin/init-db.c:440 msgid "cannot tell cwd" msgstr "" -#: builtin/init-db.c:450 builtin/init-db.c:457 +#: builtin/init-db.c:521 builtin/init-db.c:528 #, fuzzy, c-format msgid "cannot mkdir %s" msgstr "निर्देशिका '%s' नहीं खोल सके" -#: builtin/init-db.c:461 +#: builtin/init-db.c:532 #, fuzzy, c-format msgid "cannot chdir to %s" msgstr "निर्देशिका '%s' नहीं खोल सके" -#: builtin/init-db.c:483 +#: 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:509 +#: builtin/init-db.c:578 msgid "Cannot access current working directory" msgstr "" -#: builtin/init-db.c:512 +#: builtin/init-db.c:585 #, fuzzy, c-format msgid "Cannot access work tree '%s'" msgstr "टेम्पलेट '%s' को [stat] नहीं कर सके" -#: builtin/log.c:104 -#, c-format -msgid "invalid --decorate option: %s" -msgstr "" - -#: builtin/log.c:113 builtin/log.c:1138 builtin/shortlog.c:287 -#, c-format -msgid "unrecognized argument: %s" -msgstr "" - -#: builtin/log.c:156 +#: builtin/log.c:186 #, c-format msgid "Final output: %d %s\n" msgstr "" -#: builtin/log.c:255 builtin/log.c:674 builtin/log.c:1222 builtin/log.c:1428 -#: builtin/merge.c:310 builtin/revert.c:556 builtin/shortlog.c:184 +#: builtin/log.c:287 builtin/log.c:721 builtin/log.c:1274 builtin/log.c:1492 +#: builtin/merge.c:338 builtin/revert.c:539 builtin/shortlog.c:181 msgid "revision walk setup failed" msgstr "" -#: builtin/log.c:347 builtin/log.c:434 +#: builtin/log.c:397 builtin/log.c:486 #, c-format msgid "Could not read object %s" msgstr "" -#: builtin/log.c:458 +#: builtin/log.c:510 #, c-format msgid "Unknown type: %d" msgstr "" -#: builtin/log.c:558 +#: builtin/log.c:605 msgid "format.headers without value" msgstr "" -#: builtin/log.c:630 +#: builtin/log.c:677 msgid "name of output directory is too long" msgstr "" -#: builtin/log.c:641 +#: builtin/log.c:688 #, fuzzy, c-format msgid "Cannot open patch file %s" msgstr "निर्देशिका '%s' नहीं खोल सके" -#: builtin/log.c:655 +#: builtin/log.c:702 msgid "Need exactly one range." msgstr "" -#: builtin/log.c:663 +#: builtin/log.c:710 msgid "Not a range." msgstr "" -#: builtin/log.c:700 +#: builtin/log.c:747 msgid "Could not extract email from committer identity." msgstr "" -#: builtin/log.c:732 +#: builtin/log.c:779 msgid "Cover letter needs email format" msgstr "" -#: builtin/log.c:825 +#: builtin/log.c:872 #, fuzzy, c-format msgid "insane in-reply-to: %s" msgstr "खराब गिट निर्देशिका %s" -#: builtin/log.c:898 +#: builtin/log.c:945 msgid "Two output directories?" msgstr "" -#: builtin/log.c:1087 +#: builtin/log.c:1136 #, c-format msgid "bogus committer info %s" msgstr "" -#: builtin/log.c:1132 +#: builtin/log.c:1181 msgid "-n and -k are mutually exclusive." msgstr "" -#: builtin/log.c:1134 +#: builtin/log.c:1183 msgid "--subject-prefix and -k are mutually exclusive." msgstr "" -#: builtin/log.c:1141 +#: builtin/log.c:1188 builtin/shortlog.c:284 +#, c-format +msgid "unrecognized argument: %s" +msgstr "" + +#: builtin/log.c:1191 msgid "--name-only does not make sense" msgstr "" -#: builtin/log.c:1143 +#: builtin/log.c:1193 msgid "--name-status does not make sense" msgstr "" -#: builtin/log.c:1145 +#: builtin/log.c:1195 msgid "--check does not make sense" msgstr "" -#: builtin/log.c:1166 +#: builtin/log.c:1218 msgid "standard output, or directory, which one?" msgstr "" -#: builtin/log.c:1168 +#: builtin/log.c:1220 #, c-format msgid "Could not create directory '%s'" msgstr "" -#: builtin/log.c:1307 +#: builtin/log.c:1355 msgid "Failed to create output files" msgstr "" -#: builtin/log.c:1394 +#: builtin/log.c:1458 #, c-format msgid "" "Could not find a tracked remote branch, please specify manually.\n" msgstr "" -#: builtin/log.c:1410 builtin/log.c:1412 builtin/log.c:1424 +#: builtin/log.c:1474 builtin/log.c:1476 builtin/log.c:1488 #, c-format msgid "Unknown commit %s" msgstr "" -#: builtin/merge.c:82 +#: builtin/merge.c:88 msgid "switch `m' requires a value" msgstr "" -#: builtin/merge.c:119 +#: builtin/merge.c:125 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "" -#: builtin/merge.c:120 +#: builtin/merge.c:126 #, c-format msgid "Available strategies are:" msgstr "" -#: builtin/merge.c:125 +#: builtin/merge.c:131 #, c-format msgid "Available custom strategies are:" msgstr "" -#: builtin/merge.c:223 +#: builtin/merge.c:233 msgid "could not run stash." msgstr "" -#: builtin/merge.c:228 +#: builtin/merge.c:238 msgid "stash failed" msgstr "" -#: builtin/merge.c:233 +#: builtin/merge.c:243 #, c-format msgid "not a valid object: %s" msgstr "" -#: builtin/merge.c:250 +#: builtin/merge.c:261 builtin/merge.c:278 msgid "read-tree failed" msgstr "" -#: builtin/merge.c:279 +#: builtin/merge.c:307 msgid " (nothing to squash)" msgstr "" -#: builtin/merge.c:292 +#: builtin/merge.c:320 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "" -#: builtin/merge.c:295 builtin/merge.c:1290 builtin/merge.c:1299 -#: builtin/merge.c:1309 +#: builtin/merge.c:323 builtin/merge.c:844 builtin/merge.c:1430 +#: builtin/merge.c:1442 builtin/revert.c:213 #, c-format msgid "Could not write to '%s'" msgstr "" -#: builtin/merge.c:323 +#: builtin/merge.c:352 msgid "Writing SQUASH_MSG" msgstr "" -#: builtin/merge.c:325 +#: builtin/merge.c:354 msgid "Finishing SQUASH_MSG" msgstr "" -#: builtin/merge.c:345 +#: builtin/merge.c:374 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "" -#: builtin/merge.c:396 +#: builtin/merge.c:425 #, c-format msgid "'%s' does not point to a commit" msgstr "" -#: builtin/merge.c:491 +#: builtin/merge.c:517 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "" -#: builtin/merge.c:553 +#: builtin/merge.c:550 +#, c-format +msgid "%s: negative length %s" +msgstr "" + +#: builtin/merge.c:609 msgid "git write-tree failed to write a tree" msgstr "" -#: builtin/merge.c:594 +#: builtin/merge.c:659 msgid "failed to read the cache" msgstr "" -#: builtin/merge.c:611 +#: builtin/merge.c:676 msgid "Unable to write index." msgstr "" -#: builtin/merge.c:624 +#: builtin/merge.c:689 msgid "Not handling anything other than two heads merge." msgstr "" -#: builtin/merge.c:651 +#: builtin/merge.c:703 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "" -#: builtin/merge.c:666 +#: builtin/merge.c:717 #, c-format msgid "unable to write %s" msgstr "" -#: builtin/merge.c:791 -#, c-format -msgid "Wonderful.\n" -msgstr "" - -#: builtin/merge.c:840 builtin/merge.c:1287 builtin/merge.c:1295 -#: builtin/merge.c:1303 +#: builtin/merge.c:841 builtin/merge.c:920 builtin/merge.c:1427 +#: builtin/merge.c:1436 builtin/revert.c:210 #, fuzzy, c-format msgid "Could not open '%s' for writing" msgstr "%s को समूह द्वारा लिखने की इजाज़त नही दे सके" -#: builtin/merge.c:856 +#: builtin/merge.c:852 +#, fuzzy, c-format +msgid "Could not read from '%s'" +msgstr "लिंक '%s' नहीं पढ़ सके" + +#: builtin/merge.c:869 +#, c-format +msgid "Wonderful.\n" +msgstr "" + +#: builtin/merge.c:936 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" -#: builtin/merge.c:871 +#: builtin/merge.c:951 #, c-format msgid "'%s' is not a commit" msgstr "" -#: builtin/merge.c:921 +#: builtin/merge.c:992 +msgid "No current branch." +msgstr "" + +#: builtin/merge.c:994 +msgid "No remote for the current branch." +msgstr "" + +#: builtin/merge.c:996 +msgid "No default upstream defined for the current branch." +msgstr "" + +#: builtin/merge.c:1001 +#, c-format +msgid "No remote tracking branch for %s from %s" +msgstr "" + +#: builtin/merge.c:1053 +msgid "There is no merge to abort (MERGE_HEAD missing)." +msgstr "" + +#: builtin/merge.c:1068 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:924 +#: builtin/merge.c:1071 git-pull.sh:34 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "" -#: builtin/merge.c:951 +#: builtin/merge.c:1075 +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:1078 +msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." +msgstr "" + +#: builtin/merge.c:1087 msgid "You cannot combine --squash with --no-ff." msgstr "" -#: builtin/merge.c:956 +#: builtin/merge.c:1092 msgid "You cannot combine --no-ff with --ff-only." msgstr "" -#: builtin/merge.c:984 +#: builtin/merge.c:1126 msgid "Can merge only exactly one commit into empty head" msgstr "" -#: builtin/merge.c:987 +#: builtin/merge.c:1129 msgid "Squash commit into empty head not supported yet" msgstr "" -#: builtin/merge.c:989 +#: builtin/merge.c:1131 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "" -#: builtin/merge.c:993 builtin/merge.c:1041 +#: builtin/merge.c:1135 builtin/merge.c:1181 #, c-format msgid "%s - not something we can merge" msgstr "" -#: builtin/merge.c:1099 +#: builtin/merge.c:1239 #, c-format msgid "Updating %s..%s\n" msgstr "" -#: builtin/merge.c:1133 +#: builtin/merge.c:1273 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "" -#: builtin/merge.c:1137 +#: builtin/merge.c:1277 #, c-format msgid "Nope.\n" msgstr "" -#: builtin/merge.c:1170 +#: builtin/merge.c:1310 msgid "Not possible to fast-forward, aborting." msgstr "" -#: builtin/merge.c:1196 builtin/merge.c:1269 +#: builtin/merge.c:1336 builtin/merge.c:1409 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "" -#: builtin/merge.c:1200 +#: builtin/merge.c:1340 #, c-format msgid "Trying merge strategy %s...\n" msgstr "" -#: builtin/merge.c:1261 +#: builtin/merge.c:1401 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "" -#: builtin/merge.c:1263 +#: builtin/merge.c:1403 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "" -#: builtin/merge.c:1271 +#: builtin/merge.c:1411 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "" -#: builtin/merge.c:1314 +#: builtin/merge.c:1447 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -2028,193 +2175,154 @@ msgstr "" msgid "renaming '%s' failed" msgstr "" -#: builtin/notes.c:122 +#: builtin/notes.c:139 #, c-format msgid "unable to start 'show' for object '%s'" msgstr "" -#: builtin/notes.c:128 +#: builtin/notes.c:145 msgid "can't fdopen 'show' output fd" msgstr "" -#: builtin/notes.c:138 +#: builtin/notes.c:155 #, c-format msgid "failed to close pipe to 'show' for object '%s'" msgstr "" -#: builtin/notes.c:141 +#: builtin/notes.c:158 #, c-format msgid "failed to finish 'show' for object '%s'" msgstr "" -#: builtin/notes.c:158 builtin/tag.c:311 +#: builtin/notes.c:175 builtin/tag.c:303 #, fuzzy, c-format msgid "could not create file '%s'" msgstr "लिंक '%s' नहीं पढ़ सके" -#: builtin/notes.c:172 +#: builtin/notes.c:189 msgid "Please supply the note contents using either -m or -F option" msgstr "" -#: builtin/notes.c:193 builtin/notes.c:797 +#: builtin/notes.c:210 builtin/notes.c:968 #, c-format msgid "Removing note for object %s\n" msgstr "" -#: builtin/notes.c:198 +#: builtin/notes.c:215 msgid "unable to write note object" msgstr "" -#: builtin/notes.c:200 +#: builtin/notes.c:217 #, c-format msgid "The note contents has been left in %s" msgstr "" -#: builtin/notes.c:234 builtin/tag.c:445 +#: builtin/notes.c:251 builtin/tag.c:448 #, fuzzy, c-format msgid "cannot read '%s'" msgstr "लिंक '%s' नहीं पढ़ सके" -#: builtin/notes.c:236 builtin/tag.c:448 +#: builtin/notes.c:253 builtin/tag.c:451 #, fuzzy, c-format msgid "could not open or read '%s'" msgstr "निर्देशिका '%s' नहीं खोल सके" -#: builtin/notes.c:255 builtin/notes.c:444 builtin/notes.c:446 -#: builtin/notes.c:508 builtin/notes.c:560 builtin/notes.c:631 -#: builtin/notes.c:636 builtin/notes.c:710 builtin/notes.c:752 -#: builtin/notes.c:789 builtin/reset.c:303 builtin/tag.c:461 +#: 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:963 builtin/reset.c:303 builtin/tag.c:464 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "" -#: builtin/notes.c:258 +#: builtin/notes.c:275 #, c-format msgid "Failed to read object '%s'." msgstr "" -#: builtin/notes.c:283 +#: builtin/notes.c:299 msgid "Cannot commit uninitialized/unreferenced notes tree" msgstr "" -#: builtin/notes.c:295 -msgid "Failed to write current notes tree to database" -msgstr "" - -#: builtin/notes.c:307 -msgid "Failed to commit notes tree to database" -msgstr "" - -#: builtin/notes.c:339 +#: builtin/notes.c:340 #, c-format msgid "Bad notes.rewriteMode value: '%s'" msgstr "" -#: builtin/notes.c:349 +#: 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:376 +#: builtin/notes.c:377 #, c-format msgid "Bad %s value: '%s'" msgstr "" -#: builtin/notes.c:440 +#: builtin/notes.c:441 #, c-format msgid "Malformed input line: '%s'." msgstr "" -#: builtin/notes.c:455 +#: builtin/notes.c:456 #, fuzzy, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "'%s' की अनुकृति '%s' में नहीं कर सके" -#. TRANSLATORS: The first %s is one of "git notes ACTION", -#. e.g. "add", "copy", "append" etc. -#: builtin/notes.c:481 -#, c-format -msgid "Refusing to %s notes in %s (outside of refs/notes/)" -msgstr "" - -#: builtin/notes.c:501 builtin/notes.c:553 builtin/notes.c:614 -#: builtin/notes.c:626 builtin/notes.c:698 builtin/notes.c:745 -#: builtin/notes.c:782 builtin/notes.c:821 +#: 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:1028 msgid "too many parameters" msgstr "" -#: builtin/notes.c:505 -msgid "list" -msgstr "" - -#: builtin/notes.c:514 builtin/notes.c:758 +#: builtin/notes.c:513 builtin/notes.c:772 #, c-format msgid "No note found for object %s." msgstr "" -#: builtin/notes.c:562 -msgid "add" -msgstr "" - -#: builtin/notes.c:567 +#: 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:572 builtin/notes.c:649 +#: builtin/notes.c:585 builtin/notes.c:662 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "" -#: builtin/notes.c:622 +#: builtin/notes.c:635 msgid "too few parameters" msgstr "" -#: builtin/notes.c:638 -msgid "copy" -msgstr "" - -#: builtin/notes.c:643 +#: 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:655 +#: builtin/notes.c:668 #, c-format msgid "Missing notes on source object %s. Cannot copy." msgstr "" -#: builtin/notes.c:703 +#: 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:754 -msgid "show" -msgstr "" - -#: builtin/notes.c:791 -msgid "remove" -msgstr "" - -#: builtin/notes.c:795 +#: builtin/notes.c:966 #, c-format msgid "Object %s has no note\n" msgstr "" -#: builtin/notes.c:825 -msgid "prune" -msgstr "" - -#: builtin/notes.c:877 +#: builtin/notes.c:1098 #, c-format msgid "Unknown subcommand: %s" msgstr "" @@ -2228,35 +2336,45 @@ msgid "--delete only accepts plain target ref names" msgstr "" #: builtin/push.c:72 -msgid "You are not currently on a branch." +#, 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:74 +#: builtin/push.c:79 #, c-format -msgid "The current branch %s is not tracking anything." +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:77 +#: builtin/push.c:87 #, c-format -msgid "The current branch %s is tracking multiple branches, refusing to push." +msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "" -#: builtin/push.c:100 +#: builtin/push.c:110 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "" -#: builtin/push.c:120 +#: builtin/push.c:130 #, c-format msgid "Pushing to %s\n" msgstr "" -#: builtin/push.c:124 +#: builtin/push.c:134 #, c-format msgid "failed to push some refs to '%s'" msgstr "" -#: builtin/push.c:132 +#: builtin/push.c:142 #, c-format msgid "" "To prevent you from losing history, non-fast-forward updates were rejected\n" @@ -2264,40 +2382,49 @@ msgid "" "'Note about fast-forwards' section of 'git push --help' for details.\n" msgstr "" -#: builtin/push.c:149 +#: builtin/push.c:159 #, c-format msgid "bad repository '%s'" msgstr "" -#: builtin/push.c:150 -msgid "No destination configured to push to." +#: builtin/push.c:160 +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:158 +#: builtin/push.c:175 msgid "--all and --tags are incompatible" msgstr "" -#: builtin/push.c:159 +#: builtin/push.c:176 msgid "--all can't be combined with refspecs" msgstr "" -#: builtin/push.c:164 +#: builtin/push.c:181 msgid "--mirror and --tags are incompatible" msgstr "" -#: builtin/push.c:165 +#: builtin/push.c:182 msgid "--mirror can't be combined with refspecs" msgstr "" -#: builtin/push.c:170 +#: builtin/push.c:187 msgid "--all and --mirror are incompatible" msgstr "" -#: builtin/push.c:235 +#: builtin/push.c:253 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "" -#: builtin/push.c:237 +#: builtin/push.c:255 msgid "--delete doesn't make sense without any refs" msgstr "" @@ -2389,206 +2516,199 @@ msgstr "" msgid "Could not reset index file to revision '%s'." msgstr "" -#: builtin/revert.c:82 +#: builtin/revert.c:99 msgid "program error" msgstr "" -#: builtin/revert.c:154 builtin/revert.c:188 +#: builtin/revert.c:171 #, c-format msgid "Could not read commit message of %s" msgstr "" -#: builtin/revert.c:202 -#, c-format -msgid "Could not extract author email from %s" -msgstr "" - -#: builtin/revert.c:214 -#, c-format -msgid "Could not extract author time from %s" -msgstr "" - -#: builtin/revert.c:230 -#, c-format -msgid "No author information found in %s" -msgstr "" - -#: builtin/revert.c:267 +#: builtin/revert.c:253 #, c-format msgid "Could not write to %s." msgstr "" -#: builtin/revert.c:270 +#: builtin/revert.c:256 #, c-format msgid "Error wrapping up %s" msgstr "" -#: builtin/revert.c:290 +#: builtin/revert.c:276 msgid "" "Your local changes would be overwritten by revert.\n" "Please, commit your changes or stash them to proceed." msgstr "" -#: builtin/revert.c:293 +#: builtin/revert.c:279 msgid "" "Your local changes would be overwritten by cherry-pick.\n" "Please, commit your changes or stash them to proceed." msgstr "" +#: builtin/revert.c:283 +msgid "Your local changes would be overwritten by revert.\n" +msgstr "" + +#: builtin/revert.c:285 +msgid "Your local changes would be overwritten by cherry-pick.\n" +msgstr "" + #. TRANSLATORS: %s will be "revert" or "cherry-pick" -#: builtin/revert.c:351 +#: builtin/revert.c:335 #, c-format msgid "%s: Unable to write new index file" msgstr "" -#: builtin/revert.c:417 +#: builtin/revert.c:401 msgid "Your index file is unmerged." msgstr "" -#: builtin/revert.c:420 +#: builtin/revert.c:404 msgid "You do not have a valid HEAD" msgstr "" -#: builtin/revert.c:428 -msgid "Cannot revert a root commit" -msgstr "" - -#: builtin/revert.c:437 +#: builtin/revert.c:419 #, c-format msgid "Commit %s is a merge but no -m option was given." msgstr "" -#: builtin/revert.c:445 +#: builtin/revert.c:427 #, c-format msgid "Commit %s does not have parent %d" msgstr "" -#: builtin/revert.c:449 +#: builtin/revert.c:431 #, 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 -#: builtin/revert.c:460 +#: builtin/revert.c:442 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "" -#: builtin/revert.c:464 +#: builtin/revert.c:446 #, c-format msgid "Cannot get commit message for %s" msgstr "" -#: builtin/revert.c:525 +#: builtin/revert.c:508 #, c-format msgid "could not revert %s... %s" msgstr "" -#: builtin/revert.c:526 +#: builtin/revert.c:509 #, c-format msgid "could not apply %s... %s" msgstr "" -#: builtin/revert.c:559 +#: builtin/revert.c:542 msgid "empty commit set passed" msgstr "" -#: builtin/revert.c:573 +#: builtin/revert.c:550 +#, c-format +msgid "git %s: failed to read the index" +msgstr "" + +#: builtin/revert.c:555 +#, c-format +msgid "git %s: failed to refresh the index" +msgstr "" + +#: builtin/revert.c:571 msgid "cherry-pick --ff cannot be used with --signoff" msgstr "" -#: builtin/revert.c:575 +#: builtin/revert.c:573 msgid "cherry-pick --ff cannot be used with --no-commit" msgstr "" -#: builtin/revert.c:577 +#: builtin/revert.c:575 msgid "cherry-pick --ff cannot be used with -x" msgstr "" -#: builtin/revert.c:579 +#: builtin/revert.c:577 msgid "cherry-pick --ff cannot be used with --edit" msgstr "" -#. TRANSLATORS: %s will be "revert" or "cherry-pick" -#: builtin/revert.c:584 -#, c-format -msgid "git %s: failed to read the index" -msgstr "" - -#: builtin/rm.c:118 +#: builtin/rm.c:109 #, c-format msgid "" "'%s' has staged content different from both the file and the HEAD\n" "(use -f to force removal)" msgstr "" -#: builtin/rm.c:124 +#: builtin/rm.c:115 #, c-format msgid "" "'%s' has changes staged in the index\n" "(use --cached to keep the file, or -f to force removal)" msgstr "" -#: builtin/rm.c:128 +#: builtin/rm.c:119 #, c-format msgid "" "'%s' has local modifications\n" "(use --cached to keep the file, or -f to force removal)" msgstr "" -#: builtin/rm.c:202 +#: builtin/rm.c:194 #, c-format msgid "not removing '%s' recursively without -r" msgstr "" -#: builtin/rm.c:238 +#: builtin/rm.c:230 #, c-format msgid "git rm: unable to remove %s" msgstr "" -#: builtin/shortlog.c:161 +#: builtin/shortlog.c:157 #, c-format msgid "Missing author: %s" msgstr "" -#: builtin/tag.c:123 builtin/tag.c:464 +#: builtin/tag.c:121 #, c-format msgid "tag name too long: %.*s..." msgstr "" -#: builtin/tag.c:128 +#: builtin/tag.c:126 #, fuzzy, c-format msgid "tag '%s' not found." msgstr "टेम्पलेट्स नहीं मिले: %s" -#: builtin/tag.c:143 +#: builtin/tag.c:141 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "" -#: builtin/tag.c:155 +#: builtin/tag.c:153 #, c-format msgid "could not verify the tag '%s'" msgstr "" -#: builtin/tag.c:170 +#: builtin/tag.c:168 msgid "committer info too long." msgstr "" -#: builtin/tag.c:190 +#: builtin/tag.c:188 msgid "could not run gpg." msgstr "" -#: builtin/tag.c:196 +#: builtin/tag.c:194 msgid "gpg did not accept the tag data" msgstr "" -#: builtin/tag.c:203 +#: builtin/tag.c:201 msgid "gpg failed to sign the tag" msgstr "" -#: builtin/tag.c:218 +#: builtin/tag.c:216 msgid "" "\n" "#\n" @@ -2596,73 +2716,73 @@ msgid "" "#\n" msgstr "" -#: builtin/tag.c:226 +#: builtin/tag.c:224 #, c-format msgid "signing key value too long (%.10s...)" msgstr "" -#: builtin/tag.c:272 +#: builtin/tag.c:264 msgid "unable to sign the tag" msgstr "" -#: builtin/tag.c:274 +#: builtin/tag.c:266 msgid "unable to write tag file" msgstr "" -#: builtin/tag.c:289 +#: builtin/tag.c:281 msgid "bad object type." msgstr "" -#: builtin/tag.c:302 +#: builtin/tag.c:294 msgid "tag header too big." msgstr "" -#: builtin/tag.c:329 +#: builtin/tag.c:321 msgid "no tag message?" msgstr "" -#: builtin/tag.c:335 +#: builtin/tag.c:327 #, c-format msgid "The tag message has been left in %s\n" msgstr "" -#: builtin/tag.c:428 +#: builtin/tag.c:431 msgid "-n option is only allowed with -l." msgstr "" -#: builtin/tag.c:430 +#: builtin/tag.c:433 msgid "--contains option is only allowed with -l." msgstr "" -#: builtin/tag.c:438 +#: builtin/tag.c:441 msgid "only one -F or -m option is allowed." msgstr "" -#: builtin/tag.c:458 +#: builtin/tag.c:461 msgid "too many params" msgstr "" -#: builtin/tag.c:466 +#: builtin/tag.c:467 #, c-format msgid "'%s' is not a valid tag name." msgstr "" -#: builtin/tag.c:471 +#: builtin/tag.c:472 #, c-format msgid "tag '%s' already exists" msgstr "" -#: builtin/tag.c:479 +#: builtin/tag.c:480 #, c-format msgid "%s: cannot lock the ref" msgstr "" -#: builtin/tag.c:481 +#: builtin/tag.c:482 #, c-format msgid "%s: cannot update the ref" msgstr "" -#: builtin/tag.c:483 +#: builtin/tag.c:484 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "" @@ -2671,7 +2791,13 @@ msgstr "" msgid "You need to set your committer info first" msgstr "" -#: git-am.sh:80 +#: git-am.sh:93 +msgid "" +"You seem to have moved HEAD since the last 'am' failure.\n" +"Not rewinding to ORIG_HEAD" +msgstr "" + +#: git-am.sh:105 #, sh-format msgid "" "When you have resolved this problem run \"$cmdline --resolved\".\n" @@ -2679,56 +2805,60 @@ msgid "" "To restore the original branch and stop patching run \"$cmdline --abort\"." msgstr "" -#: git-am.sh:96 +#: git-am.sh:121 msgid "Cannot fall back to three-way merge." msgstr "" -#: git-am.sh:111 +#: git-am.sh:136 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" -#: git-am.sh:120 +#: git-am.sh:145 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." msgstr "" -#: git-am.sh:236 +#: git-am.sh:154 +msgid "Falling back to patching base and 3-way merge..." +msgstr "" + +#: git-am.sh:261 msgid "Only one StGIT patch series can be applied at once" msgstr "" -#: git-am.sh:288 +#: git-am.sh:313 #, sh-format msgid "Patch format $patch_format is not supported." msgstr "" -#: git-am.sh:290 +#: git-am.sh:315 msgid "Patch format detection failed." msgstr "" -#: git-am.sh:340 +#: git-am.sh:365 msgid "-d option is no longer supported. Do not use." msgstr "" -#: git-am.sh:403 +#: git-am.sh:428 #, sh-format msgid "previous rebase directory $dotest still exists but mbox given." msgstr "" -#: git-am.sh:408 +#: git-am.sh:433 msgid "Please make up your mind. --skip or --abort?" msgstr "" -#: git-am.sh:434 +#: git-am.sh:460 msgid "Resolve operation not in progress, we are not resuming." msgstr "" -#: git-am.sh:499 +#: git-am.sh:525 #, sh-format msgid "Dirty index: cannot apply patches (dirty: $files)" msgstr "" -#: git-am.sh:595 +#: git-am.sh:614 #, sh-format msgid "" "Patch is empty. Was it split wrong?\n" @@ -2736,52 +2866,530 @@ msgid "" "To restore the original branch and stop patching run \"$cmdline --abort\"." msgstr "" -#: git-am.sh:632 +#: git-am.sh:651 msgid "Patch does not have a valid e-mail address." msgstr "" -#: git-am.sh:679 +#: git-am.sh:698 msgid "cannot be interactive without stdin connected to a terminal." msgstr "" -#: git-am.sh:683 +#: git-am.sh:702 msgid "Commit Body is:" msgstr "" #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] #. in your translation. The program will only accept English #. input at this point. -#: git-am.sh:690 +#: git-am.sh:709 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " msgstr "" -#: git-am.sh:726 +#: git-am.sh:745 #, sh-format msgid "Applying: $FIRSTLINE" msgstr "" -#: git-am.sh:747 +#: git-am.sh:766 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" "already introduced the same changes; you might want to skip this patch." msgstr "" -#: git-am.sh:755 +#: git-am.sh:774 msgid "" "You still have unmerged paths in your index\n" "did you forget to use 'git add'?" msgstr "" -#: git-am.sh:771 +#: git-am.sh:790 msgid "No changes -- Patch already applied." msgstr "" -#: git-am.sh:781 +#: git-am.sh:800 #, sh-format msgid "Patch failed at $msgnum $FIRSTLINE" msgstr "" -#: git-am.sh:797 +#: git-am.sh:816 msgid "applying to an empty history" msgstr "" + +#: git-bisect.sh:40 +msgid "You need to start by \"git bisect start\"" +msgstr "" + +#. TRANSLATORS: Make sure to include [Y] and [n] in your +#. translation. The program will only accept English input +#. at this point. +#: git-bisect.sh:48 +msgid "Do you want me to do it for you [Y/n]? " +msgstr "" + +#: git-bisect.sh:67 +msgid "Bad HEAD - I need a HEAD" +msgstr "" + +#: git-bisect.sh:86 +msgid "won't bisect on seeked tree" +msgstr "" + +#: git-bisect.sh:90 +msgid "Bad HEAD - strange symbolic ref" +msgstr "" + +#: git-bisect.sh:120 +#, sh-format +msgid "'$arg' does not appear to be a valid revision" +msgstr "" + +#: git-bisect.sh:165 +#, sh-format +msgid "Bad bisect_write argument: $state" +msgstr "" + +#: git-bisect.sh:193 +#, sh-format +msgid "Bad rev input: $arg" +msgstr "" + +#: git-bisect.sh:207 +msgid "Please call 'bisect_state' with at least one argument." +msgstr "" + +#: git-bisect.sh:210 +msgid "Bad rev input: HEAD" +msgstr "" + +#: git-bisect.sh:219 +#, sh-format +msgid "Bad rev input: $rev" +msgstr "" + +#: git-bisect.sh:225 +msgid "'git bisect bad' can take only one argument." +msgstr "" + +#. have bad but not good. we could bisect although +#. this is less optimum. +#: git-bisect.sh:249 +msgid "Warning: bisecting only with a bad commit." +msgstr "" + +#. TRANSLATORS: Make sure to include [Y] and [n] in your +#. translation. The program will only accept English input +#. at this point. +#: git-bisect.sh:257 +msgid "Are you sure [Y/n]? " +msgstr "" + +#: git-bisect.sh:268 +msgid "" +"You need to give me at least one good and one bad revisions.\n" +"(You can use \"git bisect bad\" and \"git bisect good\" for that.)" +msgstr "" + +#: git-bisect.sh:274 +msgid "" +"You need to start by \"git bisect start\".\n" +"You then need to give me at least one good and one bad revisions.\n" +"(You can use \"git bisect bad\" and \"git bisect good\" for that.)" +msgstr "" + +#: git-bisect.sh:330 git-bisect.sh:457 +msgid "We are not bisecting." +msgstr "" + +#: git-bisect.sh:337 +#, sh-format +msgid "'$invalid' is not a valid commit" +msgstr "" + +#: git-bisect.sh:346 +#, sh-format +msgid "" +"Could not check out original HEAD '$branch'.\n" +"Try 'git bisect reset '." +msgstr "" + +#: git-bisect.sh:371 +msgid "No logfile given" +msgstr "" + +#: git-bisect.sh:372 +#, fuzzy, sh-format +msgid "cannot read $file for replaying" +msgstr "लिंक '%s' नहीं पढ़ सके" + +#: git-bisect.sh:388 +msgid "?? what are you talking about?" +msgstr "" + +#: git-bisect.sh:400 +#, sh-format +msgid "running $command" +msgstr "" + +#: git-bisect.sh:407 +#, sh-format +msgid "" +"bisect run failed:\n" +"exit code $res from '$command' is < 0 or >= 128" +msgstr "" + +#: git-bisect.sh:433 +msgid "bisect run cannot continue any more" +msgstr "" + +#: git-bisect.sh:441 +#, sh-format +msgid "" +"bisect run failed:\n" +"'bisect_state $state' exited with error code $res" +msgstr "" + +#: git-bisect.sh:449 +msgid "bisect run success" +msgstr "" + +#: git-pull.sh:21 +msgid "" +"Pull is not possible because you have unmerged files.\n" +"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 "" + +#: git-pull.sh:25 +msgid "Pull is not possible because you have unmerged files." +msgstr "" + +#: git-pull.sh:189 +msgid "updating an unborn branch with changes added to the index" +msgstr "" + +#. The fetch involved updating the current branch. +#. The working tree and the index file is still based on the +#. $orig_head commit, but we are merging into $curr_head. +#. First update the working tree to match $curr_head. +#: git-pull.sh:221 +#, sh-format +msgid "" +"Warning: fetch updated the current branch head.\n" +"Warning: fast-forwarding your working tree from\n" +"Warning: commit $orig_head." +msgstr "" + +#: git-pull.sh:248 +msgid "Cannot merge multiple branches into empty head" +msgstr "" + +#: git-pull.sh:252 +msgid "Cannot rebase onto multiple branches" +msgstr "" + +#: git-stash.sh:43 +msgid "git stash clear with parameters is unimplemented" +msgstr "" + +#: git-stash.sh:65 +msgid "You do not have the initial commit yet" +msgstr "" + +#: git-stash.sh:80 +#, fuzzy +msgid "Cannot save the current index state" +msgstr "लिंक '%s' नहीं पढ़ सके" + +#: git-stash.sh:94 git-stash.sh:107 +#, fuzzy +msgid "Cannot save the current worktree state" +msgstr "टेम्पलेट '%s' को [stat] नहीं कर सके" + +#: git-stash.sh:111 +msgid "No changes selected" +msgstr "" + +#: git-stash.sh:114 +msgid "Cannot remove temporary index (can't happen)" +msgstr "" + +#: git-stash.sh:127 +#, fuzzy +msgid "Cannot record working tree state" +msgstr "टेम्पलेट '%s' को [stat] नहीं कर सके" + +#: git-stash.sh:182 +msgid "No local changes to save" +msgstr "" + +#: git-stash.sh:186 +msgid "Cannot initialize stash" +msgstr "" + +#: git-stash.sh:194 +msgid "Cannot save the current status" +msgstr "" + +#: git-stash.sh:207 +#, fuzzy +msgid "Cannot remove worktree changes" +msgstr "टेम्पलेट '%s' को [stat] नहीं कर सके" + +#: git-stash.sh:302 +msgid "No stash found." +msgstr "" + +#: git-stash.sh:309 +#, sh-format +msgid "Too many revisions specified: $REV" +msgstr "" + +#: git-stash.sh:315 +#, sh-format +msgid "$reference is not valid reference" +msgstr "" + +#: git-stash.sh:340 +#, sh-format +msgid "'$args' is not a stash-like commit" +msgstr "" + +#: git-stash.sh:351 +#, sh-format +msgid "'$args' is not a stash reference" +msgstr "" + +#: git-stash.sh:359 +msgid "unable to refresh index" +msgstr "" + +#: git-stash.sh:363 +msgid "Cannot apply a stash in the middle of a merge" +msgstr "" + +#: git-stash.sh:371 +msgid "Conflicts in index. Try without --index." +msgstr "" + +#: git-stash.sh:373 +#, fuzzy +msgid "Could not save index tree" +msgstr "%s को समूह द्वारा लिखने की इजाज़त नही दे सके" + +#: git-stash.sh:399 +msgid "Cannot unstage modified files" +msgstr "" + +#: git-stash.sh:414 +msgid "Index was not unstashed." +msgstr "" + +#: git-stash.sh:433 +#, sh-format +msgid "Dropped ${REV} ($s)" +msgstr "" + +#: git-stash.sh:434 +#, sh-format +msgid "${REV}: Could not drop stash entry" +msgstr "" + +#: git-stash.sh:441 +msgid "No branch name specified" +msgstr "" + +#: git-stash.sh:512 +msgid "(To restore them type \"git stash apply\")" +msgstr "" + +#: git-submodule.sh:38 +#, sh-format +msgid "remote ($remote) does not have a url defined in .git/config" +msgstr "" + +#: git-submodule.sh:56 +#, sh-format +msgid "cannot strip one component off url '$remoteurl'" +msgstr "" + +#: git-submodule.sh:108 +#, sh-format +msgid "No submodule mapping found in .gitmodules for path '$path'" +msgstr "" + +#: git-submodule.sh:132 +#, sh-format +msgid "Clone of '$url' into submodule path '$path' failed" +msgstr "" + +#: git-submodule.sh:205 +#, sh-format +msgid "repo URL: '$repo' must be absolute or begin with ./|../" +msgstr "" + +#: git-submodule.sh:222 +#, fuzzy, sh-format +msgid "'$path' already exists in the index" +msgstr "लिंक '%s' नहीं पढ़ सके" + +#: git-submodule.sh:227 +#, sh-format +msgid "" +"The following path is ignored by one of your .gitignore files:\n" +"$path\n" +"Use -f if you really want to add it." +msgstr "" + +#: git-submodule.sh:240 +#, sh-format +msgid "Adding existing repo at '$path' to the index" +msgstr "" + +#: git-submodule.sh:242 +#, fuzzy, sh-format +msgid "'$path' already exists and is not a valid git repo" +msgstr "खराब गिट निर्देशिका %s" + +#: git-submodule.sh:265 +#, sh-format +msgid "Unable to checkout submodule '$path'" +msgstr "" + +#: git-submodule.sh:269 +#, sh-format +msgid "Failed to add submodule '$path'" +msgstr "" + +#: git-submodule.sh:274 +#, sh-format +msgid "Failed to register submodule '$path'" +msgstr "" + +#: git-submodule.sh:312 +#, sh-format +msgid "Entering '$prefix$path'" +msgstr "" + +#: git-submodule.sh:324 +#, sh-format +msgid "Stopping at '$path'; script returned non-zero status." +msgstr "" + +#: git-submodule.sh:367 +#, sh-format +msgid "No url found for submodule path '$path' in .gitmodules" +msgstr "" + +#: git-submodule.sh:377 +#, sh-format +msgid "Failed to register url for submodule path '$path'" +msgstr "" + +#: git-submodule.sh:382 +#, sh-format +msgid "Failed to register update mode for submodule path '$path'" +msgstr "" + +#: git-submodule.sh:384 +#, sh-format +msgid "Submodule '$name' ($url) registered for path '$path'" +msgstr "" + +#: git-submodule.sh:467 +#, sh-format +msgid "" +"Submodule path '$path' not initialized\n" +"Maybe you want to use 'update --init'?" +msgstr "" + +#: git-submodule.sh:480 +#, sh-format +msgid "Unable to find current revision in submodule path '$path'" +msgstr "" + +#: git-submodule.sh:504 +#, sh-format +msgid "Unable to fetch in submodule path '$path'" +msgstr "" + +#: git-submodule.sh:517 +#, sh-format +msgid "Unable to rebase '$sha1' in submodule path '$path'" +msgstr "" + +#: git-submodule.sh:518 +#, sh-format +msgid "Submodule path '$path': rebased into '$sha1'" +msgstr "" + +#: git-submodule.sh:522 +#, sh-format +msgid "Unable to merge '$sha1' in submodule path '$path'" +msgstr "" + +#: git-submodule.sh:523 +#, sh-format +msgid "Submodule path '$path': merged in '$sha1'" +msgstr "" + +#: git-submodule.sh:527 +#, sh-format +msgid "Unable to checkout '$sha1' in submodule path '$path'" +msgstr "" + +#: git-submodule.sh:528 +#, sh-format +msgid "Submodule path '$path': checked out '$sha1'" +msgstr "" + +#: git-submodule.sh:539 git-submodule.sh:841 +#, sh-format +msgid "Failed to recurse into submodule path '$path'" +msgstr "" + +#: git-submodule.sh:623 +msgid "--" +msgstr "" + +#. unexpected type +#: git-submodule.sh:664 +#, sh-format +msgid "unexpected mode $mod_dst" +msgstr "" + +#: git-submodule.sh:684 +#, sh-format +msgid " Warn: $name doesn't contain commit $sha1_src" +msgstr "" + +#: git-submodule.sh:687 +#, sh-format +msgid " Warn: $name doesn't contain commit $sha1_dst" +msgstr "" + +#: git-submodule.sh:690 +#, sh-format +msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst" +msgstr "" + +#: git-submodule.sh:715 +msgid "blob" +msgstr "" + +#: git-submodule.sh:716 +msgid "submodule" +msgstr "" + +#: git-submodule.sh:753 +msgid "# Submodules changed but not updated:" +msgstr "" + +#: git-submodule.sh:755 +msgid "# Submodule changes to be committed:" +msgstr "" + +#: git-submodule.sh:885 +#, sh-format +msgid "Synchronizing submodule url for '$name'" +msgstr "" From a073e3c52aac2f76d3f65d145d82e35ec317be7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Date: Wed, 6 Jul 2011 19:22:54 +0000 Subject: [PATCH 11/15] is.po: msgmerge --- po/is.po | 3469 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 3347 insertions(+), 122 deletions(-) diff --git a/po/is.po b/po/is.po index 1c554143ca07bd..db8cb653bf1a44 100644 --- a/po/is.po +++ b/po/is.po @@ -1,187 +1,3412 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" -"PO-Revision-Date: 2011-07-06 19:07 +0000\n" -"Language-Team: Git Mailing List \n" "Report-Msgid-Bugs-To: Git Mailing List \n" -"Last-Translator: Ævar Arnfjörð Bjarmason \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#~ # Icelandic translations for Git. -#~ # Copyright (C) 2010 Ævar Arnfjörð Bjarmason -#~ # This file is distributed under the same license as the Git package. -#~ # Ævar Arnfjörð Bjarmason , 2010. -#~ # -#~ msgid "" -#~ msgstr "" -#~ "Project-Id-Version: Git\n" -#~ "Report-Msgid-Bugs-To: Git Mailing List \n" -"POT-Creation-Date: 2010-09-20 20:14+0000\n" -"PO-Revision-Date: 2010-09-20 15:01+0000\n" +"POT-Creation-Date: 2011-07-06 19:20+0000\n" +"PO-Revision-Date: 2011-07-06 19:07 +0000\n" "Last-Translator: Ævar Arnfjörð Bjarmason \n" "Language-Team: Git Mailing List \n" -"Language: is\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: builtin/init-db.c:34 +#: diff.c:104 #, c-format -msgid "Could not make %s writable by group" -msgstr "Gat ekki gert %s skrifanlega af hóp" +msgid " Failed to parse dirstat cut-off percentage '%.*s'\n" +msgstr "" + +#: diff.c:109 +#, fuzzy, c-format +msgid " Unknown dirstat parameter '%.*s'\n" +msgstr "gat ekki stat-að sniðið '%s'" -#: builtin/init-db.c:61 +#: diff.c:205 #, c-format -msgid "insanely long template name %s" -msgstr "brjálæðislega langt sniðsnafn %s" +msgid "" +"Found errors in 'diff.dirstat' config variable:\n" +"%s" +msgstr "" -#: builtin/init-db.c:66 +#: diff.c:3295 #, c-format -msgid "cannot stat '%s'" -msgstr "gat ekki stat-að '%s'" +msgid "" +"Failed to parse --dirstat/-X option parameter:\n" +"%s" +msgstr "" + +#: wt-status.c:134 +msgid "Unmerged paths:" +msgstr "" -#: builtin/init-db.c:72 +#: wt-status.c:140 wt-status.c:157 #, c-format -msgid "cannot stat template '%s'" -msgstr "gat ekki stat-að sniðið '%s'" +msgid " (use \"git reset %s ...\" to unstage)" +msgstr "" + +#: wt-status.c:142 wt-status.c:159 +msgid " (use \"git rm --cached ...\" to unstage)" +msgstr "" + +#: wt-status.c:143 +msgid " (use \"git add/rm ...\" as appropriate to mark resolution)" +msgstr "" + +#: wt-status.c:151 +msgid "Changes to be committed:" +msgstr "" -#: builtin/init-db.c:79 +#: wt-status.c:169 +msgid "Changes not staged for commit:" +msgstr "" + +#: wt-status.c:173 +msgid " (use \"git add ...\" to update what will be committed)" +msgstr "" + +#: wt-status.c:175 +msgid " (use \"git add/rm ...\" to update what will be committed)" +msgstr "" + +#: wt-status.c:176 +msgid "" +" (use \"git checkout -- ...\" to discard changes in working directory)" +msgstr "" + +#: wt-status.c:178 +msgid " (commit or discard the untracked or modified content in submodules)" +msgstr "" + +#: wt-status.c:187 #, c-format -msgid "cannot opendir '%s'" -msgstr "gat ekki opnað möppuna '%s'" +msgid "%s files:" +msgstr "" -#: builtin/init-db.c:96 +#: wt-status.c:190 #, c-format -msgid "cannot readlink '%s'" -msgstr "gat ekki lesið tengilinn '%s'" +msgid " (use \"git %s ...\" to include in what will be committed)" +msgstr "" + +#: wt-status.c:207 +msgid "bug" +msgstr "" + +#: wt-status.c:212 +msgid "both deleted:" +msgstr "" + +#: wt-status.c:213 +msgid "added by us:" +msgstr "" + +#: wt-status.c:214 +msgid "deleted by them:" +msgstr "" + +#: wt-status.c:215 +msgid "added by them:" +msgstr "" + +#: wt-status.c:216 +msgid "deleted by us:" +msgstr "" + +#: wt-status.c:217 +msgid "both added:" +msgstr "" + +#: wt-status.c:218 +msgid "both modified:" +msgstr "" + +#: wt-status.c:248 +msgid "new commits, " +msgstr "" + +#: wt-status.c:250 +msgid "modified content, " +msgstr "" + +#: wt-status.c:252 +msgid "untracked content, " +msgstr "" -#: builtin/init-db.c:98 +#: wt-status.c:266 #, c-format -msgid "insanely long symlink %s" -msgstr "brjálæðislega langur tengill %s" +msgid "new file: %s" +msgstr "" -#: builtin/init-db.c:101 +#: wt-status.c:269 #, c-format -msgid "cannot symlink '%s' '%s'" -msgstr "gat ekki búið til tengilinn '%s' '%s'" +msgid "copied: %s -> %s" +msgstr "" -#: builtin/init-db.c:105 +#: wt-status.c:272 #, c-format -msgid "cannot copy '%s' to '%s'" -msgstr "gat ekki afritað '%s' til '%s'" +msgid "deleted: %s" +msgstr "" -#: builtin/init-db.c:109 +#: wt-status.c:275 #, c-format -msgid "ignoring template %s" -msgstr "hunsa sniðið %s" +msgid "modified: %s" +msgstr "" -#: builtin/init-db.c:132 +#: wt-status.c:278 #, c-format -msgid "insanely long template path %s" -msgstr "brjálæðislega löng slóð á snið %s" +msgid "renamed: %s -> %s" +msgstr "" -#: builtin/init-db.c:140 +#: wt-status.c:281 #, c-format -msgid "templates not found %s" -msgstr "sniðin funndust ekki %s" +msgid "typechange: %s" +msgstr "" -#: builtin/init-db.c:153 +#: wt-status.c:284 #, c-format -msgid "not copying templates of a wrong format version %d from '%s'" -msgstr "afrita ekki sniðin vegna rangar útgáfu %d frá '%s'" +msgid "unknown: %s" +msgstr "" -#: builtin/init-db.c:191 +#: wt-status.c:287 #, c-format -msgid "insane git directory %s" -msgstr "brjáluð git mappa %s" +msgid "unmerged: %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:355 +#: wt-status.c:290 #, c-format -msgid "%s%s Git repository in %s%s\n" -msgstr "%s%s Git lind í %s%s\n" +msgid "bug: unhandled diff status %c" +msgstr "" -#: builtin/init-db.c:356 -msgid "Reinitialized existing" -msgstr "Endurgerði" +#: wt-status.c:713 +msgid "On branch " +msgstr "" -#: builtin/init-db.c:356 -msgid "Initialized empty" +#: wt-status.c:720 +msgid "Not currently on any branch." +msgstr "" + +#: wt-status.c:731 +#, fuzzy +msgid "Initial commit" msgstr "Bjó til tóma" -#: builtin/init-db.c:357 -msgid " shared" -msgstr " sameiginlega" +#: wt-status.c:745 +msgid "Untracked" +msgstr "" -#: builtin/init-db.c:376 -msgid "cannot tell cwd" +#: wt-status.c:747 +msgid "Ignored" +msgstr "" + +#: wt-status.c:749 +#, c-format +msgid "Untracked files not listed%s" +msgstr "" + +#: wt-status.c:751 +msgid " (use -u option to show untracked files)" +msgstr "" + +#: wt-status.c:757 +msgid "No changes" +msgstr "" + +#: wt-status.c:761 +#, c-format +msgid "no changes added to commit%s\n" +msgstr "" + +#: wt-status.c:763 +msgid " (use \"git add\" and/or \"git commit -a\")" +msgstr "" + +#: wt-status.c:765 +#, c-format +msgid "nothing added to commit but untracked files present%s\n" +msgstr "" + +#: wt-status.c:767 +msgid " (use \"git add\" to track)" +msgstr "" + +#: wt-status.c:769 wt-status.c:772 wt-status.c:775 +#, c-format +msgid "nothing to commit%s\n" +msgstr "" + +#: wt-status.c:770 +msgid " (create/copy files and use \"git add\" to track)" +msgstr "" + +#: wt-status.c:773 +msgid " (use -u to show untracked files)" +msgstr "" + +#: wt-status.c:776 +msgid " (working directory clean)" +msgstr "" + +#: wt-status.c:884 +msgid "HEAD (no branch)" +msgstr "" + +#: wt-status.c:890 +msgid "Initial commit on " +msgstr "" + +#: wt-status.c:905 +msgid "behind " +msgstr "" + +#: wt-status.c:908 wt-status.c:911 +msgid "ahead " +msgstr "" + +#: wt-status.c:913 +msgid ", behind " +msgstr "" + +#: builtin/add.c:61 +#, c-format +msgid "unexpected diff status %c" +msgstr "" + +#: builtin/add.c:66 builtin/commit.c:291 +msgid "updating files failed" +msgstr "" + +#: builtin/add.c:76 +#, c-format +msgid "remove '%s'\n" +msgstr "" + +#: builtin/add.c:175 +#, c-format +msgid "Path '%s' is in submodule '%.*s'" +msgstr "" + +#: builtin/add.c:191 +msgid "Unstaged changes after refreshing the index:" +msgstr "" + +#: builtin/add.c:194 builtin/add.c:454 builtin/rm.c:186 +#, c-format +msgid "pathspec '%s' did not match any files" +msgstr "" + +#: builtin/add.c:208 +#, c-format +msgid "'%s' is beyond a symbolic link" +msgstr "" + +#: builtin/add.c:275 +msgid "Could not read the index" +msgstr "" + +#: builtin/add.c:284 +#, c-format +msgid "Could not open '%s' for writing." +msgstr "" + +#: builtin/add.c:288 +#, fuzzy +msgid "Could not write patch" +msgstr "Gat ekki gert %s skrifanlega af hóp" + +#: builtin/add.c:293 +#, fuzzy, c-format +msgid "Could not stat '%s'" +msgstr "gat ekki stat-að '%s'" + +#: builtin/add.c:295 +msgid "Empty patch. Aborted." +msgstr "" + +#: builtin/add.c:301 +#, c-format +msgid "Could not apply '%s'" +msgstr "" + +#: builtin/add.c:310 +msgid "The following paths are ignored by one of your .gitignore files:\n" +msgstr "" + +#: builtin/add.c:350 +#, c-format +msgid "Use -f if you really want to add them.\n" +msgstr "" + +#: builtin/add.c:351 +msgid "no files added" +msgstr "" + +#: builtin/add.c:357 +msgid "adding files failed" +msgstr "" + +#: builtin/add.c:389 +msgid "-A and -u are mutually incompatible" +msgstr "" + +#: builtin/add.c:391 +msgid "Option --ignore-missing can only be used together with --dry-run" +msgstr "" + +#: builtin/add.c:411 +#, c-format +msgid "Nothing specified, nothing added.\n" +msgstr "" + +#: builtin/add.c:412 +#, c-format +msgid "Maybe you wanted to say 'git add .'?\n" +msgstr "" + +#: builtin/add.c:418 builtin/clean.c:95 builtin/commit.c:350 builtin/mv.c:77 +#: builtin/rm.c:162 +msgid "index file corrupt" +msgstr "" + +#: builtin/add.c:470 builtin/mv.c:223 builtin/rm.c:260 +msgid "Unable to write new index file" +msgstr "" + +#: builtin/archive.c:17 +#, c-format +msgid "could not create archive file '%s'" +msgstr "" + +#: builtin/archive.c:20 +msgid "could not redirect output" +msgstr "" + +#: builtin/archive.c:36 +msgid "git archive: Remote with no URL" +msgstr "" + +#: builtin/archive.c:46 +msgid "git archive: expected ACK/NAK, got EOF" +msgstr "" + +#: builtin/archive.c:51 +#, c-format +msgid "git archive: NACK %s" +msgstr "" + +#: builtin/archive.c:52 +msgid "git archive: protocol error" +msgstr "" + +#: builtin/archive.c:57 +msgid "git archive: expected a flush" +msgstr "" + +#: builtin/branch.c:136 +#, c-format +msgid "" +"deleting branch '%s' that has been merged to\n" +" '%s', but not yet merged to HEAD." +msgstr "" + +#: builtin/branch.c:140 +#, c-format +msgid "" +"not deleting branch '%s' that is not yet merged to\n" +" '%s', even though it is merged to HEAD." +msgstr "" + +#. TRANSLATORS: This is "remote " in "remote branch '%s' not found" +#: builtin/branch.c:161 +msgid "remote " +msgstr "" + +#: builtin/branch.c:169 +#, fuzzy +msgid "cannot use -a with -d" msgstr "finn ekki núverandi möppu" -#: builtin/init-db.c:450 builtin/init-db.c:457 +#: builtin/branch.c:175 +msgid "Couldn't look up commit object for HEAD" +msgstr "" + +#: builtin/branch.c:180 #, c-format -msgid "cannot mkdir %s" -msgstr "get ekki búið til möppuna %s" +msgid "Cannot delete the branch '%s' which you are currently on." +msgstr "" -#: builtin/init-db.c:461 +#: builtin/branch.c:190 #, c-format -msgid "cannot chdir to %s" -msgstr "get ekki farið inn í möppuna %s" +msgid "%sbranch '%s' not found." +msgstr "" + +#: builtin/branch.c:198 +#, c-format +msgid "Couldn't look up commit object for '%s'" +msgstr "" -#: builtin/init-db.c:483 +#: builtin/branch.c:204 #, c-format msgid "" -"%s (or --work-tree=) not allowed without specifying %s (or --git-" -"dir=)" +"The branch '%s' is not fully merged.\n" +"If you are sure you want to delete it, run 'git branch -D %s'." msgstr "" -"%s (eða --work-tree=) ekki leyfilegt ásamt %s (eða --git-dir=)" -#: builtin/init-db.c:509 -msgid "Cannot access current working directory" -msgstr "Get ekki opnað núverandi möppu" +#: builtin/branch.c:212 +#, c-format +msgid "Error deleting %sbranch '%s'" +msgstr "" -#: builtin/init-db.c:512 +#: builtin/branch.c:217 #, c-format -msgid "Cannot access work tree '%s'" -msgstr "Get ekki opnað tréð '%s'" +msgid "Deleted %sbranch %s (was %s).\n" +msgstr "" -#. TRANSLATORS: This is a test. You don't need to translate it. -#: t/t0200/test.c:5 -msgid "See 'git help COMMAND' for more information on a specific command." -msgstr "Sjá 'git help SKIPUN' til að sjá hjálp fyrir tiltekna skipun." +#: builtin/branch.c:222 +msgid "Update of config-file failed" +msgstr "" -#. TRANSLATORS: This is a test. You don't need to translate it. -#: t/t0200/test.c:9 -msgid "TEST: A C test string" -msgstr "TILRAUN: C tilraunastrengur" +#: builtin/branch.c:304 +#, c-format +msgid "branch '%s' does not point at a commit" +msgstr "" -#. TRANSLATORS: This is a test. You don't need to translate it. -#: t/t0200/test.c:12 +#: builtin/branch.c:376 #, c-format -msgid "TEST: A C test string %s" -msgstr "TILRAUN: C tilraunastrengur %s" +msgid "behind %d] " +msgstr "" -#. TRANSLATORS: This is a test. You don't need to translate it. -#: t/t0200/test.sh:8 -msgid "TEST: A Shell test string" -msgstr "TILRAUN: Skeljartilraunastrengur" +#: builtin/branch.c:378 +#, c-format +msgid "ahead %d] " +msgstr "" -#. TRANSLATORS: This is a test. You don't need to translate it. -#: t/t0200/test.sh:11 +#: builtin/branch.c:380 +#, c-format +msgid "ahead %d, behind %d] " +msgstr "" + +#: builtin/branch.c:483 +msgid "(no branch)" +msgstr "" + +#: builtin/branch.c:543 +msgid "some refs could not be read" +msgstr "" + +#: builtin/branch.c:556 +msgid "cannot rename the current branch while not on any." +msgstr "" + +#: builtin/branch.c:566 builtin/branch.c:570 +#, c-format +msgid "Invalid branch name: '%s'" +msgstr "" + +#: builtin/branch.c:573 +#, c-format +msgid "A branch named '%s' already exists." +msgstr "" + +#: builtin/branch.c:579 +msgid "Branch rename failed" +msgstr "" + +#: builtin/branch.c:583 +#, c-format +msgid "Renamed a misnamed branch '%s' away" +msgstr "" + +#: builtin/branch.c:587 +#, c-format +msgid "Branch renamed to %s, but HEAD is not updated!" +msgstr "" + +#: builtin/branch.c:594 +msgid "Branch is renamed, but update of config-file failed" +msgstr "" + +#: builtin/branch.c:609 +#, c-format +msgid "malformed object name %s" +msgstr "" + +#: builtin/branch.c:683 +msgid "Failed to resolve HEAD as a valid ref." +msgstr "" + +#: builtin/branch.c:689 +msgid "HEAD not found below refs/heads!" +msgstr "" + +#: builtin/branch.c:709 +msgid "-a and -r options to 'git branch' do not make sense with a branch name" +msgstr "" + +#: builtin/bundle.c:47 +#, c-format +msgid "%s is okay\n" +msgstr "" + +#: builtin/bundle.c:56 +msgid "Need a repository to create a bundle." +msgstr "" + +#: builtin/bundle.c:60 +msgid "Need a repository to unbundle." +msgstr "" + +#: builtin/checkout.c:111 builtin/checkout.c:139 +#, c-format +msgid "path '%s' does not have our version" +msgstr "" + +#: builtin/checkout.c:113 builtin/checkout.c:141 +#, c-format +msgid "path '%s' does not have their version" +msgstr "" + +#: builtin/checkout.c:124 +#, c-format +msgid "path '%s' does not have all three versions" +msgstr "" + +#: builtin/checkout.c:159 +#, c-format +msgid "path '%s' does not have all 3 versions" +msgstr "" + +#: builtin/checkout.c:176 +#, c-format +msgid "path '%s': cannot merge" +msgstr "" + +#: builtin/checkout.c:193 +#, c-format +msgid "Unable to add merge result for '%s'" +msgstr "" + +#: builtin/checkout.c:198 builtin/reset.c:170 +#, c-format +msgid "make_cache_entry failed for path '%s'" +msgstr "" + +#: builtin/checkout.c:220 builtin/checkout.c:374 +msgid "corrupt index file" +msgstr "" + +#: builtin/checkout.c:248 builtin/checkout.c:255 +#, c-format +msgid "path '%s' is unmerged" +msgstr "" + +#: builtin/checkout.c:284 builtin/checkout.c:478 builtin/clone.c:668 +#: builtin/merge.c:789 +msgid "unable to write new index file" +msgstr "" + +#: builtin/checkout.c:301 builtin/diff.c:301 builtin/merge.c:396 +msgid "diff_setup_done failed" +msgstr "" + +#: builtin/checkout.c:396 +msgid "you need to resolve your current index first" +msgstr "" + +#: builtin/checkout.c:527 +#, fuzzy, c-format +msgid "Can not do reflog for '%s'\n" +msgstr "gat ekki opnað möppuna '%s'" + +#: builtin/checkout.c:557 +msgid "HEAD is now at" +msgstr "" + +#: builtin/checkout.c:563 +#, c-format +msgid "Already on '%s'\n" +msgstr "" + +#: builtin/checkout.c:567 +#, c-format +msgid "Switched to and reset branch '%s'\n" +msgstr "" + +#: builtin/checkout.c:569 +#, c-format +msgid "Switched to a new branch '%s'\n" +msgstr "" + +#: builtin/checkout.c:571 +#, c-format +msgid "Switched to branch '%s'\n" +msgstr "" + +#: builtin/checkout.c:651 +#, c-format +msgid " ... and %d more.\n" +msgstr "" + +#. The singular version +#: builtin/checkout.c:657 +#, 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:675 +#, 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/checkout.c:700 +msgid "internal error: only -- alone should have been left" +msgstr "" + +#: builtin/checkout.c:702 +msgid "internal error in revision walk" +msgstr "" + +#: builtin/checkout.c:706 +msgid "Previous HEAD position was" +msgstr "" + +#: builtin/checkout.c:731 +msgid "You are on a branch yet to be born" +msgstr "" + +#. case (1) +#: builtin/checkout.c:859 +#, c-format +msgid "invalid reference: %s" +msgstr "" + +#. case (1): want a tree +#: builtin/checkout.c:898 +#, c-format +msgid "reference is not a tree: %s" +msgstr "" + +#: builtin/checkout.c:965 +msgid "-B cannot be used with -b" +msgstr "" + +#: builtin/checkout.c:974 +msgid "--patch is incompatible with all other options" +msgstr "" + +#: builtin/checkout.c:977 +msgid "--detach cannot be used with -b/-B/--orphan" +msgstr "" + +#: builtin/checkout.c:979 +msgid "--detach cannot be used with -t" +msgstr "" + +#: builtin/checkout.c:985 +msgid "--track needs a branch name" +msgstr "" + +#: builtin/checkout.c:992 +msgid "Missing branch name; try -b" +msgstr "" + +#: builtin/checkout.c:998 +msgid "--orphan and -b|-B are mutually exclusive" +msgstr "" + +#: builtin/checkout.c:1000 +msgid "--orphan cannot be used with -t" +msgstr "" + +#: builtin/checkout.c:1010 +msgid "git checkout: -f and -m are incompatible" +msgstr "" + +#: builtin/checkout.c:1044 +msgid "invalid path specification" +msgstr "" + +#: builtin/checkout.c:1052 +#, c-format +msgid "" +"git checkout: updating paths is incompatible with switching branches.\n" +"Did you intend to checkout '%s' which can not be resolved as commit?" +msgstr "" + +#: builtin/checkout.c:1054 +msgid "git checkout: updating paths is incompatible with switching branches." +msgstr "" + +#: builtin/checkout.c:1059 +msgid "git checkout: --detach does not take a path argument" +msgstr "" + +#: builtin/checkout.c:1062 +msgid "" +"git checkout: --ours/--theirs, --force and --merge are incompatible when\n" +"checking out of the index." +msgstr "" + +#: builtin/checkout.c:1073 +#, c-format +msgid "git checkout: we do not like '%s' as a branch name." +msgstr "" + +#: builtin/checkout.c:1078 +#, c-format +msgid "git checkout: branch %s already exists" +msgstr "" + +#: builtin/checkout.c:1085 +msgid "Cannot switch branch to a non-commit." +msgstr "" + +#: builtin/checkout.c:1088 +msgid "--ours/--theirs is incompatible with switching branches." +msgstr "" + +#: builtin/clean.c:78 +msgid "-x and -X cannot be used together" +msgstr "" + +#: builtin/clean.c:82 +msgid "" +"clean.requireForce set to true and neither -n nor -f given; refusing to clean" +msgstr "" + +#: builtin/clean.c:85 +msgid "" +"clean.requireForce defaults to true and neither -n nor -f given; refusing to " +"clean" +msgstr "" + +#: builtin/clean.c:154 builtin/clean.c:175 +#, c-format +msgid "Would remove %s\n" +msgstr "" + +#: builtin/clean.c:158 builtin/clean.c:178 +#, c-format +msgid "Removing %s\n" +msgstr "" + +#: builtin/clean.c:161 builtin/clean.c:181 +#, c-format +msgid "failed to remove %s" +msgstr "" + +#: builtin/clean.c:165 +#, c-format +msgid "Would not remove %s\n" +msgstr "" + +#: builtin/clean.c:167 +#, c-format +msgid "Not removing %s\n" +msgstr "" + +#: builtin/clone.c:214 +#, c-format +msgid "reference repository '%s' is not a local directory." +msgstr "" + +#: builtin/clone.c:241 +#, fuzzy, c-format +msgid "failed to open '%s'" +msgstr "gat ekki opnað möppuna '%s'" + +#: builtin/clone.c:245 +#, fuzzy, c-format +msgid "failed to create directory '%s'" +msgstr "brjáluð git mappa %s" + +#: builtin/clone.c:247 builtin/diff.c:74 +#, fuzzy, c-format +msgid "failed to stat '%s'" +msgstr "gat ekki stat-að '%s'" + +#: builtin/clone.c:249 +#, fuzzy, c-format +msgid "%s exists and is not a directory" +msgstr "brjáluð git mappa %s" + +#: builtin/clone.c:263 +#, c-format +msgid "failed to stat %s\n" +msgstr "" + +#: builtin/clone.c:273 +#, c-format +msgid "failed to unlink '%s'" +msgstr "" + +#: builtin/clone.c:278 +#, fuzzy, c-format +msgid "failed to create link '%s'" +msgstr "gat ekki lesið tengilinn '%s'" + +#: builtin/clone.c:282 +#, fuzzy, c-format +msgid "failed to copy file to '%s'" +msgstr "gat ekki afritað '%s' til '%s'" + +#: builtin/clone.c:311 +#, c-format +msgid "done.\n" +msgstr "" + +#: builtin/clone.c:394 +msgid "Too many arguments." +msgstr "" + +#: builtin/clone.c:398 +msgid "You must specify a repository to clone." +msgstr "" + +#: builtin/clone.c:406 +#, c-format +msgid "--bare and --origin %s options are incompatible." +msgstr "" + +#: builtin/clone.c:420 +#, c-format +msgid "repository '%s' does not exist" +msgstr "" + +#: builtin/clone.c:425 +msgid "--depth is ignored in local clones; use file:// instead." +msgstr "" + +#: builtin/clone.c:435 +#, c-format +msgid "destination path '%s' already exists and is not an empty directory." +msgstr "" + +#: builtin/clone.c:445 +#, c-format +msgid "working tree '%s' already exists." +msgstr "" + +#: builtin/clone.c:458 builtin/clone.c:472 +#, c-format +msgid "could not create leading directories of '%s'" +msgstr "" + +#: builtin/clone.c:461 +#, fuzzy, c-format +msgid "could not create work tree dir '%s'." +msgstr "Get ekki opnað tréð '%s'" + +#: builtin/clone.c:480 +#, c-format +msgid "Cloning into bare repository %s...\n" +msgstr "" + +#: builtin/clone.c:482 +#, c-format +msgid "Cloning into %s...\n" +msgstr "" + +#: builtin/clone.c:540 +#, c-format +msgid "Don't know how to clone %s" +msgstr "" + +#: builtin/clone.c:579 +#, c-format +msgid "Remote branch %s not found in upstream %s, using HEAD instead" +msgstr "" + +#: builtin/clone.c:589 +msgid "You appear to have cloned an empty repository." +msgstr "" + +#: builtin/clone.c:631 +msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" +msgstr "" + +#: builtin/commit.c:41 +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/commit.c:53 +msgid "" +"You asked to amend the most recent commit, but doing so would make\n" +"it empty. You can repeat your command with --allow-empty, or you can\n" +"remove the commit entirely with \"git reset HEAD^\".\n" +msgstr "" + +#: builtin/commit.c:58 +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" +msgstr "" + +#: builtin/commit.c:318 +msgid "failed to unpack HEAD tree object" +msgstr "" + +#: builtin/commit.c:359 +msgid "unable to create temporary index" +msgstr "" + +#: builtin/commit.c:365 +msgid "interactive add failed" +msgstr "" + +#: builtin/commit.c:397 builtin/commit.c:417 builtin/commit.c:463 +msgid "unable to write new_index file" +msgstr "" + +#: builtin/commit.c:447 +#, c-format +msgid "cannot do a partial commit during a %s." +msgstr "" + +#: builtin/commit.c:456 +#, fuzzy +msgid "cannot read the index" +msgstr "gat ekki lesið tengilinn '%s'" + +#: builtin/commit.c:476 +msgid "unable to write temporary index file" +msgstr "" + +#: builtin/commit.c:523 builtin/commit.c:1428 +msgid "could not parse HEAD commit" +msgstr "" + +#: builtin/commit.c:542 builtin/commit.c:548 +#, c-format +msgid "invalid commit: %s" +msgstr "" + +#: builtin/commit.c:566 +msgid "malformed --author parameter" +msgstr "" + +#: builtin/commit.c:622 +#, c-format +msgid "Malformed ident string: '%s'" +msgstr "" + +#: builtin/commit.c:656 builtin/commit.c:689 builtin/commit.c:989 +#, c-format +msgid "could not lookup commit %s" +msgstr "" + +#: builtin/commit.c:668 builtin/shortlog.c:296 +#, c-format +msgid "(reading log message from standard input)\n" +msgstr "" + +#: builtin/commit.c:670 +msgid "could not read log from standard input" +msgstr "" + +#: builtin/commit.c:674 +#, fuzzy, c-format +msgid "could not read log file '%s'" +msgstr "gat ekki lesið tengilinn '%s'" + +#: builtin/commit.c:680 +msgid "commit has empty message" +msgstr "" + +#: builtin/commit.c:696 +msgid "could not read MERGE_MSG" +msgstr "" + +#: builtin/commit.c:700 +msgid "could not read SQUASH_MSG" +msgstr "" + +#: builtin/commit.c:704 +#, fuzzy, c-format +msgid "could not read '%s'" +msgstr "gat ekki lesið tengilinn '%s'" + +#: builtin/commit.c:732 +#, fuzzy, c-format +msgid "could not open '%s'" +msgstr "gat ekki opnað möppuna '%s'" + +#: builtin/commit.c:756 +msgid "could not write commit template" +msgstr "" + +#: builtin/commit.c:769 +#, 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" +msgstr "" + +#: builtin/commit.c:782 +msgid "Please enter the commit message for your changes." +msgstr "" + +#: builtin/commit.c:785 +msgid "" +" Lines starting\n" +"with '#' will be ignored, and an empty message aborts the commit.\n" +msgstr "" + +#: builtin/commit.c:790 +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" +msgstr "" + +#: builtin/commit.c:802 +#, c-format +msgid "%sAuthor: %s" +msgstr "" + +#: builtin/commit.c:809 +#, c-format +msgid "%sCommitter: %s" +msgstr "" + +#: builtin/commit.c:829 +#, fuzzy +msgid "Cannot read index" +msgstr "gat ekki lesið tengilinn '%s'" + +#: builtin/commit.c:869 +msgid "Error building trees" +msgstr "" + +#: builtin/commit.c:884 builtin/tag.c:313 +#, c-format +msgid "Please supply the message using either -m or -F option.\n" +msgstr "" + +#: builtin/commit.c:964 +#, c-format +msgid "No existing author found with '%s'" +msgstr "" + +#: builtin/commit.c:979 builtin/commit.c:1173 +#, c-format +msgid "Invalid untracked files mode '%s'" +msgstr "" + +#: builtin/commit.c:1018 +msgid "Using both --reset-author and --author does not make sense" +msgstr "" + +#: builtin/commit.c:1032 +msgid "You have nothing to amend." +msgstr "" + +#: builtin/commit.c:1034 +#, c-format +msgid "You are in the middle of a %s -- cannot amend." +msgstr "" + +#: builtin/commit.c:1036 +msgid "Options --squash and --fixup cannot be used together" +msgstr "" + +#: builtin/commit.c:1046 +msgid "Only one of -c/-C/-F/--fixup can be used." +msgstr "" + +#: builtin/commit.c:1048 +msgid "Option -m cannot be combined with -c/-C/-F/--fixup." +msgstr "" + +#: builtin/commit.c:1054 +msgid "--reset-author can be used only with -C, -c or --amend." +msgstr "" + +#: builtin/commit.c:1071 +msgid "Only one of --include/--only/--all/--interactive/--patch can be used." +msgstr "" + +#: builtin/commit.c:1073 +msgid "No paths with --include/--only does not make sense." +msgstr "" + +#: builtin/commit.c:1075 +msgid "Clever... amending the last one with dirty index." +msgstr "" + +#: builtin/commit.c:1077 +msgid "Explicit paths specified without -i nor -o; assuming --only paths..." +msgstr "" + +#: builtin/commit.c:1087 +#, c-format +msgid "Invalid cleanup mode %s" +msgstr "" + +#: builtin/commit.c:1092 +msgid "Paths with -a does not make sense." +msgstr "" + +#: builtin/commit.c:1274 +msgid "couldn't look up newly created commit" +msgstr "" + +#: builtin/commit.c:1276 +msgid "could not parse newly created commit" +msgstr "" + +#: builtin/commit.c:1316 +msgid "detached HEAD" +msgstr "" + +#: builtin/commit.c:1318 +msgid " (root-commit)" +msgstr "" + +#: builtin/commit.c:1441 builtin/merge.c:490 +#, c-format +msgid "could not open '%s' for reading" +msgstr "" + +#: builtin/commit.c:1446 +#, c-format +msgid "Corrupt MERGE_HEAD file (%s)" +msgstr "" + +#: builtin/commit.c:1453 +msgid "could not read MERGE_MODE" +msgstr "" + +#: builtin/commit.c:1472 +#, c-format +msgid "could not read commit message: %s" +msgstr "" + +#: builtin/commit.c:1486 +#, c-format +msgid "Aborting commit due to empty commit message.\n" +msgstr "" + +#: builtin/commit.c:1493 +msgid "failed to write commit object" +msgstr "" + +#: builtin/commit.c:1511 +msgid "cannot lock HEAD ref" +msgstr "" + +#: builtin/commit.c:1515 +msgid "cannot update HEAD ref" +msgstr "" + +#: builtin/commit.c:1525 +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/describe.c:234 +#, c-format +msgid "annotated tag %s not available" +msgstr "" + +#: builtin/describe.c:238 +#, c-format +msgid "annotated tag %s has no embedded name" +msgstr "" + +#: builtin/describe.c:240 +#, c-format +msgid "tag '%s' is really '%s' here" +msgstr "" + +#: builtin/describe.c:267 +#, c-format +msgid "Not a valid object name %s" +msgstr "" + +#: builtin/describe.c:270 +#, c-format +msgid "%s is not a valid '%s' object" +msgstr "" + +#: builtin/describe.c:287 +#, fuzzy, c-format +msgid "no tag exactly matches '%s'" +msgstr "gat ekki stat-að sniðið '%s'" + +#: builtin/describe.c:289 +#, c-format +msgid "searching to describe %s\n" +msgstr "" + +#: builtin/describe.c:329 +#, c-format +msgid "finished search at %s\n" +msgstr "" + +#: builtin/describe.c:353 +#, c-format +msgid "" +"No annotated tags can describe '%s'.\n" +"However, there were unannotated tags: try --tags." +msgstr "" + +#: builtin/describe.c:357 +#, c-format +msgid "" +"No tags can describe '%s'.\n" +"Try --always, or create some tags." +msgstr "" + +#: builtin/describe.c:378 +#, c-format +msgid "traversed %lu commits\n" +msgstr "" + +#: builtin/describe.c:381 +#, c-format +msgid "" +"more than %i tags found; listed %i most recent\n" +"gave up search at %s\n" +msgstr "" + +#: builtin/describe.c:436 +msgid "--long is incompatible with --abbrev=0" +msgstr "" + +#: builtin/describe.c:462 +msgid "No names found, cannot describe anything." +msgstr "" + +#: builtin/describe.c:469 +msgid "--dirty is incompatible with committishes" +msgstr "" + +#: builtin/diff.c:76 +#, c-format +msgid "'%s': not a regular file or symlink" +msgstr "" + +#: builtin/diff.c:220 +#, c-format +msgid "invalid option: %s" +msgstr "" + +#: builtin/diff.c:296 +msgid "Not a git repository" +msgstr "" + +#: builtin/diff.c:346 +#, c-format +msgid "invalid object '%s' given." +msgstr "" + +#: builtin/diff.c:351 +#, c-format +msgid "more than %d trees given: '%s'" +msgstr "" + +#: builtin/diff.c:361 +#, c-format +msgid "more than two blobs given: '%s'" +msgstr "" + +#: builtin/diff.c:369 +#, c-format +msgid "unhandled object '%s' given." +msgstr "" + +#: builtin/fetch.c:199 +msgid "Couldn't find remote ref HEAD" +msgstr "" + +#: builtin/fetch.c:252 +#, fuzzy, c-format +msgid "object %s not found" +msgstr "sniðin funndust ekki %s" + +#: builtin/fetch.c:257 +msgid "[up to date]" +msgstr "" + +#. +#. * If this is the head, and it's not okay to update +#. * the head, and the old value of the head isn't empty... +#. +#: builtin/fetch.c:270 +#, c-format +msgid "! %-*s %-*s -> %s (can't fetch in current branch)" +msgstr "" + +#: builtin/fetch.c:271 builtin/fetch.c:342 +msgid "[rejected]" +msgstr "" + +#: builtin/fetch.c:281 +msgid "[tag update]" +msgstr "" + +#: builtin/fetch.c:282 builtin/fetch.c:307 builtin/fetch.c:323 +msgid " (unable to update local ref)" +msgstr "" + +#: builtin/fetch.c:294 +msgid "[new tag]" +msgstr "" + +#: builtin/fetch.c:298 +msgid "[new branch]" +msgstr "" + +#: builtin/fetch.c:338 +msgid "unable to update local ref" +msgstr "" + +#: builtin/fetch.c:338 +msgid "forced update" +msgstr "" + +#: builtin/fetch.c:343 +msgid "(non-fast-forward)" +msgstr "" + +#: builtin/fetch.c:361 builtin/fetch.c:684 +#, fuzzy, c-format +msgid "cannot open %s: %s\n" +msgstr "gat ekki opnað möppuna '%s'" + +#: builtin/fetch.c:439 +#, c-format +msgid "From %.*s\n" +msgstr "" + +#: builtin/fetch.c:450 +#, c-format +msgid "" +"some local refs could not be updated; try running\n" +" 'git remote prune %s' to remove any old, conflicting branches" +msgstr "" + +#: builtin/fetch.c:500 +msgid "could not run rev-list" +msgstr "" + +#: builtin/fetch.c:514 +#, c-format +msgid "failed write to rev-list: %s" +msgstr "" + +#: builtin/fetch.c:521 +#, c-format +msgid "failed to close rev-list's stdin: %s" +msgstr "" + +#: builtin/fetch.c:548 +#, c-format +msgid " (%s will become dangling)\n" +msgstr "" + +#: builtin/fetch.c:549 +#, c-format +msgid " (%s has become dangling)\n" +msgstr "" + +#: builtin/fetch.c:556 +msgid "[deleted]" +msgstr "" + +#: builtin/fetch.c:557 +msgid "(none)" +msgstr "" + +#: builtin/fetch.c:674 +#, c-format +msgid "Refusing to fetch into current branch %s of non-bare repository" +msgstr "" + +#: builtin/fetch.c:708 +#, c-format +msgid "Don't know how to fetch from %s" +msgstr "" + +#: builtin/fetch.c:762 +#, c-format +msgid "Option \"%s\" value \"%s\" is not valid for %s" +msgstr "" + +#: builtin/fetch.c:765 +#, c-format +msgid "Option \"%s\" is ignored for %s\n" +msgstr "" + +#: builtin/fetch.c:864 +#, c-format +msgid "Fetching %s\n" +msgstr "" + +#: builtin/fetch.c:866 +#, c-format +msgid "Could not fetch %s" +msgstr "" + +#: builtin/fetch.c:883 +msgid "" +"No remote repository specified. Please, specify either a URL or a\n" +"remote name from which new revisions should be fetched." +msgstr "" + +#: builtin/fetch.c:903 +msgid "You need to specify a tag name." +msgstr "" + +#: builtin/fetch.c:946 +msgid "fetch --all does not take a repository argument" +msgstr "" + +#: builtin/fetch.c:948 +msgid "fetch --all does not make sense with refspecs" +msgstr "" + +#: builtin/fetch.c:959 +#, c-format +msgid "No such remote or remote group: %s" +msgstr "" + +#: builtin/fetch.c:967 +msgid "Fetching a group and specifying refspecs does not make sense" +msgstr "" + +#: builtin/gc.c:63 +#, c-format +msgid "Invalid %s: '%s'" +msgstr "" + +#: builtin/gc.c:78 +msgid "Too many options specified" +msgstr "" + +#: builtin/gc.c:103 +#, fuzzy, c-format +msgid "insanely long object directory %.*s" +msgstr "brjáluð git mappa %s" + +#: builtin/gc.c:223 +#, c-format +msgid "Auto packing the repository for optimum performance.\n" +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" +msgstr "" + +#: builtin/gc.c:254 +msgid "" +"There are too many unreachable loose objects; run 'git prune' to remove them." +msgstr "" + +#: builtin/grep.c:256 +#, c-format +msgid "grep: failed to create thread: %s" +msgstr "" + +#: builtin/grep.c:374 +#, c-format +msgid "'%s': unable to read %s" +msgstr "" + +#: builtin/grep.c:425 +#, c-format +msgid "'%s': %s" +msgstr "" + +#: builtin/grep.c:436 +#, c-format +msgid "'%s': short read %s" +msgstr "" + +#: builtin/grep.c:498 +#, c-format +msgid "Failed to chdir: %s" +msgstr "" + +#: builtin/grep.c:573 builtin/grep.c:604 +#, c-format +msgid "unable to read tree (%s)" +msgstr "" + +#: builtin/grep.c:618 +#, c-format +msgid "unable to grep from object of type %s" +msgstr "" + +#: builtin/grep.c:674 +#, c-format +msgid "switch `%c' expects a numerical value" +msgstr "" + +#: builtin/grep.c:691 +#, fuzzy, c-format +msgid "cannot open '%s'" +msgstr "gat ekki opnað möppuna '%s'" + +#: builtin/grep.c:974 +msgid "no pattern given." +msgstr "" + +#: builtin/grep.c:1001 +#, c-format +msgid "bad object %s" +msgstr "" + +#: builtin/grep.c:1025 +msgid "--open-files-in-pager only works on the worktree" +msgstr "" + +#: builtin/grep.c:1050 +msgid "--cached cannot be used with --no-index." +msgstr "" + +#: builtin/grep.c:1052 +msgid "--no-index cannot be used with revs." +msgstr "" + +#: builtin/grep.c:1061 +msgid "both --cached and trees are given." +msgstr "" + +#: builtin/init-db.c:35 +#, c-format +msgid "Could not make %s writable by group" +msgstr "Gat ekki gert %s skrifanlega af hóp" + +#: builtin/init-db.c:62 +#, c-format +msgid "insanely long template name %s" +msgstr "brjálæðislega langt sniðsnafn %s" + +#: builtin/init-db.c:67 +#, c-format +msgid "cannot stat '%s'" +msgstr "gat ekki stat-að '%s'" + +#: builtin/init-db.c:73 +#, c-format +msgid "cannot stat template '%s'" +msgstr "gat ekki stat-að sniðið '%s'" + +#: builtin/init-db.c:80 +#, c-format +msgid "cannot opendir '%s'" +msgstr "gat ekki opnað möppuna '%s'" + +#: builtin/init-db.c:97 +#, c-format +msgid "cannot readlink '%s'" +msgstr "gat ekki lesið tengilinn '%s'" + +#: builtin/init-db.c:99 +#, c-format +msgid "insanely long symlink %s" +msgstr "brjálæðislega langur tengill %s" + +#: builtin/init-db.c:102 +#, c-format +msgid "cannot symlink '%s' '%s'" +msgstr "gat ekki búið til tengilinn '%s' '%s'" + +#: builtin/init-db.c:106 +#, c-format +msgid "cannot copy '%s' to '%s'" +msgstr "gat ekki afritað '%s' til '%s'" + +#: builtin/init-db.c:110 +#, c-format +msgid "ignoring template %s" +msgstr "hunsa sniðið %s" + +#: builtin/init-db.c:133 +#, c-format +msgid "insanely long template path %s" +msgstr "brjálæðislega löng slóð á snið %s" + +#: builtin/init-db.c:141 +#, c-format +msgid "templates not found %s" +msgstr "sniðin funndust ekki %s" + +#: builtin/init-db.c:154 +#, c-format +msgid "not copying templates of a wrong format version %d from '%s'" +msgstr "afrita ekki sniðin vegna rangar útgáfu %d frá '%s'" + +#: builtin/init-db.c:192 +#, c-format +msgid "insane git directory %s" +msgstr "brjáluð git mappa %s" + +#: 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 "%s%s Git lind í %s%s\n" + +#: builtin/init-db.c:420 +msgid "Reinitialized existing" +msgstr "Endurgerði" + +#: builtin/init-db.c:420 +msgid "Initialized empty" +msgstr "Bjó til tóma" + +#: builtin/init-db.c:421 +msgid " shared" +msgstr " sameiginlega" + +#: builtin/init-db.c:440 +msgid "cannot tell cwd" +msgstr "finn ekki núverandi möppu" + +#: builtin/init-db.c:521 builtin/init-db.c:528 +#, c-format +msgid "cannot mkdir %s" +msgstr "get ekki búið til möppuna %s" + +#: builtin/init-db.c:532 +#, c-format +msgid "cannot chdir to %s" +msgstr "get ekki farið inn í möppuna %s" + +#: builtin/init-db.c:554 +#, c-format +msgid "" +"%s (or --work-tree=) not allowed without specifying %s (or --git-" +"dir=)" +msgstr "" +"%s (eða --work-tree=) ekki leyfilegt ásamt %s (eða --git-dir=)" + +#: builtin/init-db.c:578 +msgid "Cannot access current working directory" +msgstr "Get ekki opnað núverandi möppu" + +#: builtin/init-db.c:585 +#, c-format +msgid "Cannot access work tree '%s'" +msgstr "Get ekki opnað tréð '%s'" + +#: builtin/log.c:186 +#, c-format +msgid "Final output: %d %s\n" +msgstr "" + +#: builtin/log.c:287 builtin/log.c:721 builtin/log.c:1274 builtin/log.c:1492 +#: builtin/merge.c:338 builtin/revert.c:539 builtin/shortlog.c:181 +msgid "revision walk setup failed" +msgstr "" + +#: builtin/log.c:397 builtin/log.c:486 +#, c-format +msgid "Could not read object %s" +msgstr "" + +#: builtin/log.c:510 +#, c-format +msgid "Unknown type: %d" +msgstr "" + +#: builtin/log.c:605 +msgid "format.headers without value" +msgstr "" + +#: builtin/log.c:677 +msgid "name of output directory is too long" +msgstr "" + +#: builtin/log.c:688 +#, fuzzy, c-format +msgid "Cannot open patch file %s" +msgstr "gat ekki opnað möppuna '%s'" + +#: builtin/log.c:702 +msgid "Need exactly one range." +msgstr "" + +#: builtin/log.c:710 +msgid "Not a range." +msgstr "" + +#: builtin/log.c:747 +msgid "Could not extract email from committer identity." +msgstr "" + +#: builtin/log.c:779 +msgid "Cover letter needs email format" +msgstr "" + +#: builtin/log.c:872 +#, fuzzy, c-format +msgid "insane in-reply-to: %s" +msgstr "brjáluð git mappa %s" + +#: builtin/log.c:945 +msgid "Two output directories?" +msgstr "" + +#: builtin/log.c:1136 +#, c-format +msgid "bogus committer info %s" +msgstr "" + +#: builtin/log.c:1181 +msgid "-n and -k are mutually exclusive." +msgstr "" + +#: builtin/log.c:1183 +msgid "--subject-prefix and -k are mutually exclusive." +msgstr "" + +#: builtin/log.c:1188 builtin/shortlog.c:284 +#, c-format +msgid "unrecognized argument: %s" +msgstr "" + +#: builtin/log.c:1191 +msgid "--name-only does not make sense" +msgstr "" + +#: builtin/log.c:1193 +msgid "--name-status does not make sense" +msgstr "" + +#: builtin/log.c:1195 +msgid "--check does not make sense" +msgstr "" + +#: builtin/log.c:1218 +msgid "standard output, or directory, which one?" +msgstr "" + +#: builtin/log.c:1220 +#, c-format +msgid "Could not create directory '%s'" +msgstr "" + +#: builtin/log.c:1355 +msgid "Failed to create output files" +msgstr "" + +#: builtin/log.c:1458 +#, c-format +msgid "" +"Could not find a tracked remote branch, please specify manually.\n" +msgstr "" + +#: builtin/log.c:1474 builtin/log.c:1476 builtin/log.c:1488 +#, c-format +msgid "Unknown commit %s" +msgstr "" + +#: builtin/merge.c:88 +msgid "switch `m' requires a value" +msgstr "" + +#: builtin/merge.c:125 +#, c-format +msgid "Could not find merge strategy '%s'.\n" +msgstr "" + +#: builtin/merge.c:126 +#, c-format +msgid "Available strategies are:" +msgstr "" + +#: builtin/merge.c:131 +#, c-format +msgid "Available custom strategies are:" +msgstr "" + +#: builtin/merge.c:233 +msgid "could not run stash." +msgstr "" + +#: builtin/merge.c:238 +msgid "stash failed" +msgstr "" + +#: builtin/merge.c:243 +#, c-format +msgid "not a valid object: %s" +msgstr "" + +#: builtin/merge.c:261 builtin/merge.c:278 +msgid "read-tree failed" +msgstr "" + +#: builtin/merge.c:307 +msgid " (nothing to squash)" +msgstr "" + +#: builtin/merge.c:320 +#, c-format +msgid "Squash commit -- not updating HEAD\n" +msgstr "" + +#: builtin/merge.c:323 builtin/merge.c:844 builtin/merge.c:1430 +#: builtin/merge.c:1442 builtin/revert.c:213 +#, c-format +msgid "Could not write to '%s'" +msgstr "" + +#: builtin/merge.c:352 +msgid "Writing SQUASH_MSG" +msgstr "" + +#: builtin/merge.c:354 +msgid "Finishing SQUASH_MSG" +msgstr "" + +#: builtin/merge.c:374 +#, c-format +msgid "No merge message -- not updating HEAD\n" +msgstr "" + +#: builtin/merge.c:425 +#, c-format +msgid "'%s' does not point to a commit" +msgstr "" + +#: builtin/merge.c:517 +#, c-format +msgid "Bad branch.%s.mergeoptions string: %s" +msgstr "" + +#: builtin/merge.c:550 +#, c-format +msgid "%s: negative length %s" +msgstr "" + +#: builtin/merge.c:609 +msgid "git write-tree failed to write a tree" +msgstr "" + +#: builtin/merge.c:659 +msgid "failed to read the cache" +msgstr "" + +#: builtin/merge.c:676 +msgid "Unable to write index." +msgstr "" + +#: builtin/merge.c:689 +msgid "Not handling anything other than two heads merge." +msgstr "" + +#: builtin/merge.c:703 +#, c-format +msgid "Unknown option for merge-recursive: -X%s" +msgstr "" + +#: builtin/merge.c:717 +#, c-format +msgid "unable to write %s" +msgstr "" + +#: builtin/merge.c:841 builtin/merge.c:920 builtin/merge.c:1427 +#: builtin/merge.c:1436 builtin/revert.c:210 +#, fuzzy, c-format +msgid "Could not open '%s' for writing" +msgstr "Gat ekki gert %s skrifanlega af hóp" + +#: builtin/merge.c:852 +#, c-format +msgid "Could not read from '%s'" +msgstr "" + +#: builtin/merge.c:869 +#, c-format +msgid "Wonderful.\n" +msgstr "" + +#: builtin/merge.c:936 +#, c-format +msgid "Automatic merge failed; fix conflicts and then commit the result.\n" +msgstr "" + +#: builtin/merge.c:951 +#, c-format +msgid "'%s' is not a commit" +msgstr "" + +#: builtin/merge.c:992 +msgid "No current branch." +msgstr "" + +#: builtin/merge.c:994 +msgid "No remote for the current branch." +msgstr "" + +#: builtin/merge.c:996 +msgid "No default upstream defined for the current branch." +msgstr "" + +#: builtin/merge.c:1001 +#, c-format +msgid "No remote tracking branch for %s from %s" +msgstr "" + +#: builtin/merge.c:1053 +msgid "There is no merge to abort (MERGE_HEAD missing)." +msgstr "" + +#: builtin/merge.c:1068 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:1071 git-pull.sh:34 +msgid "You have not concluded your merge (MERGE_HEAD exists)." +msgstr "" + +#: builtin/merge.c:1075 +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:1078 +msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." +msgstr "" + +#: builtin/merge.c:1087 +msgid "You cannot combine --squash with --no-ff." +msgstr "" + +#: builtin/merge.c:1092 +msgid "You cannot combine --no-ff with --ff-only." +msgstr "" + +#: builtin/merge.c:1126 +msgid "Can merge only exactly one commit into empty head" +msgstr "" + +#: builtin/merge.c:1129 +msgid "Squash commit into empty head not supported yet" +msgstr "" + +#: builtin/merge.c:1131 +msgid "Non-fast-forward commit does not make sense into an empty head" +msgstr "" + +#: builtin/merge.c:1135 builtin/merge.c:1181 +#, c-format +msgid "%s - not something we can merge" +msgstr "" + +#: builtin/merge.c:1239 +#, c-format +msgid "Updating %s..%s\n" +msgstr "" + +#: builtin/merge.c:1273 +#, c-format +msgid "Trying really trivial in-index merge...\n" +msgstr "" + +#: builtin/merge.c:1277 +#, c-format +msgid "Nope.\n" +msgstr "" + +#: builtin/merge.c:1310 +msgid "Not possible to fast-forward, aborting." +msgstr "" + +#: builtin/merge.c:1336 builtin/merge.c:1409 +#, c-format +msgid "Rewinding the tree to pristine...\n" +msgstr "" + +#: builtin/merge.c:1340 +#, c-format +msgid "Trying merge strategy %s...\n" +msgstr "" + +#: builtin/merge.c:1401 +#, c-format +msgid "No merge strategy handled the merge.\n" +msgstr "" + +#: builtin/merge.c:1403 +#, c-format +msgid "Merge with strategy %s failed.\n" +msgstr "" + +#: builtin/merge.c:1411 +#, c-format +msgid "Using the %s to prepare resolving by hand.\n" +msgstr "" + +#: builtin/merge.c:1447 +#, c-format +msgid "Automatic merge went well; stopped before committing as requested\n" +msgstr "" + +#: builtin/mv.c:103 +#, fuzzy, c-format +msgid "Checking rename of '%s' to '%s'\n" +msgstr "gat ekki afritað '%s' til '%s'" + +#: builtin/mv.c:107 +msgid "bad source" +msgstr "" + +#: builtin/mv.c:110 +msgid "can not move directory into itself" +msgstr "" + +#: builtin/mv.c:113 +msgid "cannot move directory over file" +msgstr "" + +#: builtin/mv.c:123 +#, c-format +msgid "Huh? %.*s is in index?" +msgstr "" + +#: builtin/mv.c:135 +msgid "source directory is empty" +msgstr "" + +#: builtin/mv.c:166 +msgid "not under version control" +msgstr "" + +#: builtin/mv.c:168 +msgid "destination exists" +msgstr "" + +#: builtin/mv.c:175 +#, c-format +msgid "%s; will overwrite!" +msgstr "" + +#: builtin/mv.c:178 +msgid "Cannot overwrite" +msgstr "" + +#: builtin/mv.c:181 +msgid "multiple sources for the same target" +msgstr "" + +#: builtin/mv.c:196 +#, c-format +msgid "%s, source=%s, destination=%s" +msgstr "" + +#: builtin/mv.c:206 +#, c-format +msgid "Renaming %s to %s\n" +msgstr "" + +#: builtin/mv.c:209 +#, 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/notes.c:158 +#, c-format +msgid "failed to finish 'show' for object '%s'" +msgstr "" + +#: builtin/notes.c:175 builtin/tag.c:303 +#, fuzzy, c-format +msgid "could not create file '%s'" +msgstr "gat ekki lesið tengilinn '%s'" + +#: builtin/notes.c:189 +msgid "Please supply the note contents using either -m or -F option" +msgstr "" + +#: builtin/notes.c:210 builtin/notes.c:968 +#, c-format +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:448 +#, fuzzy, c-format +msgid "cannot read '%s'" +msgstr "gat ekki lesið tengilinn '%s'" + +#: builtin/notes.c:253 builtin/tag.c:451 +#, fuzzy, c-format +msgid "could not open or read '%s'" +msgstr "gat ekki opnað möppuna '%s'" + +#: builtin/notes.c:272 builtin/notes.c:445 builtin/notes.c:447 +#: builtin/notes.c:507 builtin/notes.c:561 builtin/notes.c:644 +#: builtin/notes.c:649 builtin/notes.c:724 builtin/notes.c:766 +#: builtin/notes.c:963 builtin/reset.c:303 builtin/tag.c:464 +#, 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 +#, fuzzy, c-format +msgid "Failed to copy notes from '%s' to '%s'" +msgstr "gat ekki afritað '%s' til '%s'" + +#: builtin/notes.c:500 builtin/notes.c:554 builtin/notes.c:627 +#: builtin/notes.c:639 builtin/notes.c:712 builtin/notes.c:759 +#: builtin/notes.c:1028 +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:966 +#, c-format +msgid "Object %s has no note\n" +msgstr "" + +#: builtin/notes.c:1098 +#, c-format +msgid "Unknown subcommand: %s" +msgstr "" + +#: builtin/push.c:43 +msgid "tag shorthand without " +msgstr "" + +#: builtin/push.c:62 +msgid "--delete only accepts plain target ref names" +msgstr "" + +#: builtin/push.c:72 +#, 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:79 +#, 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:87 +#, c-format +msgid "The current branch %s has multiple upstream branches, refusing to push." +msgstr "" + +#: builtin/push.c:110 +msgid "" +"You didn't specify any refspecs to push, and push.default is \"nothing\"." +msgstr "" + +#: builtin/push.c:130 +#, c-format +msgid "Pushing to %s\n" +msgstr "" + +#: builtin/push.c:134 +#, c-format +msgid "failed to push some refs to '%s'" +msgstr "" + +#: builtin/push.c:142 +#, 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 "" + +#: builtin/push.c:159 +#, c-format +msgid "bad repository '%s'" +msgstr "" + +#: builtin/push.c:160 +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:175 +msgid "--all and --tags are incompatible" +msgstr "" + +#: builtin/push.c:176 +msgid "--all can't be combined with refspecs" +msgstr "" + +#: builtin/push.c:181 +msgid "--mirror and --tags are incompatible" +msgstr "" + +#: builtin/push.c:182 +msgid "--mirror can't be combined with refspecs" +msgstr "" + +#: builtin/push.c:187 +msgid "--all and --mirror are incompatible" +msgstr "" + +#: builtin/push.c:253 +msgid "--delete is incompatible with --all, --mirror and --tags" +msgstr "" + +#: builtin/push.c:255 +msgid "--delete doesn't make sense without any refs" +msgstr "" + +#: builtin/reset.c:33 +msgid "mixed" +msgstr "" + +#: builtin/reset.c:33 +msgid "soft" +msgstr "" + +#: builtin/reset.c:33 +msgid "hard" +msgstr "" + +#: builtin/reset.c:33 +msgid "merge" +msgstr "" + +#: builtin/reset.c:33 +msgid "keep" +msgstr "" + +#: builtin/reset.c:95 +msgid "You do not have a valid HEAD." +msgstr "" + +#: builtin/reset.c:97 +msgid "Failed to find tree of HEAD." +msgstr "" + +#: builtin/reset.c:103 +#, c-format +msgid "Failed to find tree of %s." +msgstr "" + +#: builtin/reset.c:108 +msgid "Could not write new index file." +msgstr "" + +#: builtin/reset.c:118 +#, c-format +msgid "HEAD is now at %s" +msgstr "" + +#: builtin/reset.c:142 +msgid "Could not read index" +msgstr "" + +#: builtin/reset.c:145 +msgid "Unstaged changes after reset:" +msgstr "" + +#: builtin/reset.c:225 +#, c-format +msgid "Reflog action message too long: %.*s..." +msgstr "" + +#: builtin/reset.c:231 +#, c-format +msgid "Cannot do a %s reset in the middle of a merge." +msgstr "" + +#: builtin/reset.c:307 +#, c-format +msgid "Could not parse object '%s'." +msgstr "" + +#: builtin/reset.c:312 +msgid "--patch is incompatible with --{hard,mixed,soft}" +msgstr "" + +#: builtin/reset.c:321 +msgid "--mixed with paths is deprecated; use 'git reset -- ' instead." +msgstr "" + +#: builtin/reset.c:323 +#, c-format +msgid "Cannot do %s reset with paths." +msgstr "" + +#: builtin/reset.c:335 +#, c-format +msgid "%s reset is not allowed in a bare repository" +msgstr "" + +#: builtin/reset.c:351 +#, c-format +msgid "Could not reset index file to revision '%s'." +msgstr "" + +#: builtin/revert.c:99 +msgid "program error" +msgstr "" + +#: builtin/revert.c:171 +#, c-format +msgid "Could not read commit message of %s" +msgstr "" + +#: builtin/revert.c:253 +#, c-format +msgid "Could not write to %s." +msgstr "" + +#: builtin/revert.c:256 +#, c-format +msgid "Error wrapping up %s" +msgstr "" + +#: builtin/revert.c:276 +msgid "" +"Your local changes would be overwritten by revert.\n" +"Please, commit your changes or stash them to proceed." +msgstr "" + +#: builtin/revert.c:279 +msgid "" +"Your local changes would be overwritten by cherry-pick.\n" +"Please, commit your changes or stash them to proceed." +msgstr "" + +#: builtin/revert.c:283 +msgid "Your local changes would be overwritten by revert.\n" +msgstr "" + +#: builtin/revert.c:285 +msgid "Your local changes would be overwritten by cherry-pick.\n" +msgstr "" + +#. TRANSLATORS: %s will be "revert" or "cherry-pick" +#: builtin/revert.c:335 +#, c-format +msgid "%s: Unable to write new index file" +msgstr "" + +#: builtin/revert.c:401 +msgid "Your index file is unmerged." +msgstr "" + +#: builtin/revert.c:404 +msgid "You do not have a valid HEAD" +msgstr "" + +#: builtin/revert.c:419 +#, c-format +msgid "Commit %s is a merge but no -m option was given." +msgstr "" + +#: builtin/revert.c:427 +#, c-format +msgid "Commit %s does not have parent %d" +msgstr "" + +#: builtin/revert.c:431 +#, 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 +#: builtin/revert.c:442 +#, c-format +msgid "%s: cannot parse parent commit %s" +msgstr "" + +#: builtin/revert.c:446 +#, c-format +msgid "Cannot get commit message for %s" +msgstr "" + +#: builtin/revert.c:508 +#, c-format +msgid "could not revert %s... %s" +msgstr "" + +#: builtin/revert.c:509 +#, c-format +msgid "could not apply %s... %s" +msgstr "" + +#: builtin/revert.c:542 +msgid "empty commit set passed" +msgstr "" + +#: builtin/revert.c:550 +#, c-format +msgid "git %s: failed to read the index" +msgstr "" + +#: builtin/revert.c:555 +#, c-format +msgid "git %s: failed to refresh the index" +msgstr "" + +#: builtin/revert.c:571 +msgid "cherry-pick --ff cannot be used with --signoff" +msgstr "" + +#: builtin/revert.c:573 +msgid "cherry-pick --ff cannot be used with --no-commit" +msgstr "" + +#: builtin/revert.c:575 +msgid "cherry-pick --ff cannot be used with -x" +msgstr "" + +#: builtin/revert.c:577 +msgid "cherry-pick --ff cannot be used with --edit" +msgstr "" + +#: builtin/rm.c:109 +#, c-format +msgid "" +"'%s' has staged content different from both the file and the HEAD\n" +"(use -f to force removal)" +msgstr "" + +#: builtin/rm.c:115 +#, c-format +msgid "" +"'%s' has changes staged in the index\n" +"(use --cached to keep the file, or -f to force removal)" +msgstr "" + +#: builtin/rm.c:119 +#, c-format +msgid "" +"'%s' has local modifications\n" +"(use --cached to keep the file, or -f to force removal)" +msgstr "" + +#: builtin/rm.c:194 +#, c-format +msgid "not removing '%s' recursively without -r" +msgstr "" + +#: builtin/rm.c:230 +#, c-format +msgid "git rm: unable to remove %s" +msgstr "" + +#: builtin/shortlog.c:157 +#, c-format +msgid "Missing author: %s" +msgstr "" + +#: builtin/tag.c:121 +#, c-format +msgid "tag name too long: %.*s..." +msgstr "" + +#: builtin/tag.c:126 +#, fuzzy, c-format +msgid "tag '%s' not found." +msgstr "sniðin funndust ekki %s" + +#: builtin/tag.c:141 +#, c-format +msgid "Deleted tag '%s' (was %s)\n" +msgstr "" + +#: builtin/tag.c:153 +#, c-format +msgid "could not verify the tag '%s'" +msgstr "" + +#: builtin/tag.c:168 +msgid "committer info too long." +msgstr "" + +#: builtin/tag.c:188 +msgid "could not run gpg." +msgstr "" + +#: builtin/tag.c:194 +msgid "gpg did not accept the tag data" +msgstr "" + +#: builtin/tag.c:201 +msgid "gpg failed to sign the tag" +msgstr "" + +#: builtin/tag.c:216 +msgid "" +"\n" +"#\n" +"# Write a tag message\n" +"#\n" +msgstr "" + +#: builtin/tag.c:224 +#, c-format +msgid "signing key value too long (%.10s...)" +msgstr "" + +#: builtin/tag.c:264 +msgid "unable to sign the tag" +msgstr "" + +#: builtin/tag.c:266 +msgid "unable to write tag file" +msgstr "" + +#: builtin/tag.c:281 +msgid "bad object type." +msgstr "" + +#: builtin/tag.c:294 +msgid "tag header too big." +msgstr "" + +#: builtin/tag.c:321 +msgid "no tag message?" +msgstr "" + +#: builtin/tag.c:327 +#, c-format +msgid "The tag message has been left in %s\n" +msgstr "" + +#: builtin/tag.c:431 +msgid "-n option is only allowed with -l." +msgstr "" + +#: builtin/tag.c:433 +msgid "--contains option is only allowed with -l." +msgstr "" + +#: builtin/tag.c:441 +msgid "only one -F or -m option is allowed." +msgstr "" + +#: builtin/tag.c:461 +msgid "too many params" +msgstr "" + +#: builtin/tag.c:467 +#, c-format +msgid "'%s' is not a valid tag name." +msgstr "" + +#: builtin/tag.c:472 +#, c-format +msgid "tag '%s' already exists" +msgstr "" + +#: builtin/tag.c:480 +#, c-format +msgid "%s: cannot lock the ref" +msgstr "" + +#: builtin/tag.c:482 +#, c-format +msgid "%s: cannot update the ref" +msgstr "" + +#: builtin/tag.c:484 +#, c-format +msgid "Updated tag '%s' (was %s)\n" +msgstr "" + +#: git-am.sh:47 +msgid "You need to set your committer info first" +msgstr "" + +#: git-am.sh:93 +msgid "" +"You seem to have moved HEAD since the last 'am' failure.\n" +"Not rewinding to ORIG_HEAD" +msgstr "" + +#: git-am.sh:105 +#, sh-format +msgid "" +"When you have resolved this problem run \"$cmdline --resolved\".\n" +"If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n" +"To restore the original branch and stop patching run \"$cmdline --abort\"." +msgstr "" + +#: git-am.sh:121 +msgid "Cannot fall back to three-way merge." +msgstr "" + +#: git-am.sh:136 +msgid "Repository lacks necessary blobs to fall back on 3-way merge." +msgstr "" + +#: git-am.sh:145 +msgid "" +"Did you hand edit your patch?\n" +"It does not apply to blobs recorded in its index." +msgstr "" + +#: git-am.sh:154 +msgid "Falling back to patching base and 3-way merge..." +msgstr "" + +#: git-am.sh:261 +msgid "Only one StGIT patch series can be applied at once" +msgstr "" + +#: git-am.sh:313 +#, sh-format +msgid "Patch format $patch_format is not supported." +msgstr "" + +#: git-am.sh:315 +msgid "Patch format detection failed." +msgstr "" + +#: git-am.sh:365 +msgid "-d option is no longer supported. Do not use." +msgstr "" + +#: git-am.sh:428 +#, sh-format +msgid "previous rebase directory $dotest still exists but mbox given." +msgstr "" + +#: git-am.sh:433 +msgid "Please make up your mind. --skip or --abort?" +msgstr "" + +#: git-am.sh:460 +msgid "Resolve operation not in progress, we are not resuming." +msgstr "" + +#: git-am.sh:525 +#, sh-format +msgid "Dirty index: cannot apply patches (dirty: $files)" +msgstr "" + +#: git-am.sh:614 +#, sh-format +msgid "" +"Patch is empty. Was it split wrong?\n" +"If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n" +"To restore the original branch and stop patching run \"$cmdline --abort\"." +msgstr "" + +#: git-am.sh:651 +msgid "Patch does not have a valid e-mail address." +msgstr "" + +#: git-am.sh:698 +msgid "cannot be interactive without stdin connected to a terminal." +msgstr "" + +#: git-am.sh:702 +msgid "Commit Body is:" +msgstr "" + +#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] +#. in your translation. The program will only accept English +#. input at this point. +#: git-am.sh:709 +msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " +msgstr "" + +#: git-am.sh:745 +#, sh-format +msgid "Applying: $FIRSTLINE" +msgstr "" + +#: git-am.sh:766 +msgid "" +"No changes - did you forget to use 'git add'?\n" +"If there is nothing left to stage, chances are that something else\n" +"already introduced the same changes; you might want to skip this patch." +msgstr "" + +#: git-am.sh:774 +msgid "" +"You still have unmerged paths in your index\n" +"did you forget to use 'git add'?" +msgstr "" + +#: git-am.sh:790 +msgid "No changes -- Patch already applied." +msgstr "" + +#: git-am.sh:800 +#, sh-format +msgid "Patch failed at $msgnum $FIRSTLINE" +msgstr "" + +#: git-am.sh:816 +msgid "applying to an empty history" +msgstr "" + +#: git-bisect.sh:40 +msgid "You need to start by \"git bisect start\"" +msgstr "" + +#. TRANSLATORS: Make sure to include [Y] and [n] in your +#. translation. The program will only accept English input +#. at this point. +#: git-bisect.sh:48 +msgid "Do you want me to do it for you [Y/n]? " +msgstr "" + +#: git-bisect.sh:67 +msgid "Bad HEAD - I need a HEAD" +msgstr "" + +#: git-bisect.sh:86 +msgid "won't bisect on seeked tree" +msgstr "" + +#: git-bisect.sh:90 +msgid "Bad HEAD - strange symbolic ref" +msgstr "" + +#: git-bisect.sh:120 +#, sh-format +msgid "'$arg' does not appear to be a valid revision" +msgstr "" + +#: git-bisect.sh:165 +#, sh-format +msgid "Bad bisect_write argument: $state" +msgstr "" + +#: git-bisect.sh:193 +#, sh-format +msgid "Bad rev input: $arg" +msgstr "" + +#: git-bisect.sh:207 +msgid "Please call 'bisect_state' with at least one argument." +msgstr "" + +#: git-bisect.sh:210 +msgid "Bad rev input: HEAD" +msgstr "" + +#: git-bisect.sh:219 +#, sh-format +msgid "Bad rev input: $rev" +msgstr "" + +#: git-bisect.sh:225 +msgid "'git bisect bad' can take only one argument." +msgstr "" + +#. have bad but not good. we could bisect although +#. this is less optimum. +#: git-bisect.sh:249 +msgid "Warning: bisecting only with a bad commit." +msgstr "" + +#. TRANSLATORS: Make sure to include [Y] and [n] in your +#. translation. The program will only accept English input +#. at this point. +#: git-bisect.sh:257 +msgid "Are you sure [Y/n]? " +msgstr "" + +#: git-bisect.sh:268 +msgid "" +"You need to give me at least one good and one bad revisions.\n" +"(You can use \"git bisect bad\" and \"git bisect good\" for that.)" +msgstr "" + +#: git-bisect.sh:274 +msgid "" +"You need to start by \"git bisect start\".\n" +"You then need to give me at least one good and one bad revisions.\n" +"(You can use \"git bisect bad\" and \"git bisect good\" for that.)" +msgstr "" + +#: git-bisect.sh:330 git-bisect.sh:457 +msgid "We are not bisecting." +msgstr "" + +#: git-bisect.sh:337 +#, sh-format +msgid "'$invalid' is not a valid commit" +msgstr "" + +#: git-bisect.sh:346 +#, sh-format +msgid "" +"Could not check out original HEAD '$branch'.\n" +"Try 'git bisect reset '." +msgstr "" + +#: git-bisect.sh:371 +msgid "No logfile given" +msgstr "" + +#: git-bisect.sh:372 +#, sh-format +msgid "cannot read $file for replaying" +msgstr "" + +#: git-bisect.sh:388 +msgid "?? what are you talking about?" +msgstr "" + +#: git-bisect.sh:400 +#, sh-format +msgid "running $command" +msgstr "" + +#: git-bisect.sh:407 +#, sh-format +msgid "" +"bisect run failed:\n" +"exit code $res from '$command' is < 0 or >= 128" +msgstr "" + +#: git-bisect.sh:433 +msgid "bisect run cannot continue any more" +msgstr "" + +#: git-bisect.sh:441 +#, sh-format +msgid "" +"bisect run failed:\n" +"'bisect_state $state' exited with error code $res" +msgstr "" + +#: git-bisect.sh:449 +msgid "bisect run success" +msgstr "" + +#: git-pull.sh:21 +msgid "" +"Pull is not possible because you have unmerged files.\n" +"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 "" + +#: git-pull.sh:25 +msgid "Pull is not possible because you have unmerged files." +msgstr "" + +#: git-pull.sh:189 +msgid "updating an unborn branch with changes added to the index" +msgstr "" + +#. The fetch involved updating the current branch. +#. The working tree and the index file is still based on the +#. $orig_head commit, but we are merging into $curr_head. +#. First update the working tree to match $curr_head. +#: git-pull.sh:221 +#, sh-format +msgid "" +"Warning: fetch updated the current branch head.\n" +"Warning: fast-forwarding your working tree from\n" +"Warning: commit $orig_head." +msgstr "" + +#: git-pull.sh:248 +msgid "Cannot merge multiple branches into empty head" +msgstr "" + +#: git-pull.sh:252 +msgid "Cannot rebase onto multiple branches" +msgstr "" + +#: git-stash.sh:43 +msgid "git stash clear with parameters is unimplemented" +msgstr "" + +#: git-stash.sh:65 +msgid "You do not have the initial commit yet" +msgstr "" + +#: git-stash.sh:80 +#, fuzzy +msgid "Cannot save the current index state" +msgstr "Get ekki opnað núverandi möppu" + +#: git-stash.sh:94 git-stash.sh:107 +#, fuzzy +msgid "Cannot save the current worktree state" +msgstr "Get ekki opnað núverandi möppu" + +#: git-stash.sh:111 +msgid "No changes selected" +msgstr "" + +#: git-stash.sh:114 +msgid "Cannot remove temporary index (can't happen)" +msgstr "" + +#: git-stash.sh:127 +#, fuzzy +msgid "Cannot record working tree state" +msgstr "Get ekki opnað tréð '%s'" + +#: git-stash.sh:182 +msgid "No local changes to save" +msgstr "" + +#: git-stash.sh:186 +msgid "Cannot initialize stash" +msgstr "" + +#: git-stash.sh:194 +msgid "Cannot save the current status" +msgstr "" + +#: git-stash.sh:207 +#, fuzzy +msgid "Cannot remove worktree changes" +msgstr "Get ekki opnað tréð '%s'" + +#: git-stash.sh:302 +msgid "No stash found." +msgstr "" + +#: git-stash.sh:309 +#, sh-format +msgid "Too many revisions specified: $REV" +msgstr "" + +#: git-stash.sh:315 +#, sh-format +msgid "$reference is not valid reference" +msgstr "" + +#: git-stash.sh:340 +#, sh-format +msgid "'$args' is not a stash-like commit" +msgstr "" + +#: git-stash.sh:351 +#, sh-format +msgid "'$args' is not a stash reference" +msgstr "" + +#: git-stash.sh:359 +msgid "unable to refresh index" +msgstr "" + +#: git-stash.sh:363 +msgid "Cannot apply a stash in the middle of a merge" +msgstr "" + +#: git-stash.sh:371 +msgid "Conflicts in index. Try without --index." +msgstr "" + +#: git-stash.sh:373 +msgid "Could not save index tree" +msgstr "" + +#: git-stash.sh:399 +msgid "Cannot unstage modified files" +msgstr "" + +#: git-stash.sh:414 +msgid "Index was not unstashed." +msgstr "" + +#: git-stash.sh:433 +#, sh-format +msgid "Dropped ${REV} ($s)" +msgstr "" + +#: git-stash.sh:434 +#, sh-format +msgid "${REV}: Could not drop stash entry" +msgstr "" + +#: git-stash.sh:441 +msgid "No branch name specified" +msgstr "" + +#: git-stash.sh:512 +msgid "(To restore them type \"git stash apply\")" +msgstr "" + +#: git-submodule.sh:38 +#, sh-format +msgid "remote ($remote) does not have a url defined in .git/config" +msgstr "" + +#: git-submodule.sh:56 +#, sh-format +msgid "cannot strip one component off url '$remoteurl'" +msgstr "" + +#: git-submodule.sh:108 +#, sh-format +msgid "No submodule mapping found in .gitmodules for path '$path'" +msgstr "" + +#: git-submodule.sh:132 +#, sh-format +msgid "Clone of '$url' into submodule path '$path' failed" +msgstr "" + +#: git-submodule.sh:205 +#, sh-format +msgid "repo URL: '$repo' must be absolute or begin with ./|../" +msgstr "" + +#: git-submodule.sh:222 +#, sh-format +msgid "'$path' already exists in the index" +msgstr "" + +#: git-submodule.sh:227 +#, sh-format +msgid "" +"The following path is ignored by one of your .gitignore files:\n" +"$path\n" +"Use -f if you really want to add it." +msgstr "" + +#: git-submodule.sh:240 +#, sh-format +msgid "Adding existing repo at '$path' to the index" +msgstr "" + +#: git-submodule.sh:242 +#, sh-format +msgid "'$path' already exists and is not a valid git repo" +msgstr "" + +#: git-submodule.sh:265 +#, sh-format +msgid "Unable to checkout submodule '$path'" +msgstr "" + +#: git-submodule.sh:269 +#, sh-format +msgid "Failed to add submodule '$path'" +msgstr "" + +#: git-submodule.sh:274 +#, sh-format +msgid "Failed to register submodule '$path'" +msgstr "" + +#: git-submodule.sh:312 +#, sh-format +msgid "Entering '$prefix$path'" +msgstr "" + +#: git-submodule.sh:324 +#, sh-format +msgid "Stopping at '$path'; script returned non-zero status." +msgstr "" + +#: git-submodule.sh:367 +#, sh-format +msgid "No url found for submodule path '$path' in .gitmodules" +msgstr "" + +#: git-submodule.sh:377 +#, sh-format +msgid "Failed to register url for submodule path '$path'" +msgstr "" + +#: git-submodule.sh:382 +#, sh-format +msgid "Failed to register update mode for submodule path '$path'" +msgstr "" + +#: git-submodule.sh:384 +#, sh-format +msgid "Submodule '$name' ($url) registered for path '$path'" +msgstr "" + +#: git-submodule.sh:467 +#, sh-format +msgid "" +"Submodule path '$path' not initialized\n" +"Maybe you want to use 'update --init'?" +msgstr "" + +#: git-submodule.sh:480 +#, sh-format +msgid "Unable to find current revision in submodule path '$path'" +msgstr "" + +#: git-submodule.sh:504 +#, sh-format +msgid "Unable to fetch in submodule path '$path'" +msgstr "" + +#: git-submodule.sh:517 +#, sh-format +msgid "Unable to rebase '$sha1' in submodule path '$path'" +msgstr "" + +#: git-submodule.sh:518 +#, sh-format +msgid "Submodule path '$path': rebased into '$sha1'" +msgstr "" + +#: git-submodule.sh:522 +#, sh-format +msgid "Unable to merge '$sha1' in submodule path '$path'" +msgstr "" + +#: git-submodule.sh:523 +#, sh-format +msgid "Submodule path '$path': merged in '$sha1'" +msgstr "" + +#: git-submodule.sh:527 +#, sh-format +msgid "Unable to checkout '$sha1' in submodule path '$path'" +msgstr "" + +#: git-submodule.sh:528 +#, sh-format +msgid "Submodule path '$path': checked out '$sha1'" +msgstr "" + +#: git-submodule.sh:539 git-submodule.sh:841 +#, sh-format +msgid "Failed to recurse into submodule path '$path'" +msgstr "" + +#: git-submodule.sh:623 +msgid "--" +msgstr "" + +#. unexpected type +#: git-submodule.sh:664 +#, sh-format +msgid "unexpected mode $mod_dst" +msgstr "" + +#: git-submodule.sh:684 +#, sh-format +msgid " Warn: $name doesn't contain commit $sha1_src" +msgstr "" + +#: git-submodule.sh:687 +#, sh-format +msgid " Warn: $name doesn't contain commit $sha1_dst" +msgstr "" + +#: git-submodule.sh:690 +#, sh-format +msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst" +msgstr "" + +#: git-submodule.sh:715 +msgid "blob" +msgstr "" + +#: git-submodule.sh:716 +msgid "submodule" +msgstr "" + +#: git-submodule.sh:753 +msgid "# Submodules changed but not updated:" +msgstr "" + +#: git-submodule.sh:755 +msgid "# Submodule changes to be committed:" +msgstr "" + +#: git-submodule.sh:885 #, sh-format -msgid "TEST: A Shell test $variable" -msgstr "TILRAUN: Skeljartilraunastrengur með breytunni $variable" +msgid "Synchronizing submodule url for '$name'" +msgstr "" + +#~ msgid "See 'git help COMMAND' for more information on a specific command." +#~ msgstr "Sjá 'git help SKIPUN' til að sjá hjálp fyrir tiltekna skipun." + +#~ msgid "TEST: A C test string" +#~ msgstr "TILRAUN: C tilraunastrengur" + +#~ msgid "TEST: A C test string %s" +#~ msgstr "TILRAUN: C tilraunastrengur %s" + +#~ msgid "TEST: A Shell test string" +#~ msgstr "TILRAUN: Skeljartilraunastrengur" + +#~ msgid "TEST: A Shell test $variable" +#~ msgstr "TILRAUN: Skeljartilraunastrengur með breytunni $variable" -#. TRANSLATORS: This is a test. You don't need to translate it. -#: t/t0200/test.perl:8 -msgid "TEST: A Perl test string" -msgstr "TILRAUN: Perl tilraunastrengur" +#~ msgid "TEST: A Perl test string" +#~ msgstr "TILRAUN: Perl tilraunastrengur" -#. TRANSLATORS: This is a test. You don't need to translate it. -#: t/t0200/test.perl:11 -#, perl-format -msgid "TEST: A Perl test variable %s" -msgstr "TILRAUN: Perl tilraunastrengur með breytunni %s" +#~ msgid "TEST: A Perl test variable %s" +#~ msgstr "TILRAUN: Perl tilraunastrengur með breytunni %s" From 9f018058188ed50717015d5a32d4afe42d082a97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Date: Wed, 6 Jul 2011 19:22:54 +0000 Subject: [PATCH 12/15] pl.po: msgmerge --- po/pl.po | 1927 +++++++++++++++++++++++++++++++++++------------------- 1 file changed, 1269 insertions(+), 658 deletions(-) diff --git a/po/pl.po b/po/pl.po index 577b47f20c7303..f7f2129fd6a1e6 100644 --- a/po/pl.po +++ b/po/pl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List \n" -"POT-Creation-Date: 2010-09-20 15:09+0000\n" +"POT-Creation-Date: 2011-07-06 19:20+0000\n" "PO-Revision-Date: 2010-08-30 17:02+0200\n" "Last-Translator: Marcin Cieślak \n" "Language-Team: Git Mailing List \n" @@ -15,250 +15,273 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " +"|| n%100>=20) ? 1 : 2);\n" -#: wt-status.c:56 -msgid "# Unmerged paths:" +#: diff.c:104 +#, c-format +msgid " Failed to parse dirstat cut-off percentage '%.*s'\n" +msgstr "" + +#: diff.c:109 +#, fuzzy, c-format +msgid " Unknown dirstat parameter '%.*s'\n" +msgstr "nie mogę tknąć szablonu '%s'" + +#: diff.c:205 +#, c-format +msgid "" +"Found errors in 'diff.dirstat' config variable:\n" +"%s" msgstr "" -#: wt-status.c:62 wt-status.c:79 +#: diff.c:3295 #, c-format -msgid "# (use \"git reset %s ...\" to unstage)" +msgid "" +"Failed to parse --dirstat/-X option parameter:\n" +"%s" +msgstr "" + +#: wt-status.c:134 +msgid "Unmerged paths:" msgstr "" -#: wt-status.c:64 wt-status.c:81 -msgid "# (use \"git rm --cached ...\" to unstage)" +#: wt-status.c:140 wt-status.c:157 +#, c-format +msgid " (use \"git reset %s ...\" to unstage)" +msgstr "" + +#: wt-status.c:142 wt-status.c:159 +msgid " (use \"git rm --cached ...\" to unstage)" msgstr "" -#: wt-status.c:65 -msgid "# (use \"git add/rm ...\" as appropriate to mark resolution)" +#: wt-status.c:143 +msgid " (use \"git add/rm ...\" as appropriate to mark resolution)" msgstr "" -#: wt-status.c:73 -msgid "# Changes to be committed:" +#: wt-status.c:151 +msgid "Changes to be committed:" msgstr "" -#: wt-status.c:91 -msgid "# Changed but not updated:" +#: wt-status.c:169 +msgid "Changes not staged for commit:" msgstr "" -#: wt-status.c:95 -msgid "# (use \"git add ...\" to update what will be committed)" +#: wt-status.c:173 +msgid " (use \"git add ...\" to update what will be committed)" msgstr "" -#: wt-status.c:97 -msgid "# (use \"git add/rm ...\" to update what will be committed)" +#: wt-status.c:175 +msgid " (use \"git add/rm ...\" to update what will be committed)" msgstr "" -#: wt-status.c:98 +#: wt-status.c:176 msgid "" -"# (use \"git checkout -- ...\" to discard changes in working " -"directory)" +" (use \"git checkout -- ...\" to discard changes in working directory)" msgstr "" -#: wt-status.c:100 -msgid "# (commit or discard the untracked or modified content in submodules)" +#: wt-status.c:178 +msgid " (commit or discard the untracked or modified content in submodules)" msgstr "" -#: wt-status.c:109 +#: wt-status.c:187 #, c-format -msgid "# %s files:" +msgid "%s files:" msgstr "" -#: wt-status.c:112 +#: wt-status.c:190 #, c-format -msgid "# (use \"git %s ...\" to include in what will be committed)" +msgid " (use \"git %s ...\" to include in what will be committed)" msgstr "" -#: wt-status.c:129 +#: wt-status.c:207 msgid "bug" msgstr "" -#: wt-status.c:134 +#: wt-status.c:212 msgid "both deleted:" msgstr "" -#: wt-status.c:135 +#: wt-status.c:213 msgid "added by us:" msgstr "" -#: wt-status.c:136 +#: wt-status.c:214 msgid "deleted by them:" msgstr "" -#: wt-status.c:137 +#: wt-status.c:215 msgid "added by them:" msgstr "" -#: wt-status.c:138 +#: wt-status.c:216 msgid "deleted by us:" msgstr "" -#: wt-status.c:139 +#: wt-status.c:217 msgid "both added:" msgstr "" -#: wt-status.c:140 +#: wt-status.c:218 msgid "both modified:" msgstr "" -#: wt-status.c:170 +#: wt-status.c:248 msgid "new commits, " msgstr "" -#: wt-status.c:172 +#: wt-status.c:250 msgid "modified content, " msgstr "" -#: wt-status.c:174 +#: wt-status.c:252 msgid "untracked content, " msgstr "" -#: wt-status.c:188 +#: wt-status.c:266 #, c-format msgid "new file: %s" msgstr "" -#: wt-status.c:191 +#: wt-status.c:269 #, c-format msgid "copied: %s -> %s" msgstr "" -#: wt-status.c:194 +#: wt-status.c:272 #, c-format msgid "deleted: %s" msgstr "" -#: wt-status.c:197 +#: wt-status.c:275 #, c-format msgid "modified: %s" msgstr "" -#: wt-status.c:200 +#: wt-status.c:278 #, c-format msgid "renamed: %s -> %s" msgstr "" -#: wt-status.c:203 +#: wt-status.c:281 #, c-format msgid "typechange: %s" msgstr "" -#: wt-status.c:206 +#: wt-status.c:284 #, c-format msgid "unknown: %s" msgstr "" -#: wt-status.c:209 +#: wt-status.c:287 #, c-format msgid "unmerged: %s" msgstr "" -#: wt-status.c:212 +#: wt-status.c:290 #, c-format msgid "bug: unhandled diff status %c" msgstr "" -#: wt-status.c:635 +#: wt-status.c:713 msgid "On branch " msgstr "" -#: wt-status.c:642 +#: wt-status.c:720 msgid "Not currently on any branch." msgstr "" -#: wt-status.c:652 +#: wt-status.c:731 #, fuzzy -msgid "# Initial commit" +msgid "Initial commit" msgstr "Utworzyłem puste" -#: wt-status.c:666 +#: wt-status.c:745 msgid "Untracked" msgstr "" -#: wt-status.c:668 +#: wt-status.c:747 msgid "Ignored" msgstr "" -#: wt-status.c:670 +#: wt-status.c:749 #, c-format -msgid "# Untracked files not listed%s\n" +msgid "Untracked files not listed%s" msgstr "" -#: wt-status.c:672 +#: wt-status.c:751 msgid " (use -u option to show untracked files)" msgstr "" -#: wt-status.c:678 -#, c-format -msgid "# No changes\n" +#: wt-status.c:757 +msgid "No changes" msgstr "" -#: wt-status.c:682 +#: wt-status.c:761 #, c-format msgid "no changes added to commit%s\n" msgstr "" -#: wt-status.c:684 +#: wt-status.c:763 msgid " (use \"git add\" and/or \"git commit -a\")" msgstr "" -#: wt-status.c:686 +#: wt-status.c:765 #, c-format msgid "nothing added to commit but untracked files present%s\n" msgstr "" -#: wt-status.c:688 +#: wt-status.c:767 msgid " (use \"git add\" to track)" msgstr "" -#: wt-status.c:690 wt-status.c:693 wt-status.c:696 +#: wt-status.c:769 wt-status.c:772 wt-status.c:775 #, c-format msgid "nothing to commit%s\n" msgstr "" -#: wt-status.c:691 +#: wt-status.c:770 msgid " (create/copy files and use \"git add\" to track)" msgstr "" -#: wt-status.c:694 +#: wt-status.c:773 msgid " (use -u to show untracked files)" msgstr "" -#: wt-status.c:697 +#: wt-status.c:776 msgid " (working directory clean)" msgstr "" -#: wt-status.c:795 +#: wt-status.c:884 msgid "HEAD (no branch)" msgstr "" -#: wt-status.c:801 +#: wt-status.c:890 msgid "Initial commit on " msgstr "" -#: wt-status.c:816 +#: wt-status.c:905 msgid "behind " msgstr "" -#: wt-status.c:819 wt-status.c:822 +#: wt-status.c:908 wt-status.c:911 msgid "ahead " msgstr "" -#: wt-status.c:824 +#: wt-status.c:913 msgid ", behind " msgstr "" -#: builtin/add.c:41 +#: builtin/add.c:61 #, c-format msgid "unexpected diff status %c" msgstr "" -#: builtin/add.c:67 builtin/commit.c:244 +#: builtin/add.c:66 builtin/commit.c:291 msgid "updating files failed" msgstr "" -#: builtin/add.c:77 +#: builtin/add.c:76 #, c-format msgid "remove '%s'\n" msgstr "" @@ -272,7 +295,7 @@ msgstr "" msgid "Unstaged changes after refreshing the index:" msgstr "" -#: builtin/add.c:194 builtin/add.c:452 builtin/rm.c:194 +#: builtin/add.c:194 builtin/add.c:454 builtin/rm.c:186 #, c-format msgid "pathspec '%s' did not match any files" msgstr "" @@ -310,43 +333,47 @@ msgstr "" msgid "Could not apply '%s'" msgstr "" -#: builtin/add.c:349 +#: builtin/add.c:310 +msgid "The following paths are ignored by one of your .gitignore files:\n" +msgstr "" + +#: builtin/add.c:350 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "" -#: builtin/add.c:350 +#: builtin/add.c:351 msgid "no files added" msgstr "" -#: builtin/add.c:356 +#: builtin/add.c:357 msgid "adding files failed" msgstr "" -#: builtin/add.c:388 +#: builtin/add.c:389 msgid "-A and -u are mutually incompatible" msgstr "" -#: builtin/add.c:390 +#: builtin/add.c:391 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "" -#: builtin/add.c:410 +#: builtin/add.c:411 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "" -#: builtin/add.c:411 +#: builtin/add.c:412 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "" -#: builtin/add.c:417 builtin/clean.c:95 builtin/commit.c:301 -#: builtin/commit.c:310 builtin/mv.c:77 builtin/rm.c:171 +#: builtin/add.c:418 builtin/clean.c:95 builtin/commit.c:350 builtin/mv.c:77 +#: builtin/rm.c:162 msgid "index file corrupt" msgstr "" -#: builtin/add.c:468 builtin/mv.c:223 builtin/rm.c:268 +#: builtin/add.c:470 builtin/mv.c:223 builtin/rm.c:260 msgid "Unable to write new index file" msgstr "" @@ -384,7 +411,7 @@ msgstr "" #, c-format msgid "" "deleting branch '%s' that has been merged to\n" -" '%s', but it is not yet merged to HEAD." +" '%s', but not yet merged to HEAD." msgstr "" #: builtin/branch.c:140 @@ -449,75 +476,75 @@ msgstr "" msgid "branch '%s' does not point at a commit" msgstr "" -#: builtin/branch.c:381 +#: builtin/branch.c:376 #, c-format msgid "behind %d] " msgstr "" -#: builtin/branch.c:383 +#: builtin/branch.c:378 #, c-format msgid "ahead %d] " msgstr "" -#: builtin/branch.c:385 +#: builtin/branch.c:380 #, c-format msgid "ahead %d, behind %d] " msgstr "" -#: builtin/branch.c:484 +#: builtin/branch.c:483 msgid "(no branch)" msgstr "" -#: builtin/branch.c:544 +#: builtin/branch.c:543 msgid "some refs could not be read" msgstr "" -#: builtin/branch.c:557 +#: builtin/branch.c:556 msgid "cannot rename the current branch while not on any." msgstr "" -#: builtin/branch.c:567 builtin/branch.c:571 +#: builtin/branch.c:566 builtin/branch.c:570 #, c-format msgid "Invalid branch name: '%s'" msgstr "" -#: builtin/branch.c:574 +#: builtin/branch.c:573 #, c-format msgid "A branch named '%s' already exists." msgstr "" -#: builtin/branch.c:580 +#: builtin/branch.c:579 msgid "Branch rename failed" msgstr "" -#: builtin/branch.c:584 +#: builtin/branch.c:583 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "" -#: builtin/branch.c:588 +#: builtin/branch.c:587 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "" -#: builtin/branch.c:595 +#: builtin/branch.c:594 msgid "Branch is renamed, but update of config-file failed" msgstr "" -#: builtin/branch.c:610 +#: builtin/branch.c:609 #, c-format msgid "malformed object name %s" msgstr "" -#: builtin/branch.c:680 +#: builtin/branch.c:683 msgid "Failed to resolve HEAD as a valid ref." msgstr "" -#: builtin/branch.c:686 +#: builtin/branch.c:689 msgid "HEAD not found below refs/heads!" msgstr "" -#: builtin/branch.c:706 +#: builtin/branch.c:709 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" @@ -534,176 +561,229 @@ msgstr "" msgid "Need a repository to unbundle." msgstr "" -#: builtin/checkout.c:107 builtin/checkout.c:135 +#: builtin/checkout.c:111 builtin/checkout.c:139 #, c-format msgid "path '%s' does not have our version" msgstr "" -#: builtin/checkout.c:109 builtin/checkout.c:137 +#: builtin/checkout.c:113 builtin/checkout.c:141 #, c-format msgid "path '%s' does not have their version" msgstr "" -#: builtin/checkout.c:120 +#: builtin/checkout.c:124 #, c-format msgid "path '%s' does not have all three versions" msgstr "" -#: builtin/checkout.c:155 +#: builtin/checkout.c:159 #, c-format msgid "path '%s' does not have all 3 versions" msgstr "" -#: builtin/checkout.c:172 +#: builtin/checkout.c:176 #, c-format msgid "path '%s': cannot merge" msgstr "" -#: builtin/checkout.c:189 +#: builtin/checkout.c:193 #, c-format msgid "Unable to add merge result for '%s'" msgstr "" -#: builtin/checkout.c:194 builtin/reset.c:170 +#: builtin/checkout.c:198 builtin/reset.c:170 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "" -#: builtin/checkout.c:216 builtin/checkout.c:371 +#: builtin/checkout.c:220 builtin/checkout.c:374 msgid "corrupt index file" msgstr "" -#: builtin/checkout.c:244 builtin/checkout.c:251 +#: builtin/checkout.c:248 builtin/checkout.c:255 #, c-format msgid "path '%s' is unmerged" msgstr "" -#: builtin/checkout.c:280 builtin/checkout.c:475 builtin/clone.c:658 -#: builtin/merge.c:737 +#: builtin/checkout.c:284 builtin/checkout.c:478 builtin/clone.c:668 +#: builtin/merge.c:789 msgid "unable to write new index file" msgstr "" -#: builtin/checkout.c:297 builtin/diff.c:307 builtin/merge.c:367 +#: builtin/checkout.c:301 builtin/diff.c:301 builtin/merge.c:396 msgid "diff_setup_done failed" msgstr "" -#: builtin/checkout.c:393 +#: builtin/checkout.c:396 msgid "you need to resolve your current index first" msgstr "" -#: builtin/checkout.c:524 +#: builtin/checkout.c:527 #, fuzzy, c-format msgid "Can not do reflog for '%s'\n" msgstr "nie mogę otworzyć katalogu '%s'" -#: builtin/checkout.c:550 +#: builtin/checkout.c:557 +msgid "HEAD is now at" +msgstr "" + +#: builtin/checkout.c:563 #, c-format msgid "Already on '%s'\n" msgstr "" -#: builtin/checkout.c:554 +#: builtin/checkout.c:567 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "" -#: builtin/checkout.c:556 +#: builtin/checkout.c:569 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "" -#: builtin/checkout.c:558 +#: builtin/checkout.c:571 #, c-format msgid "Switched to branch '%s'\n" msgstr "" -#: builtin/checkout.c:575 -msgid "HEAD is now at" +#: builtin/checkout.c:651 +#, c-format +msgid " ... and %d more.\n" msgstr "" -#: builtin/checkout.c:603 -msgid "You are on a branch yet to be born" +#. The singular version +#: builtin/checkout.c:657 +#, 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] "" +msgstr[2] "" + +#: builtin/checkout.c:675 +#, 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/checkout.c:617 +#: builtin/checkout.c:700 +msgid "internal error: only -- alone should have been left" +msgstr "" + +#: builtin/checkout.c:702 +msgid "internal error in revision walk" +msgstr "" + +#: builtin/checkout.c:706 msgid "Previous HEAD position was" msgstr "" -#: builtin/checkout.c:730 +#: builtin/checkout.c:731 +msgid "You are on a branch yet to be born" +msgstr "" + +#. case (1) +#: builtin/checkout.c:859 +#, c-format +msgid "invalid reference: %s" +msgstr "" + +#. case (1): want a tree +#: builtin/checkout.c:898 +#, c-format +msgid "reference is not a tree: %s" +msgstr "" + +#: builtin/checkout.c:965 msgid "-B cannot be used with -b" msgstr "" -#: builtin/checkout.c:738 +#: builtin/checkout.c:974 msgid "--patch is incompatible with all other options" msgstr "" -#: builtin/checkout.c:744 +#: builtin/checkout.c:977 +msgid "--detach cannot be used with -b/-B/--orphan" +msgstr "" + +#: builtin/checkout.c:979 +#, fuzzy +msgid "--detach cannot be used with -t" +msgstr "nie wiem w którym katalogu jestem" + +#: builtin/checkout.c:985 msgid "--track needs a branch name" msgstr "" -#: builtin/checkout.c:751 +#: builtin/checkout.c:992 msgid "Missing branch name; try -b" msgstr "" -#: builtin/checkout.c:757 +#: builtin/checkout.c:998 msgid "--orphan and -b|-B are mutually exclusive" msgstr "" -#: builtin/checkout.c:759 +#: builtin/checkout.c:1000 msgid "--orphan cannot be used with -t" msgstr "" -#: builtin/checkout.c:769 +#: builtin/checkout.c:1010 msgid "git checkout: -f and -m are incompatible" msgstr "" -#. case (1) -#: builtin/checkout.c:815 -#, c-format -msgid "invalid reference: %s" -msgstr "" - -#. case (1): want a tree -#: builtin/checkout.c:852 -#, c-format -msgid "reference is not a tree: %s" -msgstr "" - -#: builtin/checkout.c:878 +#: builtin/checkout.c:1044 msgid "invalid path specification" msgstr "" -#: builtin/checkout.c:886 +#: builtin/checkout.c:1052 #, c-format msgid "" "git checkout: updating paths is incompatible with switching branches.\n" "Did you intend to checkout '%s' which can not be resolved as commit?" msgstr "" -#: builtin/checkout.c:888 +#: builtin/checkout.c:1054 msgid "git checkout: updating paths is incompatible with switching branches." msgstr "" -#: builtin/checkout.c:893 +#: builtin/checkout.c:1059 +msgid "git checkout: --detach does not take a path argument" +msgstr "" + +#: builtin/checkout.c:1062 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." msgstr "" -#: builtin/checkout.c:904 +#: builtin/checkout.c:1073 #, c-format msgid "git checkout: we do not like '%s' as a branch name." msgstr "" -#: builtin/checkout.c:909 +#: builtin/checkout.c:1078 #, c-format msgid "git checkout: branch %s already exists" msgstr "" -#: builtin/checkout.c:916 +#: builtin/checkout.c:1085 msgid "Cannot switch branch to a non-commit." msgstr "" -#: builtin/checkout.c:919 +#: builtin/checkout.c:1088 msgid "--ours/--theirs is incompatible with switching branches." msgstr "" @@ -733,9 +813,9 @@ msgid "Removing %s\n" msgstr "" #: builtin/clean.c:161 builtin/clean.c:181 -#, c-format -msgid "failed to remove '%s'" -msgstr "" +#, fuzzy, c-format +msgid "failed to remove %s" +msgstr "nie mogę otworzyć katalogu '%s'" #: builtin/clean.c:165 #, c-format @@ -747,114 +827,123 @@ msgstr "" msgid "Not removing %s\n" msgstr "" -#: builtin/clone.c:208 +#: builtin/clone.c:214 #, c-format msgid "reference repository '%s' is not a local directory." msgstr "" -#: builtin/clone.c:235 +#: builtin/clone.c:241 #, fuzzy, c-format msgid "failed to open '%s'" msgstr "nie mogę otworzyć katalogu '%s'" -#: builtin/clone.c:239 +#: builtin/clone.c:245 #, fuzzy, c-format msgid "failed to create directory '%s'" msgstr "beznadziejny katalog gita %s" -#: builtin/clone.c:241 builtin/diff.c:74 +#: builtin/clone.c:247 builtin/diff.c:74 #, fuzzy, c-format msgid "failed to stat '%s'" msgstr "nie mogę tknąć '%s'" -#: builtin/clone.c:243 +#: builtin/clone.c:249 #, fuzzy, c-format msgid "%s exists and is not a directory" msgstr "beznadziejny katalog gita %s" -#: builtin/clone.c:257 +#: builtin/clone.c:263 #, c-format msgid "failed to stat %s\n" msgstr "" -#: builtin/clone.c:267 +#: builtin/clone.c:273 #, c-format msgid "failed to unlink '%s'" msgstr "" -#: builtin/clone.c:272 +#: builtin/clone.c:278 #, fuzzy, c-format msgid "failed to create link '%s'" msgstr "readlink nie zadziałało dla '%s'" -#: builtin/clone.c:276 +#: builtin/clone.c:282 #, fuzzy, c-format msgid "failed to copy file to '%s'" msgstr "nie mogę skopiować '%s' to '%s'" -#: builtin/clone.c:305 +#: builtin/clone.c:311 #, c-format msgid "done.\n" msgstr "" -#: builtin/clone.c:387 +#: builtin/clone.c:394 msgid "Too many arguments." msgstr "" -#: builtin/clone.c:391 +#: builtin/clone.c:398 msgid "You must specify a repository to clone." msgstr "" -#: builtin/clone.c:399 +#: builtin/clone.c:406 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "" -#: builtin/clone.c:428 +#: builtin/clone.c:420 +#, c-format +msgid "repository '%s' does not exist" +msgstr "" + +#: builtin/clone.c:425 +msgid "--depth is ignored in local clones; use file:// instead." +msgstr "" + +#: builtin/clone.c:435 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "" -#: builtin/clone.c:438 +#: builtin/clone.c:445 #, c-format msgid "working tree '%s' already exists." msgstr "" -#: builtin/clone.c:451 builtin/clone.c:465 +#: builtin/clone.c:458 builtin/clone.c:472 #, c-format msgid "could not create leading directories of '%s'" msgstr "" -#: builtin/clone.c:454 +#: builtin/clone.c:461 #, fuzzy, c-format msgid "could not create work tree dir '%s'." msgstr "Nie mogę dostać się do drzewa roboczego '%s'" -#: builtin/clone.c:470 +#: builtin/clone.c:480 #, c-format -msgid "Cloning into bare repository %s\n" +msgid "Cloning into bare repository %s...\n" msgstr "" -#: builtin/clone.c:472 +#: builtin/clone.c:482 #, c-format -msgid "Cloning into %s\n" +msgid "Cloning into %s...\n" msgstr "" -#: builtin/clone.c:530 +#: builtin/clone.c:540 #, c-format msgid "Don't know how to clone %s" msgstr "" -#: builtin/clone.c:569 +#: builtin/clone.c:579 #, c-format msgid "Remote branch %s not found in upstream %s, using HEAD instead" msgstr "" -#: builtin/clone.c:579 +#: builtin/clone.c:589 msgid "You appear to have cloned an empty repository." msgstr "" -#: builtin/clone.c:621 +#: builtin/clone.c:631 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" @@ -867,9 +956,9 @@ msgid "" " git config --global user.name \"Your Name\"\n" " git config --global user.email you@example.com\n" "\n" -"If the identity used for this commit is wrong, you can fix it with:\n" +"After doing this, you may fix the identity used for this commit with:\n" "\n" -" git commit --amend --author='Your Name '\n" +" git commit --amend --reset-author\n" msgstr "" #: builtin/commit.c:53 @@ -879,348 +968,359 @@ msgid "" "remove the commit entirely with \"git reset HEAD^\".\n" msgstr "" -#: builtin/commit.c:271 +#: builtin/commit.c:58 +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" +msgstr "" + +#: builtin/commit.c:318 msgid "failed to unpack HEAD tree object" msgstr "" -#: builtin/commit.c:299 +#: builtin/commit.c:359 +#, fuzzy +msgid "unable to create temporary index" +msgstr "beznadziejny katalog gita %s" + +#: builtin/commit.c:365 msgid "interactive add failed" msgstr "" -#: builtin/commit.c:330 builtin/commit.c:350 builtin/commit.c:396 +#: builtin/commit.c:397 builtin/commit.c:417 builtin/commit.c:463 msgid "unable to write new_index file" msgstr "" -#: builtin/commit.c:380 -msgid "cannot do a partial commit during a merge." +#: builtin/commit.c:447 +#, c-format +msgid "cannot do a partial commit during a %s." msgstr "" -#: builtin/commit.c:389 +#: builtin/commit.c:456 #, fuzzy msgid "cannot read the index" msgstr "readlink nie zadziałało dla '%s'" -#: builtin/commit.c:409 +#: builtin/commit.c:476 msgid "unable to write temporary index file" msgstr "" -#: builtin/commit.c:456 builtin/commit.c:1294 +#: builtin/commit.c:523 builtin/commit.c:1428 msgid "could not parse HEAD commit" msgstr "" -#: builtin/commit.c:475 builtin/commit.c:481 +#: builtin/commit.c:542 builtin/commit.c:548 #, c-format msgid "invalid commit: %s" msgstr "" -#: builtin/commit.c:499 +#: builtin/commit.c:566 msgid "malformed --author parameter" msgstr "" -#: builtin/commit.c:573 builtin/shortlog.c:299 +#: builtin/commit.c:622 +#, c-format +msgid "Malformed ident string: '%s'" +msgstr "" + +#: builtin/commit.c:656 builtin/commit.c:689 builtin/commit.c:989 +#, c-format +msgid "could not lookup commit %s" +msgstr "" + +#: builtin/commit.c:668 builtin/shortlog.c:296 #, c-format msgid "(reading log message from standard input)\n" msgstr "" -#: builtin/commit.c:575 +#: builtin/commit.c:670 msgid "could not read log from standard input" msgstr "" -#: builtin/commit.c:579 +#: builtin/commit.c:674 #, fuzzy, c-format msgid "could not read log file '%s'" msgstr "readlink nie zadziałało dla '%s'" -#: builtin/commit.c:585 +#: builtin/commit.c:680 msgid "commit has empty message" msgstr "" -#: builtin/commit.c:591 +#: builtin/commit.c:696 msgid "could not read MERGE_MSG" msgstr "" -#: builtin/commit.c:595 +#: builtin/commit.c:700 msgid "could not read SQUASH_MSG" msgstr "" -#: builtin/commit.c:599 +#: builtin/commit.c:704 #, fuzzy, c-format msgid "could not read '%s'" msgstr "readlink nie zadziałało dla '%s'" -#: builtin/commit.c:612 +#: builtin/commit.c:732 #, fuzzy, c-format msgid "could not open '%s'" msgstr "nie mogę otworzyć katalogu '%s'" -#: builtin/commit.c:636 +#: builtin/commit.c:756 msgid "could not write commit template" msgstr "" -#: builtin/commit.c:650 +#: builtin/commit.c:769 #, 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" -"#\n" +"\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" msgstr "" -#: builtin/commit.c:659 -#, c-format -msgid "" -"\n" -"# Please enter the commit message for your changes." +#: builtin/commit.c:782 +msgid "Please enter the commit message for your changes." msgstr "" -#: builtin/commit.c:663 -#, c-format +#: builtin/commit.c:785 msgid "" " Lines starting\n" -"# with '#' will be ignored, and an empty message aborts the commit.\n" +"with '#' will be ignored, and an empty message aborts the commit.\n" msgstr "" -#: builtin/commit.c:668 -#, c-format +#: builtin/commit.c:790 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" +"with '#' will be kept; you may remove them yourself if you want to.\n" +"An empty message aborts the commit.\n" msgstr "" -#: builtin/commit.c:680 +#: builtin/commit.c:802 #, c-format -msgid "%s# Author: %s\n" +msgid "%sAuthor: %s" msgstr "" -#: builtin/commit.c:688 +#: builtin/commit.c:809 #, c-format -msgid "%s# Committer: %s\n" +msgid "%sCommitter: %s" msgstr "" -#: builtin/commit.c:705 +#: builtin/commit.c:829 #, fuzzy msgid "Cannot read index" msgstr "readlink nie zadziałało dla '%s'" -#: builtin/commit.c:737 +#: builtin/commit.c:869 msgid "Error building trees" msgstr "" -#: builtin/commit.c:752 builtin/tag.c:321 +#: builtin/commit.c:884 builtin/tag.c:313 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "" -#: builtin/commit.c:832 +#: builtin/commit.c:964 #, c-format msgid "No existing author found with '%s'" msgstr "" -#: builtin/commit.c:847 builtin/commit.c:1039 +#: builtin/commit.c:979 builtin/commit.c:1173 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "" -#: builtin/commit.c:864 +#: builtin/commit.c:1018 msgid "Using both --reset-author and --author does not make sense" msgstr "" -#: builtin/commit.c:878 +#: builtin/commit.c:1032 msgid "You have nothing to amend." msgstr "" -#: builtin/commit.c:880 -msgid "You are in the middle of a merge -- cannot amend." -msgstr "" - -#: builtin/commit.c:889 -msgid "Only one of -c/-C/-F can be used." +#: builtin/commit.c:1034 +#, c-format +msgid "You are in the middle of a %s -- cannot amend." msgstr "" -#: builtin/commit.c:891 -msgid "Option -m cannot be combined with -c/-C/-F." +#: builtin/commit.c:1036 +msgid "Options --squash and --fixup cannot be used together" msgstr "" -#: builtin/commit.c:897 -msgid "--reset-author can be used only with -C, -c or --amend." +#: builtin/commit.c:1046 +msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "" -#: builtin/commit.c:906 -#, c-format -msgid "could not lookup commit %s" +#: builtin/commit.c:1048 +msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "" -#: builtin/commit.c:909 -#, c-format -msgid "could not parse commit %s" +#: builtin/commit.c:1054 +msgid "--reset-author can be used only with -C, -c or --amend." msgstr "" -#: builtin/commit.c:937 -msgid "Only one of --include/--only/--all/--interactive can be used." +#: builtin/commit.c:1071 +msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" -#: builtin/commit.c:939 +#: builtin/commit.c:1073 msgid "No paths with --include/--only does not make sense." msgstr "" -#: builtin/commit.c:941 +#: builtin/commit.c:1075 msgid "Clever... amending the last one with dirty index." msgstr "" -#: builtin/commit.c:943 +#: builtin/commit.c:1077 msgid "Explicit paths specified without -i nor -o; assuming --only paths..." msgstr "" -#: builtin/commit.c:953 +#: builtin/commit.c:1087 #, c-format msgid "Invalid cleanup mode %s" msgstr "" -#: builtin/commit.c:958 +#: builtin/commit.c:1092 msgid "Paths with -a does not make sense." msgstr "" -#: builtin/commit.c:960 -msgid "Paths with --interactive does not make sense." -msgstr "" - -#: builtin/commit.c:1142 +#: builtin/commit.c:1274 msgid "couldn't look up newly created commit" msgstr "" -#: builtin/commit.c:1144 +#: builtin/commit.c:1276 msgid "could not parse newly created commit" msgstr "" -#: builtin/commit.c:1185 +#: builtin/commit.c:1316 msgid "detached HEAD" msgstr "" -#: builtin/commit.c:1187 +#: builtin/commit.c:1318 msgid " (root-commit)" msgstr "" -#: builtin/commit.c:1307 builtin/merge.c:461 +#: builtin/commit.c:1441 builtin/merge.c:490 #, c-format msgid "could not open '%s' for reading" msgstr "" -#: builtin/commit.c:1312 +#: builtin/commit.c:1446 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "" -#: builtin/commit.c:1319 +#: builtin/commit.c:1453 msgid "could not read MERGE_MODE" msgstr "" -#: builtin/commit.c:1336 +#: builtin/commit.c:1472 #, c-format msgid "could not read commit message: %s" msgstr "" -#: builtin/commit.c:1350 +#: builtin/commit.c:1486 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "" -#: builtin/commit.c:1358 +#: builtin/commit.c:1493 msgid "failed to write commit object" msgstr "" -#: builtin/commit.c:1375 +#: builtin/commit.c:1511 msgid "cannot lock HEAD ref" msgstr "" -#: builtin/commit.c:1379 +#: builtin/commit.c:1515 msgid "cannot update HEAD ref" msgstr "" -#: builtin/commit.c:1388 +#: builtin/commit.c:1525 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/describe.c:205 +#: builtin/describe.c:234 #, c-format msgid "annotated tag %s not available" msgstr "" -#: builtin/describe.c:209 +#: builtin/describe.c:238 #, c-format msgid "annotated tag %s has no embedded name" msgstr "" -#: builtin/describe.c:211 +#: builtin/describe.c:240 #, c-format msgid "tag '%s' is really '%s' here" msgstr "" -#: builtin/describe.c:238 +#: builtin/describe.c:267 #, c-format msgid "Not a valid object name %s" msgstr "" -#: builtin/describe.c:241 +#: builtin/describe.c:270 #, c-format msgid "%s is not a valid '%s' object" msgstr "" -#: builtin/describe.c:258 +#: builtin/describe.c:287 #, fuzzy, c-format msgid "no tag exactly matches '%s'" msgstr "nie mogę tknąć szablonu '%s'" -#: builtin/describe.c:260 +#: builtin/describe.c:289 #, c-format msgid "searching to describe %s\n" msgstr "" -#: builtin/describe.c:295 +#: builtin/describe.c:329 #, c-format msgid "finished search at %s\n" msgstr "" -#: builtin/describe.c:319 +#: builtin/describe.c:353 #, c-format msgid "" "No annotated tags can describe '%s'.\n" "However, there were unannotated tags: try --tags." msgstr "" -#: builtin/describe.c:323 +#: builtin/describe.c:357 #, c-format msgid "" "No tags can describe '%s'.\n" "Try --always, or create some tags." msgstr "" -#: builtin/describe.c:344 +#: builtin/describe.c:378 #, c-format msgid "traversed %lu commits\n" msgstr "" -#: builtin/describe.c:347 +#: builtin/describe.c:381 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" "gave up search at %s\n" msgstr "" -#: builtin/describe.c:398 +#: builtin/describe.c:436 msgid "--long is incompatible with --abbrev=0" msgstr "" -#: builtin/describe.c:423 +#: builtin/describe.c:462 msgid "No names found, cannot describe anything." msgstr "" -#: builtin/describe.c:430 +#: builtin/describe.c:469 msgid "--dirty is incompatible with committishes" msgstr "" @@ -1229,49 +1329,45 @@ msgstr "" msgid "'%s': not a regular file or symlink" msgstr "" -#: builtin/diff.c:225 +#: builtin/diff.c:220 #, c-format msgid "invalid option: %s" msgstr "" -#: builtin/diff.c:302 +#: builtin/diff.c:296 msgid "Not a git repository" msgstr "" -#: builtin/diff.c:334 -msgid "No HEAD commit to compare with (yet)" -msgstr "" - -#: builtin/diff.c:349 +#: builtin/diff.c:346 #, c-format msgid "invalid object '%s' given." msgstr "" -#: builtin/diff.c:354 +#: builtin/diff.c:351 #, c-format msgid "more than %d trees given: '%s'" msgstr "" -#: builtin/diff.c:364 +#: builtin/diff.c:361 #, c-format msgid "more than two blobs given: '%s'" msgstr "" -#: builtin/diff.c:372 +#: builtin/diff.c:369 #, c-format msgid "unhandled object '%s' given." msgstr "" -#: builtin/fetch.c:175 +#: builtin/fetch.c:199 msgid "Couldn't find remote ref HEAD" msgstr "" -#: builtin/fetch.c:228 +#: builtin/fetch.c:252 #, fuzzy, c-format msgid "object %s not found" msgstr "nie znaleziono szablonów %s" -#: builtin/fetch.c:233 +#: builtin/fetch.c:257 msgid "[up to date]" msgstr "" @@ -1279,146 +1375,146 @@ msgstr "" #. * If this is the head, and it's not okay to update #. * the head, and the old value of the head isn't empty... #. -#: builtin/fetch.c:246 +#: builtin/fetch.c:270 #, c-format msgid "! %-*s %-*s -> %s (can't fetch in current branch)" msgstr "" -#: builtin/fetch.c:247 builtin/fetch.c:309 +#: builtin/fetch.c:271 builtin/fetch.c:342 msgid "[rejected]" msgstr "" -#: builtin/fetch.c:257 +#: builtin/fetch.c:281 msgid "[tag update]" msgstr "" -#: builtin/fetch.c:258 builtin/fetch.c:280 builtin/fetch.c:293 +#: builtin/fetch.c:282 builtin/fetch.c:307 builtin/fetch.c:323 msgid " (unable to update local ref)" msgstr "" -#: builtin/fetch.c:270 +#: builtin/fetch.c:294 msgid "[new tag]" msgstr "" -#: builtin/fetch.c:274 +#: builtin/fetch.c:298 msgid "[new branch]" msgstr "" -#: builtin/fetch.c:305 +#: builtin/fetch.c:338 msgid "unable to update local ref" msgstr "" -#: builtin/fetch.c:305 +#: builtin/fetch.c:338 msgid "forced update" msgstr "" -#: builtin/fetch.c:310 +#: builtin/fetch.c:343 msgid "(non-fast-forward)" msgstr "" -#: builtin/fetch.c:328 builtin/fetch.c:651 +#: builtin/fetch.c:361 builtin/fetch.c:684 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "nie mogę otworzyć katalogu '%s'" -#: builtin/fetch.c:406 +#: builtin/fetch.c:439 #, c-format msgid "From %.*s\n" msgstr "" -#: builtin/fetch.c:417 +#: builtin/fetch.c:450 #, c-format msgid "" "some local refs could not be updated; try running\n" " 'git remote prune %s' to remove any old, conflicting branches" msgstr "" -#: builtin/fetch.c:467 +#: builtin/fetch.c:500 msgid "could not run rev-list" msgstr "" -#: builtin/fetch.c:481 +#: builtin/fetch.c:514 #, c-format msgid "failed write to rev-list: %s" msgstr "" -#: builtin/fetch.c:488 +#: builtin/fetch.c:521 #, c-format msgid "failed to close rev-list's stdin: %s" msgstr "" -#: builtin/fetch.c:515 +#: builtin/fetch.c:548 #, c-format msgid " (%s will become dangling)\n" msgstr "" -#: builtin/fetch.c:516 +#: builtin/fetch.c:549 #, c-format msgid " (%s has become dangling)\n" msgstr "" -#: builtin/fetch.c:523 +#: builtin/fetch.c:556 msgid "[deleted]" msgstr "" -#: builtin/fetch.c:524 +#: builtin/fetch.c:557 msgid "(none)" msgstr "" -#: builtin/fetch.c:641 +#: builtin/fetch.c:674 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "" -#: builtin/fetch.c:675 +#: builtin/fetch.c:708 #, c-format msgid "Don't know how to fetch from %s" msgstr "" -#: builtin/fetch.c:729 +#: builtin/fetch.c:762 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "" -#: builtin/fetch.c:732 +#: builtin/fetch.c:765 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "" -#: builtin/fetch.c:821 +#: builtin/fetch.c:864 #, c-format msgid "Fetching %s\n" msgstr "" -#: builtin/fetch.c:823 +#: builtin/fetch.c:866 #, c-format msgid "Could not fetch %s" msgstr "" -#: builtin/fetch.c:839 +#: builtin/fetch.c:883 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." msgstr "" -#: builtin/fetch.c:859 +#: builtin/fetch.c:903 msgid "You need to specify a tag name." msgstr "" -#: builtin/fetch.c:899 +#: builtin/fetch.c:946 msgid "fetch --all does not take a repository argument" msgstr "" -#: builtin/fetch.c:901 +#: builtin/fetch.c:948 msgid "fetch --all does not make sense with refspecs" msgstr "" -#: builtin/fetch.c:912 +#: builtin/fetch.c:959 #, c-format msgid "No such remote or remote group: %s" msgstr "" -#: builtin/fetch.c:920 +#: builtin/fetch.c:967 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "" @@ -1436,203 +1532,221 @@ msgstr "" msgid "insanely long object directory %.*s" msgstr "beznadziejny katalog gita %s" -#: builtin/gc.c:220 +#: builtin/gc.c:223 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "" -#: builtin/gc.c:223 +#: 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." +"run \"git gc\" manually. See \"git help gc\" for more information.\n" msgstr "" -#: builtin/gc.c:251 +#: builtin/gc.c:254 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" -#: builtin/grep.c:252 +#: builtin/grep.c:256 #, c-format msgid "grep: failed to create thread: %s" msgstr "" -#: builtin/grep.c:457 +#: builtin/grep.c:374 #, c-format msgid "'%s': unable to read %s" msgstr "" -#: builtin/grep.c:508 +#: builtin/grep.c:425 #, c-format msgid "'%s': %s" msgstr "" -#: builtin/grep.c:519 +#: builtin/grep.c:436 #, c-format msgid "'%s': short read %s" msgstr "" -#: builtin/grep.c:581 +#: builtin/grep.c:498 #, c-format msgid "Failed to chdir: %s" msgstr "" -#: builtin/grep.c:671 builtin/grep.c:697 +#: builtin/grep.c:573 builtin/grep.c:604 #, c-format msgid "unable to read tree (%s)" msgstr "" -#: builtin/grep.c:703 +#: builtin/grep.c:618 #, c-format msgid "unable to grep from object of type %s" msgstr "" -#: builtin/grep.c:755 +#: builtin/grep.c:674 #, c-format msgid "switch `%c' expects a numerical value" msgstr "" -#: builtin/grep.c:771 +#: builtin/grep.c:691 #, fuzzy, c-format msgid "cannot open '%s'" msgstr "nie mogę otworzyć katalogu '%s'" -#: builtin/grep.c:1012 +#: builtin/grep.c:974 msgid "no pattern given." msgstr "" -#: builtin/grep.c:1016 -msgid "cannot mix --fixed-strings and regexp" -msgstr "" - -#: builtin/grep.c:1041 +#: builtin/grep.c:1001 #, c-format msgid "bad object %s" msgstr "" -#: builtin/grep.c:1068 +#: builtin/grep.c:1025 msgid "--open-files-in-pager only works on the worktree" msgstr "" -#: builtin/grep.c:1093 +#: builtin/grep.c:1050 msgid "--cached cannot be used with --no-index." msgstr "" -#: builtin/grep.c:1095 +#: builtin/grep.c:1052 msgid "--no-index cannot be used with revs." msgstr "" -#: builtin/grep.c:1104 +#: builtin/grep.c:1061 msgid "both --cached and trees are given." msgstr "" -#: builtin/init-db.c:34 +#: builtin/init-db.c:35 #, c-format msgid "Could not make %s writable by group" msgstr "Nie mogę dać prawa zapisu grupie w %s" -#: builtin/init-db.c:61 +#: builtin/init-db.c:62 #, c-format msgid "insanely long template name %s" msgstr "beznadziejnie długa nazwa szablonu %s" -#: builtin/init-db.c:66 +#: builtin/init-db.c:67 #, c-format msgid "cannot stat '%s'" msgstr "nie mogę tknąć '%s'" -#: builtin/init-db.c:72 +#: builtin/init-db.c:73 #, c-format msgid "cannot stat template '%s'" msgstr "nie mogę tknąć szablonu '%s'" -#: builtin/init-db.c:79 +#: builtin/init-db.c:80 #, c-format msgid "cannot opendir '%s'" msgstr "nie mogę otworzyć katalogu '%s'" -#: builtin/init-db.c:96 +#: builtin/init-db.c:97 #, c-format msgid "cannot readlink '%s'" msgstr "readlink nie zadziałało dla '%s'" -#: builtin/init-db.c:98 +#: builtin/init-db.c:99 #, c-format msgid "insanely long symlink %s" msgstr "beznadziejnie długi link symboliczny %s" -#: builtin/init-db.c:101 +#: builtin/init-db.c:102 #, c-format msgid "cannot symlink '%s' '%s'" msgstr "nie mogę założyć symbolicznego link z '%s' do '%s'" -#: builtin/init-db.c:105 +#: builtin/init-db.c:106 #, c-format msgid "cannot copy '%s' to '%s'" msgstr "nie mogę skopiować '%s' to '%s'" -#: builtin/init-db.c:109 +#: builtin/init-db.c:110 #, c-format msgid "ignoring template %s" msgstr "pomijam szablon %s" -#: builtin/init-db.c:132 +#: builtin/init-db.c:133 #, c-format msgid "insanely long template path %s" msgstr "beznadziejnie długa śieżka do wzorca %s" -#: builtin/init-db.c:140 +#: builtin/init-db.c:141 #, c-format msgid "templates not found %s" msgstr "nie znaleziono szablonów %s" -#: builtin/init-db.c:153 +#: builtin/init-db.c:154 #, c-format msgid "not copying templates of a wrong format version %d from '%s'" msgstr "" "nie będę kopiować szablonów oznaczonych niewłaściwym numerem wersji %d z '%s'" -#: builtin/init-db.c:191 +#: builtin/init-db.c:192 #, c-format msgid "insane git directory %s" msgstr "beznadziejny katalog gita %s" -#. 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:355 +#: 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 +#, fuzzy, c-format +msgid "unable to move %s to %s" +msgstr "nie mogę skopiować '%s' to '%s'" + +#: builtin/init-db.c:362 +#, fuzzy, c-format +msgid "Could not create git link %s" +msgstr "readlink nie zadziałało dla '%s'" + +#. +#. * 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 "%s%s repozytorium Gita w %s%s\n" -#: builtin/init-db.c:356 +#: builtin/init-db.c:420 msgid "Reinitialized existing" msgstr "Ponownie zainicjowałem istniejące" -#: builtin/init-db.c:356 +#: builtin/init-db.c:420 msgid "Initialized empty" msgstr "Utworzyłem puste" -#: builtin/init-db.c:357 +#: builtin/init-db.c:421 msgid " shared" msgstr " współdzielone" -#: builtin/init-db.c:376 +#: builtin/init-db.c:440 msgid "cannot tell cwd" msgstr "nie wiem w którym katalogu jestem" -#: builtin/init-db.c:450 builtin/init-db.c:457 +#: builtin/init-db.c:521 builtin/init-db.c:528 #, c-format msgid "cannot mkdir %s" msgstr "nie mogę utworzyć katalogu %s" -#: builtin/init-db.c:461 +#: builtin/init-db.c:532 #, c-format msgid "cannot chdir to %s" msgstr "nie mogę wejść do katalogu %s" -#: builtin/init-db.c:483 +#: builtin/init-db.c:554 #, c-format msgid "" "%s (or --work-tree=) not allowed without specifying %s (or --git-" @@ -1641,333 +1755,369 @@ msgstr "" "nie można użyć %s (or --work-tree=) bez podania %s (or --git-" "dir=)" -#: builtin/init-db.c:509 +#: builtin/init-db.c:578 msgid "Cannot access current working directory" msgstr "Nie mogę dobrać się do bieżącego katalogu" -#: builtin/init-db.c:512 +#: builtin/init-db.c:585 #, c-format msgid "Cannot access work tree '%s'" msgstr "Nie mogę dostać się do drzewa roboczego '%s'" -#: builtin/log.c:104 -#, c-format -msgid "invalid --decorate option: %s" -msgstr "" - -#: builtin/log.c:113 builtin/log.c:1138 builtin/shortlog.c:287 -#, c-format -msgid "unrecognized argument: %s" -msgstr "" - -#: builtin/log.c:156 +#: builtin/log.c:186 #, c-format msgid "Final output: %d %s\n" msgstr "" -#: builtin/log.c:255 builtin/log.c:674 builtin/log.c:1222 builtin/log.c:1428 -#: builtin/merge.c:310 builtin/revert.c:556 builtin/shortlog.c:184 +#: builtin/log.c:287 builtin/log.c:721 builtin/log.c:1274 builtin/log.c:1492 +#: builtin/merge.c:338 builtin/revert.c:539 builtin/shortlog.c:181 msgid "revision walk setup failed" msgstr "" -#: builtin/log.c:347 builtin/log.c:434 +#: builtin/log.c:397 builtin/log.c:486 #, c-format msgid "Could not read object %s" msgstr "" -#: builtin/log.c:458 +#: builtin/log.c:510 #, c-format msgid "Unknown type: %d" msgstr "" -#: builtin/log.c:558 +#: builtin/log.c:605 msgid "format.headers without value" msgstr "" -#: builtin/log.c:630 +#: builtin/log.c:677 msgid "name of output directory is too long" msgstr "" -#: builtin/log.c:641 +#: builtin/log.c:688 #, fuzzy, c-format msgid "Cannot open patch file %s" msgstr "nie mogę otworzyć katalogu '%s'" -#: builtin/log.c:655 +#: builtin/log.c:702 msgid "Need exactly one range." msgstr "" -#: builtin/log.c:663 +#: builtin/log.c:710 msgid "Not a range." msgstr "" -#: builtin/log.c:700 +#: builtin/log.c:747 msgid "Could not extract email from committer identity." msgstr "" -#: builtin/log.c:732 +#: builtin/log.c:779 msgid "Cover letter needs email format" msgstr "" -#: builtin/log.c:825 +#: builtin/log.c:872 #, fuzzy, c-format msgid "insane in-reply-to: %s" msgstr "beznadziejny katalog gita %s" -#: builtin/log.c:898 +#: builtin/log.c:945 msgid "Two output directories?" msgstr "" -#: builtin/log.c:1087 +#: builtin/log.c:1136 #, c-format msgid "bogus committer info %s" msgstr "" -#: builtin/log.c:1132 +#: builtin/log.c:1181 msgid "-n and -k are mutually exclusive." msgstr "" -#: builtin/log.c:1134 +#: builtin/log.c:1183 msgid "--subject-prefix and -k are mutually exclusive." msgstr "" -#: builtin/log.c:1141 +#: builtin/log.c:1188 builtin/shortlog.c:284 +#, c-format +msgid "unrecognized argument: %s" +msgstr "" + +#: builtin/log.c:1191 msgid "--name-only does not make sense" msgstr "" -#: builtin/log.c:1143 +#: builtin/log.c:1193 msgid "--name-status does not make sense" msgstr "" -#: builtin/log.c:1145 +#: builtin/log.c:1195 msgid "--check does not make sense" msgstr "" -#: builtin/log.c:1166 +#: builtin/log.c:1218 msgid "standard output, or directory, which one?" msgstr "" -#: builtin/log.c:1168 +#: builtin/log.c:1220 #, c-format msgid "Could not create directory '%s'" msgstr "" -#: builtin/log.c:1307 +#: builtin/log.c:1355 msgid "Failed to create output files" msgstr "" -#: builtin/log.c:1394 +#: builtin/log.c:1458 #, c-format msgid "" "Could not find a tracked remote branch, please specify manually.\n" msgstr "" -#: builtin/log.c:1410 builtin/log.c:1412 builtin/log.c:1424 +#: builtin/log.c:1474 builtin/log.c:1476 builtin/log.c:1488 #, c-format msgid "Unknown commit %s" msgstr "" -#: builtin/merge.c:82 +#: builtin/merge.c:88 msgid "switch `m' requires a value" msgstr "" -#: builtin/merge.c:119 +#: builtin/merge.c:125 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "" -#: builtin/merge.c:120 +#: builtin/merge.c:126 #, c-format msgid "Available strategies are:" msgstr "" -#: builtin/merge.c:125 +#: builtin/merge.c:131 #, c-format msgid "Available custom strategies are:" msgstr "" -#: builtin/merge.c:223 +#: builtin/merge.c:233 msgid "could not run stash." msgstr "" -#: builtin/merge.c:228 +#: builtin/merge.c:238 msgid "stash failed" msgstr "" -#: builtin/merge.c:233 +#: builtin/merge.c:243 #, c-format msgid "not a valid object: %s" msgstr "" -#: builtin/merge.c:250 +#: builtin/merge.c:261 builtin/merge.c:278 msgid "read-tree failed" msgstr "" -#: builtin/merge.c:279 +#: builtin/merge.c:307 msgid " (nothing to squash)" msgstr "" -#: builtin/merge.c:292 +#: builtin/merge.c:320 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "" -#: builtin/merge.c:295 builtin/merge.c:1290 builtin/merge.c:1299 -#: builtin/merge.c:1309 +#: builtin/merge.c:323 builtin/merge.c:844 builtin/merge.c:1430 +#: builtin/merge.c:1442 builtin/revert.c:213 #, c-format msgid "Could not write to '%s'" msgstr "" -#: builtin/merge.c:323 +#: builtin/merge.c:352 msgid "Writing SQUASH_MSG" msgstr "" -#: builtin/merge.c:325 +#: builtin/merge.c:354 msgid "Finishing SQUASH_MSG" msgstr "" -#: builtin/merge.c:345 +#: builtin/merge.c:374 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "" -#: builtin/merge.c:396 +#: builtin/merge.c:425 #, c-format msgid "'%s' does not point to a commit" msgstr "" -#: builtin/merge.c:491 +#: builtin/merge.c:517 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "" -#: builtin/merge.c:553 +#: builtin/merge.c:550 +#, c-format +msgid "%s: negative length %s" +msgstr "" + +#: builtin/merge.c:609 msgid "git write-tree failed to write a tree" msgstr "" -#: builtin/merge.c:594 +#: builtin/merge.c:659 msgid "failed to read the cache" msgstr "" -#: builtin/merge.c:611 +#: builtin/merge.c:676 msgid "Unable to write index." msgstr "" -#: builtin/merge.c:624 +#: builtin/merge.c:689 msgid "Not handling anything other than two heads merge." msgstr "" -#: builtin/merge.c:651 +#: builtin/merge.c:703 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "" -#: builtin/merge.c:666 +#: builtin/merge.c:717 #, c-format msgid "unable to write %s" msgstr "" -#: builtin/merge.c:791 -#, c-format -msgid "Wonderful.\n" -msgstr "" - -#: builtin/merge.c:840 builtin/merge.c:1287 builtin/merge.c:1295 -#: builtin/merge.c:1303 +#: builtin/merge.c:841 builtin/merge.c:920 builtin/merge.c:1427 +#: builtin/merge.c:1436 builtin/revert.c:210 #, fuzzy, c-format msgid "Could not open '%s' for writing" msgstr "Nie mogę dać prawa zapisu grupie w %s" -#: builtin/merge.c:856 +#: builtin/merge.c:852 +#, fuzzy, c-format +msgid "Could not read from '%s'" +msgstr "readlink nie zadziałało dla '%s'" + +#: builtin/merge.c:869 +#, c-format +msgid "Wonderful.\n" +msgstr "" + +#: builtin/merge.c:936 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" -#: builtin/merge.c:871 +#: builtin/merge.c:951 #, c-format msgid "'%s' is not a commit" msgstr "" -#: builtin/merge.c:921 +#: builtin/merge.c:992 +msgid "No current branch." +msgstr "" + +#: builtin/merge.c:994 +msgid "No remote for the current branch." +msgstr "" + +#: builtin/merge.c:996 +msgid "No default upstream defined for the current branch." +msgstr "" + +#: builtin/merge.c:1001 +#, c-format +msgid "No remote tracking branch for %s from %s" +msgstr "" + +#: builtin/merge.c:1053 +msgid "There is no merge to abort (MERGE_HEAD missing)." +msgstr "" + +#: builtin/merge.c:1068 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:924 +#: builtin/merge.c:1071 git-pull.sh:34 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "" -#: builtin/merge.c:951 +#: builtin/merge.c:1075 +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:1078 +msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." +msgstr "" + +#: builtin/merge.c:1087 msgid "You cannot combine --squash with --no-ff." msgstr "" -#: builtin/merge.c:956 +#: builtin/merge.c:1092 msgid "You cannot combine --no-ff with --ff-only." msgstr "" -#: builtin/merge.c:984 +#: builtin/merge.c:1126 msgid "Can merge only exactly one commit into empty head" msgstr "" -#: builtin/merge.c:987 +#: builtin/merge.c:1129 msgid "Squash commit into empty head not supported yet" msgstr "" -#: builtin/merge.c:989 +#: builtin/merge.c:1131 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "" -#: builtin/merge.c:993 builtin/merge.c:1041 +#: builtin/merge.c:1135 builtin/merge.c:1181 #, c-format msgid "%s - not something we can merge" msgstr "" -#: builtin/merge.c:1099 +#: builtin/merge.c:1239 #, c-format msgid "Updating %s..%s\n" msgstr "" -#: builtin/merge.c:1133 +#: builtin/merge.c:1273 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "" -#: builtin/merge.c:1137 +#: builtin/merge.c:1277 #, c-format msgid "Nope.\n" msgstr "" -#: builtin/merge.c:1170 +#: builtin/merge.c:1310 msgid "Not possible to fast-forward, aborting." msgstr "" -#: builtin/merge.c:1196 builtin/merge.c:1269 +#: builtin/merge.c:1336 builtin/merge.c:1409 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "" -#: builtin/merge.c:1200 +#: builtin/merge.c:1340 #, c-format msgid "Trying merge strategy %s...\n" msgstr "" -#: builtin/merge.c:1261 +#: builtin/merge.c:1401 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "" -#: builtin/merge.c:1263 +#: builtin/merge.c:1403 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "" -#: builtin/merge.c:1271 +#: builtin/merge.c:1411 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "" -#: builtin/merge.c:1314 +#: builtin/merge.c:1447 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -2034,193 +2184,154 @@ msgstr "" msgid "renaming '%s' failed" msgstr "" -#: builtin/notes.c:122 +#: builtin/notes.c:139 #, c-format msgid "unable to start 'show' for object '%s'" msgstr "" -#: builtin/notes.c:128 +#: builtin/notes.c:145 msgid "can't fdopen 'show' output fd" msgstr "" -#: builtin/notes.c:138 +#: builtin/notes.c:155 #, c-format msgid "failed to close pipe to 'show' for object '%s'" msgstr "" -#: builtin/notes.c:141 +#: builtin/notes.c:158 #, c-format msgid "failed to finish 'show' for object '%s'" msgstr "" -#: builtin/notes.c:158 builtin/tag.c:311 +#: builtin/notes.c:175 builtin/tag.c:303 #, fuzzy, c-format msgid "could not create file '%s'" msgstr "readlink nie zadziałało dla '%s'" -#: builtin/notes.c:172 +#: builtin/notes.c:189 msgid "Please supply the note contents using either -m or -F option" msgstr "" -#: builtin/notes.c:193 builtin/notes.c:797 +#: builtin/notes.c:210 builtin/notes.c:968 #, c-format msgid "Removing note for object %s\n" msgstr "" -#: builtin/notes.c:198 +#: builtin/notes.c:215 msgid "unable to write note object" msgstr "" -#: builtin/notes.c:200 +#: builtin/notes.c:217 #, c-format msgid "The note contents has been left in %s" msgstr "" -#: builtin/notes.c:234 builtin/tag.c:445 +#: builtin/notes.c:251 builtin/tag.c:448 #, fuzzy, c-format msgid "cannot read '%s'" msgstr "readlink nie zadziałało dla '%s'" -#: builtin/notes.c:236 builtin/tag.c:448 +#: builtin/notes.c:253 builtin/tag.c:451 #, fuzzy, c-format msgid "could not open or read '%s'" msgstr "nie mogę otworzyć katalogu '%s'" -#: builtin/notes.c:255 builtin/notes.c:444 builtin/notes.c:446 -#: builtin/notes.c:508 builtin/notes.c:560 builtin/notes.c:631 -#: builtin/notes.c:636 builtin/notes.c:710 builtin/notes.c:752 -#: builtin/notes.c:789 builtin/reset.c:303 builtin/tag.c:461 +#: 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:963 builtin/reset.c:303 builtin/tag.c:464 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "" -#: builtin/notes.c:258 +#: builtin/notes.c:275 #, c-format msgid "Failed to read object '%s'." msgstr "" -#: builtin/notes.c:283 +#: builtin/notes.c:299 msgid "Cannot commit uninitialized/unreferenced notes tree" msgstr "" -#: builtin/notes.c:295 -msgid "Failed to write current notes tree to database" -msgstr "" - -#: builtin/notes.c:307 -msgid "Failed to commit notes tree to database" -msgstr "" - -#: builtin/notes.c:339 +#: builtin/notes.c:340 #, c-format msgid "Bad notes.rewriteMode value: '%s'" msgstr "" -#: builtin/notes.c:349 +#: 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:376 +#: builtin/notes.c:377 #, c-format msgid "Bad %s value: '%s'" msgstr "" -#: builtin/notes.c:440 +#: builtin/notes.c:441 #, c-format msgid "Malformed input line: '%s'." msgstr "" -#: builtin/notes.c:455 +#: builtin/notes.c:456 #, fuzzy, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "nie mogę skopiować '%s' to '%s'" -#. TRANSLATORS: The first %s is one of "git notes ACTION", -#. e.g. "add", "copy", "append" etc. -#: builtin/notes.c:481 -#, c-format -msgid "Refusing to %s notes in %s (outside of refs/notes/)" -msgstr "" - -#: builtin/notes.c:501 builtin/notes.c:553 builtin/notes.c:614 -#: builtin/notes.c:626 builtin/notes.c:698 builtin/notes.c:745 -#: builtin/notes.c:782 builtin/notes.c:821 +#: 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:1028 msgid "too many parameters" msgstr "" -#: builtin/notes.c:505 -msgid "list" -msgstr "" - -#: builtin/notes.c:514 builtin/notes.c:758 +#: builtin/notes.c:513 builtin/notes.c:772 #, c-format msgid "No note found for object %s." msgstr "" -#: builtin/notes.c:562 -msgid "add" -msgstr "" - -#: builtin/notes.c:567 +#: 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:572 builtin/notes.c:649 +#: builtin/notes.c:585 builtin/notes.c:662 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "" -#: builtin/notes.c:622 +#: builtin/notes.c:635 msgid "too few parameters" msgstr "" -#: builtin/notes.c:638 -msgid "copy" -msgstr "" - -#: builtin/notes.c:643 +#: 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:655 +#: builtin/notes.c:668 #, c-format msgid "Missing notes on source object %s. Cannot copy." msgstr "" -#: builtin/notes.c:703 +#: 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:754 -msgid "show" -msgstr "" - -#: builtin/notes.c:791 -msgid "remove" -msgstr "" - -#: builtin/notes.c:795 +#: builtin/notes.c:966 #, c-format msgid "Object %s has no note\n" msgstr "" -#: builtin/notes.c:825 -msgid "prune" -msgstr "" - -#: builtin/notes.c:877 +#: builtin/notes.c:1098 #, c-format msgid "Unknown subcommand: %s" msgstr "" @@ -2234,35 +2345,45 @@ msgid "--delete only accepts plain target ref names" msgstr "" #: builtin/push.c:72 -msgid "You are not currently on a branch." +#, 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:74 +#: builtin/push.c:79 #, c-format -msgid "The current branch %s is not tracking anything." +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:77 +#: builtin/push.c:87 #, c-format -msgid "The current branch %s is tracking multiple branches, refusing to push." +msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "" -#: builtin/push.c:100 +#: builtin/push.c:110 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "" -#: builtin/push.c:120 +#: builtin/push.c:130 #, c-format msgid "Pushing to %s\n" msgstr "" -#: builtin/push.c:124 +#: builtin/push.c:134 #, c-format msgid "failed to push some refs to '%s'" msgstr "" -#: builtin/push.c:132 +#: builtin/push.c:142 #, c-format msgid "" "To prevent you from losing history, non-fast-forward updates were rejected\n" @@ -2270,40 +2391,49 @@ msgid "" "'Note about fast-forwards' section of 'git push --help' for details.\n" msgstr "" -#: builtin/push.c:149 +#: builtin/push.c:159 #, c-format msgid "bad repository '%s'" msgstr "" -#: builtin/push.c:150 -msgid "No destination configured to push to." +#: builtin/push.c:160 +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:158 +#: builtin/push.c:175 msgid "--all and --tags are incompatible" msgstr "" -#: builtin/push.c:159 +#: builtin/push.c:176 msgid "--all can't be combined with refspecs" msgstr "" -#: builtin/push.c:164 +#: builtin/push.c:181 msgid "--mirror and --tags are incompatible" msgstr "" -#: builtin/push.c:165 +#: builtin/push.c:182 msgid "--mirror can't be combined with refspecs" msgstr "" -#: builtin/push.c:170 +#: builtin/push.c:187 msgid "--all and --mirror are incompatible" msgstr "" -#: builtin/push.c:235 +#: builtin/push.c:253 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "" -#: builtin/push.c:237 +#: builtin/push.c:255 msgid "--delete doesn't make sense without any refs" msgstr "" @@ -2395,206 +2525,199 @@ msgstr "" msgid "Could not reset index file to revision '%s'." msgstr "" -#: builtin/revert.c:82 +#: builtin/revert.c:99 msgid "program error" msgstr "" -#: builtin/revert.c:154 builtin/revert.c:188 +#: builtin/revert.c:171 #, c-format msgid "Could not read commit message of %s" msgstr "" -#: builtin/revert.c:202 -#, c-format -msgid "Could not extract author email from %s" -msgstr "" - -#: builtin/revert.c:214 -#, c-format -msgid "Could not extract author time from %s" -msgstr "" - -#: builtin/revert.c:230 -#, c-format -msgid "No author information found in %s" -msgstr "" - -#: builtin/revert.c:267 +#: builtin/revert.c:253 #, c-format msgid "Could not write to %s." msgstr "" -#: builtin/revert.c:270 +#: builtin/revert.c:256 #, c-format msgid "Error wrapping up %s" msgstr "" -#: builtin/revert.c:290 +#: builtin/revert.c:276 msgid "" "Your local changes would be overwritten by revert.\n" "Please, commit your changes or stash them to proceed." msgstr "" -#: builtin/revert.c:293 +#: builtin/revert.c:279 msgid "" "Your local changes would be overwritten by cherry-pick.\n" "Please, commit your changes or stash them to proceed." msgstr "" +#: builtin/revert.c:283 +msgid "Your local changes would be overwritten by revert.\n" +msgstr "" + +#: builtin/revert.c:285 +msgid "Your local changes would be overwritten by cherry-pick.\n" +msgstr "" + #. TRANSLATORS: %s will be "revert" or "cherry-pick" -#: builtin/revert.c:351 +#: builtin/revert.c:335 #, c-format msgid "%s: Unable to write new index file" msgstr "" -#: builtin/revert.c:417 +#: builtin/revert.c:401 msgid "Your index file is unmerged." msgstr "" -#: builtin/revert.c:420 +#: builtin/revert.c:404 msgid "You do not have a valid HEAD" msgstr "" -#: builtin/revert.c:428 -msgid "Cannot revert a root commit" -msgstr "" - -#: builtin/revert.c:437 +#: builtin/revert.c:419 #, c-format msgid "Commit %s is a merge but no -m option was given." msgstr "" -#: builtin/revert.c:445 +#: builtin/revert.c:427 #, c-format msgid "Commit %s does not have parent %d" msgstr "" -#: builtin/revert.c:449 +#: builtin/revert.c:431 #, 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 -#: builtin/revert.c:460 +#: builtin/revert.c:442 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "" -#: builtin/revert.c:464 +#: builtin/revert.c:446 #, c-format msgid "Cannot get commit message for %s" msgstr "" -#: builtin/revert.c:525 +#: builtin/revert.c:508 #, c-format msgid "could not revert %s... %s" msgstr "" -#: builtin/revert.c:526 +#: builtin/revert.c:509 #, c-format msgid "could not apply %s... %s" msgstr "" -#: builtin/revert.c:559 +#: builtin/revert.c:542 msgid "empty commit set passed" msgstr "" -#: builtin/revert.c:573 +#: builtin/revert.c:550 +#, c-format +msgid "git %s: failed to read the index" +msgstr "" + +#: builtin/revert.c:555 +#, c-format +msgid "git %s: failed to refresh the index" +msgstr "" + +#: builtin/revert.c:571 msgid "cherry-pick --ff cannot be used with --signoff" msgstr "" -#: builtin/revert.c:575 +#: builtin/revert.c:573 msgid "cherry-pick --ff cannot be used with --no-commit" msgstr "" -#: builtin/revert.c:577 +#: builtin/revert.c:575 msgid "cherry-pick --ff cannot be used with -x" msgstr "" -#: builtin/revert.c:579 +#: builtin/revert.c:577 msgid "cherry-pick --ff cannot be used with --edit" msgstr "" -#. TRANSLATORS: %s will be "revert" or "cherry-pick" -#: builtin/revert.c:584 -#, c-format -msgid "git %s: failed to read the index" -msgstr "" - -#: builtin/rm.c:118 +#: builtin/rm.c:109 #, c-format msgid "" "'%s' has staged content different from both the file and the HEAD\n" "(use -f to force removal)" msgstr "" -#: builtin/rm.c:124 +#: builtin/rm.c:115 #, c-format msgid "" "'%s' has changes staged in the index\n" "(use --cached to keep the file, or -f to force removal)" msgstr "" -#: builtin/rm.c:128 +#: builtin/rm.c:119 #, c-format msgid "" "'%s' has local modifications\n" "(use --cached to keep the file, or -f to force removal)" msgstr "" -#: builtin/rm.c:202 +#: builtin/rm.c:194 #, c-format msgid "not removing '%s' recursively without -r" msgstr "" -#: builtin/rm.c:238 +#: builtin/rm.c:230 #, c-format msgid "git rm: unable to remove %s" msgstr "" -#: builtin/shortlog.c:161 +#: builtin/shortlog.c:157 #, c-format msgid "Missing author: %s" msgstr "" -#: builtin/tag.c:123 builtin/tag.c:464 +#: builtin/tag.c:121 #, c-format msgid "tag name too long: %.*s..." msgstr "" -#: builtin/tag.c:128 +#: builtin/tag.c:126 #, fuzzy, c-format msgid "tag '%s' not found." msgstr "nie znaleziono szablonów %s" -#: builtin/tag.c:143 +#: builtin/tag.c:141 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "" -#: builtin/tag.c:155 +#: builtin/tag.c:153 #, c-format msgid "could not verify the tag '%s'" msgstr "" -#: builtin/tag.c:170 +#: builtin/tag.c:168 msgid "committer info too long." msgstr "" -#: builtin/tag.c:190 +#: builtin/tag.c:188 msgid "could not run gpg." msgstr "" -#: builtin/tag.c:196 +#: builtin/tag.c:194 msgid "gpg did not accept the tag data" msgstr "" -#: builtin/tag.c:203 +#: builtin/tag.c:201 msgid "gpg failed to sign the tag" msgstr "" -#: builtin/tag.c:218 +#: builtin/tag.c:216 msgid "" "\n" "#\n" @@ -2602,73 +2725,73 @@ msgid "" "#\n" msgstr "" -#: builtin/tag.c:226 +#: builtin/tag.c:224 #, c-format msgid "signing key value too long (%.10s...)" msgstr "" -#: builtin/tag.c:272 +#: builtin/tag.c:264 msgid "unable to sign the tag" msgstr "" -#: builtin/tag.c:274 +#: builtin/tag.c:266 msgid "unable to write tag file" msgstr "" -#: builtin/tag.c:289 +#: builtin/tag.c:281 msgid "bad object type." msgstr "" -#: builtin/tag.c:302 +#: builtin/tag.c:294 msgid "tag header too big." msgstr "" -#: builtin/tag.c:329 +#: builtin/tag.c:321 msgid "no tag message?" msgstr "" -#: builtin/tag.c:335 +#: builtin/tag.c:327 #, c-format msgid "The tag message has been left in %s\n" msgstr "" -#: builtin/tag.c:428 +#: builtin/tag.c:431 msgid "-n option is only allowed with -l." msgstr "" -#: builtin/tag.c:430 +#: builtin/tag.c:433 msgid "--contains option is only allowed with -l." msgstr "" -#: builtin/tag.c:438 +#: builtin/tag.c:441 msgid "only one -F or -m option is allowed." msgstr "" -#: builtin/tag.c:458 +#: builtin/tag.c:461 msgid "too many params" msgstr "" -#: builtin/tag.c:466 +#: builtin/tag.c:467 #, c-format msgid "'%s' is not a valid tag name." msgstr "" -#: builtin/tag.c:471 +#: builtin/tag.c:472 #, c-format msgid "tag '%s' already exists" msgstr "" -#: builtin/tag.c:479 +#: builtin/tag.c:480 #, c-format msgid "%s: cannot lock the ref" msgstr "" -#: builtin/tag.c:481 +#: builtin/tag.c:482 #, c-format msgid "%s: cannot update the ref" msgstr "" -#: builtin/tag.c:483 +#: builtin/tag.c:484 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "" @@ -2677,7 +2800,13 @@ msgstr "" msgid "You need to set your committer info first" msgstr "" -#: git-am.sh:80 +#: git-am.sh:93 +msgid "" +"You seem to have moved HEAD since the last 'am' failure.\n" +"Not rewinding to ORIG_HEAD" +msgstr "" + +#: git-am.sh:105 #, sh-format msgid "" "When you have resolved this problem run \"$cmdline --resolved\".\n" @@ -2685,56 +2814,60 @@ msgid "" "To restore the original branch and stop patching run \"$cmdline --abort\"." msgstr "" -#: git-am.sh:96 +#: git-am.sh:121 msgid "Cannot fall back to three-way merge." msgstr "" -#: git-am.sh:111 +#: git-am.sh:136 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" -#: git-am.sh:120 +#: git-am.sh:145 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." msgstr "" -#: git-am.sh:236 +#: git-am.sh:154 +msgid "Falling back to patching base and 3-way merge..." +msgstr "" + +#: git-am.sh:261 msgid "Only one StGIT patch series can be applied at once" msgstr "" -#: git-am.sh:288 +#: git-am.sh:313 #, sh-format msgid "Patch format $patch_format is not supported." msgstr "" -#: git-am.sh:290 +#: git-am.sh:315 msgid "Patch format detection failed." msgstr "" -#: git-am.sh:340 +#: git-am.sh:365 msgid "-d option is no longer supported. Do not use." msgstr "" -#: git-am.sh:403 +#: git-am.sh:428 #, sh-format msgid "previous rebase directory $dotest still exists but mbox given." msgstr "" -#: git-am.sh:408 +#: git-am.sh:433 msgid "Please make up your mind. --skip or --abort?" msgstr "" -#: git-am.sh:434 +#: git-am.sh:460 msgid "Resolve operation not in progress, we are not resuming." msgstr "" -#: git-am.sh:499 +#: git-am.sh:525 #, sh-format msgid "Dirty index: cannot apply patches (dirty: $files)" msgstr "" -#: git-am.sh:595 +#: git-am.sh:614 #, sh-format msgid "" "Patch is empty. Was it split wrong?\n" @@ -2742,52 +2875,530 @@ msgid "" "To restore the original branch and stop patching run \"$cmdline --abort\"." msgstr "" -#: git-am.sh:632 +#: git-am.sh:651 msgid "Patch does not have a valid e-mail address." msgstr "" -#: git-am.sh:679 +#: git-am.sh:698 msgid "cannot be interactive without stdin connected to a terminal." msgstr "" -#: git-am.sh:683 +#: git-am.sh:702 msgid "Commit Body is:" msgstr "" #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] #. in your translation. The program will only accept English #. input at this point. -#: git-am.sh:690 +#: git-am.sh:709 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " msgstr "" -#: git-am.sh:726 +#: git-am.sh:745 #, sh-format msgid "Applying: $FIRSTLINE" msgstr "" -#: git-am.sh:747 +#: git-am.sh:766 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" "already introduced the same changes; you might want to skip this patch." msgstr "" -#: git-am.sh:755 +#: git-am.sh:774 msgid "" "You still have unmerged paths in your index\n" "did you forget to use 'git add'?" msgstr "" -#: git-am.sh:771 +#: git-am.sh:790 msgid "No changes -- Patch already applied." msgstr "" -#: git-am.sh:781 +#: git-am.sh:800 #, sh-format msgid "Patch failed at $msgnum $FIRSTLINE" msgstr "" -#: git-am.sh:797 +#: git-am.sh:816 msgid "applying to an empty history" msgstr "" + +#: git-bisect.sh:40 +msgid "You need to start by \"git bisect start\"" +msgstr "" + +#. TRANSLATORS: Make sure to include [Y] and [n] in your +#. translation. The program will only accept English input +#. at this point. +#: git-bisect.sh:48 +msgid "Do you want me to do it for you [Y/n]? " +msgstr "" + +#: git-bisect.sh:67 +msgid "Bad HEAD - I need a HEAD" +msgstr "" + +#: git-bisect.sh:86 +msgid "won't bisect on seeked tree" +msgstr "" + +#: git-bisect.sh:90 +msgid "Bad HEAD - strange symbolic ref" +msgstr "" + +#: git-bisect.sh:120 +#, sh-format +msgid "'$arg' does not appear to be a valid revision" +msgstr "" + +#: git-bisect.sh:165 +#, sh-format +msgid "Bad bisect_write argument: $state" +msgstr "" + +#: git-bisect.sh:193 +#, sh-format +msgid "Bad rev input: $arg" +msgstr "" + +#: git-bisect.sh:207 +msgid "Please call 'bisect_state' with at least one argument." +msgstr "" + +#: git-bisect.sh:210 +msgid "Bad rev input: HEAD" +msgstr "" + +#: git-bisect.sh:219 +#, sh-format +msgid "Bad rev input: $rev" +msgstr "" + +#: git-bisect.sh:225 +msgid "'git bisect bad' can take only one argument." +msgstr "" + +#. have bad but not good. we could bisect although +#. this is less optimum. +#: git-bisect.sh:249 +msgid "Warning: bisecting only with a bad commit." +msgstr "" + +#. TRANSLATORS: Make sure to include [Y] and [n] in your +#. translation. The program will only accept English input +#. at this point. +#: git-bisect.sh:257 +msgid "Are you sure [Y/n]? " +msgstr "" + +#: git-bisect.sh:268 +msgid "" +"You need to give me at least one good and one bad revisions.\n" +"(You can use \"git bisect bad\" and \"git bisect good\" for that.)" +msgstr "" + +#: git-bisect.sh:274 +msgid "" +"You need to start by \"git bisect start\".\n" +"You then need to give me at least one good and one bad revisions.\n" +"(You can use \"git bisect bad\" and \"git bisect good\" for that.)" +msgstr "" + +#: git-bisect.sh:330 git-bisect.sh:457 +msgid "We are not bisecting." +msgstr "" + +#: git-bisect.sh:337 +#, sh-format +msgid "'$invalid' is not a valid commit" +msgstr "" + +#: git-bisect.sh:346 +#, sh-format +msgid "" +"Could not check out original HEAD '$branch'.\n" +"Try 'git bisect reset '." +msgstr "" + +#: git-bisect.sh:371 +msgid "No logfile given" +msgstr "" + +#: git-bisect.sh:372 +#, fuzzy, sh-format +msgid "cannot read $file for replaying" +msgstr "readlink nie zadziałało dla '%s'" + +#: git-bisect.sh:388 +msgid "?? what are you talking about?" +msgstr "" + +#: git-bisect.sh:400 +#, sh-format +msgid "running $command" +msgstr "" + +#: git-bisect.sh:407 +#, sh-format +msgid "" +"bisect run failed:\n" +"exit code $res from '$command' is < 0 or >= 128" +msgstr "" + +#: git-bisect.sh:433 +msgid "bisect run cannot continue any more" +msgstr "" + +#: git-bisect.sh:441 +#, sh-format +msgid "" +"bisect run failed:\n" +"'bisect_state $state' exited with error code $res" +msgstr "" + +#: git-bisect.sh:449 +msgid "bisect run success" +msgstr "" + +#: git-pull.sh:21 +msgid "" +"Pull is not possible because you have unmerged files.\n" +"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 "" + +#: git-pull.sh:25 +msgid "Pull is not possible because you have unmerged files." +msgstr "" + +#: git-pull.sh:189 +msgid "updating an unborn branch with changes added to the index" +msgstr "" + +#. The fetch involved updating the current branch. +#. The working tree and the index file is still based on the +#. $orig_head commit, but we are merging into $curr_head. +#. First update the working tree to match $curr_head. +#: git-pull.sh:221 +#, sh-format +msgid "" +"Warning: fetch updated the current branch head.\n" +"Warning: fast-forwarding your working tree from\n" +"Warning: commit $orig_head." +msgstr "" + +#: git-pull.sh:248 +msgid "Cannot merge multiple branches into empty head" +msgstr "" + +#: git-pull.sh:252 +msgid "Cannot rebase onto multiple branches" +msgstr "" + +#: git-stash.sh:43 +msgid "git stash clear with parameters is unimplemented" +msgstr "" + +#: git-stash.sh:65 +msgid "You do not have the initial commit yet" +msgstr "" + +#: git-stash.sh:80 +#, fuzzy +msgid "Cannot save the current index state" +msgstr "Nie mogę dobrać się do bieżącego katalogu" + +#: git-stash.sh:94 git-stash.sh:107 +#, fuzzy +msgid "Cannot save the current worktree state" +msgstr "Nie mogę dobrać się do bieżącego katalogu" + +#: git-stash.sh:111 +msgid "No changes selected" +msgstr "" + +#: git-stash.sh:114 +msgid "Cannot remove temporary index (can't happen)" +msgstr "" + +#: git-stash.sh:127 +#, fuzzy +msgid "Cannot record working tree state" +msgstr "Nie mogę dostać się do drzewa roboczego '%s'" + +#: git-stash.sh:182 +msgid "No local changes to save" +msgstr "" + +#: git-stash.sh:186 +msgid "Cannot initialize stash" +msgstr "" + +#: git-stash.sh:194 +msgid "Cannot save the current status" +msgstr "" + +#: git-stash.sh:207 +#, fuzzy +msgid "Cannot remove worktree changes" +msgstr "Nie mogę dostać się do drzewa roboczego '%s'" + +#: git-stash.sh:302 +msgid "No stash found." +msgstr "" + +#: git-stash.sh:309 +#, sh-format +msgid "Too many revisions specified: $REV" +msgstr "" + +#: git-stash.sh:315 +#, sh-format +msgid "$reference is not valid reference" +msgstr "" + +#: git-stash.sh:340 +#, sh-format +msgid "'$args' is not a stash-like commit" +msgstr "" + +#: git-stash.sh:351 +#, sh-format +msgid "'$args' is not a stash reference" +msgstr "" + +#: git-stash.sh:359 +msgid "unable to refresh index" +msgstr "" + +#: git-stash.sh:363 +msgid "Cannot apply a stash in the middle of a merge" +msgstr "" + +#: git-stash.sh:371 +msgid "Conflicts in index. Try without --index." +msgstr "" + +#: git-stash.sh:373 +#, fuzzy +msgid "Could not save index tree" +msgstr "Nie mogę dać prawa zapisu grupie w %s" + +#: git-stash.sh:399 +msgid "Cannot unstage modified files" +msgstr "" + +#: git-stash.sh:414 +msgid "Index was not unstashed." +msgstr "" + +#: git-stash.sh:433 +#, sh-format +msgid "Dropped ${REV} ($s)" +msgstr "" + +#: git-stash.sh:434 +#, sh-format +msgid "${REV}: Could not drop stash entry" +msgstr "" + +#: git-stash.sh:441 +msgid "No branch name specified" +msgstr "" + +#: git-stash.sh:512 +msgid "(To restore them type \"git stash apply\")" +msgstr "" + +#: git-submodule.sh:38 +#, sh-format +msgid "remote ($remote) does not have a url defined in .git/config" +msgstr "" + +#: git-submodule.sh:56 +#, sh-format +msgid "cannot strip one component off url '$remoteurl'" +msgstr "" + +#: git-submodule.sh:108 +#, sh-format +msgid "No submodule mapping found in .gitmodules for path '$path'" +msgstr "" + +#: git-submodule.sh:132 +#, sh-format +msgid "Clone of '$url' into submodule path '$path' failed" +msgstr "" + +#: git-submodule.sh:205 +#, sh-format +msgid "repo URL: '$repo' must be absolute or begin with ./|../" +msgstr "" + +#: git-submodule.sh:222 +#, fuzzy, sh-format +msgid "'$path' already exists in the index" +msgstr "readlink nie zadziałało dla '%s'" + +#: git-submodule.sh:227 +#, sh-format +msgid "" +"The following path is ignored by one of your .gitignore files:\n" +"$path\n" +"Use -f if you really want to add it." +msgstr "" + +#: git-submodule.sh:240 +#, sh-format +msgid "Adding existing repo at '$path' to the index" +msgstr "" + +#: git-submodule.sh:242 +#, fuzzy, sh-format +msgid "'$path' already exists and is not a valid git repo" +msgstr "beznadziejny katalog gita %s" + +#: git-submodule.sh:265 +#, sh-format +msgid "Unable to checkout submodule '$path'" +msgstr "" + +#: git-submodule.sh:269 +#, sh-format +msgid "Failed to add submodule '$path'" +msgstr "" + +#: git-submodule.sh:274 +#, sh-format +msgid "Failed to register submodule '$path'" +msgstr "" + +#: git-submodule.sh:312 +#, sh-format +msgid "Entering '$prefix$path'" +msgstr "" + +#: git-submodule.sh:324 +#, sh-format +msgid "Stopping at '$path'; script returned non-zero status." +msgstr "" + +#: git-submodule.sh:367 +#, sh-format +msgid "No url found for submodule path '$path' in .gitmodules" +msgstr "" + +#: git-submodule.sh:377 +#, sh-format +msgid "Failed to register url for submodule path '$path'" +msgstr "" + +#: git-submodule.sh:382 +#, sh-format +msgid "Failed to register update mode for submodule path '$path'" +msgstr "" + +#: git-submodule.sh:384 +#, sh-format +msgid "Submodule '$name' ($url) registered for path '$path'" +msgstr "" + +#: git-submodule.sh:467 +#, sh-format +msgid "" +"Submodule path '$path' not initialized\n" +"Maybe you want to use 'update --init'?" +msgstr "" + +#: git-submodule.sh:480 +#, sh-format +msgid "Unable to find current revision in submodule path '$path'" +msgstr "" + +#: git-submodule.sh:504 +#, sh-format +msgid "Unable to fetch in submodule path '$path'" +msgstr "" + +#: git-submodule.sh:517 +#, sh-format +msgid "Unable to rebase '$sha1' in submodule path '$path'" +msgstr "" + +#: git-submodule.sh:518 +#, sh-format +msgid "Submodule path '$path': rebased into '$sha1'" +msgstr "" + +#: git-submodule.sh:522 +#, sh-format +msgid "Unable to merge '$sha1' in submodule path '$path'" +msgstr "" + +#: git-submodule.sh:523 +#, sh-format +msgid "Submodule path '$path': merged in '$sha1'" +msgstr "" + +#: git-submodule.sh:527 +#, sh-format +msgid "Unable to checkout '$sha1' in submodule path '$path'" +msgstr "" + +#: git-submodule.sh:528 +#, sh-format +msgid "Submodule path '$path': checked out '$sha1'" +msgstr "" + +#: git-submodule.sh:539 git-submodule.sh:841 +#, sh-format +msgid "Failed to recurse into submodule path '$path'" +msgstr "" + +#: git-submodule.sh:623 +msgid "--" +msgstr "" + +#. unexpected type +#: git-submodule.sh:664 +#, sh-format +msgid "unexpected mode $mod_dst" +msgstr "" + +#: git-submodule.sh:684 +#, sh-format +msgid " Warn: $name doesn't contain commit $sha1_src" +msgstr "" + +#: git-submodule.sh:687 +#, sh-format +msgid " Warn: $name doesn't contain commit $sha1_dst" +msgstr "" + +#: git-submodule.sh:690 +#, sh-format +msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst" +msgstr "" + +#: git-submodule.sh:715 +msgid "blob" +msgstr "" + +#: git-submodule.sh:716 +msgid "submodule" +msgstr "" + +#: git-submodule.sh:753 +msgid "# Submodules changed but not updated:" +msgstr "" + +#: git-submodule.sh:755 +msgid "# Submodule changes to be committed:" +msgstr "" + +#: git-submodule.sh:885 +#, sh-format +msgid "Synchronizing submodule url for '$name'" +msgstr "" From c5d2a3cc7dae2eea1cb1800b530034200af84393 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Date: Wed, 6 Jul 2011 19:22:54 +0000 Subject: [PATCH 13/15] sv.po: msgmerge --- po/sv.po | 1900 +++++++++++++++++++++++++++++------------------------- 1 file changed, 1017 insertions(+), 883 deletions(-) diff --git a/po/sv.po b/po/sv.po index 78b4d9a11ddada..3c651cf5fdff20 100644 --- a/po/sv.po +++ b/po/sv.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: git 1.7.3\n" "Report-Msgid-Bugs-To: Git Mailing List \n" -"POT-Creation-Date: 2010-09-20 15:16+0000\n" +"POT-Creation-Date: 2011-07-06 19:20+0000\n" "PO-Revision-Date: 2010-09-12 21:07+0100\n" "Last-Translator: Peter Krefting \n" "Language-Team: Swedish \n" @@ -17,254 +17,287 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: wt-status.c:56 -msgid "# Unmerged paths:" -msgstr "# Ej sammanslagna sökvägar:" +#: diff.c:104 +#, c-format +msgid " Failed to parse dirstat cut-off percentage '%.*s'\n" +msgstr "" -#: wt-status.c:62 wt-status.c:79 +#: diff.c:109 +#, fuzzy, c-format +msgid " Unknown dirstat parameter '%.*s'\n" +msgstr "kan inte ta status på mallen \"%s\"" + +#: diff.c:205 #, c-format -msgid "# (use \"git reset %s ...\" to unstage)" +msgid "" +"Found errors in 'diff.dirstat' config variable:\n" +"%s" +msgstr "" + +#: diff.c:3295 +#, c-format +msgid "" +"Failed to parse --dirstat/-X option parameter:\n" +"%s" +msgstr "" + +#: wt-status.c:134 +#, fuzzy +msgid "Unmerged paths:" +msgstr "# Ej sammanslagna sökvägar:" + +#: wt-status.c:140 wt-status.c:157 +#, fuzzy, c-format +msgid " (use \"git reset %s ...\" to unstage)" msgstr "# (använd \"git reset %s ...\" för att ta bort från kö)" -#: wt-status.c:64 wt-status.c:81 -msgid "# (use \"git rm --cached ...\" to unstage)" +#: wt-status.c:142 wt-status.c:159 +#, fuzzy +msgid " (use \"git rm --cached ...\" to unstage)" msgstr "# (använd \"git rm --cached ...\" för att ta bort från kö)" -#: wt-status.c:65 -msgid "# (use \"git add/rm ...\" as appropriate to mark resolution)" +#: wt-status.c:143 +#, fuzzy +msgid " (use \"git add/rm ...\" as appropriate to mark resolution)" msgstr "# (använd \"git add/rm ...\" som lämpligt för att ange lösning)" -#: wt-status.c:73 -msgid "# Changes to be committed:" +#: wt-status.c:151 +#, fuzzy +msgid "Changes to be committed:" msgstr "# Ändringar att checka in:" -#: wt-status.c:91 -msgid "# Changed but not updated:" -msgstr "# Ändrade men inte uppdaterade:" +#: wt-status.c:169 +#, fuzzy +msgid "Changes not staged for commit:" +msgstr "# Ändringar att checka in:" -#: wt-status.c:95 -msgid "# (use \"git add ...\" to update what will be committed)" +#: wt-status.c:173 +#, fuzzy +msgid " (use \"git add ...\" to update what will be committed)" msgstr "" "# (använd \"git add ...\" för att uppdatera vad som skall checkas in)" -#: wt-status.c:97 -msgid "# (use \"git add/rm ...\" to update what will be committed)" +#: wt-status.c:175 +#, fuzzy +msgid " (use \"git add/rm ...\" to update what will be committed)" msgstr "" "# (använd \"git add/rm ...\" för att uppdatera vad som skall checkas " "in)" -#: wt-status.c:98 +#: wt-status.c:176 +#, fuzzy msgid "" -"# (use \"git checkout -- ...\" to discard changes in working " -"directory)" +" (use \"git checkout -- ...\" to discard changes in working directory)" msgstr "" "# (använd \"git checkout -- ...\" för att förkasta ändringar i " "arbetskatalogen)" -#: wt-status.c:100 -msgid "# (commit or discard the untracked or modified content in submodules)" +#: wt-status.c:178 +#, fuzzy +msgid " (commit or discard the untracked or modified content in submodules)" msgstr "" "# (checka in eller förkasta ospårat eller ändrat innehåll i undermoduler)" -#: wt-status.c:109 -#, c-format -msgid "# %s files:" +#: wt-status.c:187 +#, fuzzy, c-format +msgid "%s files:" msgstr "# %s filer:" -#: wt-status.c:112 -#, c-format -msgid "# (use \"git %s ...\" to include in what will be committed)" +#: wt-status.c:190 +#, fuzzy, c-format +msgid " (use \"git %s ...\" to include in what will be committed)" msgstr "" "# (använd \"git %s ...\" för att ta med i vad som skall checkas in)" -#: wt-status.c:129 +#: wt-status.c:207 msgid "bug" msgstr "programfel" -#: wt-status.c:134 +#: wt-status.c:212 msgid "both deleted:" msgstr "borttaget av bägge:" -#: wt-status.c:135 +#: wt-status.c:213 msgid "added by us:" msgstr "tillagt av oss:" -#: wt-status.c:136 +#: wt-status.c:214 msgid "deleted by them:" msgstr "borttaget av dem:" -#: wt-status.c:137 +#: wt-status.c:215 msgid "added by them:" msgstr "tillagt av dem:" -#: wt-status.c:138 +#: wt-status.c:216 msgid "deleted by us:" msgstr "borttaget av oss:" -#: wt-status.c:139 +#: wt-status.c:217 msgid "both added:" msgstr "tillagt av bägge:" -#: wt-status.c:140 +#: wt-status.c:218 msgid "both modified:" msgstr "ändrat av bägge:" -#: wt-status.c:170 +#: wt-status.c:248 msgid "new commits, " msgstr "nya incheckningar, " -#: wt-status.c:172 +#: wt-status.c:250 msgid "modified content, " msgstr "ändrat innehåll, " -#: wt-status.c:174 +#: wt-status.c:252 msgid "untracked content, " msgstr "ospårat innehåll, " -#: wt-status.c:188 +#: wt-status.c:266 #, c-format msgid "new file: %s" msgstr "ny fil: %s" -#: wt-status.c:191 +#: wt-status.c:269 #, c-format msgid "copied: %s -> %s" msgstr "kopierad: %s -> %s" -#: wt-status.c:194 +#: wt-status.c:272 #, c-format msgid "deleted: %s" msgstr "borttagen: %s" -#: wt-status.c:197 +#: wt-status.c:275 #, c-format msgid "modified: %s" msgstr "ändrad: %s" -#: wt-status.c:200 +#: wt-status.c:278 #, c-format msgid "renamed: %s -> %s" msgstr "namnbyte: %s -> %s" -#: wt-status.c:203 +#: wt-status.c:281 #, c-format msgid "typechange: %s" msgstr "typbyte: %s" -#: wt-status.c:206 +#: wt-status.c:284 #, c-format msgid "unknown: %s" msgstr "okänd: %s" -#: wt-status.c:209 +#: wt-status.c:287 #, c-format msgid "unmerged: %s" msgstr "osammansl.: %s" -#: wt-status.c:212 +#: wt-status.c:290 #, c-format msgid "bug: unhandled diff status %c" msgstr "programfel: diff-status %c ej hanterad" -#: wt-status.c:635 +#: wt-status.c:713 msgid "On branch " msgstr "På grenen " -#: wt-status.c:642 +#: wt-status.c:720 msgid "Not currently on any branch." msgstr "Inte på någon gren för närvarande." -#: wt-status.c:652 -msgid "# Initial commit" +#: wt-status.c:731 +#, fuzzy +msgid "Initial commit" msgstr "# Grundincheckning" -#: wt-status.c:666 +#: wt-status.c:745 msgid "Untracked" msgstr "Ospårad" -#: wt-status.c:668 +#: wt-status.c:747 msgid "Ignored" msgstr "Ignorerad" -#: wt-status.c:670 -#, c-format -msgid "# Untracked files not listed%s\n" +#: wt-status.c:749 +#, fuzzy, c-format +msgid "Untracked files not listed%s" msgstr "# Ospårade filer visas ej%s\n" -#: wt-status.c:672 +#: wt-status.c:751 msgid " (use -u option to show untracked files)" msgstr " (använd flaggan -u för att visa ospårade filer)" -#: wt-status.c:678 -#, c-format -msgid "# No changes\n" +#: wt-status.c:757 +#, fuzzy +msgid "No changes" msgstr "# Inga ändringar\n" -#: wt-status.c:682 +#: wt-status.c:761 #, c-format msgid "no changes added to commit%s\n" msgstr "inga ändringar att checka in%s\n" -#: wt-status.c:684 +#: wt-status.c:763 msgid " (use \"git add\" and/or \"git commit -a\")" msgstr " (använd \"git add\" och/eller \"git commit -a\")" -#: wt-status.c:686 +#: wt-status.c:765 #, c-format msgid "nothing added to commit but untracked files present%s\n" msgstr "inget köat för incheckning, men ospårade filer finns%s\n" -#: wt-status.c:688 +#: wt-status.c:767 msgid " (use \"git add\" to track)" msgstr " (använd \"git add\" för att spåra)" -#: wt-status.c:690 wt-status.c:693 wt-status.c:696 +#: wt-status.c:769 wt-status.c:772 wt-status.c:775 #, c-format msgid "nothing to commit%s\n" msgstr "inget att checka in%s\n" -#: wt-status.c:691 +#: wt-status.c:770 msgid " (create/copy files and use \"git add\" to track)" msgstr " (skapa/kopiera filer och använd \"git add\" för att spåra)" -#: wt-status.c:694 +#: wt-status.c:773 msgid " (use -u to show untracked files)" msgstr " (använd -u för att visa ospårade filer)" -#: wt-status.c:697 +#: wt-status.c:776 msgid " (working directory clean)" msgstr " (arbetskatalogen ren)" -#: wt-status.c:795 +#: wt-status.c:884 msgid "HEAD (no branch)" msgstr "HEAD (ingen gren)" -#: wt-status.c:801 +#: wt-status.c:890 msgid "Initial commit on " msgstr "Grundincheckning på " -#: wt-status.c:816 +#: wt-status.c:905 msgid "behind " msgstr "efter " -#: wt-status.c:819 wt-status.c:822 +#: wt-status.c:908 wt-status.c:911 msgid "ahead " msgstr "före " -#: wt-status.c:824 +#: wt-status.c:913 msgid ", behind " msgstr ", efter " -#: builtin/add.c:41 +#: builtin/add.c:61 #, c-format msgid "unexpected diff status %c" msgstr "diff-status %c förväntades inte" -#: builtin/add.c:67 builtin/commit.c:244 +#: builtin/add.c:66 builtin/commit.c:291 msgid "updating files failed" msgstr "misslyckades uppdatera filer" -#: builtin/add.c:77 +#: builtin/add.c:76 #, c-format msgid "remove '%s'\n" msgstr "ta bort \"%s\"\n" @@ -278,7 +311,7 @@ msgstr "Sökvägen \"%s\" är i undermodulen \"%.*s\"" msgid "Unstaged changes after refreshing the index:" msgstr "Ospårade ändringar efter att ha uppdaterat indexet:" -#: builtin/add.c:194 builtin/add.c:452 builtin/rm.c:194 +#: builtin/add.c:194 builtin/add.c:454 builtin/rm.c:186 #, c-format msgid "pathspec '%s' did not match any files" msgstr "sökvägsangivelsen \"%s\" motsvarade inte några filer" @@ -315,43 +348,47 @@ msgstr "Tom patch. Avbryter." msgid "Could not apply '%s'" msgstr "Kunde inte applicera \"%s\"" -#: builtin/add.c:349 +#: builtin/add.c:310 +msgid "The following paths are ignored by one of your .gitignore files:\n" +msgstr "" + +#: builtin/add.c:350 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "Använd -f om du verkligen vill lägga till dem.\n" -#: builtin/add.c:350 +#: builtin/add.c:351 msgid "no files added" msgstr "inga filer har lagts till" -#: builtin/add.c:356 +#: builtin/add.c:357 msgid "adding files failed" msgstr "misslyckades lägga till filer" -#: builtin/add.c:388 +#: builtin/add.c:389 msgid "-A and -u are mutually incompatible" msgstr "-A och -u är ömsesidigt inkompatibla" -#: builtin/add.c:390 +#: builtin/add.c:391 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "Flaggan --ignore-missing kan endast användas tillsammans med --dry-run" -#: builtin/add.c:410 +#: builtin/add.c:411 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "Inget angivet, inget tillagt.\n" -#: builtin/add.c:411 +#: builtin/add.c:412 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Kanske menade du att skriva \"git add .\"?\n" -#: builtin/add.c:417 builtin/clean.c:95 builtin/commit.c:301 -#: builtin/commit.c:310 builtin/mv.c:77 builtin/rm.c:171 +#: builtin/add.c:418 builtin/clean.c:95 builtin/commit.c:350 builtin/mv.c:77 +#: builtin/rm.c:162 msgid "index file corrupt" msgstr "indexfilen trasig" -#: builtin/add.c:468 builtin/mv.c:223 builtin/rm.c:268 +#: builtin/add.c:470 builtin/mv.c:223 builtin/rm.c:260 msgid "Unable to write new index file" msgstr "Kunde inte skriva ny indexfil" @@ -386,10 +423,10 @@ msgid "git archive: expected a flush" msgstr "git archive: förväntade en tömning (flush)" #: builtin/branch.c:136 -#, c-format +#, fuzzy, c-format msgid "" "deleting branch '%s' that has been merged to\n" -" '%s', but it is not yet merged to HEAD." +" '%s', but not yet merged to HEAD." msgstr "" "tar bort grenen \"%s\" som inte har slagits ihop med\n" " \"%s\", men som ännu inte slagits ihop med HEAD." @@ -459,76 +496,76 @@ msgstr "Misslyckades uppdatera konfigurationsfil" msgid "branch '%s' does not point at a commit" msgstr "grenen \"%s\" pekar inte på en incheckning" -#: builtin/branch.c:381 +#: builtin/branch.c:376 #, c-format msgid "behind %d] " msgstr "bakom %d] " -#: builtin/branch.c:383 +#: builtin/branch.c:378 #, c-format msgid "ahead %d] " msgstr "före %d] " -#: builtin/branch.c:385 +#: builtin/branch.c:380 #, c-format msgid "ahead %d, behind %d] " msgstr "före %d, bakom %d] " -#: builtin/branch.c:484 +#: builtin/branch.c:483 msgid "(no branch)" msgstr "(ingen gren)" -#: builtin/branch.c:544 +#: builtin/branch.c:543 msgid "some refs could not be read" msgstr "vissa referenser kunde inte läsas" -#: builtin/branch.c:557 +#: builtin/branch.c:556 msgid "cannot rename the current branch while not on any." msgstr "" "kunde inte byta namn på aktuell gren när du inte befinner dig på någon." -#: builtin/branch.c:567 builtin/branch.c:571 +#: builtin/branch.c:566 builtin/branch.c:570 #, c-format msgid "Invalid branch name: '%s'" msgstr "Felaktigt namn på gren: \"%s\"" -#: builtin/branch.c:574 +#: builtin/branch.c:573 #, c-format msgid "A branch named '%s' already exists." msgstr "Det finns redan en gren som heter \"%s\"" -#: builtin/branch.c:580 +#: builtin/branch.c:579 msgid "Branch rename failed" msgstr "Misslyckades byta namn på gren" -#: builtin/branch.c:584 +#: builtin/branch.c:583 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "Bytte bort namn på en felaktigt namngiven gren \"%s\"" -#: builtin/branch.c:588 +#: builtin/branch.c:587 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "Grenen namnbytt till %s, men HEAD har inte uppdaterats!" -#: builtin/branch.c:595 +#: builtin/branch.c:594 msgid "Branch is renamed, but update of config-file failed" msgstr "Grenen namnbytt, men misslyckades uppdatera konfigurationsfilen" -#: builtin/branch.c:610 +#: builtin/branch.c:609 #, c-format msgid "malformed object name %s" msgstr "felformat objektnamn %s" -#: builtin/branch.c:680 +#: builtin/branch.c:683 msgid "Failed to resolve HEAD as a valid ref." msgstr "Misslyckades slå upp HEAD som giltig referens" -#: builtin/branch.c:686 +#: builtin/branch.c:689 msgid "HEAD not found below refs/heads!" msgstr "HEAD hittades inte under refs/heads!" -#: builtin/branch.c:706 +#: builtin/branch.c:709 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" "flaggorna -a och -r på \"git branch\" kan inte anges tillsammans med ett " @@ -547,145 +584,194 @@ msgstr "Behöver ett arkiv för att skapa ett paket (bundle)." msgid "Need a repository to unbundle." msgstr "Behöver ett arkiv för att packa upp ett paket (bundle)." -#: builtin/checkout.c:107 builtin/checkout.c:135 +#: builtin/checkout.c:111 builtin/checkout.c:139 #, c-format msgid "path '%s' does not have our version" msgstr "sökvägen \"%s\" har inte vår version" -#: builtin/checkout.c:109 builtin/checkout.c:137 +#: builtin/checkout.c:113 builtin/checkout.c:141 #, c-format msgid "path '%s' does not have their version" msgstr "sökvägen \"%s\" har inte deras version" -#: builtin/checkout.c:120 +#: builtin/checkout.c:124 #, c-format msgid "path '%s' does not have all three versions" msgstr "sökvägen \"%s\" har inte alla tre versionerna" -#: builtin/checkout.c:155 +#: builtin/checkout.c:159 #, c-format msgid "path '%s' does not have all 3 versions" msgstr "sökvägen \"%s\" har inte alla 3 versionerna" -#: builtin/checkout.c:172 +#: builtin/checkout.c:176 #, c-format msgid "path '%s': cannot merge" msgstr "sökväg \"%s\": kan inte slå ihop" -#: builtin/checkout.c:189 +#: builtin/checkout.c:193 #, c-format msgid "Unable to add merge result for '%s'" msgstr "Kunde inte lägga till sammanslagningsresultat för \"%s\"" -#: builtin/checkout.c:194 builtin/reset.c:170 +#: builtin/checkout.c:198 builtin/reset.c:170 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "make_cache_entry misslyckades för sökvägen \"%s\"" -#: builtin/checkout.c:216 builtin/checkout.c:371 +#: builtin/checkout.c:220 builtin/checkout.c:374 msgid "corrupt index file" msgstr "indexfilen är trasig" -#: builtin/checkout.c:244 builtin/checkout.c:251 +#: builtin/checkout.c:248 builtin/checkout.c:255 #, c-format msgid "path '%s' is unmerged" msgstr "sökvägen \"%s\" har inte slagits ihop" -#: builtin/checkout.c:280 builtin/checkout.c:475 builtin/clone.c:658 -#: builtin/merge.c:737 +#: builtin/checkout.c:284 builtin/checkout.c:478 builtin/clone.c:668 +#: builtin/merge.c:789 msgid "unable to write new index file" msgstr "kunde inte skriva ny indexfil" -#: builtin/checkout.c:297 builtin/diff.c:307 builtin/merge.c:367 +#: builtin/checkout.c:301 builtin/diff.c:301 builtin/merge.c:396 msgid "diff_setup_done failed" msgstr "diff_setup_done misslyckades" -#: builtin/checkout.c:393 +#: builtin/checkout.c:396 msgid "you need to resolve your current index first" msgstr "du måste lösa ditt befintliga index först" -#: builtin/checkout.c:524 +#: builtin/checkout.c:527 #, c-format msgid "Can not do reflog for '%s'\n" msgstr "Kan inte skapa referenslog för \"%s\"\n" -#: builtin/checkout.c:550 +#: builtin/checkout.c:557 +msgid "HEAD is now at" +msgstr "HEAD är nu på" + +#: builtin/checkout.c:563 #, c-format msgid "Already on '%s'\n" msgstr "Redan på \"%s\"\n" -#: builtin/checkout.c:554 +#: builtin/checkout.c:567 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Växlade till och nollställde grenen \"%s\"\n" -#: builtin/checkout.c:556 +#: builtin/checkout.c:569 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Växlade till en ny gren \"%s\"\n" -#: builtin/checkout.c:558 +#: builtin/checkout.c:571 #, c-format msgid "Switched to branch '%s'\n" msgstr "Växlade till grenen \"%s\"\n" -#: builtin/checkout.c:575 -msgid "HEAD is now at" -msgstr "HEAD är nu på" +#: builtin/checkout.c:651 +#, c-format +msgid " ... and %d more.\n" +msgstr "" -#: builtin/checkout.c:603 -msgid "You are on a branch yet to be born" -msgstr "Du är på en gren som ännu inte är född" +#. The singular version +#: builtin/checkout.c:657 +#, 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:675 +#, 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/checkout.c:617 +#: builtin/checkout.c:700 +msgid "internal error: only -- alone should have been left" +msgstr "" + +#: builtin/checkout.c:702 +msgid "internal error in revision walk" +msgstr "" + +#: builtin/checkout.c:706 msgid "Previous HEAD position was" msgstr "Tidigare position för HEAD var" -#: builtin/checkout.c:730 +#: builtin/checkout.c:731 +msgid "You are on a branch yet to be born" +msgstr "Du är på en gren som ännu inte är född" + +#. case (1) +#: builtin/checkout.c:859 +#, c-format +msgid "invalid reference: %s" +msgstr "felaktig referens: %s" + +#. case (1): want a tree +#: builtin/checkout.c:898 +#, c-format +msgid "reference is not a tree: %s" +msgstr "referensen är inte ett träd: %s" + +#: builtin/checkout.c:965 msgid "-B cannot be used with -b" msgstr "-B kan inte användas med -b" -#: builtin/checkout.c:738 +#: builtin/checkout.c:974 msgid "--patch is incompatible with all other options" msgstr "--patch är inkompatibel med alla andra flaggor" -#: builtin/checkout.c:744 +#: builtin/checkout.c:977 +#, fuzzy +msgid "--detach cannot be used with -b/-B/--orphan" +msgstr "--cached kan inte användas med --no-index." + +#: builtin/checkout.c:979 +#, fuzzy +msgid "--detach cannot be used with -t" +msgstr "--orphan kan inte användas med -t" + +#: builtin/checkout.c:985 msgid "--track needs a branch name" msgstr "--track behöver ett namn på en gren" -#: builtin/checkout.c:751 +#: builtin/checkout.c:992 msgid "Missing branch name; try -b" msgstr "Grennamn saknas; försök med -b" -#: builtin/checkout.c:757 +#: builtin/checkout.c:998 msgid "--orphan and -b|-B are mutually exclusive" msgstr "--orphan och --b|-B kan inte användas samtidigt" -#: builtin/checkout.c:759 +#: builtin/checkout.c:1000 msgid "--orphan cannot be used with -t" msgstr "--orphan kan inte användas med -t" -#: builtin/checkout.c:769 +#: builtin/checkout.c:1010 msgid "git checkout: -f and -m are incompatible" msgstr "git checkout: -f och -m är inkompatibla" -#. case (1) -#: builtin/checkout.c:815 -#, c-format -msgid "invalid reference: %s" -msgstr "felaktig referens: %s" - -#. case (1): want a tree -#: builtin/checkout.c:852 -#, c-format -msgid "reference is not a tree: %s" -msgstr "referensen är inte ett träd: %s" - -#: builtin/checkout.c:878 +#: builtin/checkout.c:1044 msgid "invalid path specification" msgstr "felaktig sökvägsangivelse" -#: builtin/checkout.c:886 +#: builtin/checkout.c:1052 #, c-format msgid "" "git checkout: updating paths is incompatible with switching branches.\n" @@ -694,11 +780,16 @@ msgstr "" "git checkout: uppdatera sökvägar är inkompatibelt med att växla gren.\n" "Ville du checka ut \"%s\" som inte kan lösas som en sammanslaning?" -#: builtin/checkout.c:888 +#: builtin/checkout.c:1054 msgid "git checkout: updating paths is incompatible with switching branches." msgstr "git checkout: uppdatera sökvägar är inkompatibelt med att växla gren." -#: builtin/checkout.c:893 +#: builtin/checkout.c:1059 +#, fuzzy +msgid "git checkout: --detach does not take a path argument" +msgstr "fetch --all tar inte namnet på ett arkiv som argument" + +#: builtin/checkout.c:1062 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -706,21 +797,21 @@ msgstr "" "git checkout: --ours/--theirs, --force och --merge är inkompatibla när\n" "du checkar ut från indexet." -#: builtin/checkout.c:904 +#: builtin/checkout.c:1073 #, c-format msgid "git checkout: we do not like '%s' as a branch name." msgstr "git checkout: vi tycker inte om \"%s\" som namn på en gren." -#: builtin/checkout.c:909 +#: builtin/checkout.c:1078 #, c-format msgid "git checkout: branch %s already exists" msgstr "git checkout: grenen %s finns redan" -#: builtin/checkout.c:916 +#: builtin/checkout.c:1085 msgid "Cannot switch branch to a non-commit." msgstr "Kan inte växla gren på en icke-incheckning." -#: builtin/checkout.c:919 +#: builtin/checkout.c:1088 msgid "--ours/--theirs is incompatible with switching branches." msgstr "--ours/--theirs är inkompatibla när du växlar gren." @@ -754,8 +845,8 @@ msgid "Removing %s\n" msgstr "Tar bort %s\n" #: builtin/clean.c:161 builtin/clean.c:181 -#, c-format -msgid "failed to remove '%s'" +#, fuzzy, c-format +msgid "failed to remove %s" msgstr "kunde inte ta bort \"%s\"" #: builtin/clean.c:165 @@ -768,120 +859,130 @@ msgstr "Skulle inte ta bort %s\n" msgid "Not removing %s\n" msgstr "Tar inte bort %s\n" -#: builtin/clone.c:208 +#: builtin/clone.c:214 #, c-format msgid "reference repository '%s' is not a local directory." msgstr "referensarkivet \"%s\" är inte en lokal katalog." -#: builtin/clone.c:235 +#: builtin/clone.c:241 #, c-format msgid "failed to open '%s'" msgstr "misslyckades öppna \"%s\"" -#: builtin/clone.c:239 +#: builtin/clone.c:245 #, c-format msgid "failed to create directory '%s'" msgstr "misslyckades skapa katalogen \"%s\"" -#: builtin/clone.c:241 builtin/diff.c:74 +#: builtin/clone.c:247 builtin/diff.c:74 #, c-format msgid "failed to stat '%s'" msgstr "misslyckades ta status på \"%s\"" -#: builtin/clone.c:243 +#: builtin/clone.c:249 #, c-format msgid "%s exists and is not a directory" msgstr "%s finns och är ingen katalog" -#: builtin/clone.c:257 +#: builtin/clone.c:263 #, c-format msgid "failed to stat %s\n" msgstr "misslyckades ta status på %s\n" -#: builtin/clone.c:267 +#: builtin/clone.c:273 #, c-format msgid "failed to unlink '%s'" msgstr "misslyckades ta bort länken \"%s\"" -#: builtin/clone.c:272 +#: builtin/clone.c:278 #, c-format msgid "failed to create link '%s'" msgstr "misslyckades skapa länken \"%s\"" -#: builtin/clone.c:276 +#: builtin/clone.c:282 #, c-format msgid "failed to copy file to '%s'" msgstr "misslyckades kopiera filen till \"%s\"" -#: builtin/clone.c:305 +#: builtin/clone.c:311 #, c-format msgid "done.\n" msgstr "klart.\n" -#: builtin/clone.c:387 +#: builtin/clone.c:394 msgid "Too many arguments." msgstr "För många argument." -#: builtin/clone.c:391 +#: builtin/clone.c:398 msgid "You must specify a repository to clone." msgstr "Du måste ange ett arkiv att klona." -#: builtin/clone.c:399 +#: builtin/clone.c:406 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "flaggorna --bare och --origin %s är inkompatibla." -#: builtin/clone.c:428 +#: builtin/clone.c:420 +#, fuzzy, c-format +msgid "repository '%s' does not exist" +msgstr "felaktigt arkiv \"%s\"" + +#: builtin/clone.c:425 +msgid "--depth is ignored in local clones; use file:// instead." +msgstr "" + +#: builtin/clone.c:435 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "destinationssökvägen \"%s\" finns redan och är inte en tom katalog." -#: builtin/clone.c:438 +#: builtin/clone.c:445 #, c-format msgid "working tree '%s' already exists." msgstr "arbetsträdet \"%s\" finns redan." -#: builtin/clone.c:451 builtin/clone.c:465 +#: builtin/clone.c:458 builtin/clone.c:472 #, c-format msgid "could not create leading directories of '%s'" msgstr "kunde inte skapa inledande kataloger för \"%s\"" -#: builtin/clone.c:454 +#: builtin/clone.c:461 #, c-format msgid "could not create work tree dir '%s'." msgstr "kunde inte skapa arbetskatalogen \"%s\"" -#: builtin/clone.c:470 -#, c-format -msgid "Cloning into bare repository %s\n" +#: builtin/clone.c:480 +#, fuzzy, c-format +msgid "Cloning into bare repository %s...\n" msgstr "Klonar till ett naket arkiv %s\n" -#: builtin/clone.c:472 -#, c-format -msgid "Cloning into %s\n" +#: builtin/clone.c:482 +#, fuzzy, c-format +msgid "Cloning into %s...\n" msgstr "Klonar till %s\n" -#: builtin/clone.c:530 +#: builtin/clone.c:540 #, c-format msgid "Don't know how to clone %s" msgstr "Vet inte hur man klonar %s" -#: builtin/clone.c:569 +#: builtin/clone.c:579 #, c-format msgid "Remote branch %s not found in upstream %s, using HEAD instead" msgstr "" "Fjärrgrenen %s hittades inte i uppströmsarkivet %s, använder HEAD istället" -#: builtin/clone.c:579 +#: builtin/clone.c:589 msgid "You appear to have cloned an empty repository." msgstr "Du verkar ha klonat ett tomt arkiv." -#: builtin/clone.c:621 +#: builtin/clone.c:631 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" "HEAD hos fjärren pekar på en obefintlig referens, kan inte checka ut.\n" #: builtin/commit.c:41 +#, fuzzy msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -890,9 +991,9 @@ msgid "" " git config --global user.name \"Your Name\"\n" " git config --global user.email you@example.com\n" "\n" -"If the identity used for this commit is wrong, you can fix it with:\n" +"After doing this, you may fix the identity used for this commit with:\n" "\n" -" git commit --amend --author='Your Name '\n" +" git commit --amend --reset-author\n" msgstr "" "Ditt namn och e-postadress konfigurerades automatiskt baserat på\n" "ditt användar-id och värdnamn. Kontrollera att de är riktiga. Du\n" @@ -916,92 +1017,117 @@ msgstr "" "blir den tom. Du kan köra kommandot på nytt med --allow-empty, eller\n" "så kan du ta bort incheckningen helt med \"git reset HEAD^\".\n" -#: builtin/commit.c:271 +#: builtin/commit.c:58 +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" +msgstr "" + +#: builtin/commit.c:318 msgid "failed to unpack HEAD tree object" msgstr "misslyckades packa upp HEAD:s trädobjekt" -#: builtin/commit.c:299 +#: builtin/commit.c:359 +#, fuzzy +msgid "unable to create temporary index" +msgstr "kunde inte skriva temporär indexfil" + +#: builtin/commit.c:365 msgid "interactive add failed" msgstr "interaktiv tilläggning misslyckades" -#: builtin/commit.c:330 builtin/commit.c:350 builtin/commit.c:396 +#: builtin/commit.c:397 builtin/commit.c:417 builtin/commit.c:463 msgid "unable to write new_index file" msgstr "kunde inte skriva filen new_index" -#: builtin/commit.c:380 -msgid "cannot do a partial commit during a merge." +#: builtin/commit.c:447 +#, fuzzy, c-format +msgid "cannot do a partial commit during a %s." msgstr "kan inte utföra en delvis incheckning under en sammanslagning." -#: builtin/commit.c:389 +#: builtin/commit.c:456 msgid "cannot read the index" msgstr "kan inte läsa indexet" -#: builtin/commit.c:409 +#: builtin/commit.c:476 msgid "unable to write temporary index file" msgstr "kunde inte skriva temporär indexfil" -#: builtin/commit.c:456 builtin/commit.c:1294 +#: builtin/commit.c:523 builtin/commit.c:1428 msgid "could not parse HEAD commit" msgstr "kunde inte tolka HEAD:s incheckning" -#: builtin/commit.c:475 builtin/commit.c:481 +#: builtin/commit.c:542 builtin/commit.c:548 #, c-format msgid "invalid commit: %s" msgstr "felaktig incheckning: %s" -#: builtin/commit.c:499 +#: builtin/commit.c:566 msgid "malformed --author parameter" msgstr "felformad \"--author\"-flagga" -#: builtin/commit.c:573 builtin/shortlog.c:299 +#: builtin/commit.c:622 +#, fuzzy, c-format +msgid "Malformed ident string: '%s'" +msgstr "Felaktig indatarad: \"%s\"." + +#: builtin/commit.c:656 builtin/commit.c:689 builtin/commit.c:989 +#, c-format +msgid "could not lookup commit %s" +msgstr "kunde inte slå upp incheckningen %s" + +#: builtin/commit.c:668 builtin/shortlog.c:296 #, c-format msgid "(reading log message from standard input)\n" msgstr "(läser loggmeddelande från standard in)\n" -#: builtin/commit.c:575 +#: builtin/commit.c:670 msgid "could not read log from standard input" msgstr "kunde inte läsa logg från standard in" -#: builtin/commit.c:579 +#: builtin/commit.c:674 #, c-format msgid "could not read log file '%s'" msgstr "kunde inte läsa loggfilen \"%s\"" -#: builtin/commit.c:585 +#: builtin/commit.c:680 msgid "commit has empty message" msgstr "incheckningen har ett tomt meddelande" -#: builtin/commit.c:591 +#: builtin/commit.c:696 msgid "could not read MERGE_MSG" msgstr "kunde inte läsa MERGE_MSG" -#: builtin/commit.c:595 +#: builtin/commit.c:700 msgid "could not read SQUASH_MSG" msgstr "kunde inte läsa SQUASH_MSG" -#: builtin/commit.c:599 +#: builtin/commit.c:704 #, c-format msgid "could not read '%s'" msgstr "kunde inte läsa \"%s\"" -#: builtin/commit.c:612 +#: builtin/commit.c:732 #, c-format msgid "could not open '%s'" msgstr "kunde inte öppna \"%s\"" -#: builtin/commit.c:636 +#: builtin/commit.c:756 msgid "could not write commit template" msgstr "kunde inte skriva incheckningsmall" -#: builtin/commit.c:650 -#, c-format +#: builtin/commit.c:769 +#, fuzzy, 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" -"#\n" +"\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" msgstr "" "#\n" "# Det verkar som du checkar in en SAMMANSLAGNING.\n" @@ -1010,185 +1136,178 @@ msgstr "" "# och försöker igen.\n" "#\n" -#: builtin/commit.c:659 -#, c-format -msgid "" -"\n" -"# Please enter the commit message for your changes." +#: builtin/commit.c:782 +#, fuzzy +msgid "Please enter the commit message for your changes." msgstr "" "\n" "# Ange ett incheckningsmeddelande för dina ändringar." -#: builtin/commit.c:663 -#, c-format +#: builtin/commit.c:785 +#, fuzzy msgid "" " Lines starting\n" -"# with '#' will be ignored, and an empty message aborts the commit.\n" +"with '#' will be ignored, and an empty message aborts the commit.\n" msgstr "" " Rader som inleds\n" "# med \"#\" kommer ignoreras, och ett tomt meddelande avbryter " "incheckningen.\n" -#: builtin/commit.c:668 -#, c-format +#: builtin/commit.c:790 +#, fuzzy 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" +"with '#' will be kept; you may remove them yourself if you want to.\n" +"An empty message aborts the commit.\n" msgstr "" " Rader som inleds\n" "# med \"#\" kommer behållas; du kan själv ta bort dem om du vill.\n" "# Ett tomt meddelande avbryter incheckningen.\n" -#: builtin/commit.c:680 -#, c-format -msgid "%s# Author: %s\n" +#: builtin/commit.c:802 +#, fuzzy, c-format +msgid "%sAuthor: %s" msgstr "%s# Författare: %s\n" -#: builtin/commit.c:688 -#, c-format -msgid "%s# Committer: %s\n" +#: builtin/commit.c:809 +#, fuzzy, c-format +msgid "%sCommitter: %s" msgstr "%s# Incheckare: %s\n" -#: builtin/commit.c:705 +#: builtin/commit.c:829 msgid "Cannot read index" msgstr "Kan inte läsa indexet" -#: builtin/commit.c:737 +#: builtin/commit.c:869 msgid "Error building trees" msgstr "Fel vid byggande av träd" -#: builtin/commit.c:752 builtin/tag.c:321 +#: builtin/commit.c:884 builtin/tag.c:313 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Ange meddelandet en av flaggorna -m eller -F.\n" -#: builtin/commit.c:832 +#: builtin/commit.c:964 #, c-format msgid "No existing author found with '%s'" msgstr "Hittade ingen befintlig författare med \"%s\"" -#: builtin/commit.c:847 builtin/commit.c:1039 +#: builtin/commit.c:979 builtin/commit.c:1173 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Ogiltigt läge för ospårade filer: \"%s\"" -#: builtin/commit.c:864 +#: builtin/commit.c:1018 msgid "Using both --reset-author and --author does not make sense" msgstr "Kan inte använda både --reset-author och --author" -#: builtin/commit.c:878 +#: builtin/commit.c:1032 msgid "You have nothing to amend." msgstr "Du har inget att utöka." -#: builtin/commit.c:880 -msgid "You are in the middle of a merge -- cannot amend." +#: builtin/commit.c:1034 +#, fuzzy, c-format +msgid "You are in the middle of a %s -- cannot amend." msgstr "Du är i mitten av en incheckning -- kan inte utöka." -#: builtin/commit.c:889 -msgid "Only one of -c/-C/-F can be used." +#: builtin/commit.c:1036 +#, fuzzy +msgid "Options --squash and --fixup cannot be used together" +msgstr "-x och -X kan inte användas samtidigt" + +#: builtin/commit.c:1046 +#, fuzzy +msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Kan endast använda en av -c/-C/-F." -#: builtin/commit.c:891 -msgid "Option -m cannot be combined with -c/-C/-F." +#: builtin/commit.c:1048 +#, fuzzy +msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "Flaggan -m kan inte kombineras med -c/-C/-F." -#: builtin/commit.c:897 +#: builtin/commit.c:1054 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author kan endast användas med -C, -c eller --amend." -#: builtin/commit.c:906 -#, c-format -msgid "could not lookup commit %s" -msgstr "kunde inte slå upp incheckningen %s" - -#: builtin/commit.c:909 -#, c-format -msgid "could not parse commit %s" -msgstr "kunde inte tolka incheckningen %s" - -#: builtin/commit.c:937 -msgid "Only one of --include/--only/--all/--interactive can be used." +#: builtin/commit.c:1071 +#, fuzzy +msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "Endast en av --include/--only/--all/--interactive kan användas." -#: builtin/commit.c:939 +#: builtin/commit.c:1073 msgid "No paths with --include/--only does not make sense." msgstr "Du måste ange sökvägar tillsammans med --include/--only." -#: builtin/commit.c:941 +#: builtin/commit.c:1075 msgid "Clever... amending the last one with dirty index." msgstr "Smart... utöka den senaste med smutsigt index." -#: builtin/commit.c:943 +#: builtin/commit.c:1077 msgid "Explicit paths specified without -i nor -o; assuming --only paths..." msgstr "Explicita sökvägar angavs utan -i eller -o; antar --only-paths..." -#: builtin/commit.c:953 +#: builtin/commit.c:1087 #, c-format msgid "Invalid cleanup mode %s" msgstr "Felaktigt städningsläge %s" -#: builtin/commit.c:958 +#: builtin/commit.c:1092 msgid "Paths with -a does not make sense." msgstr "Kan inte ange sökvägar med -a." -#: builtin/commit.c:960 -msgid "Paths with --interactive does not make sense." -msgstr "Kan inte ange sökvägar med --interactive." - -#: builtin/commit.c:1142 +#: builtin/commit.c:1274 msgid "couldn't look up newly created commit" msgstr "kunde inte slå upp en precis skapad incheckning" -#: builtin/commit.c:1144 +#: builtin/commit.c:1276 msgid "could not parse newly created commit" msgstr "kunde inte tolka en precis skapad incheckning" -#: builtin/commit.c:1185 +#: builtin/commit.c:1316 msgid "detached HEAD" msgstr "frånkopplad HEAD" -#: builtin/commit.c:1187 +#: builtin/commit.c:1318 msgid " (root-commit)" msgstr " (rotincheckning)" -#: builtin/commit.c:1307 builtin/merge.c:461 +#: builtin/commit.c:1441 builtin/merge.c:490 #, c-format msgid "could not open '%s' for reading" msgstr "kunde inte öppna \"%s\" för läsning" -#: builtin/commit.c:1312 +#: builtin/commit.c:1446 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Trasig MERGE_HEAD-fil (%s)" -#: builtin/commit.c:1319 +#: builtin/commit.c:1453 msgid "could not read MERGE_MODE" msgstr "kunde inte läsa MERGE_MODE" -#: builtin/commit.c:1336 +#: builtin/commit.c:1472 #, c-format msgid "could not read commit message: %s" msgstr "kunde inte läsa incheckningsmeddelande: %s" -#: builtin/commit.c:1350 +#: builtin/commit.c:1486 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Avbryter på grund av tomt incheckningsmeddelande.\n" -#: builtin/commit.c:1358 +#: builtin/commit.c:1493 msgid "failed to write commit object" msgstr "kunde inte skriva incheckningsobjekt" -#: builtin/commit.c:1375 +#: builtin/commit.c:1511 msgid "cannot lock HEAD ref" msgstr "kunde inte låsa HEAD-referens" -#: builtin/commit.c:1379 +#: builtin/commit.c:1515 msgid "cannot update HEAD ref" msgstr "kunde inte uppdatera HEAD-referens" -#: builtin/commit.c:1388 +#: builtin/commit.c:1525 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full or quota is\n" @@ -1199,47 +1318,47 @@ msgstr "" "att kvoten inte har överskridits, och kör sedan\n" "\"git reset HEAD\" för att återställa." -#: builtin/describe.c:205 +#: builtin/describe.c:234 #, c-format msgid "annotated tag %s not available" msgstr "den dekorerade taggen %s inte tillgänglig" -#: builtin/describe.c:209 +#: builtin/describe.c:238 #, c-format msgid "annotated tag %s has no embedded name" msgstr "den dekorerade taggen %s har inget inbäddat namn" -#: builtin/describe.c:211 +#: builtin/describe.c:240 #, c-format msgid "tag '%s' is really '%s' here" msgstr "taggen \"%s\" är i verkligheten \"%s\" här" -#: builtin/describe.c:238 +#: builtin/describe.c:267 #, c-format msgid "Not a valid object name %s" msgstr "Objektnamnet är inte giltigt: %s" -#: builtin/describe.c:241 +#: builtin/describe.c:270 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s är inte ett giltigt \"%s\"-objekt" -#: builtin/describe.c:258 +#: builtin/describe.c:287 #, c-format msgid "no tag exactly matches '%s'" msgstr "ingen tagg motsvarar \"%s\" exakt" -#: builtin/describe.c:260 +#: builtin/describe.c:289 #, c-format msgid "searching to describe %s\n" msgstr "söker för att beskriva %s\n" -#: builtin/describe.c:295 +#: builtin/describe.c:329 #, c-format msgid "finished search at %s\n" msgstr "avslutade sökning på %s\n" -#: builtin/describe.c:319 +#: builtin/describe.c:353 #, c-format msgid "" "No annotated tags can describe '%s'.\n" @@ -1248,7 +1367,7 @@ msgstr "" "Inga dekorerade taggar kan beskriva \"%s\".\n" "Det finns dock odekorerade taggar: testa --tags." -#: builtin/describe.c:323 +#: builtin/describe.c:357 #, c-format msgid "" "No tags can describe '%s'.\n" @@ -1257,12 +1376,12 @@ msgstr "" "Inga taggar kan beskriva \"%s\".\n" "Testa --always, eller skapa några taggar." -#: builtin/describe.c:344 +#: builtin/describe.c:378 #, c-format msgid "traversed %lu commits\n" msgstr "traverserade %lu incheckningar\n" -#: builtin/describe.c:347 +#: builtin/describe.c:381 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" @@ -1271,15 +1390,15 @@ msgstr "" "mer än %i taggar hittades; listar de %i senaste\n" "gav upp sökningen vid %s\n" -#: builtin/describe.c:398 +#: builtin/describe.c:436 msgid "--long is incompatible with --abbrev=0" msgstr "--long är inkompatibel med --abbrev=0" -#: builtin/describe.c:423 +#: builtin/describe.c:462 msgid "No names found, cannot describe anything." msgstr "Inga namn hittades, kan inte beskriva något." -#: builtin/describe.c:430 +#: builtin/describe.c:469 msgid "--dirty is incompatible with committishes" msgstr "--dirty är inkompatibelt med \"committish\"-värden" @@ -1288,49 +1407,45 @@ msgstr "--dirty är inkompatibelt med \"committish\"-värden" msgid "'%s': not a regular file or symlink" msgstr "\"%s\": inte en normal fil eller symbolisk länk" -#: builtin/diff.c:225 +#: builtin/diff.c:220 #, c-format msgid "invalid option: %s" msgstr "ogiltig flagga: %s" -#: builtin/diff.c:302 +#: builtin/diff.c:296 msgid "Not a git repository" msgstr "Inte ett git-arkiv" -#: builtin/diff.c:334 -msgid "No HEAD commit to compare with (yet)" -msgstr "Ingen HEAD-incheckning att jämföra med (ännu)" - -#: builtin/diff.c:349 +#: builtin/diff.c:346 #, c-format msgid "invalid object '%s' given." msgstr "objektet \"%s\" som angavs är felaktigt." -#: builtin/diff.c:354 +#: builtin/diff.c:351 #, c-format msgid "more than %d trees given: '%s'" msgstr "mer än %d träd angavs: \"%s\"" -#: builtin/diff.c:364 +#: builtin/diff.c:361 #, c-format msgid "more than two blobs given: '%s'" msgstr "mer än två blobbar angavs: \"%s\"" -#: builtin/diff.c:372 +#: builtin/diff.c:369 #, c-format msgid "unhandled object '%s' given." msgstr "ej hanterat objekt \"%s\" angavs." -#: builtin/fetch.c:175 +#: builtin/fetch.c:199 msgid "Couldn't find remote ref HEAD" msgstr "Kunde inte hitta fjärr-referensen HEAD" -#: builtin/fetch.c:228 +#: builtin/fetch.c:252 #, c-format msgid "object %s not found" msgstr "objektet %s hittades inte" -#: builtin/fetch.c:233 +#: builtin/fetch.c:257 msgid "[up to date]" msgstr "[àjour]" @@ -1338,54 +1453,54 @@ msgstr "[àjour]" #. * If this is the head, and it's not okay to update #. * the head, and the old value of the head isn't empty... #. -#: builtin/fetch.c:246 +#: builtin/fetch.c:270 #, c-format msgid "! %-*s %-*s -> %s (can't fetch in current branch)" msgstr "! %-*s %-*s -> %s (kan inte hämta i aktuell gren)" -#: builtin/fetch.c:247 builtin/fetch.c:309 +#: builtin/fetch.c:271 builtin/fetch.c:342 msgid "[rejected]" msgstr "[refuserad]" -#: builtin/fetch.c:257 +#: builtin/fetch.c:281 msgid "[tag update]" msgstr "[uppdaterad tagg]" -#: builtin/fetch.c:258 builtin/fetch.c:280 builtin/fetch.c:293 +#: builtin/fetch.c:282 builtin/fetch.c:307 builtin/fetch.c:323 msgid " (unable to update local ref)" msgstr " (kunde inte uppdatera lokal ref)" -#: builtin/fetch.c:270 +#: builtin/fetch.c:294 msgid "[new tag]" msgstr "[ny tagg]" -#: builtin/fetch.c:274 +#: builtin/fetch.c:298 msgid "[new branch]" msgstr "[ny gren]" -#: builtin/fetch.c:305 +#: builtin/fetch.c:338 msgid "unable to update local ref" msgstr "kunde inte uppdatera lokal ref" -#: builtin/fetch.c:305 +#: builtin/fetch.c:338 msgid "forced update" msgstr "tvingad uppdatering" -#: builtin/fetch.c:310 +#: builtin/fetch.c:343 msgid "(non-fast-forward)" msgstr "(ej snabbspolad)" -#: builtin/fetch.c:328 builtin/fetch.c:651 +#: builtin/fetch.c:361 builtin/fetch.c:684 #, c-format msgid "cannot open %s: %s\n" msgstr "kan inte öppna %s. %s\n" -#: builtin/fetch.c:406 +#: builtin/fetch.c:439 #, c-format msgid "From %.*s\n" msgstr "Från %.*s\n" -#: builtin/fetch.c:417 +#: builtin/fetch.c:450 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -1394,69 +1509,69 @@ msgstr "" "några lokala referenser kunde inte uppdateras; testa att köra\n" " \"git remote prune %s\" för att ta bort gamla grenar som står i konflikt" -#: builtin/fetch.c:467 +#: builtin/fetch.c:500 msgid "could not run rev-list" msgstr "kunde inte köra rev-list" -#: builtin/fetch.c:481 +#: builtin/fetch.c:514 #, c-format msgid "failed write to rev-list: %s" msgstr "kunde inte skriva till rev-list: %s" -#: builtin/fetch.c:488 +#: builtin/fetch.c:521 #, c-format msgid "failed to close rev-list's stdin: %s" msgstr "kunde inte stänga rev-list:s standard in: %s" -#: builtin/fetch.c:515 +#: builtin/fetch.c:548 #, c-format msgid " (%s will become dangling)\n" msgstr " (%s kommer bli dinglande)\n" -#: builtin/fetch.c:516 +#: builtin/fetch.c:549 #, c-format msgid " (%s has become dangling)\n" msgstr " (%s har blivit dinglande)\n" -#: builtin/fetch.c:523 +#: builtin/fetch.c:556 msgid "[deleted]" msgstr "[borttagen]" -#: builtin/fetch.c:524 +#: builtin/fetch.c:557 msgid "(none)" msgstr "(ingen)" -#: builtin/fetch.c:641 +#: builtin/fetch.c:674 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "Vägrar hämta till aktuell gren %s i ett icke-naket arkiv" -#: builtin/fetch.c:675 +#: builtin/fetch.c:708 #, c-format msgid "Don't know how to fetch from %s" msgstr "Vet inte hur man hämtar från %s" -#: builtin/fetch.c:729 +#: builtin/fetch.c:762 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "Flaggan \"%s\" och värdet \"%s\" är inte giltigt för %s" -#: builtin/fetch.c:732 +#: builtin/fetch.c:765 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Flaggan \"%s\" ignoreras för %s\n" -#: builtin/fetch.c:821 +#: builtin/fetch.c:864 #, c-format msgid "Fetching %s\n" msgstr "Hämtar %s\n" -#: builtin/fetch.c:823 +#: builtin/fetch.c:866 #, c-format msgid "Could not fetch %s" msgstr "Kunde inte hämta %s" -#: builtin/fetch.c:839 +#: builtin/fetch.c:883 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -1464,24 +1579,24 @@ msgstr "" "Inget fjärrarkiv angavs. Ange antingen en URL eller namnet på ett\n" "fjärrarkiv som nya incheckningar skall hämtas från." -#: builtin/fetch.c:859 +#: builtin/fetch.c:903 msgid "You need to specify a tag name." msgstr "Du måste ange namnet på en tagg." -#: builtin/fetch.c:899 +#: builtin/fetch.c:946 msgid "fetch --all does not take a repository argument" msgstr "fetch --all tar inte namnet på ett arkiv som argument" -#: builtin/fetch.c:901 +#: builtin/fetch.c:948 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all kan inte anges med referensspecifikationer" -#: builtin/fetch.c:912 +#: builtin/fetch.c:959 #, c-format msgid "No such remote or remote group: %s" msgstr "Fjärren eller fjärrgruppen finns inte: %s" -#: builtin/fetch.c:920 +#: builtin/fetch.c:967 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Kan inte hämta från grupp och ange referensspecifikationer" @@ -1499,206 +1614,224 @@ msgstr "För många flaggor angavs" msgid "insanely long object directory %.*s" msgstr "tokigt lång objektkatalog %.*s" -#: builtin/gc.c:220 +#: builtin/gc.c:223 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "Packar arkivet automatiskt för optimal prestanda.\n" -#: builtin/gc.c:223 -#, c-format +#: builtin/gc.c:226 +#, fuzzy, 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." +"run \"git gc\" manually. See \"git help gc\" for more information.\n" msgstr "" "Packar arkivet automatiskt för optimal prestanda. Du kan även\n" "köra \"git gc\" manuellt. Se \"git help gc\" för mer information." -#: builtin/gc.c:251 +#: builtin/gc.c:254 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" "Det finns för många onåbara lösa objekt; kör \"git prune\" för att ta bort " "dem." -#: builtin/grep.c:252 +#: builtin/grep.c:256 #, c-format msgid "grep: failed to create thread: %s" msgstr "grep: misslyckades skapa tråd. %s" -#: builtin/grep.c:457 +#: builtin/grep.c:374 #, c-format msgid "'%s': unable to read %s" msgstr "\"%s\" kunde inte läsa %s" -#: builtin/grep.c:508 +#: builtin/grep.c:425 #, c-format msgid "'%s': %s" msgstr "\"%s\": %s" -#: builtin/grep.c:519 +#: builtin/grep.c:436 #, c-format msgid "'%s': short read %s" msgstr "\"%s\": kort läsning %s" -#: builtin/grep.c:581 +#: builtin/grep.c:498 #, c-format msgid "Failed to chdir: %s" msgstr "Kunde inte byta katalog (chdir): %s" -#: builtin/grep.c:671 builtin/grep.c:697 +#: builtin/grep.c:573 builtin/grep.c:604 #, c-format msgid "unable to read tree (%s)" msgstr "kunde inte läsa träd (%s)" -#: builtin/grep.c:703 +#: builtin/grep.c:618 #, c-format msgid "unable to grep from object of type %s" msgstr "Kunde inte \"grep\" från objekt av typen %s" -#: builtin/grep.c:755 +#: builtin/grep.c:674 #, c-format msgid "switch `%c' expects a numerical value" msgstr "flaggan \"%c\" antar ett numeriskt värde" -#: builtin/grep.c:771 +#: builtin/grep.c:691 #, c-format msgid "cannot open '%s'" msgstr "kan inte öppna \"%s\"" -#: builtin/grep.c:1012 +#: builtin/grep.c:974 msgid "no pattern given." msgstr "inget mönster angavs." -#: builtin/grep.c:1016 -msgid "cannot mix --fixed-strings and regexp" -msgstr "kan inte blanda --fixed-strings och reguljära uttryck" - -#: builtin/grep.c:1041 +#: builtin/grep.c:1001 #, c-format msgid "bad object %s" msgstr "felaktigt objekt %s" -#: builtin/grep.c:1068 +#: builtin/grep.c:1025 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager fungerar endast i arbetskatalogen" -#: builtin/grep.c:1093 +#: builtin/grep.c:1050 msgid "--cached cannot be used with --no-index." msgstr "--cached kan inte användas med --no-index." -#: builtin/grep.c:1095 +#: builtin/grep.c:1052 msgid "--no-index cannot be used with revs." msgstr "--no-index kan inte användas med revisioner." -#: builtin/grep.c:1104 +#: builtin/grep.c:1061 msgid "both --cached and trees are given." msgstr "både --cached och träd angavs." -#: builtin/init-db.c:34 +#: builtin/init-db.c:35 #, c-format msgid "Could not make %s writable by group" msgstr "Kunde inte göra %s skrivbar för grubben" -#: builtin/init-db.c:61 +#: builtin/init-db.c:62 #, c-format msgid "insanely long template name %s" msgstr "tokigt långt namn på mallen %s" -#: builtin/init-db.c:66 +#: builtin/init-db.c:67 #, c-format msgid "cannot stat '%s'" msgstr "kan inte ta status på \"%s\"" -#: builtin/init-db.c:72 +#: builtin/init-db.c:73 #, c-format msgid "cannot stat template '%s'" msgstr "kan inte ta status på mallen \"%s\"" -#: builtin/init-db.c:79 +#: builtin/init-db.c:80 #, c-format msgid "cannot opendir '%s'" msgstr "kan inte öppna katalogen (opendir) \"%s\"" -#: builtin/init-db.c:96 +#: builtin/init-db.c:97 #, c-format msgid "cannot readlink '%s'" msgstr "kan inte läsa länk (readlink) \"%s\"" -#: builtin/init-db.c:98 +#: builtin/init-db.c:99 #, c-format msgid "insanely long symlink %s" msgstr "tokigt lång symbolisk länk %s" -#: builtin/init-db.c:101 +#: builtin/init-db.c:102 #, c-format msgid "cannot symlink '%s' '%s'" msgstr "kan inte skapa symbolisk länk \"%s\" \"%s\"" -#: builtin/init-db.c:105 +#: builtin/init-db.c:106 #, c-format msgid "cannot copy '%s' to '%s'" msgstr "kan inte kopiera \"%s\" till \"%s\"" -#: builtin/init-db.c:109 +#: builtin/init-db.c:110 #, c-format msgid "ignoring template %s" msgstr "ignorerar mallen %s" -#: builtin/init-db.c:132 +#: builtin/init-db.c:133 #, c-format msgid "insanely long template path %s" msgstr "tokigt lång mallsökväg %s" -#: builtin/init-db.c:140 +#: builtin/init-db.c:141 #, c-format msgid "templates not found %s" msgstr "mallarna hittades inte %s" -#: builtin/init-db.c:153 +#: builtin/init-db.c:154 #, c-format msgid "not copying templates of a wrong format version %d from '%s'" msgstr "kopierade inte mallar från felaktig formatversion %d från \"%s\"" -#: builtin/init-db.c:191 +#: builtin/init-db.c:192 #, c-format msgid "insane git directory %s" msgstr "tokig git-katalog %s" -#. 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:355 +#: builtin/init-db.c:322 builtin/init-db.c:325 +#, fuzzy, c-format +msgid "%s already exists" +msgstr "taggen \"%s\" finns redan" + +#: builtin/init-db.c:354 +#, fuzzy, c-format +msgid "unable to handle file type %d" +msgstr "kunde inte läsa träd (%s)" + +#: builtin/init-db.c:357 +#, fuzzy, c-format +msgid "unable to move %s to %s" +msgstr "kunde inte skriva %s" + +#: builtin/init-db.c:362 +#, fuzzy, c-format +msgid "Could not create git link %s" +msgstr "kunde inte skapa filen \"%s\"" + +#. +#. * 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 "%s%s Git-arkiv i %s%s\n" -#: builtin/init-db.c:356 +#: builtin/init-db.c:420 msgid "Reinitialized existing" msgstr "Ominitierade befintligt" -#: builtin/init-db.c:356 +#: builtin/init-db.c:420 msgid "Initialized empty" msgstr "Initierade tomt" -#: builtin/init-db.c:357 +#: builtin/init-db.c:421 msgid " shared" msgstr " delat" -#: builtin/init-db.c:376 +#: builtin/init-db.c:440 msgid "cannot tell cwd" msgstr "kan inte läsa aktuell katalog (cwd)" -#: builtin/init-db.c:450 builtin/init-db.c:457 +#: builtin/init-db.c:521 builtin/init-db.c:528 #, c-format msgid "cannot mkdir %s" msgstr "kan inte skapa katalogen (mkdir) %s" -#: builtin/init-db.c:461 +#: builtin/init-db.c:532 #, c-format msgid "cannot chdir to %s" msgstr "kan inte byta katalog (chdir) till %s" -#: builtin/init-db.c:483 +#: builtin/init-db.c:554 #, c-format msgid "" "%s (or --work-tree=) not allowed without specifying %s (or --git-" @@ -1707,255 +1840,283 @@ msgstr "" "%s (eller --work-tree=) inte tillåtet utan att ange %s (eller --git-" "dir=)" -#: builtin/init-db.c:509 +#: builtin/init-db.c:578 msgid "Cannot access current working directory" msgstr "Kan inte komma åt aktuell arbetskatalog" -#: builtin/init-db.c:512 +#: builtin/init-db.c:585 #, c-format msgid "Cannot access work tree '%s'" msgstr "Kan inte komma åt arbetskatalogen \"%s\"" -#: builtin/log.c:104 -#, c-format -msgid "invalid --decorate option: %s" -msgstr "felaktigt värde till --decorate: %s" - -#: builtin/log.c:113 builtin/log.c:1138 builtin/shortlog.c:287 -#, c-format -msgid "unrecognized argument: %s" -msgstr "okänt argument: %s" - -#: builtin/log.c:156 +#: builtin/log.c:186 #, c-format msgid "Final output: %d %s\n" msgstr "Slututdata: %d %s\n" -#: builtin/log.c:255 builtin/log.c:674 builtin/log.c:1222 builtin/log.c:1428 -#: builtin/merge.c:310 builtin/revert.c:556 builtin/shortlog.c:184 +#: builtin/log.c:287 builtin/log.c:721 builtin/log.c:1274 builtin/log.c:1492 +#: builtin/merge.c:338 builtin/revert.c:539 builtin/shortlog.c:181 msgid "revision walk setup failed" msgstr "misslyckades skapa revisionstraversering" -#: builtin/log.c:347 builtin/log.c:434 +#: builtin/log.c:397 builtin/log.c:486 #, c-format msgid "Could not read object %s" msgstr "Kunde inte läsa objektet %s" -#: builtin/log.c:458 +#: builtin/log.c:510 #, c-format msgid "Unknown type: %d" msgstr "Okänd typ: %d" -#: builtin/log.c:558 +#: builtin/log.c:605 msgid "format.headers without value" msgstr "format.headers utan värde" -#: builtin/log.c:630 +#: builtin/log.c:677 msgid "name of output directory is too long" msgstr "namn på utdatakatalogen är för lång" -#: builtin/log.c:641 +#: builtin/log.c:688 #, c-format msgid "Cannot open patch file %s" msgstr "Kan inte öppna patchfilen %s" -#: builtin/log.c:655 +#: builtin/log.c:702 msgid "Need exactly one range." msgstr "Behöver precis ett intervall." -#: builtin/log.c:663 +#: builtin/log.c:710 msgid "Not a range." msgstr "Inte ett intervall." -#: builtin/log.c:700 +#: builtin/log.c:747 msgid "Could not extract email from committer identity." msgstr "Kunde inte extrahera e-postadress från incheckarens identitet." -#: builtin/log.c:732 +#: builtin/log.c:779 msgid "Cover letter needs email format" msgstr "Omslagsbrevet behöver e-postformat" -#: builtin/log.c:825 +#: builtin/log.c:872 #, c-format msgid "insane in-reply-to: %s" msgstr "tokigt in-reply-to: %s" -#: builtin/log.c:898 +#: builtin/log.c:945 msgid "Two output directories?" msgstr "Två utdatakataloger?" -#: builtin/log.c:1087 +#: builtin/log.c:1136 #, c-format msgid "bogus committer info %s" msgstr "felaktig incheckarinformation %s" -#: builtin/log.c:1132 +#: builtin/log.c:1181 msgid "-n and -k are mutually exclusive." msgstr "-n och -k kan inte användas samtidigt." -#: builtin/log.c:1134 +#: builtin/log.c:1183 msgid "--subject-prefix and -k are mutually exclusive." msgstr "--subject-prefix och -k kan inte användas samtidigt." -#: builtin/log.c:1141 +#: builtin/log.c:1188 builtin/shortlog.c:284 +#, c-format +msgid "unrecognized argument: %s" +msgstr "okänt argument: %s" + +#: builtin/log.c:1191 msgid "--name-only does not make sense" msgstr "kan inte använda --name-only" -#: builtin/log.c:1143 +#: builtin/log.c:1193 msgid "--name-status does not make sense" msgstr "kan inte använda --name-status" -#: builtin/log.c:1145 +#: builtin/log.c:1195 msgid "--check does not make sense" msgstr "kan inte använda --check" -#: builtin/log.c:1166 +#: builtin/log.c:1218 msgid "standard output, or directory, which one?" msgstr "standard ut, eller katalog, vilken skall det vara?" -#: builtin/log.c:1168 +#: builtin/log.c:1220 #, c-format msgid "Could not create directory '%s'" msgstr "Kunde inte skapa katalogen \"%s\"" -#: builtin/log.c:1307 +#: builtin/log.c:1355 msgid "Failed to create output files" msgstr "Misslyckades skapa utdatafiler" -#: builtin/log.c:1394 +#: builtin/log.c:1458 #, c-format msgid "" "Could not find a tracked remote branch, please specify manually.\n" msgstr "Kunde inte hitta en spårad fjärrgren, ange manuellt.\n" -#: builtin/log.c:1410 builtin/log.c:1412 builtin/log.c:1424 +#: builtin/log.c:1474 builtin/log.c:1476 builtin/log.c:1488 #, c-format msgid "Unknown commit %s" msgstr "Okänd incheckning %s" -#: builtin/merge.c:82 +#: builtin/merge.c:88 msgid "switch `m' requires a value" msgstr "flaggan \"m\" behöver ett värde" -#: builtin/merge.c:119 +#: builtin/merge.c:125 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "Kunde inte hitta sammanslagningsstrategin \"%s\".\n" -#: builtin/merge.c:120 +#: builtin/merge.c:126 #, c-format msgid "Available strategies are:" msgstr "Tillgängliga strategier är:" -#: builtin/merge.c:125 +#: builtin/merge.c:131 #, c-format msgid "Available custom strategies are:" msgstr "Tillgängliga skräddarsydda strategier är:" -#: builtin/merge.c:223 +#: builtin/merge.c:233 msgid "could not run stash." msgstr "kunde köra stash." -#: builtin/merge.c:228 +#: builtin/merge.c:238 msgid "stash failed" msgstr "stash misslyckades" -#: builtin/merge.c:233 +#: builtin/merge.c:243 #, c-format msgid "not a valid object: %s" msgstr "inte ett giltigt objekt: %s" -#: builtin/merge.c:250 +#: builtin/merge.c:261 builtin/merge.c:278 msgid "read-tree failed" msgstr "read-tree misslyckades" -#: builtin/merge.c:279 +#: builtin/merge.c:307 msgid " (nothing to squash)" msgstr " (inget att platta till)" -#: builtin/merge.c:292 +#: builtin/merge.c:320 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Tillplattningsincheckning -- uppdaterar inte HEAD\n" -#: builtin/merge.c:295 builtin/merge.c:1290 builtin/merge.c:1299 -#: builtin/merge.c:1309 +#: builtin/merge.c:323 builtin/merge.c:844 builtin/merge.c:1430 +#: builtin/merge.c:1442 builtin/revert.c:213 #, c-format msgid "Could not write to '%s'" msgstr "Kunde inte skriva till \"%s\"" -#: builtin/merge.c:323 +#: builtin/merge.c:352 msgid "Writing SQUASH_MSG" msgstr "Skriver SQUASH_MSG" -#: builtin/merge.c:325 +#: builtin/merge.c:354 msgid "Finishing SQUASH_MSG" msgstr "Avslutar SQUASH_MSG" -#: builtin/merge.c:345 +#: builtin/merge.c:374 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "Inget sammanslagningsmeddelande -- uppdaterar inte HEAD\n" -#: builtin/merge.c:396 +#: builtin/merge.c:425 #, c-format msgid "'%s' does not point to a commit" msgstr "\"%s\" verkar inte peka på en incheckning" -#: builtin/merge.c:491 +#: builtin/merge.c:517 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Felaktig branch.%s.mergeoptions-sträng: %s" -#: builtin/merge.c:553 +#: builtin/merge.c:550 +#, c-format +msgid "%s: negative length %s" +msgstr "" + +#: builtin/merge.c:609 msgid "git write-tree failed to write a tree" msgstr "git write--tree misslyckades skriva ett träd" -#: builtin/merge.c:594 +#: builtin/merge.c:659 msgid "failed to read the cache" msgstr "misslyckads läsa cachen" -#: builtin/merge.c:611 +#: builtin/merge.c:676 msgid "Unable to write index." msgstr "Kunde inte skriva indexet." -#: builtin/merge.c:624 +#: builtin/merge.c:689 msgid "Not handling anything other than two heads merge." msgstr "Hanterar inte något annat än en sammanslagning av två huvuden." -#: builtin/merge.c:651 +#: builtin/merge.c:703 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Felaktig flagga för merge-recursive: -X%s" -#: builtin/merge.c:666 +#: builtin/merge.c:717 #, c-format msgid "unable to write %s" msgstr "kunde inte skriva %s" -#: builtin/merge.c:791 -#, c-format -msgid "Wonderful.\n" -msgstr "Underbart.\n" - -#: builtin/merge.c:840 builtin/merge.c:1287 builtin/merge.c:1295 -#: builtin/merge.c:1303 +#: builtin/merge.c:841 builtin/merge.c:920 builtin/merge.c:1427 +#: builtin/merge.c:1436 builtin/revert.c:210 #, c-format msgid "Could not open '%s' for writing" msgstr "Kunde inte öppna \"%s\" för skrivning" -#: builtin/merge.c:856 +#: builtin/merge.c:852 +#, fuzzy, c-format +msgid "Could not read from '%s'" +msgstr "kunde inte läsa \"%s\"" + +#: builtin/merge.c:869 +#, c-format +msgid "Wonderful.\n" +msgstr "Underbart.\n" + +#: builtin/merge.c:936 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" "Kunde inte slå ihop automatiskt; fixa konflikter och checka in resultatet.\n" -#: builtin/merge.c:871 +#: builtin/merge.c:951 #, c-format msgid "'%s' is not a commit" msgstr "\"%s\" är inte en incheckning" -#: builtin/merge.c:921 git-pull.sh:31 +#: builtin/merge.c:992 +#, fuzzy +msgid "No current branch." +msgstr "Inte på någon gren för närvarande." + +#: builtin/merge.c:994 +#, fuzzy +msgid "No remote for the current branch." +msgstr "Du är inte på någon gren för närvarande." + +#: builtin/merge.c:996 +msgid "No default upstream defined for the current branch." +msgstr "" + +#: builtin/merge.c:1001 +#, c-format +msgid "No remote tracking branch for %s from %s" +msgstr "" + +#: builtin/merge.c:1053 +msgid "There is no merge to abort (MERGE_HEAD missing)." +msgstr "" + +#: builtin/merge.c:1068 git-pull.sh:31 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you can merge." @@ -1963,80 +2124,94 @@ msgstr "" "Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n" "Checka in dina ändringar innan du kan slå ihop." -#: builtin/merge.c:924 git-pull.sh:34 +#: builtin/merge.c:1071 git-pull.sh:34 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Du har inte avslutat sammanslagningen (MERGE_HEAD finns)." -#: builtin/merge.c:951 +#: builtin/merge.c:1075 +#, fuzzy +msgid "" +"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" +"Please, commit your changes before you can merge." +msgstr "" +"Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n" +"Checka in dina ändringar innan du kan slå ihop." + +#: builtin/merge.c:1078 +#, fuzzy +msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." +msgstr "Du har inte avslutat sammanslagningen (MERGE_HEAD finns)." + +#: builtin/merge.c:1087 msgid "You cannot combine --squash with --no-ff." msgstr "Du kan inte kombinera --squash med --no-ff." -#: builtin/merge.c:956 +#: builtin/merge.c:1092 msgid "You cannot combine --no-ff with --ff-only." msgstr "Du kan inte kombinera --no-ff med --ff-only." -#: builtin/merge.c:984 +#: builtin/merge.c:1126 msgid "Can merge only exactly one commit into empty head" msgstr "Kan endast slå ihop en enda incheckning i ett tomt huvud." -#: builtin/merge.c:987 +#: builtin/merge.c:1129 msgid "Squash commit into empty head not supported yet" msgstr "Stöder inte en tillplattningsincheckning på ett tomt huvud ännu" -#: builtin/merge.c:989 +#: builtin/merge.c:1131 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "Icke-snabbspolad incheckning kan inte användas med ett tomt huvud" -#: builtin/merge.c:993 builtin/merge.c:1041 +#: builtin/merge.c:1135 builtin/merge.c:1181 #, c-format msgid "%s - not something we can merge" msgstr "%s - inte något vi kan slå ihop" -#: builtin/merge.c:1099 +#: builtin/merge.c:1239 #, c-format msgid "Updating %s..%s\n" msgstr "Uppdaterar %s..%s\n" -#: builtin/merge.c:1133 +#: builtin/merge.c:1273 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Försöker riktigt enkel sammanslagning i indexet...\n" -#: builtin/merge.c:1137 +#: builtin/merge.c:1277 #, c-format msgid "Nope.\n" msgstr "Nej.\n" -#: builtin/merge.c:1170 +#: builtin/merge.c:1310 msgid "Not possible to fast-forward, aborting." msgstr "Kan inte snabbspola, avbryter." -#: builtin/merge.c:1196 builtin/merge.c:1269 +#: builtin/merge.c:1336 builtin/merge.c:1409 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Återspolar trädet till ofördärvat...\n" -#: builtin/merge.c:1200 +#: builtin/merge.c:1340 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Försöker sammanslagninsstrategin %s...\n" -#: builtin/merge.c:1261 +#: builtin/merge.c:1401 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n" -#: builtin/merge.c:1263 +#: builtin/merge.c:1403 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Sammanslaning med strategin %s misslyckades.\n" -#: builtin/merge.c:1271 +#: builtin/merge.c:1411 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "Använder %s för att förbereda lösning för hand.\n" -#: builtin/merge.c:1314 +#: builtin/merge.c:1447 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -2104,139 +2279,114 @@ msgstr "Byter namn på %s till %s\n" msgid "renaming '%s' failed" msgstr "misslyckades byta namn på \"%s\"" -#: builtin/notes.c:122 +#: builtin/notes.c:139 #, c-format msgid "unable to start 'show' for object '%s'" msgstr "kunde int estarta \"show\" för objektet \"%s\"" -#: builtin/notes.c:128 +#: builtin/notes.c:145 msgid "can't fdopen 'show' output fd" msgstr "kunde inte öppna (fdopen) \"show\"-utdata-filhandtag" -#: builtin/notes.c:138 +#: builtin/notes.c:155 #, c-format msgid "failed to close pipe to 'show' for object '%s'" msgstr "kunde inte stänga röret till \"show\" för objektet \"%s\"" -#: builtin/notes.c:141 +#: builtin/notes.c:158 #, c-format msgid "failed to finish 'show' for object '%s'" msgstr "kunde inte avsluta \"show\" för objektet \"%s\"" -#: builtin/notes.c:158 builtin/tag.c:311 +#: builtin/notes.c:175 builtin/tag.c:303 #, c-format msgid "could not create file '%s'" msgstr "kunde inte skapa filen \"%s\"" -#: builtin/notes.c:172 +#: builtin/notes.c:189 msgid "Please supply the note contents using either -m or -F option" msgstr "Ange innehåll för anteckningen med antingen -m eller -F" -#: builtin/notes.c:193 builtin/notes.c:797 +#: builtin/notes.c:210 builtin/notes.c:968 #, c-format msgid "Removing note for object %s\n" msgstr "Tar bort anteckning för objektet %s\n" -#: builtin/notes.c:198 +#: builtin/notes.c:215 msgid "unable to write note object" msgstr "kunde inte skriva anteckningsobjekt" -#: builtin/notes.c:200 +#: builtin/notes.c:217 #, c-format msgid "The note contents has been left in %s" msgstr "Anteckningens innehåll har lämnats kvar i %s" -#: builtin/notes.c:234 builtin/tag.c:445 +#: builtin/notes.c:251 builtin/tag.c:448 #, c-format msgid "cannot read '%s'" msgstr "kunde inte läsa \"%s\"" -#: builtin/notes.c:236 builtin/tag.c:448 +#: builtin/notes.c:253 builtin/tag.c:451 #, c-format msgid "could not open or read '%s'" msgstr "kunde inte öppna eller läsa \"%s\"" -#: builtin/notes.c:255 builtin/notes.c:444 builtin/notes.c:446 -#: builtin/notes.c:508 builtin/notes.c:560 builtin/notes.c:631 -#: builtin/notes.c:636 builtin/notes.c:710 builtin/notes.c:752 -#: builtin/notes.c:789 builtin/reset.c:303 builtin/tag.c:461 +#: 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:963 builtin/reset.c:303 builtin/tag.c:464 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "Kunde inte slå upp \"%s\" som en giltig referens." -#: builtin/notes.c:258 +#: builtin/notes.c:275 #, c-format msgid "Failed to read object '%s'." msgstr "Kunde inte läsa objektet \"%s\"." -#: builtin/notes.c:283 +#: builtin/notes.c:299 msgid "Cannot commit uninitialized/unreferenced notes tree" msgstr "Kan inte checka in oinitierat/orefererat anteckningsträd" -#: builtin/notes.c:295 -msgid "Failed to write current notes tree to database" -msgstr "Kunde inte skriva aktuellt anteckningsträd till databasen" - -#: builtin/notes.c:307 -msgid "Failed to commit notes tree to database" -msgstr "Kunde inte checka in anteckningsträd i databasen" - -#: builtin/notes.c:339 +#: builtin/notes.c:340 #, c-format msgid "Bad notes.rewriteMode value: '%s'" msgstr "Felaktigt värde för notes.rewriteMode: '%s'" -#: builtin/notes.c:349 +#: builtin/notes.c:350 #, c-format msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" msgstr "Vägrar skriva över anteckningar i %s (utanför refs/notes/)" #. TRANSLATORS: The first %s is the name of the #. environment variable, the second %s is its value -#: builtin/notes.c:376 +#: builtin/notes.c:377 #, c-format msgid "Bad %s value: '%s'" msgstr "Felaktigt värde på %s: \"%s\"" -#: builtin/notes.c:440 +#: builtin/notes.c:441 #, c-format msgid "Malformed input line: '%s'." msgstr "Felaktig indatarad: \"%s\"." -#: builtin/notes.c:455 +#: builtin/notes.c:456 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "Misslyckades kopiera anteckningar från \"%s\" till \"%s\"" -# FIXME: Untranslatable! -# -#. TRANSLATORS: The first %s is one of "git notes ACTION", -#. e.g. "add", "copy", "append" etc. -#: builtin/notes.c:481 -#, c-format -msgid "Refusing to %s notes in %s (outside of refs/notes/)" -msgstr "Vägrar %s anteckningar i %s (utanför refs/notes/)" - -#: builtin/notes.c:501 builtin/notes.c:553 builtin/notes.c:614 -#: builtin/notes.c:626 builtin/notes.c:698 builtin/notes.c:745 -#: builtin/notes.c:782 builtin/notes.c:821 +#: 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:1028 msgid "too many parameters" msgstr "för många parametrar" -#: builtin/notes.c:505 -msgid "list" -msgstr "list" - -#: builtin/notes.c:514 builtin/notes.c:758 +#: builtin/notes.c:513 builtin/notes.c:772 #, c-format msgid "No note found for object %s." msgstr "Inga anteckningar hittades för objektet %s." -#: builtin/notes.c:562 -msgid "add" -msgstr "add" - -#: builtin/notes.c:567 +#: builtin/notes.c:580 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -2245,20 +2395,16 @@ msgstr "" "Kan inte lägga till anteckningar. Hittade befintliga anteckningar för " "objektet %s. Använd \"-f\" för att skriva över befintliga anteckningar" -#: builtin/notes.c:572 builtin/notes.c:649 +#: builtin/notes.c:585 builtin/notes.c:662 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "Skriver över befintliga anteckningar för objektet %s\n" -#: builtin/notes.c:622 +#: builtin/notes.c:635 msgid "too few parameters" msgstr "för få parametrar" -#: builtin/notes.c:638 -msgid "copy" -msgstr "copy" - -#: builtin/notes.c:643 +#: builtin/notes.c:656 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -2267,12 +2413,12 @@ msgstr "" "Kan inte kopiera anteckningar. Hittade befintliga anteckningar för objektet " "%s. Använd \"-f\" för att skriva över befintliga anteckningar" -#: builtin/notes.c:655 +#: builtin/notes.c:668 #, c-format msgid "Missing notes on source object %s. Cannot copy." msgstr "Anteckningar på källobjektet %s saknas. Kan inte kopiera." -#: builtin/notes.c:703 +#: builtin/notes.c:717 #, c-format msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" @@ -2281,24 +2427,12 @@ msgstr "" "Flaggorna -m/-F/-c/-C rekommenderas inte för underkommandot \"edit\".\n" "Använd \"git notes add -f -m/-F/-c/-C\" istället.\n" -#: builtin/notes.c:754 -msgid "show" -msgstr "show" - -#: builtin/notes.c:791 -msgid "remove" -msgstr "remove" - -#: builtin/notes.c:795 +#: builtin/notes.c:966 #, c-format msgid "Object %s has no note\n" msgstr "Objektet %s har ingen anteckning\n" -#: builtin/notes.c:825 -msgid "prune" -msgstr "prune" - -#: builtin/notes.c:877 +#: builtin/notes.c:1098 #, c-format msgid "Unknown subcommand: %s" msgstr "Okänt underkommando: %s" @@ -2312,37 +2446,47 @@ msgid "--delete only accepts plain target ref names" msgstr "--delete godtar endast enkla målreferensnamn" #: builtin/push.c:72 -msgid "You are not currently on a branch." -msgstr "Du är inte på någon gren för närvarande." - -#: builtin/push.c:74 #, c-format -msgid "The current branch %s is not tracking anything." -msgstr "Den aktuella grenen %s spårar ingenting." +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:77 +#: builtin/push.c:79 #, c-format -msgid "The current branch %s is tracking multiple branches, refusing to push." +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:87 +#, fuzzy, c-format +msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "Den aktuella grenen %s spårar flera grenar, vägrar sända." -#: builtin/push.c:100 +#: builtin/push.c:110 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "" "Du angav inga referensspecifikationer att sända, och push.default är " "\"nothing\"." -#: builtin/push.c:120 +#: builtin/push.c:130 #, c-format msgid "Pushing to %s\n" msgstr "Sänder till %s\n" -#: builtin/push.c:124 +#: builtin/push.c:134 #, c-format msgid "failed to push some refs to '%s'" msgstr "misslyckades sända några referenser till \"%s\"" -#: builtin/push.c:132 +#: builtin/push.c:142 #, c-format msgid "" "To prevent you from losing history, non-fast-forward updates were rejected\n" @@ -2356,40 +2500,49 @@ msgstr "" "Se avsnittet \"Note about fast-forward\" i \"git push --help\" för " "detaljer.\n" -#: builtin/push.c:149 +#: builtin/push.c:159 #, c-format msgid "bad repository '%s'" msgstr "felaktigt arkiv \"%s\"" -#: builtin/push.c:150 -msgid "No destination configured to push to." -msgstr "Har inte ställt in någon destination att sända till." +#: builtin/push.c:160 +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:158 +#: builtin/push.c:175 msgid "--all and --tags are incompatible" msgstr "--all och --tags är inkompatibla" -#: builtin/push.c:159 +#: builtin/push.c:176 msgid "--all can't be combined with refspecs" msgstr "--all kan inte kombineras med referensspecifikationer" -#: builtin/push.c:164 +#: builtin/push.c:181 msgid "--mirror and --tags are incompatible" msgstr "--mirror och --tags är inkompatibla" -#: builtin/push.c:165 +#: builtin/push.c:182 msgid "--mirror can't be combined with refspecs" msgstr "--mirror kan inte kombineras med referensspecifikationer" -#: builtin/push.c:170 +#: builtin/push.c:187 msgid "--all and --mirror are incompatible" msgstr "--all och --mirror är inkompatibla" -#: builtin/push.c:235 +#: builtin/push.c:253 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete är imkompatibel med --all, --mirror och --tags" -#: builtin/push.c:237 +#: builtin/push.c:255 msgid "--delete doesn't make sense without any refs" msgstr "--delete kan inte användas utan referenser" @@ -2482,41 +2635,26 @@ msgstr "%s återställning tillåts inte i ett naket arkiv" msgid "Could not reset index file to revision '%s'." msgstr "Kunde inte återställa indexfilen till versionen \"%s\"." -#: builtin/revert.c:82 +#: builtin/revert.c:99 msgid "program error" msgstr "programfel" -#: builtin/revert.c:154 builtin/revert.c:188 +#: builtin/revert.c:171 #, c-format msgid "Could not read commit message of %s" msgstr "Kunde inte läsa incheckningsmeddelandet för %s" -#: builtin/revert.c:202 -#, c-format -msgid "Could not extract author email from %s" -msgstr "Kunde inte hämta författarens e-postadress från %s" - -#: builtin/revert.c:214 -#, c-format -msgid "Could not extract author time from %s" -msgstr "Kunde inte hämta författartid från %s" - -#: builtin/revert.c:230 -#, c-format -msgid "No author information found in %s" -msgstr "Hittade ingen författarinformation i %s" - -#: builtin/revert.c:267 +#: builtin/revert.c:253 #, c-format msgid "Could not write to %s." msgstr "Kunde inte skriva till %s." -#: builtin/revert.c:270 +#: builtin/revert.c:256 #, c-format msgid "Error wrapping up %s" msgstr "Fel vid ombrytning av %s" -#: builtin/revert.c:290 +#: builtin/revert.c:276 msgid "" "Your local changes would be overwritten by revert.\n" "Please, commit your changes or stash them to proceed." @@ -2524,7 +2662,7 @@ msgstr "" "Dina lokala ändringar skulle skrivas över av \"revert\".\n" "Checka in dina ändringar eller använd \"stash\" för att fortsätta." -#: builtin/revert.c:293 +#: builtin/revert.c:279 msgid "" "Your local changes would be overwritten by cherry-pick.\n" "Please, commit your changes or stash them to proceed." @@ -2532,88 +2670,102 @@ msgstr "" "Dina lokala ändringar skulle skrivas över av \"cherry-pick\".\n" "Checka in dina ändringar eller använd \"stash\" för att fortsätta." +#: builtin/revert.c:283 +#, fuzzy +msgid "Your local changes would be overwritten by revert.\n" +msgstr "" +"Dina lokala ändringar skulle skrivas över av \"revert\".\n" +"Checka in dina ändringar eller använd \"stash\" för att fortsätta." + +#: builtin/revert.c:285 +#, fuzzy +msgid "Your local changes would be overwritten by cherry-pick.\n" +msgstr "" +"Dina lokala ändringar skulle skrivas över av \"cherry-pick\".\n" +"Checka in dina ändringar eller använd \"stash\" för att fortsätta." + #. TRANSLATORS: %s will be "revert" or "cherry-pick" -#: builtin/revert.c:351 +#: builtin/revert.c:335 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: Kunde inte skriva ny indexfil" -#: builtin/revert.c:417 +#: builtin/revert.c:401 msgid "Your index file is unmerged." msgstr "Din indexfil har inte slagits ihop." -#: builtin/revert.c:420 +#: builtin/revert.c:404 msgid "You do not have a valid HEAD" msgstr "Du har ingen giltig HEAD" -#: builtin/revert.c:428 -msgid "Cannot revert a root commit" -msgstr "Kan inte ångra en rotincheckning" - -#: builtin/revert.c:437 +#: builtin/revert.c:419 #, c-format msgid "Commit %s is a merge but no -m option was given." msgstr "Incheckning %s är en sammanslagning, men flaggan -m angavs inte." -#: builtin/revert.c:445 +#: builtin/revert.c:427 #, c-format msgid "Commit %s does not have parent %d" msgstr "Incheckning %s har inte förälder %d" -#: builtin/revert.c:449 +#: builtin/revert.c:431 #, c-format msgid "Mainline was specified but commit %s is not a merge." msgstr "Huvudlinje angavs, men incheckningen %s är inte en sammanslagning" #. TRANSLATORS: The first %s will be "revert" or #. "cherry-pick", the second %s a SHA1 -#: builtin/revert.c:460 +#: builtin/revert.c:442 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: kan inte tolka föräldraincheckningen %s" -#: builtin/revert.c:464 +#: builtin/revert.c:446 #, c-format msgid "Cannot get commit message for %s" msgstr "Kan inte hämta incheckningsmeddelande för %s" -#: builtin/revert.c:525 +#: builtin/revert.c:508 #, c-format msgid "could not revert %s... %s" msgstr "kunde inte ångra %s... %s" -#: builtin/revert.c:526 +#: builtin/revert.c:509 #, c-format msgid "could not apply %s... %s" msgstr "kunde inte applicera %s... %s" -#: builtin/revert.c:559 +#: builtin/revert.c:542 msgid "empty commit set passed" msgstr "den angivna uppsättningen incheckningar är tom" -#: builtin/revert.c:573 +#: builtin/revert.c:550 +#, c-format +msgid "git %s: failed to read the index" +msgstr "git %s: misslyckades läsa indexet" + +#: builtin/revert.c:555 +#, fuzzy, c-format +msgid "git %s: failed to refresh the index" +msgstr "git %s: misslyckades läsa indexet" + +#: builtin/revert.c:571 msgid "cherry-pick --ff cannot be used with --signoff" msgstr "cherry-pick --ff kan inte användas med --signoff" -#: builtin/revert.c:575 +#: builtin/revert.c:573 msgid "cherry-pick --ff cannot be used with --no-commit" msgstr "cherry-pick --ff kan inte användas med --no-commit" -#: builtin/revert.c:577 +#: builtin/revert.c:575 msgid "cherry-pick --ff cannot be used with -x" msgstr "cherry-pick --ff kan inte användas med -x" -#: builtin/revert.c:579 +#: builtin/revert.c:577 msgid "cherry-pick --ff cannot be used with --edit" msgstr "cherry-pick --ff kan inte användas med --edit" -#. TRANSLATORS: %s will be "revert" or "cherry-pick" -#: builtin/revert.c:584 -#, c-format -msgid "git %s: failed to read the index" -msgstr "git %s: misslyckades läsa indexet" - -#: builtin/rm.c:118 +#: builtin/rm.c:109 #, c-format msgid "" "'%s' has staged content different from both the file and the HEAD\n" @@ -2622,7 +2774,7 @@ msgstr "" "\"%s\" har köat ändringar som skiljer sig både från filen och HEAD\n" "(använd -f för att tvinga borttagning)" -#: builtin/rm.c:124 +#: builtin/rm.c:115 #, c-format msgid "" "'%s' has changes staged in the index\n" @@ -2631,7 +2783,7 @@ msgstr "" "\"%s\" har köade ändringar i indexet\n" "(använd --cached för att behålla filen eller -f för att tvinga borttagning)" -#: builtin/rm.c:128 +#: builtin/rm.c:119 #, c-format msgid "" "'%s' has local modifications\n" @@ -2640,58 +2792,58 @@ msgstr "" "\"%s\" har lokala ändringar\n" "(använd --cached för att behålla filen eller -f för att tvinga borttagning)" -#: builtin/rm.c:202 +#: builtin/rm.c:194 #, c-format msgid "not removing '%s' recursively without -r" msgstr "tar inte bort \"%s\" rekursivt utan -r" -#: builtin/rm.c:238 +#: builtin/rm.c:230 #, c-format msgid "git rm: unable to remove %s" msgstr "git rm: kan inte ta bort %s" -#: builtin/shortlog.c:161 +#: builtin/shortlog.c:157 #, c-format msgid "Missing author: %s" msgstr "Saknad författare: %s" -#: builtin/tag.c:123 builtin/tag.c:464 +#: builtin/tag.c:121 #, c-format msgid "tag name too long: %.*s..." msgstr "taggnamnet för långt: %.*s..." -#: builtin/tag.c:128 +#: builtin/tag.c:126 #, c-format msgid "tag '%s' not found." msgstr "taggen \"%s\" hittades inte." -#: builtin/tag.c:143 +#: builtin/tag.c:141 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "Tog bort tagg \"%s\" (var %s)\n" -#: builtin/tag.c:155 +#: builtin/tag.c:153 #, c-format msgid "could not verify the tag '%s'" msgstr "kunde inte bekräfta taggen \"%s\"" -#: builtin/tag.c:170 +#: builtin/tag.c:168 msgid "committer info too long." msgstr "incheckarinformation för lång." -#: builtin/tag.c:190 +#: builtin/tag.c:188 msgid "could not run gpg." msgstr "kunde inte köra gpg." -#: builtin/tag.c:196 +#: builtin/tag.c:194 msgid "gpg did not accept the tag data" msgstr "gpg godtog inte taggdata" -#: builtin/tag.c:203 +#: builtin/tag.c:201 msgid "gpg failed to sign the tag" msgstr "gpg misslyckades signera taggen" -#: builtin/tag.c:218 +#: builtin/tag.c:216 msgid "" "\n" "#\n" @@ -2703,73 +2855,73 @@ msgstr "" "# Skriv ett taggmeddelande\n" "#\n" -#: builtin/tag.c:226 +#: builtin/tag.c:224 #, c-format msgid "signing key value too long (%.10s...)" msgstr "signeringsnyckelvärdet för långt (%.10s...)" -#: builtin/tag.c:272 +#: builtin/tag.c:264 msgid "unable to sign the tag" msgstr "kunde inte signera taggen" -#: builtin/tag.c:274 +#: builtin/tag.c:266 msgid "unable to write tag file" msgstr "kunde inte skriva tagg-filen" -#: builtin/tag.c:289 +#: builtin/tag.c:281 msgid "bad object type." msgstr "felaktig objekttyp" -#: builtin/tag.c:302 +#: builtin/tag.c:294 msgid "tag header too big." msgstr "tagghuvud för stort." -#: builtin/tag.c:329 +#: builtin/tag.c:321 msgid "no tag message?" msgstr "inget taggmeddelande?" -#: builtin/tag.c:335 +#: builtin/tag.c:327 #, c-format msgid "The tag message has been left in %s\n" msgstr "Taggmeddelandet har lämnats i %s\n" -#: builtin/tag.c:428 +#: builtin/tag.c:431 msgid "-n option is only allowed with -l." msgstr "Flaggan -n är endast tillåten tillsammans med -l." -#: builtin/tag.c:430 +#: builtin/tag.c:433 msgid "--contains option is only allowed with -l." msgstr "Flaggan --contains är endast tillåten tillsammans med -l" -#: builtin/tag.c:438 +#: builtin/tag.c:441 msgid "only one -F or -m option is allowed." msgstr "endast en av flaggorna -F eller -m tillåts." -#: builtin/tag.c:458 +#: builtin/tag.c:461 msgid "too many params" msgstr "för många parametrar" -#: builtin/tag.c:466 +#: builtin/tag.c:467 #, c-format msgid "'%s' is not a valid tag name." msgstr "\"%s\" är inte ett giltigt taggnamn." -#: builtin/tag.c:471 +#: builtin/tag.c:472 #, c-format msgid "tag '%s' already exists" msgstr "taggen \"%s\" finns redan" -#: builtin/tag.c:479 +#: builtin/tag.c:480 #, c-format msgid "%s: cannot lock the ref" msgstr "%s: kan inte låsa referensen" -#: builtin/tag.c:481 +#: builtin/tag.c:482 #, c-format msgid "%s: cannot update the ref" msgstr "%s: kan inte uppdatera referensen" -#: builtin/tag.c:483 +#: builtin/tag.c:484 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "Uppdaterad tagg \"%s\" (var %s)\n" @@ -2778,7 +2930,13 @@ msgstr "Uppdaterad tagg \"%s\" (var %s)\n" msgid "You need to set your committer info first" msgstr "Du måste ställa in din incheckarinformation först" -#: git-am.sh:80 +#: git-am.sh:93 +msgid "" +"You seem to have moved HEAD since the last 'am' failure.\n" +"Not rewinding to ORIG_HEAD" +msgstr "" + +#: git-am.sh:105 #, sh-format msgid "" "When you have resolved this problem run \"$cmdline --resolved\".\n" @@ -2789,17 +2947,17 @@ msgstr "" "Om du vill hoppa över patchen kör du istället \"$cmdline --skip\".\n" "För att återställa originalgrenen och avbryta kör du \"$cmdline --abort\"." -#: git-am.sh:96 +#: git-am.sh:121 msgid "Cannot fall back to three-way merge." msgstr "Kan inte falla tillbaka på trevägssammanslagning." -#: git-am.sh:111 +#: git-am.sh:136 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" "Arkivet saknar objekt som behövs för att falla tillbaka på 3-" "vägssammanslagning." -#: git-am.sh:120 +#: git-am.sh:145 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -2807,42 +2965,47 @@ msgstr "" "Vill du handredigera din patch?\n" "Den kan inte appliceras på blobbar som antecknats i dess index." -#: git-am.sh:236 +#: git-am.sh:154 +#, fuzzy +msgid "Falling back to patching base and 3-way merge..." +msgstr "Kan inte falla tillbaka på trevägssammanslagning." + +#: git-am.sh:261 msgid "Only one StGIT patch series can be applied at once" msgstr "Endast en StGIT-patchserie kan appliceras åt gången" -#: git-am.sh:288 +#: git-am.sh:313 #, sh-format msgid "Patch format $patch_format is not supported." msgstr "Patchformatet $patch_format stöds inte." -#: git-am.sh:290 +#: git-am.sh:315 msgid "Patch format detection failed." msgstr "Misslyckades detektera patchformat." -#: git-am.sh:340 +#: git-am.sh:365 msgid "-d option is no longer supported. Do not use." msgstr "Flaggan -d stöds inte lägre. Använd inte." -#: git-am.sh:403 +#: git-am.sh:428 #, sh-format msgid "previous rebase directory $dotest still exists but mbox given." msgstr "tidigare rebase-katalog $dotest finns redan, men mbox angavs." -#: git-am.sh:408 +#: git-am.sh:433 msgid "Please make up your mind. --skip or --abort?" msgstr "Bestäm dig. --skip eller --abort?" -#: git-am.sh:434 +#: git-am.sh:460 msgid "Resolve operation not in progress, we are not resuming." msgstr "Lösningsoperation pågår inte, vi återupptar inte." -#: git-am.sh:499 +#: git-am.sh:525 #, sh-format msgid "Dirty index: cannot apply patches (dirty: $files)" msgstr "Smutsigt index: kan inte applicera patchar (smutsiga: $files)" -#: git-am.sh:595 +#: git-am.sh:614 #, sh-format msgid "" "Patch is empty. Was it split wrong?\n" @@ -2853,32 +3016,32 @@ msgstr "" "Om du vill hoppa över patchen kör du istället \"$cmdline --skip\".\n" "För att återställa originalgrenen och avbryta kör du \"$cmdline --abort\"." -#: git-am.sh:632 +#: git-am.sh:651 msgid "Patch does not have a valid e-mail address." msgstr "Patchen har inte någon giltig e-postadress." -#: git-am.sh:679 +#: git-am.sh:698 msgid "cannot be interactive without stdin connected to a terminal." msgstr "" "kan inte vara interaktiv om standard in inte är ansluten till en terminal." -#: git-am.sh:683 +#: git-am.sh:702 msgid "Commit Body is:" msgstr "Incheckningskroppen är:" #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] #. in your translation. The program will only accept English #. input at this point. -#: git-am.sh:690 +#: git-am.sh:709 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " msgstr "Applicera? Y=ja/N=nej/E=redigera/V=visa patch/A=godta alla " -#: git-am.sh:726 +#: git-am.sh:745 #, sh-format msgid "Applying: $FIRSTLINE" msgstr "Applicerar: $FIRSTLINE" -#: git-am.sh:747 +#: git-am.sh:766 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -2888,7 +3051,7 @@ msgstr "" "Om det inte är något kvar att köa kan det hända att någon annan redan\n" "introducerat samma ändringar; kanske du bör hoppa över patchen." -#: git-am.sh:755 +#: git-am.sh:774 msgid "" "You still have unmerged paths in your index\n" "did you forget to use 'git add'?" @@ -2896,20 +3059,20 @@ msgstr "" "Du har fortfarande sökvägar som inte slagits samman i ditt index\n" "glömde du använda \"git add\"?" -#: git-am.sh:771 +#: git-am.sh:790 msgid "No changes -- Patch already applied." msgstr "Inga ändringar -- Patchen har redan applicerats." -#: git-am.sh:781 +#: git-am.sh:800 #, sh-format msgid "Patch failed at $msgnum $FIRSTLINE" msgstr "Patchen misslyckades vid $msgnum $FIRSTLINE" -#: git-am.sh:797 +#: git-am.sh:816 msgid "applying to an empty history" msgstr "applicerar på en tom historik" -#: git-bisect.sh:39 +#: git-bisect.sh:40 #, fuzzy msgid "You need to start by \"git bisect start\"" msgstr "Du måste ställa in din incheckarinformation först" @@ -2917,122 +3080,133 @@ msgstr "Du måste ställa in din incheckarinformation först" #. TRANSLATORS: Make sure to include [Y] and [n] in your #. translation. The program will only accept English input #. at this point. -#: git-bisect.sh:45 +#: git-bisect.sh:48 msgid "Do you want me to do it for you [Y/n]? " msgstr "" -#: git-bisect.sh:64 +#: git-bisect.sh:67 msgid "Bad HEAD - I need a HEAD" msgstr "" -#: git-bisect.sh:83 +#: git-bisect.sh:86 msgid "won't bisect on seeked tree" msgstr "" -#: git-bisect.sh:87 +#: git-bisect.sh:90 msgid "Bad HEAD - strange symbolic ref" msgstr "" -#: git-bisect.sh:117 +#: git-bisect.sh:120 #, sh-format msgid "'$arg' does not appear to be a valid revision" msgstr "" -#: git-bisect.sh:162 +#: git-bisect.sh:165 #, sh-format msgid "Bad bisect_write argument: $state" msgstr "" -#: git-bisect.sh:190 +#: git-bisect.sh:193 #, sh-format msgid "Bad rev input: $arg" msgstr "" -#: git-bisect.sh:204 +#: git-bisect.sh:207 msgid "Please call 'bisect_state' with at least one argument." msgstr "" -#: git-bisect.sh:207 +#: git-bisect.sh:210 msgid "Bad rev input: HEAD" msgstr "" -#: git-bisect.sh:216 +#: git-bisect.sh:219 #, sh-format msgid "Bad rev input: $rev" msgstr "" -#: git-bisect.sh:222 +#: git-bisect.sh:225 msgid "'git bisect bad' can take only one argument." msgstr "" #. have bad but not good. we could bisect although #. this is less optimum. -#: git-bisect.sh:245 +#: git-bisect.sh:249 msgid "Warning: bisecting only with a bad commit." msgstr "" #. TRANSLATORS: Make sure to include [Y] and [n] in your #. translation. The program will only accept English input #. at this point. -#: git-bisect.sh:251 +#: git-bisect.sh:257 msgid "Are you sure [Y/n]? " msgstr "" -#: git-bisect.sh:261 +#: git-bisect.sh:268 msgid "" "You need to give me at least one good and one bad revisions.\n" "(You can use \"git bisect bad\" and \"git bisect good\" for that.)" msgstr "" -#: git-bisect.sh:264 +#: git-bisect.sh:274 msgid "" "You need to start by \"git bisect start\".\n" "You then need to give me at least one good and one bad revisions.\n" "(You can use \"git bisect bad\" and \"git bisect good\" for that.)" msgstr "" -#: git-bisect.sh:316 +#: git-bisect.sh:330 git-bisect.sh:457 msgid "We are not bisecting." msgstr "" -#: git-bisect.sh:323 +#: git-bisect.sh:337 #, fuzzy, sh-format msgid "'$invalid' is not a valid commit" msgstr "\"%s\" är inte en incheckning" -#: git-bisect.sh:352 +#: git-bisect.sh:346 +#, sh-format +msgid "" +"Could not check out original HEAD '$branch'.\n" +"Try 'git bisect reset '." +msgstr "" + +#: git-bisect.sh:371 +msgid "No logfile given" +msgstr "" + +#: git-bisect.sh:372 #, fuzzy, sh-format msgid "cannot read $file for replaying" msgstr "kan inte läsa indexet" -#: git-bisect.sh:368 +#: git-bisect.sh:388 msgid "?? what are you talking about?" msgstr "" -#: git-bisect.sh:380 +#: git-bisect.sh:400 #, sh-format msgid "running $command" msgstr "" -#: git-bisect.sh:386 +#: git-bisect.sh:407 #, sh-format msgid "" "bisect run failed:\n" "exit code $res from '$command' is < 0 or >= 128" msgstr "" -#: git-bisect.sh:409 +#: git-bisect.sh:433 msgid "bisect run cannot continue any more" msgstr "" -#: git-bisect.sh:414 +#: git-bisect.sh:441 #, sh-format msgid "" "bisect run failed:\n" "'bisect_state $state' exited with error code $res" msgstr "" -#: git-bisect.sh:420 +#: git-bisect.sh:449 msgid "bisect run success" msgstr "" @@ -3047,117 +3221,15 @@ msgstr "" msgid "Pull is not possible because you have unmerged files." msgstr "" -#: git-pull.sh:141 -msgid "" -"There is no candidate for rebasing against among the refs that you just " -"fetched.\n" -"Generally this means that you provided a wildcard refspec which had no\n" -"matches on the remote end." -msgstr "" - -#: git-pull.sh:145 -msgid "" -"There are no candidates for merging against among the refs that you just " -"fetched.\n" -"Generally this means that you provided a wildcard refspec which had no\n" -"matches on the remote end." -msgstr "" - -#. TRANSLATORS: $requested_remote will be a remote name, like -#. "origin" or "avar" -#: git-pull.sh:153 -#, sh-format -msgid "" -"You asked to pull from the remote '$requested_remote', but did not specify\n" -"a branch. Because this is not the default configured remote\n" -"for your current branch, you must specify a branch on the command line." -msgstr "" - -#: git-pull.sh:157 -msgid "" -"You are not currently on a branch, so I cannot use any\n" -"'branch..merge' in your configuration file.\n" -"Please specify which remote branch you want to use on the command\n" -"line and try again (e.g. 'git pull ').\n" -"See git-pull(1) for details." -msgstr "" - -#: git-pull.sh:165 -#, sh-format -msgid "" -"You asked me to pull without telling me which branch you\n" -"want to rebase against, and 'branch.${curr_branch}.merge' in\n" -"your configuration file does not tell me, either. Please\n" -"specify which branch you want to use on the command line and\n" -"try again (e.g. 'git pull ').\n" -"See git-pull(1) for details.\n" -"\n" -"If you often rebase against the same branch, you may want to\n" -"use something like the following in your configuration file:\n" -"\n" -" [branch \"${curr_branch}\"]\n" -" remote = \n" -" merge = \n" -" rebase = true\n" -"\n" -" [remote \"\"]\n" -" url = \n" -" fetch = \n" -"\n" -"See git-config(1) for details." -msgstr "" - -#: git-pull.sh:186 -#, sh-format -msgid "" -"You asked me to pull without telling me which branch you\n" -"want to merge with, and 'branch.${curr_branch}.merge' in\n" -"your configuration file does not tell me, either. Please\n" -"specify which branch you want to use on the command line and\n" -"try again (e.g. 'git pull ').\n" -"See git-pull(1) for details.\n" -"\n" -"If you often merge with the same branch, you may want to\n" -"use something like the following in your configuration file:\n" -"\n" -" [branch \"${curr_branch}\"]\n" -" remote = \n" -" merge = \n" -"\n" -" [remote \"\"]\n" -" url = \n" -" fetch = \n" -"\n" -"See git-config(1) for details." -msgstr "" - -#: git-pull.sh:210 -#, sh-format -msgid "" -"Your configuration specifies to rebase against the ref '$upstream_branch'\n" -"from the remote, but no such ref was fetched." -msgstr "" - -#: git-pull.sh:213 -#, sh-format -msgid "" -"Your configuration specifies to merge with the ref '$upstream_branch'\n" -"from the remote, but no such ref was fetched." -msgstr "" - -#: git-pull.sh:226 +#: git-pull.sh:189 msgid "updating an unborn branch with changes added to the index" msgstr "" -#: git-pull.sh:232 -msgid "refusing to pull with rebase: your working tree is not up-to-date" -msgstr "" - #. The fetch involved updating the current branch. #. The working tree and the index file is still based on the #. $orig_head commit, but we are merging into $curr_head. #. First update the working tree to match $curr_head. -#: git-pull.sh:260 +#: git-pull.sh:221 #, sh-format msgid "" "Warning: fetch updated the current branch head.\n" @@ -3165,25 +3237,25 @@ msgid "" "Warning: commit $orig_head." msgstr "" -#: git-pull.sh:285 +#: git-pull.sh:248 #, fuzzy msgid "Cannot merge multiple branches into empty head" msgstr "Kan endast slå ihop en enda incheckning i ett tomt huvud." -#: git-pull.sh:289 +#: git-pull.sh:252 msgid "Cannot rebase onto multiple branches" msgstr "" -#: git-stash.sh:41 +#: git-stash.sh:43 msgid "git stash clear with parameters is unimplemented" msgstr "" -#: git-stash.sh:63 +#: git-stash.sh:65 #, fuzzy msgid "You do not have the initial commit yet" msgstr "Du har ingen giltig HEAD" -#: git-stash.sh:78 +#: git-stash.sh:80 #, fuzzy msgid "Cannot save the current index state" msgstr "Kan inte komma åt aktuell arbetskatalog" @@ -3207,99 +3279,91 @@ msgstr "" msgid "Cannot record working tree state" msgstr "Kan inte komma åt arbetskatalogen \"%s\"" -#: git-stash.sh:176 +#: git-stash.sh:182 msgid "No local changes to save" msgstr "" -#: git-stash.sh:180 +#: git-stash.sh:186 msgid "Cannot initialize stash" msgstr "" -#: git-stash.sh:188 +#: git-stash.sh:194 msgid "Cannot save the current status" msgstr "" -#: git-stash.sh:201 +#: git-stash.sh:207 #, fuzzy msgid "Cannot remove worktree changes" msgstr "Kan inte komma åt arbetskatalogen \"%s\"" -#: git-stash.sh:303 +#: git-stash.sh:302 msgid "No stash found." msgstr "" -#: git-stash.sh:310 +#: git-stash.sh:309 #, fuzzy, sh-format msgid "Too many revisions specified: $REV" msgstr "För många flaggor angavs" -#: git-stash.sh:316 +#: git-stash.sh:315 #, fuzzy, sh-format msgid "$reference is not valid reference" msgstr "referensen är inte ett träd: %s" -#. maintainers: it would be better if git rev-parse indicated -#. this condition with a non-zero status code but as of 1.7.2.1 it -#. it did not. So, we use non-empty stderr output as a proxy for the -#. condition of interest. -#: git-stash.sh:337 -#, sh-format -msgid "$REV does not exist in the stash log" -msgstr "" - -#: git-stash.sh:351 +#: git-stash.sh:340 #, fuzzy, sh-format msgid "'$args' is not a stash-like commit" msgstr "\"%s\" är inte en incheckning" -#: git-stash.sh:362 +#: git-stash.sh:351 #, sh-format msgid "'$args' is not a stash reference" msgstr "" -#: git-stash.sh:372 -msgid "Cannot apply to a dirty working tree, please stage your changes" -msgstr "" +#: git-stash.sh:359 +#, fuzzy +msgid "unable to refresh index" +msgstr "Kunde inte skriva indexet." -#: git-stash.sh:376 +#: git-stash.sh:363 #, fuzzy msgid "Cannot apply a stash in the middle of a merge" msgstr "Kan inte utföra en %s återställning mitt i en sammanslagning." -#: git-stash.sh:384 +#: git-stash.sh:371 msgid "Conflicts in index. Try without --index." msgstr "" -#: git-stash.sh:386 +#: git-stash.sh:373 #, fuzzy msgid "Could not save index tree" msgstr "Kunde inte läsa indexet" -#: git-stash.sh:412 +#: git-stash.sh:399 msgid "Cannot unstage modified files" msgstr "" -#: git-stash.sh:426 +#: git-stash.sh:414 #, fuzzy msgid "Index was not unstashed." msgstr "kunde köra stash." -#: git-stash.sh:443 +#: git-stash.sh:433 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "" -#: git-stash.sh:444 +#: git-stash.sh:434 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "" -#: git-stash.sh:451 +#: git-stash.sh:441 #, fuzzy msgid "No branch name specified" msgstr "Misslyckades byta namn på gren" -#: git-stash.sh:522 +#: git-stash.sh:512 msgid "(To restore them type \"git stash apply\")" msgstr "" @@ -3308,37 +3372,32 @@ msgstr "" msgid "remote ($remote) does not have a url defined in .git/config" msgstr "" -#: git-submodule.sh:79 -#, sh-format -msgid "No submodule mapping found in .gitmodules for path '$path'" -msgstr "" - -#: git-submodule.sh:105 +#: git-submodule.sh:56 #, sh-format -msgid "Directory '$path' exists, but is neither empty nor a git repository" +msgid "cannot strip one component off url '$remoteurl'" msgstr "" -#: git-submodule.sh:109 +#: git-submodule.sh:108 #, sh-format -msgid "A file already exist at path '$path'" +msgid "No submodule mapping found in .gitmodules for path '$path'" msgstr "" -#: git-submodule.sh:117 +#: git-submodule.sh:132 #, sh-format msgid "Clone of '$url' into submodule path '$path' failed" msgstr "" -#: git-submodule.sh:190 +#: git-submodule.sh:205 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "" -#: git-submodule.sh:207 +#: git-submodule.sh:222 #, fuzzy, sh-format msgid "'$path' already exists in the index" msgstr "kan inte läsa indexet" -#: git-submodule.sh:211 +#: git-submodule.sh:227 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -3346,147 +3405,222 @@ msgid "" "Use -f if you really want to add it." msgstr "" -#: git-submodule.sh:222 +#: git-submodule.sh:240 #, sh-format msgid "Adding existing repo at '$path' to the index" msgstr "" -#: git-submodule.sh:224 +#: git-submodule.sh:242 #, fuzzy, sh-format msgid "'$path' already exists and is not a valid git repo" msgstr "destinationssökvägen \"%s\" finns redan och är inte en tom katalog." -#: git-submodule.sh:247 +#: git-submodule.sh:265 #, sh-format msgid "Unable to checkout submodule '$path'" msgstr "" -#: git-submodule.sh:251 +#: git-submodule.sh:269 #, fuzzy, sh-format msgid "Failed to add submodule '$path'" msgstr "Kunde inte läsa objektet \"%s\"." -#: git-submodule.sh:256 +#: git-submodule.sh:274 #, sh-format msgid "Failed to register submodule '$path'" msgstr "" -#: git-submodule.sh:294 +#: git-submodule.sh:312 #, sh-format msgid "Entering '$prefix$path'" msgstr "" -#: git-submodule.sh:306 +#: git-submodule.sh:324 #, sh-format msgid "Stopping at '$path'; script returned non-zero status." msgstr "" -#: git-submodule.sh:349 +#: git-submodule.sh:367 #, sh-format msgid "No url found for submodule path '$path' in .gitmodules" msgstr "" -#: git-submodule.sh:359 +#: git-submodule.sh:377 #, sh-format msgid "Failed to register url for submodule path '$path'" msgstr "" -#: git-submodule.sh:364 +#: git-submodule.sh:382 #, sh-format msgid "Failed to register update mode for submodule path '$path'" msgstr "" -#: git-submodule.sh:366 +#: git-submodule.sh:384 #, sh-format msgid "Submodule '$name' ($url) registered for path '$path'" msgstr "" -#: git-submodule.sh:444 +#: git-submodule.sh:467 #, sh-format msgid "" "Submodule path '$path' not initialized\n" "Maybe you want to use 'update --init'?" msgstr "" -#: git-submodule.sh:456 +#: git-submodule.sh:480 #, sh-format msgid "Unable to find current revision in submodule path '$path'" msgstr "" -#: git-submodule.sh:476 +#: git-submodule.sh:504 #, sh-format msgid "Unable to fetch in submodule path '$path'" msgstr "" -#: git-submodule.sh:482 git-submodule.sh:487 git-submodule.sh:492 +#: git-submodule.sh:517 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$path'" msgstr "" -#: git-submodule.sh:483 +#: git-submodule.sh:518 #, sh-format msgid "Submodule path '$path': rebased into '$sha1'" msgstr "" -#: git-submodule.sh:488 +#: git-submodule.sh:522 +#, fuzzy, sh-format +msgid "Unable to merge '$sha1' in submodule path '$path'" +msgstr "Kunde inte läsa objektet \"%s\"." + +#: git-submodule.sh:523 #, sh-format msgid "Submodule path '$path': merged in '$sha1'" msgstr "" -#: git-submodule.sh:493 +#: git-submodule.sh:527 +#, fuzzy, sh-format +msgid "Unable to checkout '$sha1' in submodule path '$path'" +msgstr "Kunde inte läsa objektet \"%s\"." + +#: git-submodule.sh:528 #, sh-format msgid "Submodule path '$path': checked out '$sha1'" msgstr "" -#: git-submodule.sh:504 git-submodule.sh:797 +#: git-submodule.sh:539 git-submodule.sh:841 #, sh-format msgid "Failed to recurse into submodule path '$path'" msgstr "" -#: git-submodule.sh:588 +#: git-submodule.sh:623 msgid "--" msgstr "" #. unexpected type -#: git-submodule.sh:628 +#: git-submodule.sh:664 #, fuzzy, sh-format msgid "unexpected mode $mod_dst" msgstr "diff-status %c förväntades inte" -#: git-submodule.sh:646 +#: git-submodule.sh:684 #, sh-format msgid " Warn: $name doesn't contain commit $sha1_src" msgstr "" -#: git-submodule.sh:649 +#: git-submodule.sh:687 #, sh-format msgid " Warn: $name doesn't contain commit $sha1_dst" msgstr "" -#: git-submodule.sh:652 +#: git-submodule.sh:690 #, sh-format msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst" msgstr "" -#: git-submodule.sh:677 +#: git-submodule.sh:715 msgid "blob" msgstr "" -#: git-submodule.sh:678 +#: git-submodule.sh:716 msgid "submodule" msgstr "" -#: git-submodule.sh:715 +#: git-submodule.sh:753 #, fuzzy msgid "# Submodules changed but not updated:" msgstr "# Ändrade men inte uppdaterade:" -#: git-submodule.sh:717 +#: git-submodule.sh:755 #, fuzzy msgid "# Submodule changes to be committed:" msgstr "# Ändringar att checka in:" -#: git-submodule.sh:844 +#: git-submodule.sh:885 #, sh-format msgid "Synchronizing submodule url for '$name'" msgstr "" + +#~ msgid "# Changed but not updated:" +#~ msgstr "# Ändrade men inte uppdaterade:" + +#~ msgid "could not parse commit %s" +#~ msgstr "kunde inte tolka incheckningen %s" + +#~ msgid "Paths with --interactive does not make sense." +#~ msgstr "Kan inte ange sökvägar med --interactive." + +#~ msgid "No HEAD commit to compare with (yet)" +#~ msgstr "Ingen HEAD-incheckning att jämföra med (ännu)" + +#~ msgid "cannot mix --fixed-strings and regexp" +#~ msgstr "kan inte blanda --fixed-strings och reguljära uttryck" + +#~ msgid "invalid --decorate option: %s" +#~ msgstr "felaktigt värde till --decorate: %s" + +#~ msgid "Failed to write current notes tree to database" +#~ msgstr "Kunde inte skriva aktuellt anteckningsträd till databasen" + +#~ msgid "Failed to commit notes tree to database" +#~ msgstr "Kunde inte checka in anteckningsträd i databasen" + +# FIXME: Untranslatable! +# +#~ msgid "Refusing to %s notes in %s (outside of refs/notes/)" +#~ msgstr "Vägrar %s anteckningar i %s (utanför refs/notes/)" + +#~ msgid "list" +#~ msgstr "list" + +#~ msgid "add" +#~ msgstr "add" + +#~ msgid "copy" +#~ msgstr "copy" + +#~ msgid "show" +#~ msgstr "show" + +#~ msgid "remove" +#~ msgstr "remove" + +#~ msgid "prune" +#~ msgstr "prune" + +#~ msgid "The current branch %s is not tracking anything." +#~ msgstr "Den aktuella grenen %s spårar ingenting." + +#~ msgid "No destination configured to push to." +#~ msgstr "Har inte ställt in någon destination att sända till." + +#~ msgid "Could not extract author email from %s" +#~ msgstr "Kunde inte hämta författarens e-postadress från %s" + +#~ msgid "Could not extract author time from %s" +#~ msgstr "Kunde inte hämta författartid från %s" + +#~ msgid "No author information found in %s" +#~ msgstr "Hittade ingen författarinformation i %s" + +#~ msgid "Cannot revert a root commit" +#~ msgstr "Kan inte ångra en rotincheckning" From ceb58337358d93caae779b33daf6d7fd58ccdf23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Date: Wed, 6 Jul 2011 19:24:58 +0000 Subject: [PATCH 14/15] en_GB is OK now --- po/en_GB.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/en_GB.po b/po/en_GB.po index 7447f908e8b10d..97c7abc8a539d4 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List \n" "POT-Creation-Date: 2011-07-06 19:20+0000\n" -"PO-Revision-Date: 2010-09-02 19:09 +0000\n" +"PO-Revision-Date: 2011-07-06 19:24+0000\n" "Last-Translator: Sam Reed \n" "Language-Team: Git Mailing List \n" "Language: en-gb\n" @@ -192,7 +192,7 @@ msgstr "" #: wt-status.c:731 #, fuzzy msgid "Initial commit" -msgstr "Initialised empty" +msgstr "" #: wt-status.c:745 msgid "Untracked" From 0a655b9a023708575854b059bb29400ef123df3d Mon Sep 17 00:00:00 2001 From: Peter Krefting Date: Fri, 19 Aug 2011 11:11:55 +0100 Subject: [PATCH 15/15] Update Swedish translation (701t0f0u). MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also incorporate review changes from the first translation run by Göran Uddeborg Signed-off-by: Peter Krefting --- po/sv.po | 539 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 278 insertions(+), 261 deletions(-) diff --git a/po/sv.po b/po/sv.po index 3c651cf5fdff20..45a757ba3afc9a 100644 --- a/po/sv.po +++ b/po/sv.po @@ -1,14 +1,14 @@ # Swedish translations for Git. -# Copyright (C) 2010 Peter krefting +# Copyright (C) 2010-2011 Peter Krefting # This file is distributed under the same license as the Git package. -# Peter krefting , 2010. +# Peter Krefting , 2010-2011. # msgid "" msgstr "" -"Project-Id-Version: git 1.7.3\n" +"Project-Id-Version: git 1.7.5\n" "Report-Msgid-Bugs-To: Git Mailing List \n" "POT-Creation-Date: 2011-07-06 19:20+0000\n" -"PO-Revision-Date: 2010-09-12 21:07+0100\n" +"PO-Revision-Date: 2011-08-19 11:11+0100\n" "Last-Translator: Peter Krefting \n" "Language-Team: Swedish \n" "Language: sv\n" @@ -20,12 +20,12 @@ msgstr "" #: diff.c:104 #, c-format msgid " Failed to parse dirstat cut-off percentage '%.*s'\n" -msgstr "" +msgstr " Misslyckades tolka avbrytningsprocent för dirstat: \"%.*s\"\n" #: diff.c:109 -#, fuzzy, c-format +#, c-format msgid " Unknown dirstat parameter '%.*s'\n" -msgstr "kan inte ta status på mallen \"%s\"" +msgstr " Okänd parameter för dirstat: \"%.*s\"\n" #: diff.c:205 #, c-format @@ -33,6 +33,8 @@ msgid "" "Found errors in 'diff.dirstat' config variable:\n" "%s" msgstr "" +"Hittade fel i konfigurationsvariabeln \"diff.dirstat\":\n" +"%s" #: diff.c:3295 #, c-format @@ -40,74 +42,66 @@ msgid "" "Failed to parse --dirstat/-X option parameter:\n" "%s" msgstr "" +"Misslyckades tolka argument till flaggan --dirstat/-X:\n" +"%s" #: wt-status.c:134 -#, fuzzy msgid "Unmerged paths:" -msgstr "# Ej sammanslagna sökvägar:" +msgstr "Ej sammanslagna sökvägar:" #: wt-status.c:140 wt-status.c:157 -#, fuzzy, c-format +#, c-format msgid " (use \"git reset %s ...\" to unstage)" -msgstr "# (använd \"git reset %s ...\" för att ta bort från kö)" +msgstr " (använd \"git reset %s ...\" för att ta bort från kö)" #: wt-status.c:142 wt-status.c:159 -#, fuzzy msgid " (use \"git rm --cached ...\" to unstage)" -msgstr "# (använd \"git rm --cached ...\" för att ta bort från kö)" +msgstr " (använd \"git rm --cached ...\" för att ta bort från kö)" #: wt-status.c:143 -#, fuzzy msgid " (use \"git add/rm ...\" as appropriate to mark resolution)" -msgstr "# (använd \"git add/rm ...\" som lämpligt för att ange lösning)" +msgstr " (använd \"git add/rm ...\" som lämpligt för att ange lösning)" #: wt-status.c:151 -#, fuzzy msgid "Changes to be committed:" -msgstr "# Ändringar att checka in:" +msgstr "Ändringar att checka in:" #: wt-status.c:169 -#, fuzzy msgid "Changes not staged for commit:" -msgstr "# Ändringar att checka in:" +msgstr "Ändringar ej köade för incheckning:" #: wt-status.c:173 -#, fuzzy msgid " (use \"git add ...\" to update what will be committed)" msgstr "" -"# (använd \"git add ...\" för att uppdatera vad som skall checkas in)" +" (använd \"git add ...\" för att uppdatera vad som skall checkas in)" #: wt-status.c:175 -#, fuzzy msgid " (use \"git add/rm ...\" to update what will be committed)" msgstr "" -"# (använd \"git add/rm ...\" för att uppdatera vad som skall checkas " -"in)" +" (använd \"git add/rm ...\" för att uppdatera vad som skall checkas in)" #: wt-status.c:176 -#, fuzzy msgid "" " (use \"git checkout -- ...\" to discard changes in working directory)" msgstr "" -"# (använd \"git checkout -- ...\" för att förkasta ändringar i " +" (använd \"git checkout -- ...\" för att förkasta ändringar i " "arbetskatalogen)" #: wt-status.c:178 -#, fuzzy msgid " (commit or discard the untracked or modified content in submodules)" msgstr "" -"# (checka in eller förkasta ospårat eller ändrat innehåll i undermoduler)" +" (checka in eller förkasta ospårat eller ändrat innehåll i undermoduler)" #: wt-status.c:187 -#, fuzzy, c-format +#, c-format msgid "%s files:" -msgstr "# %s filer:" +msgstr "%s filer:" #: wt-status.c:190 -#, fuzzy, c-format +#, c-format msgid " (use \"git %s ...\" to include in what will be committed)" msgstr "" -"# (använd \"git %s ...\" för att ta med i vad som skall checkas in)" +" (använd \"git %s ...\" för att ta med i vad som skall checkas in)" #: wt-status.c:207 msgid "bug" @@ -207,9 +201,8 @@ msgid "Not currently on any branch." msgstr "Inte på någon gren för närvarande." #: wt-status.c:731 -#, fuzzy msgid "Initial commit" -msgstr "# Grundincheckning" +msgstr "Första incheckning" #: wt-status.c:745 msgid "Untracked" @@ -220,18 +213,17 @@ msgid "Ignored" msgstr "Ignorerad" #: wt-status.c:749 -#, fuzzy, c-format +#, c-format msgid "Untracked files not listed%s" -msgstr "# Ospårade filer visas ej%s\n" +msgstr "Ospårade filer visas ej%s" #: wt-status.c:751 msgid " (use -u option to show untracked files)" msgstr " (använd flaggan -u för att visa ospårade filer)" #: wt-status.c:757 -#, fuzzy msgid "No changes" -msgstr "# Inga ändringar\n" +msgstr "Inga ändringar" #: wt-status.c:761 #, c-format @@ -274,7 +266,7 @@ msgstr "HEAD (ingen gren)" #: wt-status.c:890 msgid "Initial commit on " -msgstr "Grundincheckning på " +msgstr "Första incheckning på " #: wt-status.c:905 msgid "behind " @@ -350,7 +342,7 @@ msgstr "Kunde inte applicera \"%s\"" #: builtin/add.c:310 msgid "The following paths are ignored by one of your .gitignore files:\n" -msgstr "" +msgstr "Följande sökvägar ignoreras av en av dina .gitignore-filer:\n" #: builtin/add.c:350 #, c-format @@ -423,13 +415,13 @@ msgid "git archive: expected a flush" msgstr "git archive: förväntade en tömning (flush)" #: builtin/branch.c:136 -#, fuzzy, c-format +#, c-format msgid "" "deleting branch '%s' that has been merged to\n" " '%s', but not yet merged to HEAD." msgstr "" -"tar bort grenen \"%s\" som inte har slagits ihop med\n" -" \"%s\", men som ännu inte slagits ihop med HEAD." +"tar bort grenen \"%s\" som har slagits ihop med\n" +" \"%s\", men ännu inte slagits ihop med HEAD." #: builtin/branch.c:140 #, c-format @@ -673,7 +665,7 @@ msgstr "Växlade till grenen \"%s\"\n" #: builtin/checkout.c:651 #, c-format msgid " ... and %d more.\n" -msgstr "" +msgstr " ... och ytterligare %d.\n" #. The singular version #: builtin/checkout.c:657 @@ -689,7 +681,15 @@ msgid_plural "" "\n" "%s\n" msgstr[0] "" +"Varning: du lämnar kvar %d incheckning, som inte är kopplad till\n" +"någon av dina grenar:\n" +"\n" +"%s\n" msgstr[1] "" +"Varning: du lämnar kvar %d incheckningar, som inte är kopplade till\n" +"någon av dina grenar:\n" +"\n" +"%s\n" #: builtin/checkout.c:675 #, c-format @@ -700,14 +700,19 @@ msgid "" " git branch new_branch_name %s\n" "\n" msgstr "" +"Om du vill behålla dem genom att skapa en ny gren är nu en bra tidpunkt\n" +"att göra så med:\n" +"\n" +" git branch nytt_grennamn %s\n" +"\n" #: builtin/checkout.c:700 msgid "internal error: only -- alone should have been left" -msgstr "" +msgstr "internt fel: endast ensamt -- skulle varit kvar" #: builtin/checkout.c:702 msgid "internal error in revision walk" -msgstr "" +msgstr "internt fel i revisionsgenomgång" #: builtin/checkout.c:706 msgid "Previous HEAD position was" @@ -738,14 +743,12 @@ msgid "--patch is incompatible with all other options" msgstr "--patch är inkompatibel med alla andra flaggor" #: builtin/checkout.c:977 -#, fuzzy msgid "--detach cannot be used with -b/-B/--orphan" -msgstr "--cached kan inte användas med --no-index." +msgstr "--detched kan inte användas med -b/-B/--orphan" #: builtin/checkout.c:979 -#, fuzzy msgid "--detach cannot be used with -t" -msgstr "--orphan kan inte användas med -t" +msgstr "--detched kan inte användas med -t" #: builtin/checkout.c:985 msgid "--track needs a branch name" @@ -757,7 +760,7 @@ msgstr "Grennamn saknas; försök med -b" #: builtin/checkout.c:998 msgid "--orphan and -b|-B are mutually exclusive" -msgstr "--orphan och --b|-B kan inte användas samtidigt" +msgstr "--orphan och -b|-B kan inte användas samtidigt" #: builtin/checkout.c:1000 msgid "--orphan cannot be used with -t" @@ -785,9 +788,8 @@ msgid "git checkout: updating paths is incompatible with switching branches." msgstr "git checkout: uppdatera sökvägar är inkompatibelt med att växla gren." #: builtin/checkout.c:1059 -#, fuzzy msgid "git checkout: --detach does not take a path argument" -msgstr "fetch --all tar inte namnet på ett arkiv som argument" +msgstr "git checkout: --detach tar inte ett sökvägsargument" #: builtin/checkout.c:1062 msgid "" @@ -813,7 +815,7 @@ msgstr "Kan inte växla gren på en icke-incheckning." #: builtin/checkout.c:1088 msgid "--ours/--theirs is incompatible with switching branches." -msgstr "--ours/--theirs är inkompatibla när du växlar gren." +msgstr "--ours/--theirs är inkompatibla med att växla gren." #: builtin/clean.c:78 msgid "-x and -X cannot be used together" @@ -845,9 +847,9 @@ msgid "Removing %s\n" msgstr "Tar bort %s\n" #: builtin/clean.c:161 builtin/clean.c:181 -#, fuzzy, c-format +#, c-format msgid "failed to remove %s" -msgstr "kunde inte ta bort \"%s\"" +msgstr "kunde inte ta bort %s" #: builtin/clean.c:165 #, c-format @@ -923,13 +925,13 @@ msgid "--bare and --origin %s options are incompatible." msgstr "flaggorna --bare och --origin %s är inkompatibla." #: builtin/clone.c:420 -#, fuzzy, c-format +#, c-format msgid "repository '%s' does not exist" -msgstr "felaktigt arkiv \"%s\"" +msgstr "arkivet \"%s\" finns inte" #: builtin/clone.c:425 msgid "--depth is ignored in local clones; use file:// instead." -msgstr "" +msgstr "--depth ignoreras i lokala koner; använd file:// istället" #: builtin/clone.c:435 #, c-format @@ -952,14 +954,14 @@ msgid "could not create work tree dir '%s'." msgstr "kunde inte skapa arbetskatalogen \"%s\"" #: builtin/clone.c:480 -#, fuzzy, c-format +#, c-format msgid "Cloning into bare repository %s...\n" -msgstr "Klonar till ett naket arkiv %s\n" +msgstr "Klonar till ett naket arkiv %s...\n" #: builtin/clone.c:482 -#, fuzzy, c-format +#, c-format msgid "Cloning into %s...\n" -msgstr "Klonar till %s\n" +msgstr "Klonar till %s...\n" #: builtin/clone.c:540 #, c-format @@ -982,7 +984,6 @@ msgstr "" "HEAD hos fjärren pekar på en obefintlig referens, kan inte checka ut.\n" #: builtin/commit.c:41 -#, fuzzy msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -1002,10 +1003,10 @@ msgstr "" " git config --global user.name \"Ditt namn\"\n" " git config --global user.email du@example.com\n" "\n" -"Om identiteten som användes för incheckningen är felaktig kan du\n" +"När du gjort detta kan du rätta identiteten för den här incheckningen med:\n" "rätta den med:\n" "\n" -" git commit --amend --author='Ditt namn '\n" +" git commit --amend --reset-author\n" #: builtin/commit.c:53 msgid "" @@ -1026,15 +1027,20 @@ msgid "" "\n" "Otherwise, please use 'git reset'\n" msgstr "" +"Den tidigare \"cherry-pick\":en är nu tom, antagligen på grund av lösning\n" +"av konflikter. Om du vill checka in i alla fall använder du:\n" +"\n" +" git commit --allow-empty\n" +"\n" +"Om inte, använd \"git reset\"\n" #: builtin/commit.c:318 msgid "failed to unpack HEAD tree object" msgstr "misslyckades packa upp HEAD:s trädobjekt" #: builtin/commit.c:359 -#, fuzzy msgid "unable to create temporary index" -msgstr "kunde inte skriva temporär indexfil" +msgstr "kunde inte skapa temporär indexfil" #: builtin/commit.c:365 msgid "interactive add failed" @@ -1045,9 +1051,9 @@ msgid "unable to write new_index file" msgstr "kunde inte skriva filen new_index" #: builtin/commit.c:447 -#, fuzzy, c-format +#, c-format msgid "cannot do a partial commit during a %s." -msgstr "kan inte utföra en delvis incheckning under en sammanslagning." +msgstr "kan inte utföra en delvis incheckning under en %s." #: builtin/commit.c:456 msgid "cannot read the index" @@ -1071,9 +1077,9 @@ msgid "malformed --author parameter" msgstr "felformad \"--author\"-flagga" #: builtin/commit.c:622 -#, fuzzy, c-format +#, c-format msgid "Malformed ident string: '%s'" -msgstr "Felaktig indatarad: \"%s\"." +msgstr "Felaktig identitetssträng: \"%s\"" #: builtin/commit.c:656 builtin/commit.c:689 builtin/commit.c:989 #, c-format @@ -1121,7 +1127,7 @@ msgid "could not write commit template" msgstr "kunde inte skriva incheckningsmall" #: builtin/commit.c:769 -#, fuzzy, c-format +#, c-format msgid "" "\n" "It looks like you may be committing a %s.\n" @@ -1129,50 +1135,43 @@ msgid "" "\t%s\n" "and try again.\n" msgstr "" -"#\n" -"# Det verkar som du checkar in en SAMMANSLAGNING.\n" -"# Om det inte stämmer tar du bort filen\n" -"#\t%s\n" -"# och försöker igen.\n" -"#\n" +"\n" +"Det verkar som du checkar in en %s.\n" +"Om det inte stämmer tar du bort filen\n" +"\t%s\n" +"och försöker igen.\n" #: builtin/commit.c:782 -#, fuzzy msgid "Please enter the commit message for your changes." -msgstr "" -"\n" -"# Ange ett incheckningsmeddelande för dina ändringar." +msgstr "Ange ett incheckningsmeddelande för dina ändringar." #: builtin/commit.c:785 -#, fuzzy msgid "" " Lines starting\n" "with '#' will be ignored, and an empty message aborts the commit.\n" msgstr "" " Rader som inleds\n" -"# med \"#\" kommer ignoreras, och ett tomt meddelande avbryter " -"incheckningen.\n" +"med \"#\" kommer ignoreras, och ett tomt meddelande avbryter incheckningen.\n" #: builtin/commit.c:790 -#, fuzzy 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" msgstr "" " Rader som inleds\n" -"# med \"#\" kommer behållas; du kan själv ta bort dem om du vill.\n" -"# Ett tomt meddelande avbryter incheckningen.\n" +"med \"#\" kommer behållas; du kan själv ta bort dem om du vill.\n" +"Ett tomt meddelande avbryter incheckningen.\n" #: builtin/commit.c:802 -#, fuzzy, c-format +#, c-format msgid "%sAuthor: %s" -msgstr "%s# Författare: %s\n" +msgstr "%sFörfattare: %s" #: builtin/commit.c:809 -#, fuzzy, c-format +#, c-format msgid "%sCommitter: %s" -msgstr "%s# Incheckare: %s\n" +msgstr "%sIncheckare: %s" #: builtin/commit.c:829 msgid "Cannot read index" @@ -1206,33 +1205,30 @@ msgid "You have nothing to amend." msgstr "Du har inget att utöka." #: builtin/commit.c:1034 -#, fuzzy, c-format +#, c-format msgid "You are in the middle of a %s -- cannot amend." -msgstr "Du är i mitten av en incheckning -- kan inte utöka." +msgstr "Du är i mitten av en %s -- kan inte utöka." #: builtin/commit.c:1036 -#, fuzzy msgid "Options --squash and --fixup cannot be used together" -msgstr "-x och -X kan inte användas samtidigt" +msgstr "Flaggorna --squash och --fixup kan inte användas samtidigt" #: builtin/commit.c:1046 -#, fuzzy msgid "Only one of -c/-C/-F/--fixup can be used." -msgstr "Kan endast använda en av -c/-C/-F." +msgstr "Kan endast använda en av -c/-C/-F/--fixup." #: builtin/commit.c:1048 -#, fuzzy msgid "Option -m cannot be combined with -c/-C/-F/--fixup." -msgstr "Flaggan -m kan inte kombineras med -c/-C/-F." +msgstr "Flaggan -m kan inte kombineras med -c/-C/-F/--fixup." #: builtin/commit.c:1054 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author kan endast användas med -C, -c eller --amend." #: builtin/commit.c:1071 -#, fuzzy msgid "Only one of --include/--only/--all/--interactive/--patch can be used." -msgstr "Endast en av --include/--only/--all/--interactive kan användas." +msgstr "" +"Endast en av --include/--only/--all/--interactive/--patch kan användas." #: builtin/commit.c:1073 msgid "No paths with --include/--only does not make sense." @@ -1493,7 +1489,7 @@ msgstr "(ej snabbspolad)" #: builtin/fetch.c:361 builtin/fetch.c:684 #, c-format msgid "cannot open %s: %s\n" -msgstr "kan inte öppna %s. %s\n" +msgstr "kan inte öppna %s: %s\n" #: builtin/fetch.c:439 #, c-format @@ -1620,13 +1616,13 @@ msgid "Auto packing the repository for optimum performance.\n" msgstr "Packar arkivet automatiskt för optimal prestanda.\n" #: builtin/gc.c:226 -#, fuzzy, c-format +#, c-format msgid "" "Auto packing the repository for optimum performance. You may also\n" "run \"git gc\" manually. See \"git help gc\" for more information.\n" msgstr "" "Packar arkivet automatiskt för optimal prestanda. Du kan även\n" -"köra \"git gc\" manuellt. Se \"git help gc\" för mer information." +"köra \"git gc\" manuellt. Se \"git help gc\" för mer information.\n" #: builtin/gc.c:254 msgid "" @@ -1708,7 +1704,7 @@ msgstr "både --cached och träd angavs." #: builtin/init-db.c:35 #, c-format msgid "Could not make %s writable by group" -msgstr "Kunde inte göra %s skrivbar för grubben" +msgstr "Kunde inte göra %s skrivbar för gruppen" #: builtin/init-db.c:62 #, c-format @@ -1776,24 +1772,24 @@ msgid "insane git directory %s" msgstr "tokig git-katalog %s" #: builtin/init-db.c:322 builtin/init-db.c:325 -#, fuzzy, c-format +#, c-format msgid "%s already exists" -msgstr "taggen \"%s\" finns redan" +msgstr "%s finns redan" #: builtin/init-db.c:354 -#, fuzzy, c-format +#, c-format msgid "unable to handle file type %d" -msgstr "kunde inte läsa träd (%s)" +msgstr "kunde inte hantera filtypen %d" #: builtin/init-db.c:357 -#, fuzzy, c-format +#, c-format msgid "unable to move %s to %s" -msgstr "kunde inte skriva %s" +msgstr "kunde inte flytta %s till %s" #: builtin/init-db.c:362 -#, fuzzy, c-format +#, c-format msgid "Could not create git link %s" -msgstr "kunde inte skapa filen \"%s\"" +msgstr "kunde inte skapa gitlänk %s" #. #. * TRANSLATORS: The first '%s' is either "Reinitialized @@ -1875,7 +1871,7 @@ msgstr "format.headers utan värde" #: builtin/log.c:677 msgid "name of output directory is too long" -msgstr "namn på utdatakatalogen är för lång" +msgstr "namnet på utdatakatalogen är för långt" #: builtin/log.c:688 #, c-format @@ -2038,11 +2034,11 @@ msgstr "Felaktig branch.%s.mergeoptions-sträng: %s" #: builtin/merge.c:550 #, c-format msgid "%s: negative length %s" -msgstr "" +msgstr "%s: negativ längd %s" #: builtin/merge.c:609 msgid "git write-tree failed to write a tree" -msgstr "git write--tree misslyckades skriva ett träd" +msgstr "git write-tree misslyckades skriva ett träd" #: builtin/merge.c:659 msgid "failed to read the cache" @@ -2073,9 +2069,9 @@ msgid "Could not open '%s' for writing" msgstr "Kunde inte öppna \"%s\" för skrivning" #: builtin/merge.c:852 -#, fuzzy, c-format +#, c-format msgid "Could not read from '%s'" -msgstr "kunde inte läsa \"%s\"" +msgstr "Kunde inte läsa \"%s\"" #: builtin/merge.c:869 #, c-format @@ -2094,27 +2090,25 @@ msgid "'%s' is not a commit" msgstr "\"%s\" är inte en incheckning" #: builtin/merge.c:992 -#, fuzzy msgid "No current branch." -msgstr "Inte på någon gren för närvarande." +msgstr "Ingen nuvarande gren." #: builtin/merge.c:994 -#, fuzzy msgid "No remote for the current branch." -msgstr "Du är inte på någon gren för närvarande." +msgstr "Ingen fjärr för aktuell gren." #: builtin/merge.c:996 msgid "No default upstream defined for the current branch." -msgstr "" +msgstr "Standarduppströmsarkiv har inte angetts för aktuell gren." #: builtin/merge.c:1001 #, c-format msgid "No remote tracking branch for %s from %s" -msgstr "" +msgstr "Inge fjärrspårande gren för %s från %s" #: builtin/merge.c:1053 msgid "There is no merge to abort (MERGE_HEAD missing)." -msgstr "" +msgstr "Det finns ingen sammanslagning att avbryta (MERGE_HEAD saknas)." #: builtin/merge.c:1068 git-pull.sh:31 msgid "" @@ -2129,18 +2123,16 @@ msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Du har inte avslutat sammanslagningen (MERGE_HEAD finns)." #: builtin/merge.c:1075 -#, fuzzy msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you can merge." msgstr "" -"Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n" +"Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns).\n" "Checka in dina ändringar innan du kan slå ihop." #: builtin/merge.c:1078 -#, fuzzy msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." -msgstr "Du har inte avslutat sammanslagningen (MERGE_HEAD finns)." +msgstr "Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns)." #: builtin/merge.c:1087 msgid "You cannot combine --squash with --no-ff." @@ -2189,7 +2181,7 @@ msgstr "Kan inte snabbspola, avbryter." #: builtin/merge.c:1336 builtin/merge.c:1409 #, c-format msgid "Rewinding the tree to pristine...\n" -msgstr "Återspolar trädet till ofördärvat...\n" +msgstr "Återspolar trädet till orört...\n" #: builtin/merge.c:1340 #, c-format @@ -2454,6 +2446,11 @@ msgid "" "\n" " git push %s HEAD:\n" msgstr "" +"Du befinner dig inte på någon gren för närvarande.\n" +"För att sända historiken som leder till det aktuella tillståndet\n" +"(frånkopplat HEAD) nu, använd\n" +"\n" +" git push %s HEAD:\n" #: builtin/push.c:79 #, c-format @@ -2463,11 +2460,15 @@ msgid "" "\n" " git push --set-upstream %s %s\n" msgstr "" +"Den aktuella grenen %s har inte någon uppströmsgren.\n" +"För att sända den aktuella grenen och sätta fjärren som uppström, använd\n" +"\n" +" git push --set-upstream %s %s\n" #: builtin/push.c:87 -#, fuzzy, c-format +#, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." -msgstr "Den aktuella grenen %s spårar flera grenar, vägrar sända." +msgstr "Den aktuella grenen %s har flera uppströmsgrenar, vägrar sända." #: builtin/push.c:110 msgid "" @@ -2517,6 +2518,15 @@ msgid "" "\n" " git push \n" msgstr "" +"Ingen destination har angivits för sändning.\n" +"Ange antingen URL:en från kommandoraden eller konfigurera ett fjärrarkiv " +"med\n" +"\n" +" git remote add \n" +"\n" +"och sänd sedan med namnet på fjärren\n" +"\n" +" git push \n" #: builtin/push.c:175 msgid "--all and --tags are incompatible" @@ -2671,18 +2681,12 @@ msgstr "" "Checka in dina ändringar eller använd \"stash\" för att fortsätta." #: builtin/revert.c:283 -#, fuzzy msgid "Your local changes would be overwritten by revert.\n" -msgstr "" -"Dina lokala ändringar skulle skrivas över av \"revert\".\n" -"Checka in dina ändringar eller använd \"stash\" för att fortsätta." +msgstr "Dina lokala ändringar skulle skrivas över av \"revert\".\n" #: builtin/revert.c:285 -#, fuzzy msgid "Your local changes would be overwritten by cherry-pick.\n" -msgstr "" -"Dina lokala ändringar skulle skrivas över av \"cherry-pick\".\n" -"Checka in dina ändringar eller använd \"stash\" för att fortsätta." +msgstr "Dina lokala ändringar skulle skrivas över av \"cherry-pick\".\n" #. TRANSLATORS: %s will be "revert" or "cherry-pick" #: builtin/revert.c:335 @@ -2745,9 +2749,9 @@ msgid "git %s: failed to read the index" msgstr "git %s: misslyckades läsa indexet" #: builtin/revert.c:555 -#, fuzzy, c-format +#, c-format msgid "git %s: failed to refresh the index" -msgstr "git %s: misslyckades läsa indexet" +msgstr "git %s: misslyckades uppdatera indexet" #: builtin/revert.c:571 msgid "cherry-pick --ff cannot be used with --signoff" @@ -2805,7 +2809,7 @@ msgstr "git rm: kan inte ta bort %s" #: builtin/shortlog.c:157 #, c-format msgid "Missing author: %s" -msgstr "Saknad författare: %s" +msgstr "Författare saknas: %s" #: builtin/tag.c:121 #, c-format @@ -2935,6 +2939,8 @@ msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" msgstr "" +"Du verkar ha flyttat HEAD sedan den senaste misslyckade \"am\".\n" +"Spolar inte tillbaka till ORIG_HEAD" #: git-am.sh:105 #, sh-format @@ -2962,13 +2968,13 @@ msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." msgstr "" -"Vill du handredigera din patch?\n" +"Har du handredigerat din patch?\n" "Den kan inte appliceras på blobbar som antecknats i dess index." #: git-am.sh:154 -#, fuzzy msgid "Falling back to patching base and 3-way merge..." -msgstr "Kan inte falla tillbaka på trevägssammanslagning." +msgstr "" +"Faller tillbaka på att patcha basincheckning och en trevägssammanslagning..." #: git-am.sh:261 msgid "Only one StGIT patch series can be applied at once" @@ -2990,7 +2996,7 @@ msgstr "Flaggan -d stöds inte lägre. Använd inte." #: git-am.sh:428 #, sh-format msgid "previous rebase directory $dotest still exists but mbox given." -msgstr "tidigare rebase-katalog $dotest finns redan, men mbox angavs." +msgstr "tidigare rebase-katalog $dotest finns fortfarande, men mbox angavs." #: git-am.sh:433 msgid "Please make up your mind. --skip or --abort?" @@ -3047,8 +3053,8 @@ msgid "" "If there is nothing left to stage, chances are that something else\n" "already introduced the same changes; you might want to skip this patch." msgstr "" -"Inga ändrinar - glömde du använda \"git add\"?\n" -"Om det inte är något kvar att köa kan det hända att någon annan redan\n" +"Inga ändringar - glömde du använda \"git add\"?\n" +"Om det inte är något kvar att köa kan det hända att något annat redan\n" "introducerat samma ändringar; kanske du bör hoppa över patchen." #: git-am.sh:774 @@ -3073,79 +3079,80 @@ msgid "applying to an empty history" msgstr "applicerar på en tom historik" #: git-bisect.sh:40 -#, fuzzy msgid "You need to start by \"git bisect start\"" -msgstr "Du måste ställa in din incheckarinformation först" +msgstr "Du måste börja med \"git bisect start\"" #. TRANSLATORS: Make sure to include [Y] and [n] in your #. translation. The program will only accept English input #. at this point. #: git-bisect.sh:48 msgid "Do you want me to do it for you [Y/n]? " -msgstr "" +msgstr "Vill du att jag ska göra det åt dig [Y=Ja, N=Nej]?" #: git-bisect.sh:67 msgid "Bad HEAD - I need a HEAD" -msgstr "" +msgstr "Felaktigt HEAD - Jag behöver ett HEAD" #: git-bisect.sh:86 msgid "won't bisect on seeked tree" -msgstr "" +msgstr "utför inte \"bisect\" på ett sökt träd" #: git-bisect.sh:90 msgid "Bad HEAD - strange symbolic ref" -msgstr "" +msgstr "Felaktigt HEAD - konstig symbolisk referens" #: git-bisect.sh:120 #, sh-format msgid "'$arg' does not appear to be a valid revision" -msgstr "" +msgstr "\"$arg\" verkar inte vara en giltig revision" #: git-bisect.sh:165 #, sh-format msgid "Bad bisect_write argument: $state" -msgstr "" +msgstr "Felaktigt argument till bisect_write: $state" #: git-bisect.sh:193 #, sh-format msgid "Bad rev input: $arg" -msgstr "" +msgstr "Felaktig revisionsindata: $arg" #: git-bisect.sh:207 msgid "Please call 'bisect_state' with at least one argument." -msgstr "" +msgstr "Anropa \"bisect_state\" med minst ett argument." #: git-bisect.sh:210 msgid "Bad rev input: HEAD" -msgstr "" +msgstr "Felaktig revisionsindata: HEAD" #: git-bisect.sh:219 #, sh-format msgid "Bad rev input: $rev" -msgstr "" +msgstr "Felaktig revisionsindata: $rev" #: git-bisect.sh:225 msgid "'git bisect bad' can take only one argument." -msgstr "" +msgstr "\"git bisect bad\" kan bara ta ett argument." #. have bad but not good. we could bisect although #. this is less optimum. #: git-bisect.sh:249 msgid "Warning: bisecting only with a bad commit." -msgstr "" +msgstr "Varning: kör \"bisect\" endast med en dålig incheckning." #. TRANSLATORS: Make sure to include [Y] and [n] in your #. translation. The program will only accept English input #. at this point. #: git-bisect.sh:257 msgid "Are you sure [Y/n]? " -msgstr "" +msgstr "Är du säker [Y=Ja, N=Nej]?" #: git-bisect.sh:268 msgid "" "You need to give me at least one good and one bad revisions.\n" "(You can use \"git bisect bad\" and \"git bisect good\" for that.)" msgstr "" +"Du måste ange minst en bra och en dålig revision.\n" +"(Du kan använda \"git bisect bad\" och \"git bisect good\" för detta.)" #: git-bisect.sh:274 msgid "" @@ -3153,15 +3160,18 @@ msgid "" "You then need to give me at least one good and one bad revisions.\n" "(You can use \"git bisect bad\" and \"git bisect good\" for that.)" msgstr "" +"Du måste starta med \"git bisect start\".\n" +"Sedan måste du ange minst en bra och en dålig revision.\n" +"(Du kan använda \"git bisect bad\" och \"git bisect good\" för detta.)" #: git-bisect.sh:330 git-bisect.sh:457 msgid "We are not bisecting." -msgstr "" +msgstr "\"Bisect\" har inte startats." #: git-bisect.sh:337 -#, fuzzy, sh-format +#, sh-format msgid "'$invalid' is not a valid commit" -msgstr "\"%s\" är inte en incheckning" +msgstr "\"$invalid\" är inte en giltig incheckning" #: git-bisect.sh:346 #, sh-format @@ -3169,24 +3179,26 @@ msgid "" "Could not check out original HEAD '$branch'.\n" "Try 'git bisect reset '." msgstr "" +"Kunde inte checka ut original-HEAD \"$branch\".\n" +"Försök med \"git bisect reset \"." #: git-bisect.sh:371 msgid "No logfile given" -msgstr "" +msgstr "Ingen loggfil angavs" #: git-bisect.sh:372 -#, fuzzy, sh-format +#, sh-format msgid "cannot read $file for replaying" -msgstr "kan inte läsa indexet" +msgstr "kan inte läsa $file för återspelning" #: git-bisect.sh:388 msgid "?? what are you talking about?" -msgstr "" +msgstr "?? var menar du?" #: git-bisect.sh:400 #, sh-format msgid "running $command" -msgstr "" +msgstr "kör $command" #: git-bisect.sh:407 #, sh-format @@ -3194,10 +3206,12 @@ msgid "" "bisect run failed:\n" "exit code $res from '$command' is < 0 or >= 128" msgstr "" +"körning av \"bisect\" misslyckades:\n" +"felkoden $res från \"$command\" är < 0 eller >= 128" #: git-bisect.sh:433 msgid "bisect run cannot continue any more" -msgstr "" +msgstr "kan inte fortsätta \"bisect\"-körningen längre" #: git-bisect.sh:441 #, sh-format @@ -3205,10 +3219,12 @@ msgid "" "bisect run failed:\n" "'bisect_state $state' exited with error code $res" msgstr "" +"körning av \"bisect\" misslyckades:\n" +"\"bisect_state $state\" avslutade med felkoden $res" #: git-bisect.sh:449 msgid "bisect run success" -msgstr "" +msgstr "körning av \"bisect\" lyckades" #: git-pull.sh:21 msgid "" @@ -3216,14 +3232,17 @@ 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 "" +"Kan inte hämta (pull) eftersom du har filer som inte slagits samman.\n" +"Rätta dem i arbetskatalogen och använd \"git add/rm \" som\n" +"lämpligt för att markera lösning, eller använd \"git commit -a\"." #: git-pull.sh:25 msgid "Pull is not possible because you have unmerged files." -msgstr "" +msgstr "Kan inte hämta (pull) eftersom du har filer som inte slagits samman." #: git-pull.sh:189 msgid "updating an unborn branch with changes added to the index" -msgstr "" +msgstr "uppdaterar en ofödd gren med ändringar lagda till i indexet" #. The fetch involved updating the current branch. #. The working tree and the index file is still based on the @@ -3236,166 +3255,157 @@ msgid "" "Warning: fast-forwarding your working tree from\n" "Warning: commit $orig_head." msgstr "" +"Varning: \"fetch\" uppdaterade den aktuella grenens huvud.\n" +"Varning: snabbspolar din arbetskatalog från\n" +"Varning: incheckningen $orig_head." #: git-pull.sh:248 -#, fuzzy msgid "Cannot merge multiple branches into empty head" -msgstr "Kan endast slå ihop en enda incheckning i ett tomt huvud." +msgstr "Kan inte slå ihop flera grenar i ett tomt huvud" #: git-pull.sh:252 msgid "Cannot rebase onto multiple branches" -msgstr "" +msgstr "Kan inte utföra \"rebase\" ovanpå flera grenar" #: git-stash.sh:43 msgid "git stash clear with parameters is unimplemented" -msgstr "" +msgstr "git stach clear med flaggor är inte implementerat" #: git-stash.sh:65 -#, fuzzy msgid "You do not have the initial commit yet" -msgstr "Du har ingen giltig HEAD" +msgstr "Du har ingen första incheckning ännu" #: git-stash.sh:80 -#, fuzzy msgid "Cannot save the current index state" -msgstr "Kan inte komma åt aktuell arbetskatalog" +msgstr "Kan inte spara aktuellt tillstånd för indexet" #: git-stash.sh:94 git-stash.sh:107 -#, fuzzy msgid "Cannot save the current worktree state" -msgstr "Kan inte komma åt aktuell arbetskatalog" +msgstr "Kan inte spara aktuellt tillstånd för arbetskatalogen" #: git-stash.sh:111 -#, fuzzy msgid "No changes selected" -msgstr "# Inga ändringar\n" +msgstr "Inga ändringar valda" #: git-stash.sh:114 msgid "Cannot remove temporary index (can't happen)" -msgstr "" +msgstr "Kan inte ta bort temporärt index (kan inte ske)" #: git-stash.sh:127 -#, fuzzy msgid "Cannot record working tree state" -msgstr "Kan inte komma åt arbetskatalogen \"%s\"" +msgstr "Kan inte spara tillstånd för arbetskatalogen" #: git-stash.sh:182 msgid "No local changes to save" -msgstr "" +msgstr "Inga lokala ändringar att spara" #: git-stash.sh:186 msgid "Cannot initialize stash" -msgstr "" +msgstr "Kan inte initiera gömma (stash)" #: git-stash.sh:194 msgid "Cannot save the current status" -msgstr "" +msgstr "Kan inte spara aktuell status" #: git-stash.sh:207 -#, fuzzy msgid "Cannot remove worktree changes" -msgstr "Kan inte komma åt arbetskatalogen \"%s\"" +msgstr "Kan inte ta bort ändringar i arbetskatalogen" #: git-stash.sh:302 msgid "No stash found." -msgstr "" +msgstr "Hittade ingen gömma (stash)." #: git-stash.sh:309 -#, fuzzy, sh-format +#, sh-format msgid "Too many revisions specified: $REV" -msgstr "För många flaggor angavs" +msgstr "För många revisioner angavs: $REV" #: git-stash.sh:315 -#, fuzzy, sh-format +#, sh-format msgid "$reference is not valid reference" -msgstr "referensen är inte ett träd: %s" +msgstr "$reference är inte en giltig referens" #: git-stash.sh:340 -#, fuzzy, sh-format +#, sh-format msgid "'$args' is not a stash-like commit" -msgstr "\"%s\" är inte en incheckning" +msgstr "\"$args\" är inte en incheckning som liknar en gömma (stash)" #: git-stash.sh:351 #, sh-format msgid "'$args' is not a stash reference" -msgstr "" +msgstr "\"$args\" är inte en referens till en gömma (stash)" #: git-stash.sh:359 -#, fuzzy msgid "unable to refresh index" -msgstr "Kunde inte skriva indexet." +msgstr "Kunde inte uppdatera indexet" #: git-stash.sh:363 -#, fuzzy msgid "Cannot apply a stash in the middle of a merge" -msgstr "Kan inte utföra en %s återställning mitt i en sammanslagning." +msgstr "Kan inte applicera en gömma (stash) mitt i en sammanslagning" #: git-stash.sh:371 msgid "Conflicts in index. Try without --index." -msgstr "" +msgstr "Konflikter i index. Testa utan --index." #: git-stash.sh:373 -#, fuzzy msgid "Could not save index tree" -msgstr "Kunde inte läsa indexet" +msgstr "Kunde inte spara indexträd" #: git-stash.sh:399 msgid "Cannot unstage modified files" -msgstr "" +msgstr "Kunde inte avköa modifierade filer" #: git-stash.sh:414 -#, fuzzy msgid "Index was not unstashed." -msgstr "kunde köra stash." +msgstr "Indexet inte hämtat ur gömman (unstash)." #: git-stash.sh:433 #, sh-format msgid "Dropped ${REV} ($s)" -msgstr "" +msgstr "Kastade ${REV} ($s)" #: git-stash.sh:434 #, sh-format msgid "${REV}: Could not drop stash entry" -msgstr "" +msgstr "${REV}: Kunde inte kasta gömman (stash)" #: git-stash.sh:441 -#, fuzzy msgid "No branch name specified" -msgstr "Misslyckades byta namn på gren" +msgstr "Inget grennamn angivet" #: git-stash.sh:512 msgid "(To restore them type \"git stash apply\")" -msgstr "" +msgstr "(För att återställa dem, skriv \"git stash apply\")" #: git-submodule.sh:38 #, sh-format msgid "remote ($remote) does not have a url defined in .git/config" -msgstr "" +msgstr "fjärren ($remote) har ingen url angiven i .git/config" #: git-submodule.sh:56 #, sh-format msgid "cannot strip one component off url '$remoteurl'" -msgstr "" +msgstr "kan inte ta bort en komponent från url:en \"$remoteurl\"" #: git-submodule.sh:108 #, sh-format msgid "No submodule mapping found in .gitmodules for path '$path'" -msgstr "" +msgstr "Hittar ingen undermodulsmappning för sökvägen \"$path\" i .gitmodules" #: git-submodule.sh:132 #, sh-format msgid "Clone of '$url' into submodule path '$path' failed" -msgstr "" +msgstr "Misslyckades klona \"$url\" till undermodulssökvägen \"$path\"" #: git-submodule.sh:205 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" -msgstr "" +msgstr "arkiv-URL: \"$repo\" måste vara absolut eller börja med ./|../" #: git-submodule.sh:222 -#, fuzzy, sh-format +#, sh-format msgid "'$path' already exists in the index" -msgstr "kan inte läsa indexet" +msgstr "\"$path\" finns redan i indexet" #: git-submodule.sh:227 #, sh-format @@ -3404,61 +3414,66 @@ msgid "" "$path\n" "Use -f if you really want to add it." msgstr "" +"Följande sökväg ignoreras av en av dina .gitignore-filer:\n" +"$path\n" +"Använd -f om du verkligen vill lägga till den." #: git-submodule.sh:240 #, sh-format msgid "Adding existing repo at '$path' to the index" -msgstr "" +msgstr "Lägger till befintligt arkiv på \"$path\" till indexet" #: git-submodule.sh:242 -#, fuzzy, sh-format +#, sh-format msgid "'$path' already exists and is not a valid git repo" -msgstr "destinationssökvägen \"%s\" finns redan och är inte en tom katalog." +msgstr "\"$path\" finns redan och är inte ett giltigt git-arkiv" #: git-submodule.sh:265 #, sh-format msgid "Unable to checkout submodule '$path'" -msgstr "" +msgstr "Kan inte checka ut undermodulen \"\"$path\"" #: git-submodule.sh:269 -#, fuzzy, sh-format +#, sh-format msgid "Failed to add submodule '$path'" -msgstr "Kunde inte läsa objektet \"%s\"." +msgstr "Misslyckades lägga till undermodul \"$path\"" #: git-submodule.sh:274 #, sh-format msgid "Failed to register submodule '$path'" -msgstr "" +msgstr "Misslyckades registrera undermodulen \"$path\"" #: git-submodule.sh:312 #, sh-format msgid "Entering '$prefix$path'" -msgstr "" +msgstr "Går in i \"$prefix$path\"" #: git-submodule.sh:324 #, sh-format msgid "Stopping at '$path'; script returned non-zero status." msgstr "" +"Stoppar vid \"$path\"; skriptet avslutade med en status skild från noll." #: git-submodule.sh:367 #, sh-format msgid "No url found for submodule path '$path' in .gitmodules" -msgstr "" +msgstr "Hittade ingen url för undermodulsökvägen \"$path\" i .gitmodules" #: git-submodule.sh:377 #, sh-format msgid "Failed to register url for submodule path '$path'" -msgstr "" +msgstr "Misslyckades registrera url för undermodulssökvägen \"$path\"" #: git-submodule.sh:382 #, sh-format msgid "Failed to register update mode for submodule path '$path'" msgstr "" +"Misslyckades registrera uppdateringsläge för undermodulssökvägen \"$path\"" #: git-submodule.sh:384 #, sh-format msgid "Submodule '$name' ($url) registered for path '$path'" -msgstr "" +msgstr "Undermoulden \"$name\" ($url) registrerad för sökvägen \"$path\"" #: git-submodule.sh:467 #, sh-format @@ -3466,99 +3481,101 @@ msgid "" "Submodule path '$path' not initialized\n" "Maybe you want to use 'update --init'?" msgstr "" +"Undermodulen \"$path\" har inte initierats\n" +"Kanske du borde använda \"update --init\"?" #: git-submodule.sh:480 #, sh-format msgid "Unable to find current revision in submodule path '$path'" -msgstr "" +msgstr "Kan inte hitta aktuell revision i undermodulssökvägen \"$path\"" #: git-submodule.sh:504 #, sh-format msgid "Unable to fetch in submodule path '$path'" -msgstr "" +msgstr "Kan inte hämta i undermodulssökvägen \"$path\"" #: git-submodule.sh:517 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$path'" msgstr "" +"Kan inte utföra \"rebase\" till \"$sha1\" i undermodulssökvägen \"$path\"" #: git-submodule.sh:518 #, sh-format msgid "Submodule path '$path': rebased into '$sha1'" -msgstr "" +msgstr "Undermodulssökvägen \"$path\": \"rebase\":ad ovanpå \"$sha1\"" #: git-submodule.sh:522 -#, fuzzy, sh-format +#, sh-format msgid "Unable to merge '$sha1' in submodule path '$path'" -msgstr "Kunde inte läsa objektet \"%s\"." +msgstr "Kan inte slå ihop \"$sha1\" i undermodulssökvägen \"$path\"" #: git-submodule.sh:523 #, sh-format msgid "Submodule path '$path': merged in '$sha1'" -msgstr "" +msgstr "Undermodulssökvägen \"$path\": sammanslagen i \"$sha1\"" #: git-submodule.sh:527 -#, fuzzy, sh-format +#, sh-format msgid "Unable to checkout '$sha1' in submodule path '$path'" -msgstr "Kunde inte läsa objektet \"%s\"." +msgstr "Kan inte checka ut \"$sha1\" i undermodulssökvägen \"$path\"" #: git-submodule.sh:528 #, sh-format msgid "Submodule path '$path': checked out '$sha1'" -msgstr "" +msgstr "Undermodulssökvägen \"$path\": checkade ut \"$sha1\"" #: git-submodule.sh:539 git-submodule.sh:841 #, sh-format msgid "Failed to recurse into submodule path '$path'" -msgstr "" +msgstr "Kunde inte rekursera ned i undermodulssökväg \"$path\"" #: git-submodule.sh:623 msgid "--" -msgstr "" +msgstr "--" #. unexpected type #: git-submodule.sh:664 -#, fuzzy, sh-format +#, sh-format msgid "unexpected mode $mod_dst" -msgstr "diff-status %c förväntades inte" +msgstr "oväntat läge (mode) $mod_dst" #: git-submodule.sh:684 #, sh-format msgid " Warn: $name doesn't contain commit $sha1_src" -msgstr "" +msgstr " Varning: $name innehåller inte incheckningen $sha1_src" #: git-submodule.sh:687 #, sh-format msgid " Warn: $name doesn't contain commit $sha1_dst" -msgstr "" +msgstr " Varning: $name innehåller inte incheckning $sha1_dst" #: git-submodule.sh:690 #, sh-format msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst" msgstr "" +" Varning: $name innehåller inte incheckningarna $sha1_src och $sha1_dst" #: git-submodule.sh:715 msgid "blob" -msgstr "" +msgstr "blob" #: git-submodule.sh:716 msgid "submodule" -msgstr "" +msgstr "undermodul" #: git-submodule.sh:753 -#, fuzzy msgid "# Submodules changed but not updated:" -msgstr "# Ändrade men inte uppdaterade:" +msgstr "# Ändrade men inte uppdaterade undermoduler:" #: git-submodule.sh:755 -#, fuzzy msgid "# Submodule changes to be committed:" -msgstr "# Ändringar att checka in:" +msgstr "# Ändringar i undermoduler att checka in:" #: git-submodule.sh:885 #, sh-format msgid "Synchronizing submodule url for '$name'" -msgstr "" +msgstr "Synkroniserar undermodul-url för \"$name\"" #~ msgid "# Changed but not updated:" #~ msgstr "# Ändrade men inte uppdaterade:"