Merge tag 'l10n-2.42.0-rnd2' of https://github.com/git-l10n/git-po
l10n-2.42.0-rnd2 * tag 'l10n-2.42.0-rnd2' of https://github.com/git-l10n/git-po: l10n: zh_TW.po: Git 2.42 l10n: zh_CN: 2.42.0 round 2 l10n: zh_CN: v2.42.0 round 1 l10n: Update German translation l10n: Update Catalan translation l10n: tr: git 2.42.0 l10n: fr v2.42.0 rnd 2 l10n: fr v2.42.0 rnd 1 l10n: sv.po: Update Swedish translation 5549t0f0u l10n: uk: update translation (2.42.0) l10n: po-id for 2.42 (round 1) l10n: ru.po: update Russian translation
This commit is contained in:
Junio C Hamano
528
po/de.po
528
po/de.po
@@ -8,8 +8,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Git\n"
|
||||
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
|
||||
"POT-Creation-Date: 2023-05-22 17:14+0200\n"
|
||||
"PO-Revision-Date: 2023-05-22 17:16+0200\n"
|
||||
"POT-Creation-Date: 2023-08-17 16:53+0200\n"
|
||||
"PO-Revision-Date: 2023-08-17 16:55+0200\n"
|
||||
"Last-Translator: Ralf Thielow <ralf.thielow@gmail.com>\n"
|
||||
"Language-Team: German\n"
|
||||
"Language: de\n"
|
||||
@@ -17,7 +17,7 @@ msgstr ""
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Plural-Forms: nplurals=2; plural=(n!=1);\n"
|
||||
"X-Generator: Poedit 3.3.1\n"
|
||||
"X-Generator: Poedit 3.3.2\n"
|
||||
|
||||
#, c-format
|
||||
msgid "Huh (%s)?"
|
||||
@@ -664,9 +664,9 @@ msgid "Reverting is not possible because you have unmerged files."
|
||||
msgstr ""
|
||||
"Reverten ist nicht möglich, weil Sie nicht zusammengeführte Dateien haben."
|
||||
|
||||
#, c-format
|
||||
msgid "It is not possible to %s because you have unmerged files."
|
||||
msgstr "%s ist nicht möglich, weil Sie nicht zusammengeführte Dateien haben."
|
||||
msgid "Rebasing is not possible because you have unmerged files."
|
||||
msgstr ""
|
||||
"Rebase ist nicht möglich, weil Sie nicht zusammengeführte Dateien haben."
|
||||
|
||||
msgid ""
|
||||
"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
|
||||
@@ -816,6 +816,12 @@ msgstr "die Optionen '%s' und '%s' können nicht gemeinsam verwendet werden"
|
||||
msgid "'%s' outside a repository"
|
||||
msgstr "'%s' außerhalb eines Repositories"
|
||||
|
||||
msgid "failed to read patch"
|
||||
msgstr "Patch konnte nicht gelesen werden"
|
||||
|
||||
msgid "patch too large"
|
||||
msgstr "Patch zu groß"
|
||||
|
||||
#, c-format
|
||||
msgid "Cannot prepare timestamp regexp %s"
|
||||
msgstr "Kann regulären Ausdruck für Zeitstempel %s nicht verarbeiten"
|
||||
@@ -1692,12 +1698,10 @@ msgstr ""
|
||||
msgid "not tracking: ambiguous information for ref '%s'"
|
||||
msgstr "kein Tracking: mehrdeutige Informationen für Referenz '%s'"
|
||||
|
||||
#. #-#-#-#-# branch.c.po #-#-#-#-#
|
||||
#. TRANSLATORS: This is a line listing a remote with duplicate
|
||||
#. refspecs in the advice message below. For RTL languages you'll
|
||||
#. probably want to swap the "%s" and leading " " space around.
|
||||
#.
|
||||
#. #-#-#-#-# object-name.c.po #-#-#-#-#
|
||||
#. TRANSLATORS: This is line item of ambiguous object output
|
||||
#. from describe_ambiguous_object() above. For RTL languages
|
||||
#. you'll probably want to swap the "%s" and leading " " space
|
||||
@@ -1740,9 +1744,10 @@ msgid "a branch named '%s' already exists"
|
||||
msgstr "Branch '%s' existiert bereits"
|
||||
|
||||
#, c-format
|
||||
msgid "cannot force update the branch '%s' checked out at '%s'"
|
||||
msgid "cannot force update the branch '%s' used by worktree at '%s'"
|
||||
msgstr ""
|
||||
"kann Aktualisierung des Branches '%s' nicht erzwingen, ausgecheckt in '%s'"
|
||||
"Aktualisierung des vom Arbeitsverzeichnis '%2$s' verwendete Branch '%1$s' "
|
||||
"kann nicht erzwungen werden"
|
||||
|
||||
#, c-format
|
||||
msgid "cannot set up tracking information; starting point '%s' is not a branch"
|
||||
@@ -1812,17 +1817,6 @@ msgstr "git add [<Optionen>] [--] <Pfadspezifikation>..."
|
||||
msgid "cannot chmod %cx '%s'"
|
||||
msgstr "kann chmod %cx '%s' nicht ausführen"
|
||||
|
||||
#, c-format
|
||||
msgid "unexpected diff status %c"
|
||||
msgstr "unerwarteter Differenz-Status %c"
|
||||
|
||||
msgid "updating files failed"
|
||||
msgstr "Aktualisierung der Dateien fehlgeschlagen"
|
||||
|
||||
#, c-format
|
||||
msgid "remove '%s'\n"
|
||||
msgstr "lösche '%s'\n"
|
||||
|
||||
msgid "Unstaged changes after refreshing the index:"
|
||||
msgstr ""
|
||||
"Nicht zum Commit vorgemerkte Änderungen nach Aktualisierung der Staging-Area:"
|
||||
@@ -2270,9 +2264,6 @@ msgstr "-m an git-mailinfo übergeben"
|
||||
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
|
||||
msgstr "--keep-cr an git-mailsplit für mbox-Format übergeben"
|
||||
|
||||
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
|
||||
msgstr "kein --keep-cr an git-mailsplit übergeben, unabhängig von am.keepcr"
|
||||
|
||||
msgid "strip everything before a scissors line"
|
||||
msgstr "alles vor einer Scheren-Zeile entfernen"
|
||||
|
||||
@@ -3333,12 +3324,12 @@ msgid ""
|
||||
"git cat-file (--batch | --batch-check | --batch-command) [--batch-all-"
|
||||
"objects]\n"
|
||||
" [--buffer] [--follow-symlinks] [--unordered]\n"
|
||||
" [--textconv | --filters] [-z]"
|
||||
" [--textconv | --filters] [-Z]"
|
||||
msgstr ""
|
||||
"git cat-file (--batch | --batch-check | --batch-command) [--batch-all-"
|
||||
"objects]\n"
|
||||
" [--buffer] [--follow-symlinks] [--unordered]\n"
|
||||
" [--textconv | --filters] [-z]"
|
||||
" [--textconv | --filters] [-Z]"
|
||||
|
||||
msgid ""
|
||||
"git cat-file (--textconv | --filters)\n"
|
||||
@@ -3385,6 +3376,9 @@ msgstr "wie --batch, aber keine Ausgabe von <Inhalten>"
|
||||
msgid "stdin is NUL-terminated"
|
||||
msgstr "stdin endet mit NUL"
|
||||
|
||||
msgid "stdin and stdout is NUL-terminated"
|
||||
msgstr "stdin und stdout sind NUL-beendet"
|
||||
|
||||
msgid "read commands from stdin"
|
||||
msgstr "Befehle von der Standard-Eingabe lesen"
|
||||
|
||||
@@ -4269,12 +4263,6 @@ msgstr "serverspezifisch"
|
||||
msgid "option to transmit"
|
||||
msgstr "Option übertragen"
|
||||
|
||||
msgid "use IPv4 addresses only"
|
||||
msgstr "nur IPv4-Adressen benutzen"
|
||||
|
||||
msgid "use IPv6 addresses only"
|
||||
msgstr "nur IPv6-Adressen benutzen"
|
||||
|
||||
msgid "apply partial clone filters to submodules"
|
||||
msgstr "partielle Klonfilter auf Submodule anwenden"
|
||||
|
||||
@@ -4738,6 +4726,9 @@ msgstr ""
|
||||
" git cherry-pick --skip\n"
|
||||
"\n"
|
||||
|
||||
msgid "updating files failed"
|
||||
msgstr "Aktualisierung der Dateien fehlgeschlagen"
|
||||
|
||||
msgid "failed to unpack HEAD tree object"
|
||||
msgstr "Fehler beim Entpacken des Tree-Objektes von HEAD."
|
||||
|
||||
@@ -4798,8 +4789,8 @@ msgstr ""
|
||||
"der aktuellen Commit-Beschreibung verwendet wird."
|
||||
|
||||
#, c-format
|
||||
msgid "could not lookup commit %s"
|
||||
msgstr "Konnte Commit %s nicht nachschlagen"
|
||||
msgid "could not lookup commit '%s'"
|
||||
msgstr "konnte Commit '%s' nicht nachschlagen"
|
||||
|
||||
#, c-format
|
||||
msgid "(reading log message from standard input)\n"
|
||||
@@ -6889,7 +6880,6 @@ msgstr "grep: Fehler beim Erzeugen eines Thread: %s"
|
||||
msgid "invalid number of threads specified (%d) for %s"
|
||||
msgstr "ungültige Anzahl von Threads (%d) für %s angegeben"
|
||||
|
||||
#. #-#-#-#-# grep.c.po #-#-#-#-#
|
||||
#. TRANSLATORS: %s is the configuration
|
||||
#. variable for tweaking threads, currently
|
||||
#. grep.threads
|
||||
@@ -7464,77 +7454,6 @@ msgstr "--verify wurde ohne Namen der Paketdatei angegeben"
|
||||
msgid "fsck error in pack objects"
|
||||
msgstr "fsck Fehler beim Packen von Objekten"
|
||||
|
||||
#, c-format
|
||||
msgid "cannot stat template '%s'"
|
||||
msgstr "kann Vorlage '%s' nicht lesen"
|
||||
|
||||
#, c-format
|
||||
msgid "cannot opendir '%s'"
|
||||
msgstr "kann Verzeichnis '%s' nicht öffnen"
|
||||
|
||||
#, c-format
|
||||
msgid "cannot readlink '%s'"
|
||||
msgstr "kann Verweis '%s' nicht lesen"
|
||||
|
||||
#, c-format
|
||||
msgid "cannot symlink '%s' '%s'"
|
||||
msgstr "kann symbolische Verknüpfung '%s' auf '%s' nicht erstellen"
|
||||
|
||||
#, c-format
|
||||
msgid "cannot copy '%s' to '%s'"
|
||||
msgstr "kann '%s' nicht nach '%s' kopieren"
|
||||
|
||||
#, c-format
|
||||
msgid "ignoring template %s"
|
||||
msgstr "ignoriere Vorlage %s"
|
||||
|
||||
#, c-format
|
||||
msgid "templates not found in %s"
|
||||
msgstr "Keine Vorlagen in %s gefunden."
|
||||
|
||||
#, c-format
|
||||
msgid "not copying templates from '%s': %s"
|
||||
msgstr "kopiere keine Vorlagen von '%s': %s"
|
||||
|
||||
#, c-format
|
||||
msgid "invalid initial branch name: '%s'"
|
||||
msgstr "ungültiger initialer Branchname: '%s'"
|
||||
|
||||
#, c-format
|
||||
msgid "unable to handle file type %d"
|
||||
msgstr "kann nicht mit Dateityp %d umgehen"
|
||||
|
||||
#, c-format
|
||||
msgid "unable to move %s to %s"
|
||||
msgstr "Konnte %s nicht nach %s verschieben"
|
||||
|
||||
msgid "attempt to reinitialize repository with different hash"
|
||||
msgstr "Versuch, das Repository mit einem anderen Hash zu reinitialisieren"
|
||||
|
||||
#, c-format
|
||||
msgid "%s already exists"
|
||||
msgstr "%s existiert bereits"
|
||||
|
||||
#, c-format
|
||||
msgid "re-init: ignored --initial-branch=%s"
|
||||
msgstr "Neu-Initialisierung: --initial-branch=%s ignoriert"
|
||||
|
||||
#, c-format
|
||||
msgid "Reinitialized existing shared Git repository in %s%s\n"
|
||||
msgstr "Bestehendes verteiltes Git-Repository in %s%s neuinitialisiert\n"
|
||||
|
||||
#, c-format
|
||||
msgid "Reinitialized existing Git repository in %s%s\n"
|
||||
msgstr "Bestehendes Git-Repository in %s%s neuinitialisiert\n"
|
||||
|
||||
#, c-format
|
||||
msgid "Initialized empty shared Git repository in %s%s\n"
|
||||
msgstr "Leeres verteiltes Git-Repository in %s%s initialisiert\n"
|
||||
|
||||
#, c-format
|
||||
msgid "Initialized empty Git repository in %s%s\n"
|
||||
msgstr "Leeres Git-Repository in %s%s initialisiert\n"
|
||||
|
||||
msgid ""
|
||||
"git init [-q | --quiet] [--bare] [--template=<template-directory>]\n"
|
||||
" [--separate-git-dir <git-dir>] [--object-format=<format>]\n"
|
||||
@@ -7973,6 +7892,10 @@ msgstr ""
|
||||
"Konnte gefolgten Remote-Branch nicht finden, bitte geben Sie <Upstream> "
|
||||
"manuell an.\n"
|
||||
|
||||
#, c-format
|
||||
msgid "could not get object info about '%s'"
|
||||
msgstr "konnte Objekt-Informationen über '%s' nicht bestimmen"
|
||||
|
||||
#, c-format
|
||||
msgid "bad ls-files format: element '%s' does not start with '('"
|
||||
msgstr "ungültiges ls-files-Format: Element '%s' fängt nicht mit '(' an"
|
||||
@@ -8122,10 +8045,6 @@ msgstr "zusätzlich zum Objekt die darauf verweisenden Referenzen anzeigen"
|
||||
msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
|
||||
msgstr "git ls-tree [<Optionen>] <Commit-Referenz> [<Pfad>...]"
|
||||
|
||||
#, c-format
|
||||
msgid "could not get object info about '%s'"
|
||||
msgstr "konnte Objekt-Informationen über '%s' nicht bestimmen"
|
||||
|
||||
#, c-format
|
||||
msgid "bad ls-tree format: element '%s' does not start with '('"
|
||||
msgstr "ungültiges ls-tree-Format: Element '%s' fängt nicht mit '(' an"
|
||||
@@ -8871,22 +8790,26 @@ msgid "git notes [--ref <notes-ref>] [list [<object>]]"
|
||||
msgstr "git notes [--ref <Notiz-Referenz>] [list [<Objekt>]]"
|
||||
|
||||
msgid ""
|
||||
"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
|
||||
"| (-c | -C) <object>] [<object>]"
|
||||
"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [--[no-]separator|--"
|
||||
"separator=<paragraph-break>] [--[no-]stripspace] [-m <msg> | -F <file> | (-c "
|
||||
"| -C) <object>] [<object>]"
|
||||
msgstr ""
|
||||
"git notes [--ref <Notiz-Referenz>] add [-f] [--allow-empty] [-m "
|
||||
"<Beschreibung> | -F <Datei> | (-c | -C) <Objekt>] [<Objekt>]"
|
||||
"git notes [--ref <Notiz-Referenz>] add [-f] [--allow-empty] [--"
|
||||
"[no-]separator|--separator=<Absatz-Unterbrechung>] [--[no-]stripspace] [-m "
|
||||
"<Nachricht> | -F <Datei> | (-c | -C) <Objekt>] [<Objekt>]"
|
||||
|
||||
msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
|
||||
msgstr ""
|
||||
"git notes [--ref <Notiz-Referenz>] copy [-f] <von-Objekt> <nach-Objekt>"
|
||||
|
||||
msgid ""
|
||||
"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
|
||||
"(-c | -C) <object>] [<object>]"
|
||||
"git notes [--ref <notes-ref>] append [--allow-empty] [--[no-]separator|--"
|
||||
"separator=<paragraph-break>] [--[no-]stripspace] [-m <msg> | -F <file> | (-c "
|
||||
"| -C) <object>] [<object>]"
|
||||
msgstr ""
|
||||
"git notes [--ref <Notiz-Referenz>] append [--allow-empty] [-m <Beschreibung> "
|
||||
"| -F <Datei> | (-c | -C) <Objekt>] [<Objekt>]"
|
||||
"git notes [--ref <Notiz-Referenz>] append [--allow-empty] [--"
|
||||
"[no-]separator|--separator=<Absatz-Unterbrechnung>] [--[no-]stripspace] [-m "
|
||||
"<Nachricht> | -F <Datei> | (-c | -C) <Objekt>] [<Object>]"
|
||||
|
||||
msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
|
||||
msgstr "git notes [--ref <Notiz-Referenz>] edit [--allow-empty] [<Objekt>]"
|
||||
@@ -9021,6 +8944,15 @@ msgstr "Speichern leerer Notiz erlauben"
|
||||
msgid "replace existing notes"
|
||||
msgstr "existierende Notizen ersetzen"
|
||||
|
||||
msgid "<paragraph-break>"
|
||||
msgstr "<Absatz-Unterbrechung>"
|
||||
|
||||
msgid "insert <paragraph-break> between paragraphs"
|
||||
msgstr "<Absatz-Unterbrechung> zwischen Absätzen einfügen"
|
||||
|
||||
msgid "remove unnecessary whitespace"
|
||||
msgstr "unnötigen Whitespace entfernen"
|
||||
|
||||
#, c-format
|
||||
msgid ""
|
||||
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
|
||||
@@ -9595,8 +9527,11 @@ msgstr ""
|
||||
msgid "refusing to run without --i-still-use-this"
|
||||
msgstr "Ausführung ohne --i-still-use-this verweigert"
|
||||
|
||||
msgid "git pack-refs [--all] [--no-prune]"
|
||||
msgstr "git pack-refs [--all] [--no-prune]"
|
||||
msgid ""
|
||||
"git pack-refs [--all] [--no-prune] [--include <pattern>] [--exclude "
|
||||
"<pattern>]"
|
||||
msgstr ""
|
||||
"git pack-refs [--all] [--no-prune] [--include <Muster>] [--exclude <Muster>]"
|
||||
|
||||
msgid "pack everything"
|
||||
msgstr "alles packen"
|
||||
@@ -9604,6 +9539,12 @@ msgstr "alles packen"
|
||||
msgid "prune loose refs (default)"
|
||||
msgstr "lose Referenzen entfernen (Standard)"
|
||||
|
||||
msgid "references to include"
|
||||
msgstr "einzubeziehende Referenzen"
|
||||
|
||||
msgid "references to exclude"
|
||||
msgstr "Referenzen zum Ausschluss"
|
||||
|
||||
msgid "git patch-id [--stable | --unstable | --verbatim]"
|
||||
msgstr "git patch-id [--stable | --unstable | --verbatim]"
|
||||
|
||||
@@ -9663,6 +9604,12 @@ msgstr "das Überschreiben von lokalen Branches erzwingen"
|
||||
msgid "number of submodules pulled in parallel"
|
||||
msgstr "Anzahl der parallel mit 'pull' zu verarbeitenden Submodule"
|
||||
|
||||
msgid "use IPv4 addresses only"
|
||||
msgstr "nur IPv4-Adressen benutzen"
|
||||
|
||||
msgid "use IPv6 addresses only"
|
||||
msgstr "nur IPv6-Adressen benutzen"
|
||||
|
||||
msgid ""
|
||||
"There is no candidate for rebasing against among the refs that you just "
|
||||
"fetched."
|
||||
@@ -9938,35 +9885,37 @@ msgstr ""
|
||||
|
||||
msgid ""
|
||||
"Updates were rejected because the tip of your current branch is behind\n"
|
||||
"its remote counterpart. Integrate the remote changes (e.g.\n"
|
||||
"'git pull ...') before pushing again.\n"
|
||||
"its remote counterpart. If you want to integrate the remote changes,\n"
|
||||
"use 'git pull' before pushing again.\n"
|
||||
"See the 'Note about fast-forwards' in 'git push --help' for details."
|
||||
msgstr ""
|
||||
"Aktualisierungen wurden zurückgewiesen, weil die Spitze Ihres aktuellen\n"
|
||||
"Branches hinter seinem externen Gegenstück zurückgefallen ist. Führen Sie\n"
|
||||
"die externen Änderungen zusammen (z. B. 'git pull ...') bevor Sie \"push\"\n"
|
||||
"erneut ausführen.\n"
|
||||
"Siehe auch die Sektion 'Note about fast-forwards' in 'git push --help'\n"
|
||||
"für weitere Details."
|
||||
"Branches hinter seinem externen Gegenstück zurückgefallen ist. Wenn Sie\n"
|
||||
"die externen Änderungen integrieren wollen, verwenden Sie 'git pull' bevor\n"
|
||||
"Sie erneut push ausführen.\n"
|
||||
"Siehe auch die Sektion 'Note about fast-forwards' in 'git push --help' für "
|
||||
"weitere\n"
|
||||
"Informationen."
|
||||
|
||||
msgid ""
|
||||
"Updates were rejected because a pushed branch tip is behind its remote\n"
|
||||
"counterpart. Check out this branch and integrate the remote changes\n"
|
||||
"(e.g. 'git pull ...') before pushing again.\n"
|
||||
"counterpart. If you want to integrate the remote changes, use 'git pull'\n"
|
||||
"before pushing again.\n"
|
||||
"See the 'Note about fast-forwards' in 'git push --help' for details."
|
||||
msgstr ""
|
||||
"Aktualisierungen wurden zurückgewiesen, weil die Spitze eines versendeten\n"
|
||||
"Branches hinter seinem externen Gegenstück zurückgefallen ist. Checken Sie\n"
|
||||
"diesen Branch aus und führen Sie die externen Änderungen zusammen\n"
|
||||
"(z. B. 'git pull ...') bevor Sie erneut \"push\" ausführen.\n"
|
||||
"Siehe auch die Sektion 'Note about fast-forwards' in 'git push --help'\n"
|
||||
"für weitere Details."
|
||||
"Branches hinter seinem externen Gegenstück zurückgefallen ist. Wenn Sie die\n"
|
||||
"externen Änderungen integrieren wollen, verwenden Sie 'git pull'\n"
|
||||
"bevor Sie erneut push ausführen.\n"
|
||||
"Siehe auch die Sektion 'Note about fast-forwards' in 'git push --help' für "
|
||||
"weitere\n"
|
||||
"Informationen."
|
||||
|
||||
msgid ""
|
||||
"Updates were rejected because the remote contains work that you do\n"
|
||||
"not have locally. This is usually caused by another repository pushing\n"
|
||||
"to the same ref. You may want to first integrate the remote changes\n"
|
||||
"(e.g., 'git pull ...') before pushing again.\n"
|
||||
"Updates were rejected because the remote contains work that you do not\n"
|
||||
"have locally. This is usually caused by another repository pushing to\n"
|
||||
"the same ref. If you want to integrate the remote changes, use\n"
|
||||
"'git pull' before pushing again.\n"
|
||||
"See the 'Note about fast-forwards' in 'git push --help' for details."
|
||||
msgstr ""
|
||||
"Aktualisierungen wurden zurückgewiesen, weil das Remote-Repository Commits "
|
||||
@@ -9974,11 +9923,12 @@ msgstr ""
|
||||
"die lokal nicht vorhanden sind. Das wird üblicherweise durch einen \"push\" "
|
||||
"von\n"
|
||||
"Commits auf dieselbe Referenz von einem anderen Repository aus verursacht.\n"
|
||||
"Vielleicht müssen Sie die externen Änderungen zusammenführen (z. B. 'git "
|
||||
"pull ...')\n"
|
||||
"bevor Sie erneut \"push\" ausführen.\n"
|
||||
"Siehe auch die Sektion 'Note about fast-forwards' in 'git push --help'\n"
|
||||
"für weitere Details."
|
||||
"Wenn Sie die externen Änderungen integrieren wollen, verwenden Sie 'git "
|
||||
"pull'\n"
|
||||
"bevor Sie erneut push ausführen.\n"
|
||||
"Siehe auch die Sektion 'Note about fast-forwards' in 'git push --help' für "
|
||||
"weitere\n"
|
||||
"Informationen."
|
||||
|
||||
msgid "Updates were rejected because the tag already exists in the remote."
|
||||
msgstr ""
|
||||
@@ -9995,15 +9945,21 @@ msgstr ""
|
||||
"die Option '--force' zu verwenden.\n"
|
||||
|
||||
msgid ""
|
||||
"Updates were rejected because the tip of the remote-tracking\n"
|
||||
"branch has been updated since the last checkout. You may want\n"
|
||||
"to integrate those changes locally (e.g., 'git pull ...')\n"
|
||||
"before forcing an update.\n"
|
||||
"Updates were rejected because the tip of the remote-tracking branch has\n"
|
||||
"been updated since the last checkout. If you want to integrate the\n"
|
||||
"remote changes, use 'git pull' before pushing again.\n"
|
||||
"See the 'Note about fast-forwards' in 'git push --help' for details."
|
||||
msgstr ""
|
||||
"Aktualisierungen wurden zurückgewiesen, weil die Spitze des Remote-\n"
|
||||
"Tracking-Branches seit dem letzen Checkout aktualisiert wurde. Sie möchten\n"
|
||||
"diese Änderungen vielleicht lokal integrieren (z. B. 'git pull ...') bevor\n"
|
||||
"Sie die Änderungen erzwingen.\n"
|
||||
"Aktualisierungen wurden zurückgewiesen, weil die Spitze des Remote-"
|
||||
"Tracking-\n"
|
||||
"Branches seit dem letzten Auschecken aktualisiert wurde. Wenn Sie die "
|
||||
"externen\n"
|
||||
"Änderungen integrieren wollen, verwenden Sie 'git pull' bevor Sie erneut "
|
||||
"push\n"
|
||||
"ausführen.\n"
|
||||
"Siehe auch die Sektion 'Note about fast-forwards' in 'git push --help' für "
|
||||
"weitere\n"
|
||||
"Informationen."
|
||||
|
||||
#, c-format
|
||||
msgid "Pushing to %s\n"
|
||||
@@ -10886,11 +10842,12 @@ msgstr "unbekanntes Argument für Option mirror: %s"
|
||||
msgid "fetch the remote branches"
|
||||
msgstr "die Remote-Branches anfordern"
|
||||
|
||||
msgid "import all tags and associated objects when fetching"
|
||||
msgstr "alle Tags und verbundene Objekte beim Anfordern importieren"
|
||||
|
||||
msgid "or do not fetch any tag at all (--no-tags)"
|
||||
msgstr "oder fordere gar keine Tags an (--no-tags)"
|
||||
msgid ""
|
||||
"import all tags and associated objects when fetching\n"
|
||||
"or do not fetch any tag at all (--no-tags)"
|
||||
msgstr ""
|
||||
"alle Tags und zugehörigen Objekte beim Abruf importieren\n"
|
||||
"oder überhaupt keine Tags abrufen (--no-tags)"
|
||||
|
||||
msgid "branch(es) to track"
|
||||
msgstr "Branch(es) zur Übernahme"
|
||||
@@ -12875,6 +12832,10 @@ msgstr "Überspringe nicht zusammengeführtes Submodul %s"
|
||||
msgid "Skipping submodule '%s'"
|
||||
msgstr "Überspringe Submodul '%s'"
|
||||
|
||||
#, c-format
|
||||
msgid "cannot clone submodule '%s' without a URL"
|
||||
msgstr "kann Submodul '%s' nicht ohne URL klonen"
|
||||
|
||||
#, c-format
|
||||
msgid "Failed to clone '%s'. Retry scheduled"
|
||||
msgstr "Fehler beim Klonen von '%s'. Weiterer Versuch geplant"
|
||||
@@ -13649,11 +13610,12 @@ msgstr "Tag-Inhalte ausgeben"
|
||||
|
||||
msgid ""
|
||||
"git worktree add [-f] [--detach] [--checkout] [--lock [--reason <string>]]\n"
|
||||
" [-b <new-branch>] <path> [<commit-ish>]"
|
||||
" [--orphan] [(-b | -B) <new-branch>] <path> [<commit-ish>]"
|
||||
msgstr ""
|
||||
"git worktree add [-f] [--detach] [--checkout] [--lock [--reason "
|
||||
"<Zeichenkette>]]\n"
|
||||
" [-b <neuer-Branch>] <Pfad> [<Commit-Angabe>]"
|
||||
" [--orphan] [(-b | -B) <neuer-Branch>] <Pfad> [<Commit-"
|
||||
"Angabe>]"
|
||||
|
||||
msgid "git worktree list [-v | --porcelain [-z]]"
|
||||
msgstr "git worktree list [-v | --porcelain [-z]]"
|
||||
@@ -13676,6 +13638,41 @@ msgstr "git worktree repair [<Pfad>...]"
|
||||
msgid "git worktree unlock <worktree>"
|
||||
msgstr "git worktree unlock <Arbeitsverzeichnis>"
|
||||
|
||||
msgid "No possible source branch, inferring '--orphan'"
|
||||
msgstr "Kein möglicher Quell-Branch, der auf '--orphan' schließen lässt"
|
||||
|
||||
#, c-format
|
||||
msgid ""
|
||||
"If you meant to create a worktree containing a new orphan branch\n"
|
||||
"(branch with no commits) for this repository, you can do so\n"
|
||||
"using the --orphan flag:\n"
|
||||
"\n"
|
||||
" git worktree add --orphan -b %s %s\n"
|
||||
msgstr ""
|
||||
"Wenn Sie ein Arbeitsverzeichnis erstellen möchten, um einen neuen verwaisten "
|
||||
"Branch\n"
|
||||
"(Branch ohne Commits) für dieses Repository zu erstellen, können Sie dies "
|
||||
"mit\n"
|
||||
"der Option --orphan tun:\n"
|
||||
"\n"
|
||||
" git worktree add --orphan -b %s %s\n"
|
||||
|
||||
#, c-format
|
||||
msgid ""
|
||||
"If you meant to create a worktree containing a new orphan branch\n"
|
||||
"(branch with no commits) for this repository, you can do so\n"
|
||||
"using the --orphan flag:\n"
|
||||
"\n"
|
||||
" git worktree add --orphan %s\n"
|
||||
msgstr ""
|
||||
"Wenn Sie ein Arbeitsverzeichnis erstellen möchten, um einen neuen verwaisten "
|
||||
"Branch\n"
|
||||
"(Branch ohne Commits) für dieses Repository zu erstellen, können Sie dies "
|
||||
"mit\n"
|
||||
"der Option --orphan tun:\n"
|
||||
"\n"
|
||||
" git worktree add --orphan %s\n"
|
||||
|
||||
#, c-format
|
||||
msgid "Removing %s/%s: %s"
|
||||
msgstr "Entferne %s/%s: %s"
|
||||
@@ -13746,10 +13743,38 @@ msgstr "Bereite Arbeitsverzeichnis vor (setze Branch '%s' um; war bei %s)"
|
||||
msgid "Preparing worktree (checking out '%s')"
|
||||
msgstr "Bereite Arbeitsverzeichnis vor (checke '%s' aus)"
|
||||
|
||||
#, c-format
|
||||
msgid "unreachable: invalid reference: %s"
|
||||
msgstr "unerreichbar: ungültige Referenz: %s"
|
||||
|
||||
#, c-format
|
||||
msgid "Preparing worktree (detached HEAD %s)"
|
||||
msgstr "Bereite Arbeitsverzeichnis vor (losgelöster HEAD %s)"
|
||||
|
||||
#, c-format
|
||||
msgid ""
|
||||
"HEAD points to an invalid (or orphaned) reference.\n"
|
||||
"HEAD path: '%s'\n"
|
||||
"HEAD contents: '%s'"
|
||||
msgstr ""
|
||||
"HEAD zeigt auf eine ungültige (oder verwaiste) Referenz.\n"
|
||||
"HEAD-Pfad: '%s'\n"
|
||||
"HEAD Inhalte: '%s'"
|
||||
|
||||
msgid ""
|
||||
"No local or remote refs exist despite at least one remote\n"
|
||||
"present, stopping; use 'add -f' to overide or fetch a remote first"
|
||||
msgstr ""
|
||||
"Es gibt keine lokalen oder entfernten Referenzen, obwohl mindestens ein "
|
||||
"Remote-Repository\n"
|
||||
"vorhanden ist. Angehalten. Verwenden Sie 'add -f', um eine entfernte "
|
||||
"Referenz zu überschreiben\n"
|
||||
"oder rufen Sie diese zuerst ab"
|
||||
|
||||
#, c-format
|
||||
msgid "'%s' and '%s' cannot be used together"
|
||||
msgstr "'%s' und '%s' können nicht zusammen verwendet werden"
|
||||
|
||||
msgid "checkout <branch> even if already checked out in other worktree"
|
||||
msgstr ""
|
||||
"<Branch> auschecken, auch wenn dieser bereits in einem anderen "
|
||||
@@ -13761,6 +13786,9 @@ msgstr "neuen Branch erstellen"
|
||||
msgid "create or reset a branch"
|
||||
msgstr "Branch erstellen oder umsetzen"
|
||||
|
||||
msgid "create unborn/orphaned branch"
|
||||
msgstr "ungeborenen/verwaisten Branch erstellen"
|
||||
|
||||
msgid "populate the new working tree"
|
||||
msgstr "das neue Arbeitsverzeichnis auschecken"
|
||||
|
||||
@@ -13783,6 +13811,13 @@ msgid "options '%s', '%s', and '%s' cannot be used together"
|
||||
msgstr ""
|
||||
"die Optionen '%s', '%s' und '%s' können nicht gemeinsam verwendet werden"
|
||||
|
||||
#, c-format
|
||||
msgid "options '%s', and '%s' cannot be used together"
|
||||
msgstr "die Optionen '%s' und '%s' können nicht gemeinsam verwendet werden"
|
||||
|
||||
msgid "<commit-ish>"
|
||||
msgstr "<Commit-Angabe>"
|
||||
|
||||
msgid "added with --lock"
|
||||
msgstr "mit --lock hinzugefügt"
|
||||
|
||||
@@ -14022,6 +14057,14 @@ msgid_plural "The bundle requires these %<PRIuMAX> refs:"
|
||||
msgstr[0] "Das Paket benötigt diese Referenz:"
|
||||
msgstr[1] "Das Paket benötigt diese %<PRIuMAX> Referenzen:"
|
||||
|
||||
#, c-format
|
||||
msgid "The bundle uses this hash algorithm: %s"
|
||||
msgstr "Das Paket verwendet diesen Hash-Algorithmus: %s"
|
||||
|
||||
#, c-format
|
||||
msgid "The bundle uses this filter: %s"
|
||||
msgstr "Das Paket verwendet diesen Filter: %s"
|
||||
|
||||
msgid "unable to dup bundle descriptor"
|
||||
msgstr "konnte dup für Descriptor des Pakets nicht ausführen"
|
||||
|
||||
@@ -14261,9 +14304,10 @@ msgstr "Zeilen darstellen, die einem Muster entsprechen"
|
||||
msgid "A portable graphical interface to Git"
|
||||
msgstr "eine portable grafische Schnittstelle zu Git"
|
||||
|
||||
msgid "Compute object ID and optionally creates a blob from a file"
|
||||
msgid "Compute object ID and optionally create an object from a file"
|
||||
msgstr ""
|
||||
"von einer Datei die Objekt-ID berechnen und optional ein Blob erstellen"
|
||||
"Berechnung der Objekt-ID und optionales Erstellen eines Objekts aus einer "
|
||||
"Datei"
|
||||
|
||||
msgid "Display help information about Git"
|
||||
msgstr "Hilfsinformationen über Git anzeigen"
|
||||
@@ -14687,6 +14731,10 @@ msgstr "Commit-Graph hat keinen Basis-Graph-Chunk"
|
||||
msgid "commit-graph chain does not match"
|
||||
msgstr "Commit-Graph Verkettung stimmt nicht überein"
|
||||
|
||||
#, c-format
|
||||
msgid "commit count in base graph too high: %<PRIuMAX>"
|
||||
msgstr "Anzahl der Commits im Basisgraph zu hoch: %<PRIuMAX>"
|
||||
|
||||
#, c-format
|
||||
msgid "invalid commit-graph chain: line '%s' not a hash"
|
||||
msgstr "Ungültige Commit-Graph Verkettung: Zeile '%s' ist kein Hash"
|
||||
@@ -14770,6 +14818,17 @@ msgstr "konnte Basis-Commit-Graph-Datei nicht umbenennen"
|
||||
msgid "failed to rename temporary commit-graph file"
|
||||
msgstr "konnte temporäre Commit-Graph-Datei nicht umbenennen"
|
||||
|
||||
#, c-format
|
||||
msgid "cannot merge graphs with %<PRIuMAX>, %<PRIuMAX> commits"
|
||||
msgstr ""
|
||||
"Graphen mit %<PRIuMAX>, %<PRIuMAX> Commits können nicht zusammengeführt "
|
||||
"werden"
|
||||
|
||||
#, c-format
|
||||
msgid "cannot merge graph %s, too many commits: %<PRIuMAX>"
|
||||
msgstr ""
|
||||
"Graph %s kann nicht zusammengeführt werden, zu viele Commits: %<PRIuMAX>"
|
||||
|
||||
msgid "Scanning merged commits"
|
||||
msgstr "Durchsuche zusammengeführte Commits"
|
||||
|
||||
@@ -14801,9 +14860,6 @@ msgstr "Commit-Graph hat fehlerhaften Fanout-Wert: fanout[%d] = %u != %u"
|
||||
msgid "failed to parse commit %s from commit-graph"
|
||||
msgstr "konnte Commit %s von Commit-Graph nicht parsen"
|
||||
|
||||
msgid "Verifying commits in commit graph"
|
||||
msgstr "Commit in Commit-Graph überprüfen"
|
||||
|
||||
#, c-format
|
||||
msgid "failed to parse commit %s from object database for commit-graph"
|
||||
msgstr ""
|
||||
@@ -14849,6 +14905,9 @@ msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
|
||||
msgstr ""
|
||||
"Commit-Datum für Commit %s in Commit-Graph ist %<PRIuMAX> != %<PRIuMAX>"
|
||||
|
||||
msgid "Verifying commits in commit graph"
|
||||
msgstr "Commit in Commit-Graph überprüfen"
|
||||
|
||||
#, c-format
|
||||
msgid "%s %s is not a commit!"
|
||||
msgstr "%s %s ist kein Commit!"
|
||||
@@ -15816,6 +15875,12 @@ msgstr "keine Merge-Basis gefunden"
|
||||
msgid "multiple merge bases found"
|
||||
msgstr "mehrere Merge-Basen gefunden"
|
||||
|
||||
msgid "cannot compare stdin to a directory"
|
||||
msgstr "kann stdin nicht mit einem Verzeichnis vergleichen"
|
||||
|
||||
msgid "cannot compare a named pipe to a directory"
|
||||
msgstr "kann eine benannte Pipe nicht mit einem Verzeichnis vergleichen"
|
||||
|
||||
msgid "git diff --no-index [<options>] <path> <path>"
|
||||
msgstr "git diff --no-index [<Optionen>] <Pfad> <Pfad>"
|
||||
|
||||
@@ -15873,6 +15938,13 @@ msgstr ""
|
||||
msgid "external diff died, stopping at %s"
|
||||
msgstr "externes Diff-Programm unerwartet beendet, angehalten bei %s"
|
||||
|
||||
msgid "--follow requires exactly one pathspec"
|
||||
msgstr "--follow erfordert genau eine Pfadspezifikation"
|
||||
|
||||
#, c-format
|
||||
msgid "pathspec magic not supported by --follow: %s"
|
||||
msgstr "Magie von Pfadspezifikationen wird von --follow nicht unterstützt: %s"
|
||||
|
||||
#, c-format
|
||||
msgid "options '%s', '%s', '%s', and '%s' cannot be used together"
|
||||
msgstr ""
|
||||
@@ -15892,9 +15964,6 @@ msgstr ""
|
||||
"die Optionen '%s' und '%s' können nicht gemeinsam verwendet werden, nutzen "
|
||||
"Sie '%s' mit '%s' und '%s'"
|
||||
|
||||
msgid "--follow requires exactly one pathspec"
|
||||
msgstr "--follow erfordert genau eine Pfadspezifikation"
|
||||
|
||||
#, c-format
|
||||
msgid "invalid --stat value: %s"
|
||||
msgstr "Ungültiger --stat Wert: %s"
|
||||
@@ -17404,7 +17473,7 @@ msgstr ""
|
||||
#. conflict in a submodule. The first argument is the submodule
|
||||
#. name, and the second argument is the abbreviated id of the
|
||||
#. commit that needs to be merged. For example:
|
||||
#. - go to submodule (mysubmodule), and either merge commit abc1234"
|
||||
#. - go to submodule (mysubmodule), and either merge commit abc1234"
|
||||
#.
|
||||
#, c-format
|
||||
msgid ""
|
||||
@@ -18145,7 +18214,7 @@ msgstr "%s [ungültiges Objekt]"
|
||||
#. TRANSLATORS: This is a line of ambiguous commit
|
||||
#. object output. E.g.:
|
||||
#. *
|
||||
#. "deadbeef commit 2021-01-01 - Some Commit Message"
|
||||
#. "deadbeef commit 2021-01-01 - Some Commit Message"
|
||||
#.
|
||||
#, c-format
|
||||
msgid "%s commit %s - %s"
|
||||
@@ -18154,7 +18223,7 @@ msgstr "%s Commit %s - %s"
|
||||
#. TRANSLATORS: This is a line of ambiguous
|
||||
#. tag object output. E.g.:
|
||||
#. *
|
||||
#. "deadbeef tag 2022-01-01 - Some Tag Message"
|
||||
#. "deadbeef tag 2022-01-01 - Some Tag Message"
|
||||
#. *
|
||||
#. The second argument is the YYYY-MM-DD found
|
||||
#. in the tag.
|
||||
@@ -18170,7 +18239,7 @@ msgstr "%s Tag %s - %s"
|
||||
#. tag object output where we couldn't parse
|
||||
#. the tag itself. E.g.:
|
||||
#. *
|
||||
#. "deadbeef [bad tag, could not parse it]"
|
||||
#. "deadbeef [bad tag, could not parse it]"
|
||||
#.
|
||||
#, c-format
|
||||
msgid "%s [bad tag, could not parse it]"
|
||||
@@ -18827,6 +18896,13 @@ msgstr "Fehler beim Generieren des Diffs."
|
||||
msgid "could not parse log for '%s'"
|
||||
msgstr "Konnte Log für '%s' nicht parsen."
|
||||
|
||||
#, c-format
|
||||
msgid "invalid extra cruft tip: '%s'"
|
||||
msgstr "ungültiger zusätzlicher Schrotthinweis: '%s'"
|
||||
|
||||
msgid "unable to enumerate additional recent objects"
|
||||
msgstr "zusätzliche neue Objekte konnten nicht aufgezählt werden"
|
||||
|
||||
#, c-format
|
||||
msgid "will not add file alias '%s' ('%s' already exists in index)"
|
||||
msgstr ""
|
||||
@@ -18980,6 +19056,14 @@ msgstr "Konnte Zugriffsberechtigung auf '%s' nicht setzen."
|
||||
msgid "%s: cannot drop to stage #0"
|
||||
msgstr "%s: Kann nicht auf Stufe #0 wechseln."
|
||||
|
||||
#, c-format
|
||||
msgid "unexpected diff status %c"
|
||||
msgstr "unerwarteter Differenz-Status %c"
|
||||
|
||||
#, c-format
|
||||
msgid "remove '%s'\n"
|
||||
msgstr "lösche '%s'\n"
|
||||
|
||||
msgid ""
|
||||
"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
|
||||
"continue'.\n"
|
||||
@@ -19180,6 +19264,22 @@ msgstr "unbekanntes %%(trailers) Argument: %s"
|
||||
msgid "positive value expected contents:lines=%s"
|
||||
msgstr "Positiver Wert erwartet contents:lines=%s"
|
||||
|
||||
#, c-format
|
||||
msgid "argument expected for %s"
|
||||
msgstr "Argument erwartet für %s"
|
||||
|
||||
#, c-format
|
||||
msgid "positive value expected %s=%s"
|
||||
msgstr "positiver Wert erwartet %s=%s"
|
||||
|
||||
#, c-format
|
||||
msgid "cannot fully parse %s=%s"
|
||||
msgstr "kann %s=%s nicht vollständig parsen"
|
||||
|
||||
#, c-format
|
||||
msgid "value expected %s="
|
||||
msgstr "Wert erwartet %s="
|
||||
|
||||
#, c-format
|
||||
msgid "positive value expected '%s' in %%(%s)"
|
||||
msgstr "positiver Wert erwartet '%s' in %%(%s)"
|
||||
@@ -19254,6 +19354,9 @@ msgstr "dieser Befehl lehnt Atom ab %%(%.*s)"
|
||||
msgid "--format=%.*s cannot be used with --python, --shell, --tcl"
|
||||
msgstr "--format=%.*s kann nicht mit --python, --shell, --tcl verwendet werden"
|
||||
|
||||
msgid "failed to run 'describe'"
|
||||
msgstr "'describe' konnte nicht ausgeführt werden"
|
||||
|
||||
#, c-format
|
||||
msgid "(no branch, rebasing %s)"
|
||||
msgstr "(kein Branch, Rebase von %s)"
|
||||
@@ -19315,6 +19418,9 @@ msgstr "Schüssel"
|
||||
msgid "field name to sort on"
|
||||
msgstr "sortiere nach diesem Feld"
|
||||
|
||||
msgid "exclude refs which match pattern"
|
||||
msgstr "Ausschluss von Referenzen, die dem Muster entsprechen"
|
||||
|
||||
#, c-format
|
||||
msgid "not a reflog: %s"
|
||||
msgstr "Kein Reflog: %s"
|
||||
@@ -19772,10 +19878,11 @@ msgstr[1] ""
|
||||
"Ihr Branch und '%s' sind divergiert,\n"
|
||||
"und haben jeweils %d und %d unterschiedliche Commits.\n"
|
||||
|
||||
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
|
||||
msgid ""
|
||||
" (use \"git pull\" if you want to integrate the remote branch with yours)\n"
|
||||
msgstr ""
|
||||
" (benutzen Sie \"git pull\", um Ihren Branch mit dem Remote-Branch "
|
||||
"zusammenzuführen)\n"
|
||||
" (verwenden Sie \"git pull\", wenn Sie den Remote-Branch in Ihren "
|
||||
"integrieren wollen)\n"
|
||||
|
||||
#, c-format
|
||||
msgid "cannot parse expected object name '%s'"
|
||||
@@ -19887,6 +19994,10 @@ msgstr "konnte kein Commit für das Argument ancestry-path %s erhalten"
|
||||
msgid "--unpacked=<packfile> no longer supported"
|
||||
msgstr "--unpacked=<Pack-Datei> wird nicht länger unterstützt"
|
||||
|
||||
#, c-format
|
||||
msgid "invalid option '%s' in --stdin mode"
|
||||
msgstr "ungültige Option '%s' im Modus --stdin"
|
||||
|
||||
msgid "your current branch appears to be broken"
|
||||
msgstr "Ihr aktueller Branch scheint fehlerhaft zu sein."
|
||||
|
||||
@@ -21056,6 +21167,77 @@ msgstr "fork fehlgeschlagen"
|
||||
msgid "setsid failed"
|
||||
msgstr "setsid fehlgeschlagen"
|
||||
|
||||
#, c-format
|
||||
msgid "cannot stat template '%s'"
|
||||
msgstr "kann Vorlage '%s' nicht lesen"
|
||||
|
||||
#, c-format
|
||||
msgid "cannot opendir '%s'"
|
||||
msgstr "kann Verzeichnis '%s' nicht öffnen"
|
||||
|
||||
#, c-format
|
||||
msgid "cannot readlink '%s'"
|
||||
msgstr "kann Verweis '%s' nicht lesen"
|
||||
|
||||
#, c-format
|
||||
msgid "cannot symlink '%s' '%s'"
|
||||
msgstr "kann symbolische Verknüpfung '%s' auf '%s' nicht erstellen"
|
||||
|
||||
#, c-format
|
||||
msgid "cannot copy '%s' to '%s'"
|
||||
msgstr "kann '%s' nicht nach '%s' kopieren"
|
||||
|
||||
#, c-format
|
||||
msgid "ignoring template %s"
|
||||
msgstr "ignoriere Vorlage %s"
|
||||
|
||||
#, c-format
|
||||
msgid "templates not found in %s"
|
||||
msgstr "Keine Vorlagen in %s gefunden."
|
||||
|
||||
#, c-format
|
||||
msgid "not copying templates from '%s': %s"
|
||||
msgstr "kopiere keine Vorlagen von '%s': %s"
|
||||
|
||||
#, c-format
|
||||
msgid "invalid initial branch name: '%s'"
|
||||
msgstr "ungültiger initialer Branchname: '%s'"
|
||||
|
||||
#, c-format
|
||||
msgid "unable to handle file type %d"
|
||||
msgstr "kann nicht mit Dateityp %d umgehen"
|
||||
|
||||
#, c-format
|
||||
msgid "unable to move %s to %s"
|
||||
msgstr "Konnte %s nicht nach %s verschieben"
|
||||
|
||||
msgid "attempt to reinitialize repository with different hash"
|
||||
msgstr "Versuch, das Repository mit einem anderen Hash zu reinitialisieren"
|
||||
|
||||
#, c-format
|
||||
msgid "%s already exists"
|
||||
msgstr "%s existiert bereits"
|
||||
|
||||
#, c-format
|
||||
msgid "re-init: ignored --initial-branch=%s"
|
||||
msgstr "Neu-Initialisierung: --initial-branch=%s ignoriert"
|
||||
|
||||
#, c-format
|
||||
msgid "Reinitialized existing shared Git repository in %s%s\n"
|
||||
msgstr "Bestehendes verteiltes Git-Repository in %s%s neuinitialisiert\n"
|
||||
|
||||
#, c-format
|
||||
msgid "Reinitialized existing Git repository in %s%s\n"
|
||||
msgstr "Bestehendes Git-Repository in %s%s neuinitialisiert\n"
|
||||
|
||||
#, c-format
|
||||
msgid "Initialized empty shared Git repository in %s%s\n"
|
||||
msgstr "Leeres verteiltes Git-Repository in %s%s initialisiert\n"
|
||||
|
||||
#, c-format
|
||||
msgid "Initialized empty Git repository in %s%s\n"
|
||||
msgstr "Leeres Git-Repository in %s%s initialisiert\n"
|
||||
|
||||
#, c-format
|
||||
msgid "index entry is a directory, but not sparse (%08x)"
|
||||
msgstr "Index-Eintrag ist ein Verzeichnis, aber nicht partiell (%08x)"
|
||||
|
||||
519
po/fr.po
519
po/fr.po
@@ -78,8 +78,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: git\n"
|
||||
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
|
||||
"POT-Creation-Date: 2023-05-20 12:25+0200\n"
|
||||
"PO-Revision-Date: 2023-05-18 18:50+0200\n"
|
||||
"POT-Creation-Date: 2023-08-16 11:48+0200\n"
|
||||
"PO-Revision-Date: 2023-08-16 11:49+0200\n"
|
||||
"Last-Translator: Cédric Malard <c.malard-git@valdun.net>\n"
|
||||
"Language-Team: Jean-Noël Avila <jn.avila@free.fr>\n"
|
||||
"Language: fr\n"
|
||||
@@ -716,9 +716,8 @@ msgstr "Impossible de tirer car vous avez des fichiers non fusionnés."
|
||||
msgid "Reverting is not possible because you have unmerged files."
|
||||
msgstr "Impossible d'annuler car vous avez des fichiers non fusionnés."
|
||||
|
||||
#, c-format
|
||||
msgid "It is not possible to %s because you have unmerged files."
|
||||
msgstr "%s n'est pas possible car vous avez des fichiers non fusionnés."
|
||||
msgid "Rebasing is not possible because you have unmerged files."
|
||||
msgstr "Impossible de rebaser, car vous avez des fichiers non fusionnés."
|
||||
|
||||
msgid ""
|
||||
"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
|
||||
@@ -868,6 +867,12 @@ msgstr "les options '%s' et '%s' ne peuvent pas être utilisées ensemble"
|
||||
msgid "'%s' outside a repository"
|
||||
msgstr "'%s' hors d'un dépôt"
|
||||
|
||||
msgid "failed to read patch"
|
||||
msgstr "impossible de lire la rustine"
|
||||
|
||||
msgid "patch too large"
|
||||
msgstr "la rustine est trop grosse"
|
||||
|
||||
#, c-format
|
||||
msgid "Cannot prepare timestamp regexp %s"
|
||||
msgstr "Impossible de préparer la regexp d'horodatage %s"
|
||||
@@ -1787,9 +1792,10 @@ msgid "a branch named '%s' already exists"
|
||||
msgstr "Une branche nommée '%s' existe déjà"
|
||||
|
||||
#, c-format
|
||||
msgid "cannot force update the branch '%s' checked out at '%s'"
|
||||
msgid "cannot force update the branch '%s' used by worktree at '%s'"
|
||||
msgstr ""
|
||||
"impossible de forcer la mise à jour de la branche '%s' extraite dans '%s'"
|
||||
"impossible de forcer la mise à jour de la branche '%s' utilisée par l'arbre-"
|
||||
"de-travail dans '%s'"
|
||||
|
||||
#, c-format
|
||||
msgid "cannot set up tracking information; starting point '%s' is not a branch"
|
||||
@@ -1859,17 +1865,6 @@ msgstr "git add [<options>] [--] <chemin>..."
|
||||
msgid "cannot chmod %cx '%s'"
|
||||
msgstr "impossible de chmod %cx '%s'"
|
||||
|
||||
#, c-format
|
||||
msgid "unexpected diff status %c"
|
||||
msgstr "état de diff inattendu %c"
|
||||
|
||||
msgid "updating files failed"
|
||||
msgstr "échec de la mise à jour des fichiers"
|
||||
|
||||
#, c-format
|
||||
msgid "remove '%s'\n"
|
||||
msgstr "suppression de '%s'\n"
|
||||
|
||||
msgid "Unstaged changes after refreshing the index:"
|
||||
msgstr "Modifications non indexées après rafraîchissement de l'index :"
|
||||
|
||||
@@ -2305,10 +2300,6 @@ msgstr "passer l'option -m à git-mailinfo"
|
||||
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
|
||||
msgstr "passer l'option --keep-cr à git-mailsplit fpour le format mbox"
|
||||
|
||||
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
|
||||
msgstr ""
|
||||
"ne pas passer l'option --keep-cr à git-mailsplit indépendamment de am.keepcr"
|
||||
|
||||
msgid "strip everything before a scissors line"
|
||||
msgstr "retirer tout le contenu avant la ligne des ciseaux"
|
||||
|
||||
@@ -3370,12 +3361,12 @@ msgid ""
|
||||
"git cat-file (--batch | --batch-check | --batch-command) [--batch-all-"
|
||||
"objects]\n"
|
||||
" [--buffer] [--follow-symlinks] [--unordered]\n"
|
||||
" [--textconv | --filters] [-z]"
|
||||
" [--textconv | --filters] [-Z]"
|
||||
msgstr ""
|
||||
"git cat-file (--batch | --batch-check | --batch-command) [--batch-all-"
|
||||
"objects]\n"
|
||||
" [--buffer] [--follow-symlinks] [--unordered]\n"
|
||||
" [--textconv | --filters] [-z]"
|
||||
" [--textconv | --filters] [-Z]"
|
||||
|
||||
msgid ""
|
||||
"git cat-file (--textconv | --filters)\n"
|
||||
@@ -3420,6 +3411,9 @@ msgstr "comme --batch, mais ne pas émettre <contenu>"
|
||||
msgid "stdin is NUL-terminated"
|
||||
msgstr "l'entrée se termine par NUL"
|
||||
|
||||
msgid "stdin and stdout is NUL-terminated"
|
||||
msgstr "l'entrée et la sortie standard se terminent par NUL"
|
||||
|
||||
msgid "read commands from stdin"
|
||||
msgstr "lire les commandes depuis l'entrée standard"
|
||||
|
||||
@@ -4296,12 +4290,6 @@ msgstr "spécifique au serveur"
|
||||
msgid "option to transmit"
|
||||
msgstr "option à transmettre"
|
||||
|
||||
msgid "use IPv4 addresses only"
|
||||
msgstr "n'utiliser que des adresses IPv4"
|
||||
|
||||
msgid "use IPv6 addresses only"
|
||||
msgstr "n'utiliser que des adresses IPv6"
|
||||
|
||||
msgid "apply partial clone filters to submodules"
|
||||
msgstr "appliquer les filtres de clone partiel aux sous-modules"
|
||||
|
||||
@@ -4753,6 +4741,9 @@ msgstr ""
|
||||
" git cherry-pick --skip\n"
|
||||
"\n"
|
||||
|
||||
msgid "updating files failed"
|
||||
msgstr "échec de la mise à jour des fichiers"
|
||||
|
||||
msgid "failed to unpack HEAD tree object"
|
||||
msgstr "échec du dépaquetage de l'objet arbre HEAD"
|
||||
|
||||
@@ -4812,8 +4803,8 @@ msgstr ""
|
||||
"qui n'est pas utilisé dans le message de validation actuel"
|
||||
|
||||
#, c-format
|
||||
msgid "could not lookup commit %s"
|
||||
msgstr "impossible de rechercher le commit %s"
|
||||
msgid "could not lookup commit '%s'"
|
||||
msgstr "impossible de rechercher le commit '%s'"
|
||||
|
||||
#, c-format
|
||||
msgid "(reading log message from standard input)\n"
|
||||
@@ -7461,77 +7452,6 @@ msgstr "--verify sans nom de fichier paquet donné"
|
||||
msgid "fsck error in pack objects"
|
||||
msgstr "erreur de fsck dans les objets paquets"
|
||||
|
||||
#, c-format
|
||||
msgid "cannot stat template '%s'"
|
||||
msgstr "impossible de faire un stat du modèle '%s'"
|
||||
|
||||
#, c-format
|
||||
msgid "cannot opendir '%s'"
|
||||
msgstr "impossible d'ouvrir le répertoire '%s'"
|
||||
|
||||
#, c-format
|
||||
msgid "cannot readlink '%s'"
|
||||
msgstr "impossible de lire le lien '%s'"
|
||||
|
||||
#, c-format
|
||||
msgid "cannot symlink '%s' '%s'"
|
||||
msgstr "impossible de créer un lien symbolique de '%s' '%s'"
|
||||
|
||||
#, c-format
|
||||
msgid "cannot copy '%s' to '%s'"
|
||||
msgstr "impossible de copier '%s' vers '%s'"
|
||||
|
||||
#, c-format
|
||||
msgid "ignoring template %s"
|
||||
msgstr "modèle %s ignoré"
|
||||
|
||||
#, c-format
|
||||
msgid "templates not found in %s"
|
||||
msgstr "modèles non trouvés dans %s"
|
||||
|
||||
#, c-format
|
||||
msgid "not copying templates from '%s': %s"
|
||||
msgstr "pas de copie des modèles depuis '%s' : %s"
|
||||
|
||||
#, c-format
|
||||
msgid "invalid initial branch name: '%s'"
|
||||
msgstr "nom de branche initiale invalide : '%s'"
|
||||
|
||||
#, c-format
|
||||
msgid "unable to handle file type %d"
|
||||
msgstr "impossible de traiter le fichier de type %d"
|
||||
|
||||
#, c-format
|
||||
msgid "unable to move %s to %s"
|
||||
msgstr "impossible de déplacer %s vers %s"
|
||||
|
||||
msgid "attempt to reinitialize repository with different hash"
|
||||
msgstr "essai de réinitialisation du dépôt avec une empreinte différente"
|
||||
|
||||
#, c-format
|
||||
msgid "%s already exists"
|
||||
msgstr "%s existe déjà"
|
||||
|
||||
#, c-format
|
||||
msgid "re-init: ignored --initial-branch=%s"
|
||||
msgstr "re-initialisation : --initial-branch=%s ignoré"
|
||||
|
||||
#, c-format
|
||||
msgid "Reinitialized existing shared Git repository in %s%s\n"
|
||||
msgstr "Dépôt Git existant partagé réinitialisé dans %s%s\n"
|
||||
|
||||
#, c-format
|
||||
msgid "Reinitialized existing Git repository in %s%s\n"
|
||||
msgstr "Dépôt Git existant réinitialisé dans %s%s\n"
|
||||
|
||||
#, c-format
|
||||
msgid "Initialized empty shared Git repository in %s%s\n"
|
||||
msgstr "Dépôt Git vide partagé initialisé dans %s%s\n"
|
||||
|
||||
#, c-format
|
||||
msgid "Initialized empty Git repository in %s%s\n"
|
||||
msgstr "Dépôt Git vide initialisé dans %s%s\n"
|
||||
|
||||
msgid ""
|
||||
"git init [-q | --quiet] [--bare] [--template=<template-directory>]\n"
|
||||
" [--separate-git-dir <git-dir>] [--object-format=<format>]\n"
|
||||
@@ -7979,6 +7899,10 @@ msgstr ""
|
||||
"Impossible de trouver une branche distante suivie, merci de spécifier "
|
||||
"<branche_amont> manuellement.\n"
|
||||
|
||||
#, c-format
|
||||
msgid "could not get object info about '%s'"
|
||||
msgstr "impossible d'obtenir l'information d'objet pour '%s'"
|
||||
|
||||
#, c-format
|
||||
msgid "bad ls-files format: element '%s' does not start with '('"
|
||||
msgstr "mauvais format ls-files : l'élément '%s' ne commence pas par '('"
|
||||
@@ -8126,10 +8050,6 @@ msgstr "afficher la réf sous-jacente en plus de l'objet pointé par elle"
|
||||
msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
|
||||
msgstr "git ls-tree [<options>] <arbre ou apparenté> [<chemin>...]"
|
||||
|
||||
#, c-format
|
||||
msgid "could not get object info about '%s'"
|
||||
msgstr "impossible d'obtenir l'information d'objet pour '%s'"
|
||||
|
||||
#, c-format
|
||||
msgid "bad ls-tree format: element '%s' does not start with '('"
|
||||
msgstr "mauvais format ls-tree : l'élément '%s' ne commence pas par '('"
|
||||
@@ -8872,22 +8792,26 @@ msgid "git notes [--ref <notes-ref>] [list [<object>]]"
|
||||
msgstr "git notes [--ref <références-notes>] [list [<object>]]"
|
||||
|
||||
msgid ""
|
||||
"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
|
||||
"| (-c | -C) <object>] [<object>]"
|
||||
"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [--[no-]separator|--"
|
||||
"separator=<paragraph-break>] [--[no-]stripspace] [-m <msg> | -F <file> | (-c "
|
||||
"| -C) <object>] [<object>]"
|
||||
msgstr ""
|
||||
"git notes [--ref <références-notes>] add [-f] [--allow-empty] [-m <message> "
|
||||
"| -F <fichier> | (-c | -C) <objet>] [<objet>]"
|
||||
"git notes [--ref <référence-notes>] add [-f] [--allow-empty] [--"
|
||||
"[no-]separator|--separator=<coupure-paragraphe>] [--[no-]stripspace] [-m "
|
||||
"<message> | -F <fichier> | (-c | -C) <objet>] [<objet>]"
|
||||
|
||||
msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
|
||||
msgstr ""
|
||||
"git notes [--ref <références-notes>] copy [-f] <depuis-objet> <vers-objet>"
|
||||
|
||||
msgid ""
|
||||
"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
|
||||
"(-c | -C) <object>] [<object>]"
|
||||
"git notes [--ref <notes-ref>] append [--allow-empty] [--[no-]separator|--"
|
||||
"separator=<paragraph-break>] [--[no-]stripspace] [-m <msg> | -F <file> | (-c "
|
||||
"| -C) <object>] [<object>]"
|
||||
msgstr ""
|
||||
"git notes [--ref <références-notes>] append [--allow-empty] [-m <message> | -"
|
||||
"F <fichier> | (-c | -C) <objet>] [<objet>]"
|
||||
"git notes [--ref <références-notes>] append [--allow-empty] [--"
|
||||
"[no-]separator|--separator=<coupure-paragraphe>] [--[no-]stripspace]-m "
|
||||
"<message> | -F <fichier> | (-c | -C) <objet>] [<objet>]"
|
||||
|
||||
msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
|
||||
msgstr "git notes [--ref <références-notes>] edit [--allow-empty] [<objet>]"
|
||||
@@ -9019,6 +8943,15 @@ msgstr "permettre de stocker une note vide"
|
||||
msgid "replace existing notes"
|
||||
msgstr "remplacer les notes existantes"
|
||||
|
||||
msgid "<paragraph-break>"
|
||||
msgstr "<séparateur-paragraphe>"
|
||||
|
||||
msgid "insert <paragraph-break> between paragraphs"
|
||||
msgstr "insérer <séparateur-paragraphe> entre les paragraphes"
|
||||
|
||||
msgid "remove unnecessary whitespace"
|
||||
msgstr "retirer les espaces inutiles"
|
||||
|
||||
#, c-format
|
||||
msgid ""
|
||||
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
|
||||
@@ -9584,8 +9517,11 @@ msgstr ""
|
||||
msgid "refusing to run without --i-still-use-this"
|
||||
msgstr "refus de lancer sans --i-still-use-this"
|
||||
|
||||
msgid "git pack-refs [--all] [--no-prune]"
|
||||
msgstr "git pack-refs [--all] [--no-prune]"
|
||||
msgid ""
|
||||
"git pack-refs [--all] [--no-prune] [--include <pattern>] [--exclude "
|
||||
"<pattern>]"
|
||||
msgstr ""
|
||||
"git pack-refs [--all] [--no-prune] [--include <motif>] [--exclude <motif>]"
|
||||
|
||||
msgid "pack everything"
|
||||
msgstr "empaqueter tout"
|
||||
@@ -9593,6 +9529,12 @@ msgstr "empaqueter tout"
|
||||
msgid "prune loose refs (default)"
|
||||
msgstr "élaguer les références perdues (défaut)"
|
||||
|
||||
msgid "references to include"
|
||||
msgstr "références à inclure"
|
||||
|
||||
msgid "references to exclude"
|
||||
msgstr "références à exclure"
|
||||
|
||||
msgid "git patch-id [--stable | --unstable | --verbatim]"
|
||||
msgstr "git patch-id [--stable | --unstable | --verbatim]"
|
||||
|
||||
@@ -9650,6 +9592,12 @@ msgstr "forcer l'écrasement de la branche locale"
|
||||
msgid "number of submodules pulled in parallel"
|
||||
msgstr "nombre de sous-modules tirés en parallèle"
|
||||
|
||||
msgid "use IPv4 addresses only"
|
||||
msgstr "n'utiliser que des adresses IPv4"
|
||||
|
||||
msgid "use IPv6 addresses only"
|
||||
msgstr "n'utiliser que des adresses IPv6"
|
||||
|
||||
msgid ""
|
||||
"There is no candidate for rebasing against among the refs that you just "
|
||||
"fetched."
|
||||
@@ -9920,46 +9868,43 @@ msgstr ""
|
||||
|
||||
msgid ""
|
||||
"Updates were rejected because the tip of your current branch is behind\n"
|
||||
"its remote counterpart. Integrate the remote changes (e.g.\n"
|
||||
"'git pull ...') before pushing again.\n"
|
||||
"its remote counterpart. If you want to integrate the remote changes,\n"
|
||||
"use 'git pull' before pushing again.\n"
|
||||
"See the 'Note about fast-forwards' in 'git push --help' for details."
|
||||
msgstr ""
|
||||
"Les mises à jour ont été rejetées car la pointe de la branche courante est "
|
||||
"Les mises à jour ont été rejetées car le sommet de la branche actuelle est "
|
||||
"derrière\n"
|
||||
"son homologue distant. Intégrez les changements distants (par exemple 'git "
|
||||
"pull ...')\n"
|
||||
"avant de pousser à nouveau.\n"
|
||||
"son homologue distant. Si vous souhaitez intégrer les changements distants,\n"
|
||||
"utilisez 'git pull' avant de pousser à nouveau.\n"
|
||||
"Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus "
|
||||
"d'information."
|
||||
|
||||
msgid ""
|
||||
"Updates were rejected because a pushed branch tip is behind its remote\n"
|
||||
"counterpart. Check out this branch and integrate the remote changes\n"
|
||||
"(e.g. 'git pull ...') before pushing again.\n"
|
||||
"counterpart. If you want to integrate the remote changes, use 'git pull'\n"
|
||||
"before pushing again.\n"
|
||||
"See the 'Note about fast-forwards' in 'git push --help' for details."
|
||||
msgstr ""
|
||||
"Les mises à jour ont été rejetées car la pointe de la branche courante est "
|
||||
"Les mises à jour ont été rejetées, car le sommet d'une branche poussée est "
|
||||
"derrière\n"
|
||||
"son homologue distant. Extrayez cette branche et intégrez les changements "
|
||||
"distants\n"
|
||||
"(par exemple 'git pull ...') avant de pousser à nouveau.\n"
|
||||
"son homologue distant. Si vous souhaitez intégrer les changements distants,\n"
|
||||
"\"utilisez 'git pull' avant de pousser à nouveau.\n"
|
||||
"Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus "
|
||||
"d'information."
|
||||
|
||||
msgid ""
|
||||
"Updates were rejected because the remote contains work that you do\n"
|
||||
"not have locally. This is usually caused by another repository pushing\n"
|
||||
"to the same ref. You may want to first integrate the remote changes\n"
|
||||
"(e.g., 'git pull ...') before pushing again.\n"
|
||||
"Updates were rejected because the remote contains work that you do not\n"
|
||||
"have locally. This is usually caused by another repository pushing to\n"
|
||||
"the same ref. If you want to integrate the remote changes, use\n"
|
||||
"'git pull' before pushing again.\n"
|
||||
"See the 'Note about fast-forwards' in 'git push --help' for details."
|
||||
msgstr ""
|
||||
"Les mises à jour ont été rejetées car la branche distante contient du "
|
||||
"travail que\n"
|
||||
"vous n'avez pas en local. Ceci est généralement causé par un autre dépôt "
|
||||
"poussé\n"
|
||||
"vers la même référence. Vous pourriez intégrer d'abord les changements "
|
||||
"distants\n"
|
||||
"(par exemple 'git pull ...') avant de pousser à nouveau.\n"
|
||||
"Les mises à jour ont été rejetées car le distant contient du travail que "
|
||||
"vous\n"
|
||||
"n'avez pas localement. La cause probable est que quelqu'un a déjà poussé sur "
|
||||
"la même réf.\n"
|
||||
"depuis un autre dépôt. Si vous souhaitez intégrer les changements distants,\n"
|
||||
"\"utilisez 'git pull' avant de pousser à nouveau.\n"
|
||||
"Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus "
|
||||
"d'information."
|
||||
|
||||
@@ -9980,15 +9925,18 @@ msgstr ""
|
||||
"vers un objet qui n'est pas un commit, sans utiliser l'option '--force'.\n"
|
||||
|
||||
msgid ""
|
||||
"Updates were rejected because the tip of the remote-tracking\n"
|
||||
"branch has been updated since the last checkout. You may want\n"
|
||||
"to integrate those changes locally (e.g., 'git pull ...')\n"
|
||||
"before forcing an update.\n"
|
||||
"Updates were rejected because the tip of the remote-tracking branch has\n"
|
||||
"been updated since the last checkout. If you want to integrate the\n"
|
||||
"remote changes, use 'git pull' before pushing again.\n"
|
||||
"See the 'Note about fast-forwards' in 'git push --help' for details."
|
||||
msgstr ""
|
||||
"Les mises à jour ont été rejetées, car la pointe de la branche\n"
|
||||
"de suivi a été mise à jour depuis la dernière extraction. Intégrez\n"
|
||||
"ces changements localement (par exemple 'git pull ...') avant de\n"
|
||||
"forcer à nouveau une mise à jour.\n"
|
||||
"Les mises à jour ont été rejetées, car le sommet de la branche de suivi à "
|
||||
"distance a\n"
|
||||
"été mis à jour depuis la dernière extraction. Si vous souhaitez intégrer les "
|
||||
"changements distants,\n"
|
||||
"\"utilisez 'git pull' avant de pousser à nouveau.\n"
|
||||
"Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus "
|
||||
"d'information."
|
||||
|
||||
#, c-format
|
||||
msgid "Pushing to %s\n"
|
||||
@@ -10860,12 +10808,13 @@ msgstr "argument miroir inconnu : %s"
|
||||
msgid "fetch the remote branches"
|
||||
msgstr "rapatrier les branches distantes"
|
||||
|
||||
msgid "import all tags and associated objects when fetching"
|
||||
msgid ""
|
||||
"import all tags and associated objects when fetching\n"
|
||||
"or do not fetch any tag at all (--no-tags)"
|
||||
msgstr ""
|
||||
"importer toutes les étiquettes et les objets associés lors du rapatriement"
|
||||
|
||||
msgid "or do not fetch any tag at all (--no-tags)"
|
||||
msgstr "ou ne rapatrier aucune étiquette (--no-tags)"
|
||||
"importer toutes les étiquettes et les objets associés lors de la "
|
||||
"récupération\n"
|
||||
"ou ne récupérer aucune étiquette (--no-tags)"
|
||||
|
||||
msgid "branch(es) to track"
|
||||
msgstr "branche(s) à suivre"
|
||||
@@ -12848,6 +12797,10 @@ msgstr "Sous-module non fusionné %s non traité"
|
||||
msgid "Skipping submodule '%s'"
|
||||
msgstr "Sous-module '%s' non traité"
|
||||
|
||||
#, c-format
|
||||
msgid "cannot clone submodule '%s' without a URL"
|
||||
msgstr "impossible de cloner le sous-module '%s' sans une URL"
|
||||
|
||||
#, c-format
|
||||
msgid "Failed to clone '%s'. Retry scheduled"
|
||||
msgstr "Impossible de cloner '%s'. Réessai prévu"
|
||||
@@ -13611,10 +13564,11 @@ msgstr "afficher le contenu de l'étiquette"
|
||||
|
||||
msgid ""
|
||||
"git worktree add [-f] [--detach] [--checkout] [--lock [--reason <string>]]\n"
|
||||
" [-b <new-branch>] <path> [<commit-ish>]"
|
||||
" [--orphan] [(-b | -B) <new-branch>] <path> [<commit-ish>]"
|
||||
msgstr ""
|
||||
"git worktree add [-f] [--detach] [--checkout] [--lock [--reason <chaîne>]]\n"
|
||||
" [-b <nouvelle-branche>] <chemin> [<commit-esque>]"
|
||||
" [--orphan] [(-b | -B) <nouvelle-branche>] <chemin> [<commit-"
|
||||
"esque>]"
|
||||
|
||||
msgid "git worktree list [-v | --porcelain [-z]]"
|
||||
msgstr "git worktree list [-v | --porcelain [-z]]"
|
||||
@@ -13637,6 +13591,37 @@ msgstr "git worktree repair [<chemin>...]"
|
||||
msgid "git worktree unlock <worktree>"
|
||||
msgstr "git worktree unlock <arbre-de-travail>"
|
||||
|
||||
msgid "No possible source branch, inferring '--orphan'"
|
||||
msgstr "Aucune branche source possible, activation de '--orphan'"
|
||||
|
||||
#, c-format
|
||||
msgid ""
|
||||
"If you meant to create a worktree containing a new orphan branch\n"
|
||||
"(branch with no commits) for this repository, you can do so\n"
|
||||
"using the --orphan flag:\n"
|
||||
"\n"
|
||||
" git worktree add --orphan -b %s %s\n"
|
||||
msgstr ""
|
||||
"Si vous vouliez créer un arbre-de-travail contenant une nouvelle branche\n"
|
||||
"orpheline (une branche sans commit) pour ce dépôt, vous pouvez le faire\n"
|
||||
"en utilisant le drapeau --orphan :\n"
|
||||
"\n"
|
||||
" git worktree add --orphan -b %s %s\n"
|
||||
|
||||
#, c-format
|
||||
msgid ""
|
||||
"If you meant to create a worktree containing a new orphan branch\n"
|
||||
"(branch with no commits) for this repository, you can do so\n"
|
||||
"using the --orphan flag:\n"
|
||||
"\n"
|
||||
" git worktree add --orphan %s\n"
|
||||
msgstr ""
|
||||
"Si vous vouliez créer un arbre-de-travail contenant une nouvelle branche\n"
|
||||
"orpheline (une branche sans commit) pour ce dépôt, vous pouvez le faire\n"
|
||||
"en utilisant le drapeau --orphan :\n"
|
||||
"\n"
|
||||
" git worktree add --orphan %s\n"
|
||||
|
||||
#, c-format
|
||||
msgid "Removing %s/%s: %s"
|
||||
msgstr "Suppression de %s/%s : %s"
|
||||
@@ -13708,10 +13693,36 @@ msgstr ""
|
||||
msgid "Preparing worktree (checking out '%s')"
|
||||
msgstr "Préparation de l'arbre de travail (extraction de '%s')"
|
||||
|
||||
#, c-format
|
||||
msgid "unreachable: invalid reference: %s"
|
||||
msgstr "non joignable : référence invalide : %s"
|
||||
|
||||
#, c-format
|
||||
msgid "Preparing worktree (detached HEAD %s)"
|
||||
msgstr "Préparation de l'arbre de travail (HEAD détachée %s)"
|
||||
|
||||
#, c-format
|
||||
msgid ""
|
||||
"HEAD points to an invalid (or orphaned) reference.\n"
|
||||
"HEAD path: '%s'\n"
|
||||
"HEAD contents: '%s'"
|
||||
msgstr ""
|
||||
"HEAD pointe sur une référence invalide (ou orpheline).\n"
|
||||
"chemin de HEAD '%s'\n"
|
||||
"contenu de HEAD : '%s'"
|
||||
|
||||
msgid ""
|
||||
"No local or remote refs exist despite at least one remote\n"
|
||||
"present, stopping; use 'add -f' to overide or fetch a remote first"
|
||||
msgstr ""
|
||||
"Aucune réf locale ou distant n'existe malgré la présence d'au moins un "
|
||||
"distant,\n"
|
||||
"on arrête ; utilisez 'add -f' pour passe outre ou récupérer le distant avant"
|
||||
|
||||
#, c-format
|
||||
msgid "'%s' and '%s' cannot be used together"
|
||||
msgstr "'%s' et '%s' ne peuvent pas être utilisées ensemble"
|
||||
|
||||
msgid "checkout <branch> even if already checked out in other worktree"
|
||||
msgstr ""
|
||||
"extraire la <branche> même si elle est déjà extraite dans une autre copie de "
|
||||
@@ -13723,6 +13734,9 @@ msgstr "créer une nouvelle branche"
|
||||
msgid "create or reset a branch"
|
||||
msgstr "créer ou réinitialiser une branche"
|
||||
|
||||
msgid "create unborn/orphaned branch"
|
||||
msgstr "créer une branche non née/orpheline"
|
||||
|
||||
msgid "populate the new working tree"
|
||||
msgstr "remplissage de la nouvelle copie de travail"
|
||||
|
||||
@@ -13742,6 +13756,13 @@ msgstr "essayer de nommer la nouvelle branche comme la branche amont"
|
||||
msgid "options '%s', '%s', and '%s' cannot be used together"
|
||||
msgstr "les options '%s', '%s' et '%s' ne peuvent pas être utilisées ensemble"
|
||||
|
||||
#, c-format
|
||||
msgid "options '%s', and '%s' cannot be used together"
|
||||
msgstr "les options '%s' et '%s' ne peuvent pas être utilisées ensemble"
|
||||
|
||||
msgid "<commit-ish>"
|
||||
msgstr "<commit-esque>"
|
||||
|
||||
msgid "added with --lock"
|
||||
msgstr "ajouté avec --lock"
|
||||
|
||||
@@ -13979,6 +14000,14 @@ msgid_plural "The bundle requires these %<PRIuMAX> refs:"
|
||||
msgstr[0] "Le colis exige cette référence :"
|
||||
msgstr[1] "Le colis exige ces %<PRIuMAX> références :"
|
||||
|
||||
#, c-format
|
||||
msgid "The bundle uses this hash algorithm: %s"
|
||||
msgstr "algorithme d'empreinte du colis : %s"
|
||||
|
||||
#, c-format
|
||||
msgid "The bundle uses this filter: %s"
|
||||
msgstr "Le colis utilise ce filtre : %s"
|
||||
|
||||
msgid "unable to dup bundle descriptor"
|
||||
msgstr "impossible de dupliquer le descripteur de liasse"
|
||||
|
||||
@@ -14214,9 +14243,9 @@ msgstr "Afficher les lignes correspondant à un motif"
|
||||
msgid "A portable graphical interface to Git"
|
||||
msgstr "Une interface graphique portable pour Git"
|
||||
|
||||
msgid "Compute object ID and optionally creates a blob from a file"
|
||||
msgid "Compute object ID and optionally create an object from a file"
|
||||
msgstr ""
|
||||
"Calculer l'ID d'objet et créer optionnellement un blob depuis un fichier"
|
||||
"Calculer l'ID d'objet et créer optionnellement un objet depuis un fichier"
|
||||
|
||||
msgid "Display help information about Git"
|
||||
msgstr "Afficher l'information d'aide à propos de Git"
|
||||
@@ -14638,6 +14667,10 @@ msgstr "le graphe de commit n'a pas de section de graphes de base"
|
||||
msgid "commit-graph chain does not match"
|
||||
msgstr "la chaîne de graphe de commit ne correspond pas"
|
||||
|
||||
#, c-format
|
||||
msgid "commit count in base graph too high: %<PRIuMAX>"
|
||||
msgstr "nombre de commits dans le graphe de base trop haut : %<PRIuMAX>"
|
||||
|
||||
#, c-format
|
||||
msgid "invalid commit-graph chain: line '%s' not a hash"
|
||||
msgstr ""
|
||||
@@ -14729,6 +14762,15 @@ msgstr "échec du renommage du fichier de graphe de commits"
|
||||
msgid "failed to rename temporary commit-graph file"
|
||||
msgstr "impossible de renommer le fichier temporaire de graphe de commits"
|
||||
|
||||
#, c-format
|
||||
msgid "cannot merge graphs with %<PRIuMAX>, %<PRIuMAX> commits"
|
||||
msgstr ""
|
||||
"impossible de fusionner des graphes avec %<PRIuMAX>, %<PRIuMAX> commits"
|
||||
|
||||
#, c-format
|
||||
msgid "cannot merge graph %s, too many commits: %<PRIuMAX>"
|
||||
msgstr "impossible de fusionner le graphe %s, trop de commits : %<PRIuMAX>"
|
||||
|
||||
msgid "Scanning merged commits"
|
||||
msgstr "Analyse des commits de fusion"
|
||||
|
||||
@@ -14761,9 +14803,6 @@ msgstr ""
|
||||
msgid "failed to parse commit %s from commit-graph"
|
||||
msgstr "échec de l'analyse le commit %s depuis le graphe de commits"
|
||||
|
||||
msgid "Verifying commits in commit graph"
|
||||
msgstr "Verification des commits dans le graphe de commits"
|
||||
|
||||
#, c-format
|
||||
msgid "failed to parse commit %s from object database for commit-graph"
|
||||
msgstr ""
|
||||
@@ -14816,6 +14855,9 @@ msgstr ""
|
||||
"la date de validation pour le commit %s dans le graphe de commit est "
|
||||
"%<PRIuMAX> != %<PRIuMAX>"
|
||||
|
||||
msgid "Verifying commits in commit graph"
|
||||
msgstr "Verification des commits dans le graphe de commits"
|
||||
|
||||
#, c-format
|
||||
msgid "%s %s is not a commit!"
|
||||
msgstr "%s %s n'est pas un commit !"
|
||||
@@ -15784,6 +15826,12 @@ msgstr "aucune base de fusion trouvée"
|
||||
msgid "multiple merge bases found"
|
||||
msgstr "bases multiples de fusion trouvées"
|
||||
|
||||
msgid "cannot compare stdin to a directory"
|
||||
msgstr "impossible de comparer stdin à un répertoire"
|
||||
|
||||
msgid "cannot compare a named pipe to a directory"
|
||||
msgstr "impossible de réparer un tuyau nommé à un répertoire"
|
||||
|
||||
msgid "git diff --no-index [<options>] <path> <path>"
|
||||
msgstr "git diff --no-index [<options>] <chemin> <chemin>"
|
||||
|
||||
@@ -15843,6 +15891,14 @@ msgstr ""
|
||||
msgid "external diff died, stopping at %s"
|
||||
msgstr "l'application de diff externe a disparu, arrêt à %s"
|
||||
|
||||
msgid "--follow requires exactly one pathspec"
|
||||
msgstr "--follow a besoin d'une spécification de chemin unique"
|
||||
|
||||
#, c-format
|
||||
msgid "pathspec magic not supported by --follow: %s"
|
||||
msgstr ""
|
||||
"le spécificateur magique de chemin n'est pas pris en charge par --follow : %s"
|
||||
|
||||
#, c-format
|
||||
msgid "options '%s', '%s', '%s', and '%s' cannot be used together"
|
||||
msgstr ""
|
||||
@@ -15861,9 +15917,6 @@ msgstr ""
|
||||
"les options '%s' et '%s' ne peuvent pas être utilisées ensemble, utilisez "
|
||||
"'%s' avec '%s' et '%s'"
|
||||
|
||||
msgid "--follow requires exactly one pathspec"
|
||||
msgstr "--follow a besoin d'une spécification de chemin unique"
|
||||
|
||||
#, c-format
|
||||
msgid "invalid --stat value: %s"
|
||||
msgstr "valeur invalide de --stat : %s"
|
||||
@@ -18794,6 +18847,13 @@ msgstr "échec de la génération de diff"
|
||||
msgid "could not parse log for '%s'"
|
||||
msgstr "impossible d'analyser le journal pour '%s'"
|
||||
|
||||
#, c-format
|
||||
msgid "invalid extra cruft tip: '%s'"
|
||||
msgstr "sommet supplémentaire dégénéré invalide : '%s'"
|
||||
|
||||
msgid "unable to enumerate additional recent objects"
|
||||
msgstr "impossible d'énumérer les objets récents additionnels"
|
||||
|
||||
#, c-format
|
||||
msgid "will not add file alias '%s' ('%s' already exists in index)"
|
||||
msgstr "pas d'ajout d'alias de fichier '%s'(« %s » existe déjà dans l'index)"
|
||||
@@ -18946,6 +19006,14 @@ msgstr "impossible de régler les bits de droit de '%s'"
|
||||
msgid "%s: cannot drop to stage #0"
|
||||
msgstr "%s : impossible de revenir à l'étape 0"
|
||||
|
||||
#, c-format
|
||||
msgid "unexpected diff status %c"
|
||||
msgstr "état de diff inattendu %c"
|
||||
|
||||
#, c-format
|
||||
msgid "remove '%s'\n"
|
||||
msgstr "suppression de '%s'\n"
|
||||
|
||||
msgid ""
|
||||
"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
|
||||
"continue'.\n"
|
||||
@@ -19148,6 +19216,22 @@ msgstr "argument %%(trailers) inconnu : %s"
|
||||
msgid "positive value expected contents:lines=%s"
|
||||
msgstr "valeur positive attendue contents:lines=%s"
|
||||
|
||||
#, c-format
|
||||
msgid "argument expected for %s"
|
||||
msgstr "argument attendu pour %s"
|
||||
|
||||
#, c-format
|
||||
msgid "positive value expected %s=%s"
|
||||
msgstr "valeur positive attendue %s=%s"
|
||||
|
||||
#, c-format
|
||||
msgid "cannot fully parse %s=%s"
|
||||
msgstr "impossible d'analyser complètement %s=%s"
|
||||
|
||||
#, c-format
|
||||
msgid "value expected %s="
|
||||
msgstr "valeur attendue %s="
|
||||
|
||||
#, c-format
|
||||
msgid "positive value expected '%s' in %%(%s)"
|
||||
msgstr "valeur positive attendue '%s' dans %%(%s)"
|
||||
@@ -19222,6 +19306,9 @@ msgstr "cette commande rejette l'atome %%(%.*s)"
|
||||
msgid "--format=%.*s cannot be used with --python, --shell, --tcl"
|
||||
msgstr "--format=%.*s ne peut pas être utilisé avec --python, --shell, --tcl"
|
||||
|
||||
msgid "failed to run 'describe'"
|
||||
msgstr "échec pour lancer 'describe'"
|
||||
|
||||
#, c-format
|
||||
msgid "(no branch, rebasing %s)"
|
||||
msgstr "(aucune branche, rebasage de %s)"
|
||||
@@ -19283,6 +19370,9 @@ msgstr "clé"
|
||||
msgid "field name to sort on"
|
||||
msgstr "nom du champ servant à trier"
|
||||
|
||||
msgid "exclude refs which match pattern"
|
||||
msgstr "exclure les références correspondant à <motif>"
|
||||
|
||||
#, c-format
|
||||
msgid "not a reflog: %s"
|
||||
msgstr "'%s' n'est pas un journal de références"
|
||||
@@ -19736,9 +19826,10 @@ msgstr[1] ""
|
||||
"Votre branche et '%s' ont divergé,\n"
|
||||
"et ont %d et %d commits différents chacune respectivement.\n"
|
||||
|
||||
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
|
||||
msgid ""
|
||||
" (use \"git pull\" if you want to integrate the remote branch with yours)\n"
|
||||
msgstr ""
|
||||
" (utilisez \"git pull\" pour fusionner la branche distante dans la vôtre)\n"
|
||||
" (utilisez \"git pull\" pour intégrer la branche distante avec la vôtre)\n"
|
||||
|
||||
#, c-format
|
||||
msgid "cannot parse expected object name '%s'"
|
||||
@@ -19851,6 +19942,10 @@ msgstr ""
|
||||
msgid "--unpacked=<packfile> no longer supported"
|
||||
msgstr "--unpacked=<fichier-paquet> n'est plus géré"
|
||||
|
||||
#, c-format
|
||||
msgid "invalid option '%s' in --stdin mode"
|
||||
msgstr "option invalide '%s' en mode --stdin"
|
||||
|
||||
msgid "your current branch appears to be broken"
|
||||
msgstr "votre branche actuelle semble cassée"
|
||||
|
||||
@@ -21013,6 +21108,77 @@ msgstr "échec de la bifurcation"
|
||||
msgid "setsid failed"
|
||||
msgstr "échec du setsid"
|
||||
|
||||
#, c-format
|
||||
msgid "cannot stat template '%s'"
|
||||
msgstr "impossible de faire un stat du modèle '%s'"
|
||||
|
||||
#, c-format
|
||||
msgid "cannot opendir '%s'"
|
||||
msgstr "impossible d'ouvrir le répertoire '%s'"
|
||||
|
||||
#, c-format
|
||||
msgid "cannot readlink '%s'"
|
||||
msgstr "impossible de lire le lien '%s'"
|
||||
|
||||
#, c-format
|
||||
msgid "cannot symlink '%s' '%s'"
|
||||
msgstr "impossible de créer un lien symbolique de '%s' '%s'"
|
||||
|
||||
#, c-format
|
||||
msgid "cannot copy '%s' to '%s'"
|
||||
msgstr "impossible de copier '%s' vers '%s'"
|
||||
|
||||
#, c-format
|
||||
msgid "ignoring template %s"
|
||||
msgstr "modèle %s ignoré"
|
||||
|
||||
#, c-format
|
||||
msgid "templates not found in %s"
|
||||
msgstr "modèles non trouvés dans %s"
|
||||
|
||||
#, c-format
|
||||
msgid "not copying templates from '%s': %s"
|
||||
msgstr "pas de copie des modèles depuis '%s' : %s"
|
||||
|
||||
#, c-format
|
||||
msgid "invalid initial branch name: '%s'"
|
||||
msgstr "nom de branche initiale invalide : '%s'"
|
||||
|
||||
#, c-format
|
||||
msgid "unable to handle file type %d"
|
||||
msgstr "impossible de traiter le fichier de type %d"
|
||||
|
||||
#, c-format
|
||||
msgid "unable to move %s to %s"
|
||||
msgstr "impossible de déplacer %s vers %s"
|
||||
|
||||
msgid "attempt to reinitialize repository with different hash"
|
||||
msgstr "essai de réinitialisation du dépôt avec une empreinte différente"
|
||||
|
||||
#, c-format
|
||||
msgid "%s already exists"
|
||||
msgstr "%s existe déjà"
|
||||
|
||||
#, c-format
|
||||
msgid "re-init: ignored --initial-branch=%s"
|
||||
msgstr "re-initialisation : --initial-branch=%s ignoré"
|
||||
|
||||
#, c-format
|
||||
msgid "Reinitialized existing shared Git repository in %s%s\n"
|
||||
msgstr "Dépôt Git existant partagé réinitialisé dans %s%s\n"
|
||||
|
||||
#, c-format
|
||||
msgid "Reinitialized existing Git repository in %s%s\n"
|
||||
msgstr "Dépôt Git existant réinitialisé dans %s%s\n"
|
||||
|
||||
#, c-format
|
||||
msgid "Initialized empty shared Git repository in %s%s\n"
|
||||
msgstr "Dépôt Git vide partagé initialisé dans %s%s\n"
|
||||
|
||||
#, c-format
|
||||
msgid "Initialized empty Git repository in %s%s\n"
|
||||
msgstr "Dépôt Git vide initialisé dans %s%s\n"
|
||||
|
||||
#, c-format
|
||||
msgid "index entry is a directory, but not sparse (%08x)"
|
||||
msgstr "l'entrée d'index est un répertoire, mais pas clairsemé (%08x)"
|
||||
@@ -22870,6 +23036,29 @@ msgstr "%s sauté avec un suffix de sauvegarde '%s'.\n"
|
||||
msgid "Do you really want to send %s? [y|N]: "
|
||||
msgstr "Souhaitez-vous réellement envoyer %s ?[y|N] : "
|
||||
|
||||
#, c-format
|
||||
#~ msgid "It is not possible to %s because you have unmerged files."
|
||||
#~ msgstr "%s n'est pas possible car vous avez des fichiers non fusionnés."
|
||||
|
||||
#~ msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
|
||||
#~ msgstr ""
|
||||
#~ "ne pas passer l'option --keep-cr à git-mailsplit indépendamment de am."
|
||||
#~ "keepcr"
|
||||
|
||||
#~ msgid ""
|
||||
#~ "Updates were rejected because the tip of the remote-tracking\n"
|
||||
#~ "branch has been updated since the last checkout. You may want\n"
|
||||
#~ "to integrate those changes locally (e.g., 'git pull ...')\n"
|
||||
#~ "before forcing an update.\n"
|
||||
#~ msgstr ""
|
||||
#~ "Les mises à jour ont été rejetées, car la pointe de la branche\n"
|
||||
#~ "de suivi a été mise à jour depuis la dernière extraction. Intégrez\n"
|
||||
#~ "ces changements localement (par exemple 'git pull ...') avant de\n"
|
||||
#~ "forcer à nouveau une mise à jour.\n"
|
||||
|
||||
#~ msgid "or do not fetch any tag at all (--no-tags)"
|
||||
#~ msgstr "ou ne rapatrier aucune étiquette (--no-tags)"
|
||||
|
||||
#~ msgid "current working directory is untracked"
|
||||
#~ msgstr "l'arbre de travail actuel est non-suivi"
|
||||
|
||||
|
||||
608
po/id.po
608
po/id.po
@@ -7,8 +7,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Git\n"
|
||||
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
|
||||
"POT-Creation-Date: 2023-05-19 19:57+0000\n"
|
||||
"PO-Revision-Date: 2023-05-22 15:24+0700\n"
|
||||
"POT-Creation-Date: 2023-08-06 17:06+0700\n"
|
||||
"PO-Revision-Date: 2023-08-06 17:06+0700\n"
|
||||
"Last-Translator: Bagas Sanjaya <bagasdotme@gmail.com>\n"
|
||||
"Language-Team: Indonesian\n"
|
||||
"Language: id\n"
|
||||
@@ -941,6 +941,14 @@ msgstr "Opsi '%s' dan '%s' tidak dapat digunakan bersamaan"
|
||||
msgid "'%s' outside a repository"
|
||||
msgstr "'%s' di luar repositori"
|
||||
|
||||
#: apply.c
|
||||
msgid "failed to read patch"
|
||||
msgstr "gagal membaca tambalan"
|
||||
|
||||
#: apply.c
|
||||
msgid "patch too large"
|
||||
msgstr "tambalan terlalu besar"
|
||||
|
||||
#: apply.c
|
||||
#, c-format
|
||||
msgid "Cannot prepare timestamp regexp %s"
|
||||
@@ -2062,8 +2070,10 @@ msgstr "sebuah cabang bernama '%s' sudah ada"
|
||||
|
||||
#: branch.c
|
||||
#, c-format
|
||||
msgid "cannot force update the branch '%s' checked out at '%s'"
|
||||
msgstr "tidak dapat memperbarui paksa cabang '%s' yang ter-check out pada '%s'"
|
||||
msgid "cannot force update the branch '%s' used by worktree at '%s'"
|
||||
msgstr ""
|
||||
"tidak dapat memperbarui paksa cabang '%s' yang yang digunakan oleh pohon "
|
||||
"kerja pada '%s'"
|
||||
|
||||
#: branch.c
|
||||
#, c-format
|
||||
@@ -2145,20 +2155,6 @@ msgstr "git add [<opsi>] [--] <pathspec>..."
|
||||
msgid "cannot chmod %cx '%s'"
|
||||
msgstr "tidak dapat chmod %cx '%s'"
|
||||
|
||||
#: builtin/add.c
|
||||
#, c-format
|
||||
msgid "unexpected diff status %c"
|
||||
msgstr "status diff tak diharapkan %c"
|
||||
|
||||
#: builtin/add.c builtin/commit.c
|
||||
msgid "updating files failed"
|
||||
msgstr "gagal memperbarui berkas"
|
||||
|
||||
#: builtin/add.c
|
||||
#, c-format
|
||||
msgid "remove '%s'\n"
|
||||
msgstr "hapus '%s'\n"
|
||||
|
||||
#: builtin/add.c
|
||||
msgid "Unstaged changes after refreshing the index:"
|
||||
msgstr "Perubahan tak tergelar setelah menyegarkan indeks:"
|
||||
@@ -2704,11 +2700,6 @@ msgstr "lewatkan opsi -m ke git-mailinfo"
|
||||
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
|
||||
msgstr "lewatkan opsi --keep-cr ke git-mailsplit untuk format mbox"
|
||||
|
||||
#: builtin/am.c
|
||||
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
|
||||
msgstr ""
|
||||
"jangan lewatkan opsi --keep-cr ke git-mailsplit tak bergantung pada am.keepcr"
|
||||
|
||||
#: builtin/am.c
|
||||
msgid "strip everything before a scissors line"
|
||||
msgstr "copot semuanya sebelum garis gunting"
|
||||
@@ -4022,7 +4013,7 @@ msgid ""
|
||||
"git cat-file (--batch | --batch-check | --batch-command) [--batch-all-"
|
||||
"objects]\n"
|
||||
" [--buffer] [--follow-symlinks] [--unordered]\n"
|
||||
" [--textconv | --filters] [-z]"
|
||||
" [--textconv | --filters] [-Z]"
|
||||
msgstr ""
|
||||
"git cat-file (--batch | --batch-check | --batch-command) [--batch-all-"
|
||||
"objects]\n"
|
||||
@@ -4086,6 +4077,10 @@ msgstr "seperti --batch, tapi jangan keluarkan <isi>"
|
||||
msgid "stdin is NUL-terminated"
|
||||
msgstr "stdin diakhiri dengan NUL"
|
||||
|
||||
#: builtin/cat-file.c
|
||||
msgid "stdin and stdout is NUL-terminated"
|
||||
msgstr "stdin dan stdout diakhiri dengan NUL"
|
||||
|
||||
#: builtin/cat-file.c
|
||||
msgid "read commands from stdin"
|
||||
msgstr "baca perintah dari masukan standar"
|
||||
@@ -4624,8 +4619,8 @@ msgid ""
|
||||
"Consider \"git merge --quit\" or \"git worktree add\"."
|
||||
msgstr ""
|
||||
"tidak dapat mengganti cabang saat penggabungan\n"
|
||||
"Pertimbangkan untuk menggunakan \"git merge --quit\" atau \"git worktree add"
|
||||
"\"."
|
||||
"Pertimbangkan untuk menggunakan \"git merge --quit\" atau \"git worktree "
|
||||
"add\"."
|
||||
|
||||
#: builtin/checkout.c
|
||||
msgid ""
|
||||
@@ -4641,8 +4636,8 @@ msgid ""
|
||||
"Consider \"git rebase --quit\" or \"git worktree add\"."
|
||||
msgstr ""
|
||||
"tidak dapat mengganti cabang saat pendasaran ulang\n"
|
||||
"Pertimbangkan untuk menggunakan \"git rebase --quit\" atau \"git worktree add"
|
||||
"\"."
|
||||
"Pertimbangkan untuk menggunakan \"git rebase --quit\" atau \"git worktree "
|
||||
"add\"."
|
||||
|
||||
#: builtin/checkout.c
|
||||
msgid ""
|
||||
@@ -4659,8 +4654,8 @@ msgid ""
|
||||
"Consider \"git revert --quit\" or \"git worktree add\"."
|
||||
msgstr ""
|
||||
"tidak dapat mengganti cabang saat pembalikan\n"
|
||||
"Pertimbangkan untuk menggunakan \"git revert --quit\" atau \"git worktree add"
|
||||
"\"."
|
||||
"Pertimbangkan untuk menggunakan \"git revert --quit\" atau \"git worktree "
|
||||
"add\"."
|
||||
|
||||
#: builtin/checkout.c
|
||||
msgid "you are switching branch while bisecting"
|
||||
@@ -4999,7 +4994,8 @@ msgid "remove whole directories"
|
||||
msgstr "hapus keseluruhan direktori"
|
||||
|
||||
#: builtin/clean.c builtin/describe.c builtin/grep.c builtin/log.c
|
||||
#: builtin/ls-files.c builtin/name-rev.c builtin/show-ref.c
|
||||
#: builtin/ls-files.c builtin/name-rev.c builtin/pack-refs.c builtin/show-ref.c
|
||||
#: ref-filter.h
|
||||
msgid "pattern"
|
||||
msgstr "pola"
|
||||
|
||||
@@ -5171,14 +5167,6 @@ msgstr "spesifik ke server"
|
||||
msgid "option to transmit"
|
||||
msgstr "opsi untuk transmisi"
|
||||
|
||||
#: builtin/clone.c builtin/fetch.c builtin/pull.c builtin/push.c
|
||||
msgid "use IPv4 addresses only"
|
||||
msgstr "gunakan hanya alamat IPv4"
|
||||
|
||||
#: builtin/clone.c builtin/fetch.c builtin/pull.c builtin/push.c
|
||||
msgid "use IPv6 addresses only"
|
||||
msgstr "gunakan hanya alamat IPv6"
|
||||
|
||||
#: builtin/clone.c
|
||||
msgid "apply partial clone filters to submodules"
|
||||
msgstr "terapkan saringan kloning parsial ke submodul"
|
||||
@@ -5726,6 +5714,10 @@ msgstr ""
|
||||
" git cherry-pick --skip\n"
|
||||
"\n"
|
||||
|
||||
#: builtin/commit.c read-cache.c
|
||||
msgid "updating files failed"
|
||||
msgstr "gagal memperbarui berkas"
|
||||
|
||||
#: builtin/commit.c
|
||||
msgid "failed to unpack HEAD tree object"
|
||||
msgstr "gagal membuka objek pohon HEAD"
|
||||
@@ -5803,8 +5795,8 @@ msgstr ""
|
||||
|
||||
#: builtin/commit.c builtin/merge-tree.c
|
||||
#, c-format
|
||||
msgid "could not lookup commit %s"
|
||||
msgstr "tidak dapat mencari komit %s"
|
||||
msgid "could not lookup commit '%s'"
|
||||
msgstr "tidak dapat mencari komit '%s'"
|
||||
|
||||
#: builtin/commit.c builtin/shortlog.c
|
||||
#, c-format
|
||||
@@ -8065,7 +8057,7 @@ msgstr "Gagal men-fstat %s: %s"
|
||||
msgid "failed to parse '%s' value '%s'"
|
||||
msgstr "gagal menguraikan nilai '%s' '%s'"
|
||||
|
||||
#: builtin/gc.c builtin/init-db.c
|
||||
#: builtin/gc.c setup.c
|
||||
#, c-format
|
||||
msgid "cannot stat '%s'"
|
||||
msgstr "tidak dapat men-stat '%s'"
|
||||
@@ -9089,7 +9081,7 @@ msgstr "tidak dapat kembali ke direktori kerja saat ini"
|
||||
msgid "bad %s"
|
||||
msgstr "%s jelek"
|
||||
|
||||
#: builtin/index-pack.c builtin/init-db.c
|
||||
#: builtin/index-pack.c builtin/init-db.c setup.c
|
||||
#, c-format
|
||||
msgid "unknown hash algorithm '%s'"
|
||||
msgstr "algoritma hash tak dikenal '%s'"
|
||||
@@ -9106,95 +9098,6 @@ msgstr "--verify tanpa nama berkas paket diberikan"
|
||||
msgid "fsck error in pack objects"
|
||||
msgstr "kesalahan fsck dalam objek paket"
|
||||
|
||||
#: builtin/init-db.c
|
||||
#, c-format
|
||||
msgid "cannot stat template '%s'"
|
||||
msgstr "tidak dapat men-stat templat '%s'"
|
||||
|
||||
#: builtin/init-db.c
|
||||
#, c-format
|
||||
msgid "cannot opendir '%s'"
|
||||
msgstr "tidak dapat membuka direktori '%s'"
|
||||
|
||||
#: builtin/init-db.c
|
||||
#, c-format
|
||||
msgid "cannot readlink '%s'"
|
||||
msgstr "tidak dapat membaca tautan '%s'"
|
||||
|
||||
#: builtin/init-db.c
|
||||
#, c-format
|
||||
msgid "cannot symlink '%s' '%s'"
|
||||
msgstr "tidak dapat menautkan simbolik '%s' '%s'"
|
||||
|
||||
#: builtin/init-db.c
|
||||
#, c-format
|
||||
msgid "cannot copy '%s' to '%s'"
|
||||
msgstr "tidak dapat menyalin '%s' ke '%s'"
|
||||
|
||||
#: builtin/init-db.c
|
||||
#, c-format
|
||||
msgid "ignoring template %s"
|
||||
msgstr "mengabaikan templat %s"
|
||||
|
||||
#: builtin/init-db.c
|
||||
#, c-format
|
||||
msgid "templates not found in %s"
|
||||
msgstr "templat tidak ditemukan di %s"
|
||||
|
||||
#: builtin/init-db.c
|
||||
#, c-format
|
||||
msgid "not copying templates from '%s': %s"
|
||||
msgstr "tidak menyalin templat dari '%s': %s"
|
||||
|
||||
#: builtin/init-db.c
|
||||
#, c-format
|
||||
msgid "invalid initial branch name: '%s'"
|
||||
msgstr "nama cabang asal salah: '%s'"
|
||||
|
||||
#: builtin/init-db.c
|
||||
#, c-format
|
||||
msgid "unable to handle file type %d"
|
||||
msgstr "tidak dapat menangani tipe berkas %d"
|
||||
|
||||
#: builtin/init-db.c
|
||||
#, c-format
|
||||
msgid "unable to move %s to %s"
|
||||
msgstr "tidak dapat memindahkan %s ke %s"
|
||||
|
||||
#: builtin/init-db.c
|
||||
msgid "attempt to reinitialize repository with different hash"
|
||||
msgstr "mencoba menginisialisasi ulang repositori dengan hash yang berbeda"
|
||||
|
||||
#: builtin/init-db.c
|
||||
#, c-format
|
||||
msgid "%s already exists"
|
||||
msgstr "%s sudah ada"
|
||||
|
||||
#: builtin/init-db.c
|
||||
#, c-format
|
||||
msgid "re-init: ignored --initial-branch=%s"
|
||||
msgstr "re-init: --initial-branch=%s diabaikan"
|
||||
|
||||
#: builtin/init-db.c
|
||||
#, c-format
|
||||
msgid "Reinitialized existing shared Git repository in %s%s\n"
|
||||
msgstr "Repositori berbagi Git yang sudah ada diinisialisasi ulang di %s%s\n"
|
||||
|
||||
#: builtin/init-db.c
|
||||
#, c-format
|
||||
msgid "Reinitialized existing Git repository in %s%s\n"
|
||||
msgstr "Repositori Git diinisialisasi ulang di %s%s\n"
|
||||
|
||||
#: builtin/init-db.c
|
||||
#, c-format
|
||||
msgid "Initialized empty shared Git repository in %s%s\n"
|
||||
msgstr "Repositori berbagi Git kosong diinisialisasi di %s%s\n"
|
||||
|
||||
#: builtin/init-db.c
|
||||
#, c-format
|
||||
msgid "Initialized empty Git repository in %s%s\n"
|
||||
msgstr "Repositori Git kosong dinisialisasi di %s%s\n"
|
||||
|
||||
#: builtin/init-db.c
|
||||
msgid ""
|
||||
"git init [-q | --quiet] [--bare] [--template=<template-directory>]\n"
|
||||
@@ -9755,6 +9658,11 @@ msgstr ""
|
||||
"Tidak dapat menemukan cabang remote terlacak, mohon sebutkan <hulu>\n"
|
||||
"secara manual.\n"
|
||||
|
||||
#: builtin/ls-files.c builtin/ls-tree.c
|
||||
#, c-format
|
||||
msgid "could not get object info about '%s'"
|
||||
msgstr "tidak dapat mendapatkan info objek tentang '%s'"
|
||||
|
||||
#: builtin/ls-files.c
|
||||
#, c-format
|
||||
msgid "bad ls-files format: element '%s' does not start with '('"
|
||||
@@ -9942,11 +9850,6 @@ msgstr "perlihatkan referensi pokok selain objek yang ditunjuk olehnya"
|
||||
msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
|
||||
msgstr "git ls-tree [<opsi>] <mirip-pohon> [<jalur>...]"
|
||||
|
||||
#: builtin/ls-tree.c
|
||||
#, c-format
|
||||
msgid "could not get object info about '%s'"
|
||||
msgstr "tidak dapat mendapatkan info objek tentang '%s'"
|
||||
|
||||
#: builtin/ls-tree.c
|
||||
#, c-format
|
||||
msgid "bad ls-tree format: element '%s' does not start with '('"
|
||||
@@ -10884,11 +10787,13 @@ msgstr "git notes [--ref <referensi catan>] [list [<objek>]]"
|
||||
|
||||
#: builtin/notes.c
|
||||
msgid ""
|
||||
"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
|
||||
"| (-c | -C) <object>] [<object>]"
|
||||
"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [--[no-]separator|--"
|
||||
"separator=<paragraph-break>] [--[no-]stripspace] [-m <msg> | -F <file> | (-c "
|
||||
"| -C) <object>] [<object>]"
|
||||
msgstr ""
|
||||
"git notes [--ref <referensi catatan>] add [-f] [--allow-empty] [-m <pesan | -"
|
||||
"F <berkas> | (-c | -C) <objek>] [<objek>]"
|
||||
"git notes [--ref <referensi catatan>] add [-f] [--allow-empty] [--"
|
||||
"[no-]separator|--separator=<pemisah paragraf>] [--[no-]stripspace] [-m "
|
||||
"<pesan | -F <berkas> | (-c | -C) <objek>] [<objek>]"
|
||||
|
||||
#: builtin/notes.c
|
||||
msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
|
||||
@@ -10897,11 +10802,13 @@ msgstr ""
|
||||
|
||||
#: builtin/notes.c
|
||||
msgid ""
|
||||
"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
|
||||
"(-c | -C) <object>] [<object>]"
|
||||
"git notes [--ref <notes-ref>] append [--allow-empty] [--[no-]separator|--"
|
||||
"separator=<paragraph-break>] [--[no-]stripspace] [-m <msg> | -F <file> | (-c "
|
||||
"| -C) <object>] [<object>]"
|
||||
msgstr ""
|
||||
"git notes [--ref <referensi catatan>] append [--alow-empty] [-m <pesan> | -F "
|
||||
"<berkas> | (-c | -C) <objek>] [<objek>]"
|
||||
"git notes [--ref <referensi catatan>] append [--alow-empty] [--"
|
||||
"[no]separator|--separator=<pemisah paragraf>] [--[no-]stripspace] [-m "
|
||||
"<pesan> | -F <berkas> | (-c | -C) <objek>] [<objek>]"
|
||||
|
||||
#: builtin/notes.c
|
||||
msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
|
||||
@@ -11071,6 +10978,18 @@ msgstr "perbolehkan menyimpan catatan kosong"
|
||||
msgid "replace existing notes"
|
||||
msgstr "timpa catatan yang sudah ada"
|
||||
|
||||
#: builtin/notes.c
|
||||
msgid "<paragraph-break>"
|
||||
msgstr "<pemisah paragraf>"
|
||||
|
||||
#: builtin/notes.c
|
||||
msgid "insert <paragraph-break> between paragraphs"
|
||||
msgstr "masukkan <pemisah paragraf> di antara paragraf"
|
||||
|
||||
#: builtin/notes.c
|
||||
msgid "remove unnecessary whitespace"
|
||||
msgstr "hapus spasi yang tidak diperlukan"
|
||||
|
||||
#: builtin/notes.c
|
||||
#, c-format
|
||||
msgid ""
|
||||
@@ -11771,8 +11690,11 @@ msgid "refusing to run without --i-still-use-this"
|
||||
msgstr "menolak menjalankan tanpa --i-still-use-this"
|
||||
|
||||
#: builtin/pack-refs.c
|
||||
msgid "git pack-refs [--all] [--no-prune]"
|
||||
msgstr "git pack-refs [--all] [--no-prune]"
|
||||
msgid ""
|
||||
"git pack-refs [--all] [--no-prune] [--include <pattern>] [--exclude "
|
||||
"<pattern>]"
|
||||
msgstr ""
|
||||
"git pack-refs [--all] [--no-prune] [--include <pola>] [--exclude <pola>]"
|
||||
|
||||
#: builtin/pack-refs.c
|
||||
msgid "pack everything"
|
||||
@@ -11782,6 +11704,14 @@ msgstr "pak semuanya"
|
||||
msgid "prune loose refs (default)"
|
||||
msgstr "pangkas referensi longgar (asali)"
|
||||
|
||||
#: builtin/pack-refs.c
|
||||
msgid "references to include"
|
||||
msgstr "referensi untuk ditambahkan"
|
||||
|
||||
#: builtin/pack-refs.c
|
||||
msgid "references to exclude"
|
||||
msgstr "referensi untuk dikecualikan"
|
||||
|
||||
#: builtin/patch-id.c
|
||||
msgid "git patch-id [--stable | --unstable | --verbatim]"
|
||||
msgstr "git patch-id [--stable | --unstable | --verbatim]"
|
||||
@@ -11858,6 +11788,14 @@ msgstr "paksa timpa cabang lokal"
|
||||
msgid "number of submodules pulled in parallel"
|
||||
msgstr "nomor submodul ditarik dalam paralel"
|
||||
|
||||
#: builtin/pull.c parse-options.h
|
||||
msgid "use IPv4 addresses only"
|
||||
msgstr "gunakan hanya alamat IPv4"
|
||||
|
||||
#: builtin/pull.c parse-options.h
|
||||
msgid "use IPv6 addresses only"
|
||||
msgstr "gunakan hanya alamat IPv6"
|
||||
|
||||
#: builtin/pull.c
|
||||
msgid ""
|
||||
"There is no candidate for rebasing against among the refs that you just "
|
||||
@@ -12163,39 +12101,39 @@ msgstr ""
|
||||
#: builtin/push.c
|
||||
msgid ""
|
||||
"Updates were rejected because the tip of your current branch is behind\n"
|
||||
"its remote counterpart. Integrate the remote changes (e.g.\n"
|
||||
"'git pull ...') before pushing again.\n"
|
||||
"its remote counterpart. If you want to integrate the remote changes,\n"
|
||||
"use 'git pull' before pushing again.\n"
|
||||
"See the 'Note about fast-forwards' in 'git push --help' for details."
|
||||
msgstr ""
|
||||
"Pembaruan ditolak karena ujung dari cabang Anda saat ini di belakang\n"
|
||||
"pasangan remotenya. Integrasikan perubahan remote (seperti\n"
|
||||
"'git pull') sebelum dorong lagi.\n"
|
||||
"pasangan remotenya. Jika Anda ingin mengintegrasikan perubahan remote,\n"
|
||||
"lakukan 'git pull' sebelum mendorong lagi.\n"
|
||||
"Lihat 'Note about fast-forwards' di 'git push --help' untuk selengkapnya."
|
||||
|
||||
#: builtin/push.c
|
||||
msgid ""
|
||||
"Updates were rejected because a pushed branch tip is behind its remote\n"
|
||||
"counterpart. Check out this branch and integrate the remote changes\n"
|
||||
"(e.g. 'git pull ...') before pushing again.\n"
|
||||
"counterpart. If you want to integrate the remote changes, use 'git pull'\n"
|
||||
"before pushing again.\n"
|
||||
"See the 'Note about fast-forwards' in 'git push --help' for details."
|
||||
msgstr ""
|
||||
"Pembaruan ditolak karena ujung dari cabang yang didorong di belakang\n"
|
||||
"pasangan remotenya. Check out cabang itu dan integrasikan perubahan\n"
|
||||
"remote (seperti 'git pull') sebelum dorong lagi.\n"
|
||||
"pasangan remotenya. Jika anda ingin mengintegrasikan perubahan\n"
|
||||
"remote, lakukan 'git pull' sebelum mendorong lagi.\n"
|
||||
"Lihat 'Note about fast-forwards' di 'git push --help' untuk selengkapnya."
|
||||
|
||||
#: builtin/push.c
|
||||
msgid ""
|
||||
"Updates were rejected because the remote contains work that you do\n"
|
||||
"not have locally. This is usually caused by another repository pushing\n"
|
||||
"to the same ref. You may want to first integrate the remote changes\n"
|
||||
"(e.g., 'git pull ...') before pushing again.\n"
|
||||
"Updates were rejected because the remote contains work that you do not\n"
|
||||
"have locally. This is usually caused by another repository pushing to\n"
|
||||
"the same ref. If you want to integrate the remote changes, use\n"
|
||||
"'git pull' before pushing again.\n"
|
||||
"See the 'Note about fast-forwards' in 'git push --help' for details."
|
||||
msgstr ""
|
||||
"Pembaruan ditolak karena remote berisi kerja yang Anda tidak punya\n"
|
||||
"Pembaruan ditolak karena remote berisi karya yang Anda tidak punya\n"
|
||||
"di lokal. Ini biasanya disebabkan repositori yang lain dorong ke\n"
|
||||
"referensi yang sama. Mungkin Anda ingin integrasikan terlebih dahulu\n"
|
||||
"perubahan remote (seperti 'git pull') sebelum dorong lagi.\n"
|
||||
"referensi yang sama. Jika Anda ingin mengintegrasikan perubahan remote\n"
|
||||
"lakukan 'git pull' sebelum mendorong lagi.\n"
|
||||
"Lihat 'Note about fast-forwards' di 'git push --help' untuk selengkapnya."
|
||||
|
||||
#: builtin/push.c
|
||||
@@ -12214,15 +12152,15 @@ msgstr ""
|
||||
|
||||
#: builtin/push.c
|
||||
msgid ""
|
||||
"Updates were rejected because the tip of the remote-tracking\n"
|
||||
"branch has been updated since the last checkout. You may want\n"
|
||||
"to integrate those changes locally (e.g., 'git pull ...')\n"
|
||||
"before forcing an update.\n"
|
||||
"Updates were rejected because the tip of the remote-tracking branch has\n"
|
||||
"been updated since the last checkout. If you want to integrate the\n"
|
||||
"remote changes, use 'git pull' before pushing again.\n"
|
||||
"See the 'Note about fast-forwards' in 'git push --help' for details."
|
||||
msgstr ""
|
||||
"Pembaruan ditolak karena ujung dari cabang pelacak remote\n"
|
||||
"sudah diperbarui sejak checkout terakhir. Mungkin Anda ingin\n"
|
||||
"integrasikan perubahan tersebut ke lokal (seperti 'git pull...')\n"
|
||||
"sebelum memaksa pembaruan.\n"
|
||||
"Pembaruan ditolak karena ujung dari cabang Anda saat ini sudah diperbarui\n"
|
||||
"sejak checkout terakhir. Jika Anda ingin mengintegrasikan perubahan remote,\n"
|
||||
"lakukan 'git pull' sebelum mendorong lagi.\n"
|
||||
"Lihat 'Note about fast-forwards' di 'git push --help' untuk selengkapnya."
|
||||
|
||||
#: builtin/push.c
|
||||
#, c-format
|
||||
@@ -12614,8 +12552,8 @@ msgstr "opsi apply dan opsi merge tidak dapat digunakan bersamaan"
|
||||
#: builtin/rebase.c
|
||||
#, c-format
|
||||
msgid ""
|
||||
"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
|
||||
"\"."
|
||||
"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and "
|
||||
"\"ask\"."
|
||||
msgstr ""
|
||||
"tipe kosong tak dikenali '%s'; nilai yang valid adalah \"drop\", \"keep\", "
|
||||
"dan \"ask\"."
|
||||
@@ -13282,12 +13220,12 @@ msgid "fetch the remote branches"
|
||||
msgstr "ambil cabang remote"
|
||||
|
||||
#: builtin/remote.c
|
||||
msgid "import all tags and associated objects when fetching"
|
||||
msgstr "impor semua tag dan objek yang terkait ketika mengambil"
|
||||
|
||||
#: builtin/remote.c
|
||||
msgid "or do not fetch any tag at all (--no-tags)"
|
||||
msgstr "atau jangan mengambil tag apapun (--no-tags)"
|
||||
msgid ""
|
||||
"import all tags and associated objects when fetching\n"
|
||||
"or do not fetch any tag at all (--no-tags)"
|
||||
msgstr ""
|
||||
"impor semua tag dan objek yang terkait ketika mengambil atau jangan\n"
|
||||
"mengambil tag apapun (--no-tags)"
|
||||
|
||||
#: builtin/remote.c
|
||||
msgid "branch(es) to track"
|
||||
@@ -15719,6 +15657,11 @@ msgstr "Melewati submodul tak tergabung %s"
|
||||
msgid "Skipping submodule '%s'"
|
||||
msgstr "Melewati submodul '%s'"
|
||||
|
||||
#: builtin/submodule--helper.c
|
||||
#, c-format
|
||||
msgid "cannot clone submodule '%s' without a URL"
|
||||
msgstr "tidak dapat mengkloning submodul '%s' tanpa URL"
|
||||
|
||||
#: builtin/submodule--helper.c
|
||||
#, c-format
|
||||
msgid "Failed to clone '%s'. Retry scheduled"
|
||||
@@ -16651,10 +16594,10 @@ msgstr "cetak isi tag"
|
||||
#: builtin/worktree.c
|
||||
msgid ""
|
||||
"git worktree add [-f] [--detach] [--checkout] [--lock [--reason <string>]]\n"
|
||||
" [-b <new-branch>] <path> [<commit-ish>]"
|
||||
" [--orphan] [(-b | -B) <new-branch>] <path> [<commit-ish>]"
|
||||
msgstr ""
|
||||
"git worktree add [-f] [--detach] [--checkout] [--lock [--reason <untai>]]\n"
|
||||
" [-b <cabang baru>] <jalur> [<mirip komit>]"
|
||||
" [--orphan] [(-b | -B) <cabang baru>] <jalur> [<mirip komit>]"
|
||||
|
||||
#: builtin/worktree.c
|
||||
msgid "git worktree list [-v | --porcelain [-z]]"
|
||||
@@ -16684,6 +16627,38 @@ msgstr "git worktree repair [<jalur>...]"
|
||||
msgid "git worktree unlock <worktree>"
|
||||
msgstr "git worktree unlock <worktree>"
|
||||
|
||||
#: builtin/worktree.c
|
||||
msgid "No possible source branch, inferring '--orphan'"
|
||||
msgstr "Tidak ada cabang sumber yang mungkin, menyimpulkan '--orphan'"
|
||||
|
||||
#: builtin/worktree.c
|
||||
#, c-format
|
||||
msgid ""
|
||||
"If you meant to create a worktree containing a new orphan branch\n"
|
||||
"(branch with no commits) for this repository, you can do so\n"
|
||||
"using the --orphan flag:\n"
|
||||
"\n"
|
||||
" git worktree add --orphan -b %s %s\n"
|
||||
msgstr ""
|
||||
"Jika maksud Anda ingin membuat pohon kerja berisi sebuah cabang yatim baru\n"
|
||||
"(cabang tanpa komit) untuk repositori ini, Anda dapat melakukannya dengan\n"
|
||||
"opsi --orphan:\n"
|
||||
" git worktree add --orphan -b %s %s\n"
|
||||
|
||||
#: builtin/worktree.c
|
||||
#, c-format
|
||||
msgid ""
|
||||
"If you meant to create a worktree containing a new orphan branch\n"
|
||||
"(branch with no commits) for this repository, you can do so\n"
|
||||
"using the --orphan flag:\n"
|
||||
"\n"
|
||||
" git worktree add --orphan %s\n"
|
||||
msgstr ""
|
||||
"Jika maksud Anda ingin membuat pohon kerja berisi sebuah cabang yatim baru\n"
|
||||
"(cabang tanpa komit) untuk repositori ini, Anda dapat melakukannya dengan\n"
|
||||
"opsi --orphan:\n"
|
||||
" git worktree add --orphan %s\n"
|
||||
|
||||
#: builtin/worktree.c
|
||||
#, c-format
|
||||
msgid "Removing %s/%s: %s"
|
||||
@@ -16767,11 +16742,42 @@ msgstr ""
|
||||
msgid "Preparing worktree (checking out '%s')"
|
||||
msgstr "Menyiapkan pohon kerja (men-checkout '%s')"
|
||||
|
||||
#: builtin/worktree.c
|
||||
#, c-format
|
||||
msgid "unreachable: invalid reference: %s"
|
||||
msgstr "tidak dapat dicapat: referensi tidak valid: %s"
|
||||
|
||||
#: builtin/worktree.c
|
||||
#, c-format
|
||||
msgid "Preparing worktree (detached HEAD %s)"
|
||||
msgstr "Menyiapkan pohon kerja (HEAD terpisah %s)"
|
||||
|
||||
#: builtin/worktree.c
|
||||
#, c-format
|
||||
msgid ""
|
||||
"HEAD points to an invalid (or orphaned) reference.\n"
|
||||
"HEAD path: '%s'\n"
|
||||
"HEAD contents: '%s'"
|
||||
msgstr ""
|
||||
"HEAD menunjuk pada referensi tidak valid (atau yatim).\n"
|
||||
"Jalur HEAD: '%s'\n"
|
||||
"Isi HEAD: '%s'"
|
||||
|
||||
#: builtin/worktree.c
|
||||
msgid ""
|
||||
"No local or remote refs exist despite at least one remote\n"
|
||||
"present, stopping; use 'add -f' to overide or fetch a remote first"
|
||||
msgstr ""
|
||||
"Tidak ada referensi lokal atau remote yang ada meskipun salah satu remote\n"
|
||||
"ada, berhenti. Gunakan 'add -f' untuk menimpa atau mengambil remote "
|
||||
"terlebih\n"
|
||||
"dahulu"
|
||||
|
||||
#: builtin/worktree.c
|
||||
#, c-format
|
||||
msgid "'%s' and '%s' cannot be used together"
|
||||
msgstr "'%s' dan '%s' tidak dapat digunakan bersamaan"
|
||||
|
||||
#: builtin/worktree.c
|
||||
msgid "checkout <branch> even if already checked out in other worktree"
|
||||
msgstr ""
|
||||
@@ -16785,6 +16791,10 @@ msgstr "buat sebuah cabang baru"
|
||||
msgid "create or reset a branch"
|
||||
msgstr "buat atau setel ulang sebuah cabang"
|
||||
|
||||
#: builtin/worktree.c
|
||||
msgid "create unborn/orphaned branch"
|
||||
msgstr "buat cabang belum lahir/yatim"
|
||||
|
||||
#: builtin/worktree.c
|
||||
msgid "populate the new working tree"
|
||||
msgstr "isikan pohon kerja baru"
|
||||
@@ -16810,6 +16820,15 @@ msgstr "coba cocokkan nama cabang baru dengan sebuah cabang pelacakan remote"
|
||||
msgid "options '%s', '%s', and '%s' cannot be used together"
|
||||
msgstr "Opsi '%s', '%s', dan '%s' tidak dapat digunakan bersamaan"
|
||||
|
||||
#: builtin/worktree.c
|
||||
#, c-format
|
||||
msgid "options '%s', and '%s' cannot be used together"
|
||||
msgstr "Opsi '%s', dan '%s' tidak dapat digunakan bersamaan"
|
||||
|
||||
#: builtin/worktree.c
|
||||
msgid "<commit-ish>"
|
||||
msgstr "<mirip-komit>"
|
||||
|
||||
#: builtin/worktree.c
|
||||
msgid "added with --lock"
|
||||
msgstr "tambahkan dengan --lock"
|
||||
@@ -17095,6 +17114,16 @@ msgid_plural "The bundle requires these %<PRIuMAX> refs:"
|
||||
msgstr[0] "Bundel membutuhkan referensi ini:"
|
||||
msgstr[1] "Bundel membutuhkan %<PRIuMAX> referensi berikut:"
|
||||
|
||||
#: bundle.c
|
||||
#, c-format
|
||||
msgid "The bundle uses this hash algorithm: %s"
|
||||
msgstr "Bundel menggunakan algoritma hash ini: %s"
|
||||
|
||||
#: bundle.c
|
||||
#, c-format
|
||||
msgid "The bundle uses this filter: %s"
|
||||
msgstr "Bundel menggunakan penyaring ini: %s"
|
||||
|
||||
#: bundle.c
|
||||
msgid "unable to dup bundle descriptor"
|
||||
msgstr "tidak dapat men-dup pendeskripsi bundel"
|
||||
@@ -17398,8 +17427,8 @@ msgid "A portable graphical interface to Git"
|
||||
msgstr "Sebuah antarmuka grafis Git portabel"
|
||||
|
||||
#: command-list.h
|
||||
msgid "Compute object ID and optionally creates a blob from a file"
|
||||
msgstr "Hitung ID objek dan buat blob dari berkas (opsional)"
|
||||
msgid "Compute object ID and optionally create an object from a file"
|
||||
msgstr "Hitung ID objek dan buat objeck dari berkas (opsional)"
|
||||
|
||||
#: command-list.h
|
||||
msgid "Display help information about Git"
|
||||
@@ -17941,6 +17970,11 @@ msgstr "grafik komit tidak punya bingkah grafik dasar"
|
||||
msgid "commit-graph chain does not match"
|
||||
msgstr "rantai grafik komit tidak cocok"
|
||||
|
||||
#: commit-graph.c
|
||||
#, c-format
|
||||
msgid "commit count in base graph too high: %<PRIuMAX>"
|
||||
msgstr "jumlah komit pada grafik dasar terlalu tinggi: %<PRIuMAX>"
|
||||
|
||||
#: commit-graph.c
|
||||
#, c-format
|
||||
msgid "invalid commit-graph chain: line '%s' not a hash"
|
||||
@@ -18048,6 +18082,16 @@ msgstr "gagal menamai ulang berkas grafik komit dasar"
|
||||
msgid "failed to rename temporary commit-graph file"
|
||||
msgstr "gagal menamai ulang berkas grafik komit sementara"
|
||||
|
||||
#: commit-graph.c
|
||||
#, c-format
|
||||
msgid "cannot merge graphs with %<PRIuMAX>, %<PRIuMAX> commits"
|
||||
msgstr "tidak dapat menggabungkan grafik dengan %<PRIuMAX>, %<PRIuMAX> komit"
|
||||
|
||||
#: commit-graph.c
|
||||
#, c-format
|
||||
msgid "cannot merge graph %s, too many commits: %<PRIuMAX>"
|
||||
msgstr "tidak dapat menggabungkan grafik %s, terlalu banyak komit: %<PRIuMAX>"
|
||||
|
||||
#: commit-graph.c
|
||||
msgid "Scanning merged commits"
|
||||
msgstr "Memindai komit tergabung"
|
||||
@@ -18083,10 +18127,6 @@ msgstr "grafik komit punya nilai kipas keluar salah: fanout[%d] = %u != %u"
|
||||
msgid "failed to parse commit %s from commit-graph"
|
||||
msgstr "gagal menguraikan komit %s dari grafik komit"
|
||||
|
||||
#: commit-graph.c
|
||||
msgid "Verifying commits in commit graph"
|
||||
msgstr "Memverifikasi komit di dalam grafik komit"
|
||||
|
||||
#: commit-graph.c
|
||||
#, c-format
|
||||
msgid "failed to parse commit %s from object database for commit-graph"
|
||||
@@ -18140,6 +18180,10 @@ msgstr ""
|
||||
"tanggal komit untuk komit %s di dalam grafik komit yaitu %<PRIuMAX> != "
|
||||
"%<PRIuMAX>"
|
||||
|
||||
#: commit-graph.c
|
||||
msgid "Verifying commits in commit graph"
|
||||
msgstr "Memverifikasi komit di dalam grafik komit"
|
||||
|
||||
#: commit.c
|
||||
#, c-format
|
||||
msgid "%s %s is not a commit!"
|
||||
@@ -19313,6 +19357,14 @@ msgstr "dasar penggabungan tidak ditemukan"
|
||||
msgid "multiple merge bases found"
|
||||
msgstr "banyak dasar penggabungan ditemukan"
|
||||
|
||||
#: diff-no-index.c
|
||||
msgid "cannot compare stdin to a directory"
|
||||
msgstr "tidak dapat membandingkan masukan standar dan sebuah direktori"
|
||||
|
||||
#: diff-no-index.c
|
||||
msgid "cannot compare a named pipe to a directory"
|
||||
msgstr "tidak dapat membandingkan pipa bernama dan sebuah direktori"
|
||||
|
||||
#: diff-no-index.c
|
||||
msgid "git diff --no-index [<options>] <path> <path>"
|
||||
msgstr "git diff --no-index [<opsi>] <jalur> <jalur>"
|
||||
@@ -19380,6 +19432,15 @@ msgstr ""
|
||||
msgid "external diff died, stopping at %s"
|
||||
msgstr "diff eksternal mati, berhenti pada %s"
|
||||
|
||||
#: diff.c
|
||||
msgid "--follow requires exactly one pathspec"
|
||||
msgstr "--follow butuh tepatnya satu spek jalur"
|
||||
|
||||
#: diff.c
|
||||
#, c-format
|
||||
msgid "pathspec magic not supported by --follow: %s"
|
||||
msgstr "spek jalur ajaib tidak didukung oleh --follow: %s"
|
||||
|
||||
#: diff.c parse-options.c
|
||||
#, c-format
|
||||
msgid "options '%s', '%s', '%s', and '%s' cannot be used together"
|
||||
@@ -19399,10 +19460,6 @@ msgstr ""
|
||||
"opsi '%s' dan '%s' tidak dapat digunakan bersamaan, gunakan '%s' dengan '%s' "
|
||||
"dan '%s'"
|
||||
|
||||
#: diff.c
|
||||
msgid "--follow requires exactly one pathspec"
|
||||
msgstr "--follow butuh tepatnya satu spek jalur"
|
||||
|
||||
#: diff.c
|
||||
#, c-format
|
||||
msgid "invalid --stat value: %s"
|
||||
@@ -21468,8 +21525,8 @@ msgstr ""
|
||||
#: merge-recursive.c
|
||||
#, c-format
|
||||
msgid ""
|
||||
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
|
||||
"\"->\"%s\" in \"%s\"%s"
|
||||
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename "
|
||||
"\"%s\"->\"%s\" in \"%s\"%s"
|
||||
msgstr ""
|
||||
"KONFLIK (penamaan ulang/penamaan ulang): Penamaan ulang \"%s\"->\"%s\" di "
|
||||
"dalam cabang \"%s\" penamaan ulang \"%s\"->\"%s\" di \"%s\"%s"
|
||||
@@ -22947,6 +23004,15 @@ msgstr "gagal membuat diff"
|
||||
msgid "could not parse log for '%s'"
|
||||
msgstr "tidak dapat menguraikan log untuk '%s'"
|
||||
|
||||
#: reachable.c
|
||||
#, c-format
|
||||
msgid "invalid extra cruft tip: '%s'"
|
||||
msgstr "ujung sampah tambahan tidak valid: '%s'"
|
||||
|
||||
#: reachable.c
|
||||
msgid "unable to enumerate additional recent objects"
|
||||
msgstr "tidak dapat menghitung objeck terkini tambahan"
|
||||
|
||||
#: read-cache.c
|
||||
#, c-format
|
||||
msgid "will not add file alias '%s' ('%s' already exists in index)"
|
||||
@@ -23137,6 +23203,16 @@ msgstr "tidak dapat memperbaiki bit perizinan pada '%s'"
|
||||
msgid "%s: cannot drop to stage #0"
|
||||
msgstr "%s: tidak dapat menurunkan ke tahap #0"
|
||||
|
||||
#: read-cache.c
|
||||
#, c-format
|
||||
msgid "unexpected diff status %c"
|
||||
msgstr "status diff tak diharapkan %c"
|
||||
|
||||
#: read-cache.c
|
||||
#, c-format
|
||||
msgid "remove '%s'\n"
|
||||
msgstr "hapus '%s'\n"
|
||||
|
||||
#: rebase-interactive.c
|
||||
msgid ""
|
||||
"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
|
||||
@@ -23358,6 +23434,26 @@ msgstr "argumen %%(trailers) tidak dikenal: %s"
|
||||
msgid "positive value expected contents:lines=%s"
|
||||
msgstr "nilai positif diharapkan contents:lines=%s"
|
||||
|
||||
#: ref-filter.c
|
||||
#, c-format
|
||||
msgid "argument expected for %s"
|
||||
msgstr "argumen diharapkan untuk %s"
|
||||
|
||||
#: ref-filter.c
|
||||
#, c-format
|
||||
msgid "positive value expected %s=%s"
|
||||
msgstr "nilai positif %s=%s diharapkan"
|
||||
|
||||
#: ref-filter.c
|
||||
#, c-format
|
||||
msgid "cannot fully parse %s=%s"
|
||||
msgstr "tidak dapat menguraikan penuh %s=%s"
|
||||
|
||||
#: ref-filter.c
|
||||
#, c-format
|
||||
msgid "value expected %s="
|
||||
msgstr "nilai %s= diharapkan"
|
||||
|
||||
#: ref-filter.c
|
||||
#, c-format
|
||||
msgid "positive value expected '%s' in %%(%s)"
|
||||
@@ -23450,6 +23546,10 @@ msgstr "perintah ini menolak atom %%(%.*s)"
|
||||
msgid "--format=%.*s cannot be used with --python, --shell, --tcl"
|
||||
msgstr "--format=%.*s tidak dapat digunakan dengan --python, --shell, --tcl"
|
||||
|
||||
#: ref-filter.c
|
||||
msgid "failed to run 'describe'"
|
||||
msgstr "gagal menjalankan 'describe'"
|
||||
|
||||
#: ref-filter.c
|
||||
#, c-format
|
||||
msgid "(no branch, rebasing %s)"
|
||||
@@ -23527,6 +23627,10 @@ msgstr "kunci"
|
||||
msgid "field name to sort on"
|
||||
msgstr "nama bidang untuk diurutkan"
|
||||
|
||||
#: ref-filter.h
|
||||
msgid "exclude refs which match pattern"
|
||||
msgstr "hanya gunakan referensi yang cocok dengan pola"
|
||||
|
||||
#: reflog.c
|
||||
#, c-format
|
||||
msgid "not a reflog: %s"
|
||||
@@ -24067,8 +24171,11 @@ msgstr[1] ""
|
||||
"dan masing-masing punya %d dan %d komit berbeda.\n"
|
||||
|
||||
#: remote.c
|
||||
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
|
||||
msgstr " (gunakan \"git pull\" untuk gabungkan cabang remote ke milik Anda)\n"
|
||||
msgid ""
|
||||
" (use \"git pull\" if you want to integrate the remote branch with yours)\n"
|
||||
msgstr ""
|
||||
" (gunakan \"git pull\" jika Anda ingin mengintegrasikan cabang remote pada\n"
|
||||
" milik Anda)\n"
|
||||
|
||||
#: remote.c
|
||||
#, c-format
|
||||
@@ -24210,6 +24317,11 @@ msgstr "tidak dapat mendapatkan komit untuk argumen jalur leluhur '%s'"
|
||||
msgid "--unpacked=<packfile> no longer supported"
|
||||
msgstr "--unpacked=<berkas pak> tidak didukung lagi"
|
||||
|
||||
#: revision.c
|
||||
#, c-format
|
||||
msgid "invalid option '%s' in --stdin mode"
|
||||
msgstr "opsi tidak valid: '%s' di mode --stdin"
|
||||
|
||||
#: revision.c
|
||||
msgid "your current branch appears to be broken"
|
||||
msgstr "sepertinya cabang Anda saat ini rusak"
|
||||
@@ -25618,6 +25730,95 @@ msgstr "penggarpuan gagal"
|
||||
msgid "setsid failed"
|
||||
msgstr "setsid gagal"
|
||||
|
||||
#: setup.c
|
||||
#, c-format
|
||||
msgid "cannot stat template '%s'"
|
||||
msgstr "tidak dapat men-stat templat '%s'"
|
||||
|
||||
#: setup.c
|
||||
#, c-format
|
||||
msgid "cannot opendir '%s'"
|
||||
msgstr "tidak dapat membuka direktori '%s'"
|
||||
|
||||
#: setup.c
|
||||
#, c-format
|
||||
msgid "cannot readlink '%s'"
|
||||
msgstr "tidak dapat membaca tautan '%s'"
|
||||
|
||||
#: setup.c
|
||||
#, c-format
|
||||
msgid "cannot symlink '%s' '%s'"
|
||||
msgstr "tidak dapat menautkan simbolik '%s' '%s'"
|
||||
|
||||
#: setup.c
|
||||
#, c-format
|
||||
msgid "cannot copy '%s' to '%s'"
|
||||
msgstr "tidak dapat menyalin '%s' ke '%s'"
|
||||
|
||||
#: setup.c
|
||||
#, c-format
|
||||
msgid "ignoring template %s"
|
||||
msgstr "mengabaikan templat %s"
|
||||
|
||||
#: setup.c
|
||||
#, c-format
|
||||
msgid "templates not found in %s"
|
||||
msgstr "templat tidak ditemukan di %s"
|
||||
|
||||
#: setup.c
|
||||
#, c-format
|
||||
msgid "not copying templates from '%s': %s"
|
||||
msgstr "tidak menyalin templat dari '%s': %s"
|
||||
|
||||
#: setup.c
|
||||
#, c-format
|
||||
msgid "invalid initial branch name: '%s'"
|
||||
msgstr "nama cabang asal salah: '%s'"
|
||||
|
||||
#: setup.c
|
||||
#, c-format
|
||||
msgid "unable to handle file type %d"
|
||||
msgstr "tidak dapat menangani tipe berkas %d"
|
||||
|
||||
#: setup.c
|
||||
#, c-format
|
||||
msgid "unable to move %s to %s"
|
||||
msgstr "tidak dapat memindahkan %s ke %s"
|
||||
|
||||
#: setup.c
|
||||
msgid "attempt to reinitialize repository with different hash"
|
||||
msgstr "mencoba menginisialisasi ulang repositori dengan hash yang berbeda"
|
||||
|
||||
#: setup.c
|
||||
#, c-format
|
||||
msgid "%s already exists"
|
||||
msgstr "%s sudah ada"
|
||||
|
||||
#: setup.c
|
||||
#, c-format
|
||||
msgid "re-init: ignored --initial-branch=%s"
|
||||
msgstr "re-init: --initial-branch=%s diabaikan"
|
||||
|
||||
#: setup.c
|
||||
#, c-format
|
||||
msgid "Reinitialized existing shared Git repository in %s%s\n"
|
||||
msgstr "Repositori berbagi Git yang sudah ada diinisialisasi ulang di %s%s\n"
|
||||
|
||||
#: setup.c
|
||||
#, c-format
|
||||
msgid "Reinitialized existing Git repository in %s%s\n"
|
||||
msgstr "Repositori Git diinisialisasi ulang di %s%s\n"
|
||||
|
||||
#: setup.c
|
||||
#, c-format
|
||||
msgid "Initialized empty shared Git repository in %s%s\n"
|
||||
msgstr "Repositori berbagi Git kosong diinisialisasi di %s%s\n"
|
||||
|
||||
#: setup.c
|
||||
#, c-format
|
||||
msgid "Initialized empty Git repository in %s%s\n"
|
||||
msgstr "Repositori Git kosong dinisialisasi di %s%s\n"
|
||||
|
||||
#: sparse-index.c
|
||||
#, c-format
|
||||
msgid "index entry is a directory, but not sparse (%08x)"
|
||||
@@ -27845,3 +28046,22 @@ msgstr "Melewati %s dengan akhiran cadangan '%s'.\n"
|
||||
#, perl-format
|
||||
msgid "Do you really want to send %s? [y|N]: "
|
||||
msgstr "Anda benar-benar ingin mengirim %s? [y|N]: "
|
||||
|
||||
#~ msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
|
||||
#~ msgstr ""
|
||||
#~ "jangan lewatkan opsi --keep-cr ke git-mailsplit tak bergantung pada am."
|
||||
#~ "keepcr"
|
||||
|
||||
#~ msgid ""
|
||||
#~ "Updates were rejected because the tip of the remote-tracking\n"
|
||||
#~ "branch has been updated since the last checkout. You may want\n"
|
||||
#~ "to integrate those changes locally (e.g., 'git pull ...')\n"
|
||||
#~ "before forcing an update.\n"
|
||||
#~ msgstr ""
|
||||
#~ "Pembaruan ditolak karena ujung dari cabang pelacak remote\n"
|
||||
#~ "sudah diperbarui sejak checkout terakhir. Mungkin Anda ingin\n"
|
||||
#~ "integrasikan perubahan tersebut ke lokal (seperti 'git pull...')\n"
|
||||
#~ "sebelum memaksa pembaruan.\n"
|
||||
|
||||
#~ msgid "or do not fetch any tag at all (--no-tags)"
|
||||
#~ msgstr "atau jangan mengambil tag apapun (--no-tags)"
|
||||
|
||||
493
po/sv.po
493
po/sv.po
@@ -5,12 +5,12 @@
|
||||
#
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: git 2.41.0\n"
|
||||
"Project-Id-Version: git 2.42.0\n"
|
||||
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
|
||||
"POT-Creation-Date: 2023-05-31 13:14+0100\n"
|
||||
"PO-Revision-Date: 2023-05-31 13:15+0100\n"
|
||||
"POT-Creation-Date: 2023-08-16 07:40+0100\n"
|
||||
"PO-Revision-Date: 2023-08-16 07:42+0100\n"
|
||||
"Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"
|
||||
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
|
||||
"Language-Team: Svenska <tp-sv@listor.tp-sv.se>\n"
|
||||
"Language: sv\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
@@ -619,13 +619,11 @@ msgstr "%stips: %.*s%s\n"
|
||||
|
||||
msgid "Cherry-picking is not possible because you have unmerged files."
|
||||
msgstr ""
|
||||
"Du kan inte utföra en cherry-pick eftersom du har filer som inte slagits "
|
||||
"Du kan inte utföra en \"cherry-pick\" eftersom du har filer som inte slagits "
|
||||
"samman."
|
||||
|
||||
msgid "Committing is not possible because you have unmerged files."
|
||||
msgstr ""
|
||||
"Du kan inte utföra en incheckning eftersom du har filer som inte slagits "
|
||||
"samman."
|
||||
msgstr "Du kan inte checka in eftersom du har filer som inte slagits samman."
|
||||
|
||||
msgid "Merging is not possible because you have unmerged files."
|
||||
msgstr ""
|
||||
@@ -637,14 +635,10 @@ msgstr ""
|
||||
"Du kan inte utföra en \"pull\" eftersom du har filer som inte slagits samman."
|
||||
|
||||
msgid "Reverting is not possible because you have unmerged files."
|
||||
msgstr ""
|
||||
"Du kan inte utföra en \"revert\" eftersom du har filer som inte slagits "
|
||||
"samman."
|
||||
msgstr "Du kan inte återställa eftersom du har filer som inte slagits samman."
|
||||
|
||||
#, c-format
|
||||
msgid "It is not possible to %s because you have unmerged files."
|
||||
msgstr ""
|
||||
"Du kan inte utföra en \"%s\" eftersom du har filer som inte slagits samman."
|
||||
msgid "Rebasing is not possible because you have unmerged files."
|
||||
msgstr "Du kan inte ombasera eftersom du har filer som inte slagits samman."
|
||||
|
||||
msgid ""
|
||||
"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
|
||||
@@ -790,6 +784,12 @@ msgstr "flaggorna \"%s\" och \"%s\" kan inte användas samtidigt"
|
||||
msgid "'%s' outside a repository"
|
||||
msgstr "\"%s\" utanför arkiv"
|
||||
|
||||
msgid "failed to read patch"
|
||||
msgstr "misslyckades läsa patchen"
|
||||
|
||||
msgid "patch too large"
|
||||
msgstr "patchen är för stor"
|
||||
|
||||
#, c-format
|
||||
msgid "Cannot prepare timestamp regexp %s"
|
||||
msgstr "Kan inte förbereda reguljärt uttryck för tidsstämpeln %s"
|
||||
@@ -1689,9 +1689,10 @@ msgid "a branch named '%s' already exists"
|
||||
msgstr "det finns redan en gren som heter \"%s\""
|
||||
|
||||
#, c-format
|
||||
msgid "cannot force update the branch '%s' checked out at '%s'"
|
||||
msgid "cannot force update the branch '%s' used by worktree at '%s'"
|
||||
msgstr ""
|
||||
"kan inte tvinga uppdatering av grenen \"%s\" som är utcheckad på \"%s\""
|
||||
"kan inte tvinga uppdatering av grenen \"%s\" som används av arbetskatalogen "
|
||||
"på \"%s\""
|
||||
|
||||
#, c-format
|
||||
msgid "cannot set up tracking information; starting point '%s' is not a branch"
|
||||
@@ -1760,17 +1761,6 @@ msgstr "git add [<flaggor>] [--] <sökväg>..."
|
||||
msgid "cannot chmod %cx '%s'"
|
||||
msgstr "kan inte utföra chmod %cx \"%s\""
|
||||
|
||||
#, c-format
|
||||
msgid "unexpected diff status %c"
|
||||
msgstr "diff-status %c förväntades inte"
|
||||
|
||||
msgid "updating files failed"
|
||||
msgstr "misslyckades uppdatera filer"
|
||||
|
||||
#, c-format
|
||||
msgid "remove '%s'\n"
|
||||
msgstr "ta bort \"%s\"\n"
|
||||
|
||||
msgid "Unstaged changes after refreshing the index:"
|
||||
msgstr "Oköade ändringar efter att ha uppdaterat indexet:"
|
||||
|
||||
@@ -2195,9 +2185,6 @@ msgstr "sänd flaggan -m till git-mailinfo"
|
||||
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
|
||||
msgstr "sänd flaggan --keep-cr till git-mailsplit för mbox-formatet"
|
||||
|
||||
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
|
||||
msgstr "sänd inte flaggan --keep-cr till git-mailsplit oberoende av am.keepcr"
|
||||
|
||||
msgid "strip everything before a scissors line"
|
||||
msgstr "ta bort allting före en saxlinje"
|
||||
|
||||
@@ -3235,12 +3222,12 @@ msgid ""
|
||||
"git cat-file (--batch | --batch-check | --batch-command) [--batch-all-"
|
||||
"objects]\n"
|
||||
" [--buffer] [--follow-symlinks] [--unordered]\n"
|
||||
" [--textconv | --filters] [-z]"
|
||||
" [--textconv | --filters] [-Z]"
|
||||
msgstr ""
|
||||
"git cat-file (--batch | --batch-check | --batch-command) [--batch-all-"
|
||||
"objects]\n"
|
||||
" [--buffer] [--follow-symlinks] [--unordered]\n"
|
||||
" [--textconv | --filters] [-z]"
|
||||
" [--textconv | --filters] [-Z]"
|
||||
|
||||
msgid ""
|
||||
"git cat-file (--textconv | --filters)\n"
|
||||
@@ -3286,6 +3273,9 @@ msgstr "som --batch, men mata inte ut <innehåll>"
|
||||
msgid "stdin is NUL-terminated"
|
||||
msgstr "standard in är NUL-terminerad"
|
||||
|
||||
msgid "stdin and stdout is NUL-terminated"
|
||||
msgstr "standard in och standard ut är NUL-terminerade"
|
||||
|
||||
msgid "read commands from stdin"
|
||||
msgstr "läs kommandon från standard in"
|
||||
|
||||
@@ -4145,12 +4135,6 @@ msgstr "serverspecifik"
|
||||
msgid "option to transmit"
|
||||
msgstr "flagga att sända"
|
||||
|
||||
msgid "use IPv4 addresses only"
|
||||
msgstr "använd endast IPv4-adresser"
|
||||
|
||||
msgid "use IPv6 addresses only"
|
||||
msgstr "använd endast IPv6-adresser"
|
||||
|
||||
msgid "apply partial clone filters to submodules"
|
||||
msgstr "tillämpa delvisa klonfilter på undermoduler"
|
||||
|
||||
@@ -4587,6 +4571,9 @@ msgstr ""
|
||||
" git cherry-pick --skip\n"
|
||||
"\n"
|
||||
|
||||
msgid "updating files failed"
|
||||
msgstr "misslyckades uppdatera filer"
|
||||
|
||||
msgid "failed to unpack HEAD tree object"
|
||||
msgstr "misslyckades packa upp HEAD:s trädobjekt"
|
||||
|
||||
@@ -4646,8 +4633,8 @@ msgstr ""
|
||||
"i det befintliga incheckningsmeddelandet"
|
||||
|
||||
#, c-format
|
||||
msgid "could not lookup commit %s"
|
||||
msgstr "kunde inte slå upp incheckningen %s"
|
||||
msgid "could not lookup commit '%s'"
|
||||
msgstr "kunde inte slå upp incheckningen \"%s\""
|
||||
|
||||
#, c-format
|
||||
msgid "(reading log message from standard input)\n"
|
||||
@@ -7243,77 +7230,6 @@ msgstr "--verify angavs utan paketfilnamn"
|
||||
msgid "fsck error in pack objects"
|
||||
msgstr "fsck-fel i packat objekt"
|
||||
|
||||
#, c-format
|
||||
msgid "cannot stat template '%s'"
|
||||
msgstr "kan inte ta status på mallen \"%s\""
|
||||
|
||||
#, c-format
|
||||
msgid "cannot opendir '%s'"
|
||||
msgstr "kan inte öppna katalogen (opendir) \"%s\""
|
||||
|
||||
#, c-format
|
||||
msgid "cannot readlink '%s'"
|
||||
msgstr "kan inte läsa länk (readlink) \"%s\""
|
||||
|
||||
#, c-format
|
||||
msgid "cannot symlink '%s' '%s'"
|
||||
msgstr "kan inte skapa symbolisk länk \"%s\" \"%s\""
|
||||
|
||||
#, c-format
|
||||
msgid "cannot copy '%s' to '%s'"
|
||||
msgstr "kan inte kopiera \"%s\" till \"%s\""
|
||||
|
||||
#, c-format
|
||||
msgid "ignoring template %s"
|
||||
msgstr "ignorerar mallen %s"
|
||||
|
||||
#, c-format
|
||||
msgid "templates not found in %s"
|
||||
msgstr "mallarna hittades inte i %s"
|
||||
|
||||
#, c-format
|
||||
msgid "not copying templates from '%s': %s"
|
||||
msgstr "kopierade inte mallar från \"%s\": %s"
|
||||
|
||||
#, c-format
|
||||
msgid "invalid initial branch name: '%s'"
|
||||
msgstr "ogiltigt namn på första gren: \"%s\""
|
||||
|
||||
#, c-format
|
||||
msgid "unable to handle file type %d"
|
||||
msgstr "kan inte hantera filtyp %d"
|
||||
|
||||
#, c-format
|
||||
msgid "unable to move %s to %s"
|
||||
msgstr "kan inte flytta %s till %s"
|
||||
|
||||
msgid "attempt to reinitialize repository with different hash"
|
||||
msgstr "försöker initiera arkivet på nytt med annan hash"
|
||||
|
||||
#, c-format
|
||||
msgid "%s already exists"
|
||||
msgstr "%s finns redan"
|
||||
|
||||
#, c-format
|
||||
msgid "re-init: ignored --initial-branch=%s"
|
||||
msgstr "re-init: ignorerade --initial-branch=%s"
|
||||
|
||||
#, c-format
|
||||
msgid "Reinitialized existing shared Git repository in %s%s\n"
|
||||
msgstr "Ominitierade befintligt delat Git-arkiv i %s%s\n"
|
||||
|
||||
#, c-format
|
||||
msgid "Reinitialized existing Git repository in %s%s\n"
|
||||
msgstr "Ominitierade befintligt Git-arkiv i %s%s\n"
|
||||
|
||||
#, c-format
|
||||
msgid "Initialized empty shared Git repository in %s%s\n"
|
||||
msgstr "Initierade tomt delat Git-arkiv i %s%s\n"
|
||||
|
||||
#, c-format
|
||||
msgid "Initialized empty Git repository in %s%s\n"
|
||||
msgstr "Initierade tomt Git-arkiv i %s%s\n"
|
||||
|
||||
msgid ""
|
||||
"git init [-q | --quiet] [--bare] [--template=<template-directory>]\n"
|
||||
" [--separate-git-dir <git-dir>] [--object-format=<format>]\n"
|
||||
@@ -7740,6 +7656,10 @@ msgid ""
|
||||
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
|
||||
msgstr "Kunde inte hitta en spårad fjärrgren, ange <uppström> manuellt.\n"
|
||||
|
||||
#, c-format
|
||||
msgid "could not get object info about '%s'"
|
||||
msgstr "kunde inte hämta objektinfo om \"%s\""
|
||||
|
||||
#, c-format
|
||||
msgid "bad ls-files format: element '%s' does not start with '('"
|
||||
msgstr "felaktigt ls-files-format: elementet \"%s\" börjar inte med \"(\""
|
||||
@@ -7882,10 +7802,6 @@ msgstr "visa underliggande referens och objektet det pekar på"
|
||||
msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
|
||||
msgstr "git ls-tree [<flaggor>] <träd-igt> [<sökväg>...]"
|
||||
|
||||
#, c-format
|
||||
msgid "could not get object info about '%s'"
|
||||
msgstr "kunde inte hämta objektinfo om \"%s\""
|
||||
|
||||
#, c-format
|
||||
msgid "bad ls-tree format: element '%s' does not start with '('"
|
||||
msgstr "felaktigt ls-tree-format: elementet \"%s\" börjar inte med \"(\""
|
||||
@@ -8612,22 +8528,26 @@ msgid "git notes [--ref <notes-ref>] [list [<object>]]"
|
||||
msgstr "git notes [--ref <anteckningsref>] [list [<objekt>]]"
|
||||
|
||||
msgid ""
|
||||
"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
|
||||
"| (-c | -C) <object>] [<object>]"
|
||||
"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [--[no-]separator|--"
|
||||
"separator=<paragraph-break>] [--[no-]stripspace] [-m <msg> | -F <file> | (-c "
|
||||
"| -C) <object>] [<object>]"
|
||||
msgstr ""
|
||||
"git notes [--ref <anteckningsref>] add [-f] [--allow-empty] [-m <medd> | -F "
|
||||
"<fil> | (-c | -C) <objekt>] [<objekt>]"
|
||||
"git notes [--ref <anteckningsref>] add [-f] [--allow-empty] [--"
|
||||
"[no-]separator|--separator=<styckebrytning>] [--[no-]stripspace] [-m <medd> "
|
||||
"| -F <fil> | (-c | -C) <objekt>] [<objekt>]"
|
||||
|
||||
msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
|
||||
msgstr ""
|
||||
"git notes [--ref <anteckningsref>] copy [-f] <från-objekt> <till-objekt>"
|
||||
|
||||
msgid ""
|
||||
"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
|
||||
"(-c | -C) <object>] [<object>]"
|
||||
"git notes [--ref <notes-ref>] append [--allow-empty] [--[no-]separator|--"
|
||||
"separator=<paragraph-break>] [--[no-]stripspace] [-m <msg> | -F <file> | (-c "
|
||||
"| -C) <object>] [<object>]"
|
||||
msgstr ""
|
||||
"git notes [--ref <anteckningsref>] append [--allow-empty] [-m <medd> | -F "
|
||||
"<fil> | (-c | -C) <objekt>] [<objekt>]"
|
||||
"git notes [--ref <anteckningsref>] append [--allow-empty] [--"
|
||||
"[no-]separator|--separator=<styckebrytning>] [--[no-]stripspace] [-m <medd> "
|
||||
"| -F <fil> | (-c | -C) <objekt>] [<objekt>]"
|
||||
|
||||
msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
|
||||
msgstr "git notes [--ref <anteckningsref>] edit [--allow-empty] [<objekt>]"
|
||||
@@ -8759,6 +8679,15 @@ msgstr "tillåt lagra tom anteckning"
|
||||
msgid "replace existing notes"
|
||||
msgstr "ersätt befintliga anteckningar"
|
||||
|
||||
msgid "<paragraph-break>"
|
||||
msgstr "<styckebrytning>"
|
||||
|
||||
msgid "insert <paragraph-break> between paragraphs"
|
||||
msgstr "sätt in <styckebrytning> mellan stycken"
|
||||
|
||||
msgid "remove unnecessary whitespace"
|
||||
msgstr "ta bort onödiga blanksteg"
|
||||
|
||||
#, c-format
|
||||
msgid ""
|
||||
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
|
||||
@@ -9306,8 +9235,12 @@ msgstr ""
|
||||
msgid "refusing to run without --i-still-use-this"
|
||||
msgstr "vägrar köra utan --i-still-use-this"
|
||||
|
||||
msgid "git pack-refs [--all] [--no-prune]"
|
||||
msgstr "git pack-refs [--all] [--no-prune]"
|
||||
msgid ""
|
||||
"git pack-refs [--all] [--no-prune] [--include <pattern>] [--exclude "
|
||||
"<pattern>]"
|
||||
msgstr ""
|
||||
"git pack-refs [--all] [--no-prune] [--include <mönster>] [--exclude "
|
||||
"<mönster>]"
|
||||
|
||||
msgid "pack everything"
|
||||
msgstr "packa allt"
|
||||
@@ -9315,6 +9248,12 @@ msgstr "packa allt"
|
||||
msgid "prune loose refs (default)"
|
||||
msgstr "ta bort lösa referenser (standard)"
|
||||
|
||||
msgid "references to include"
|
||||
msgstr "referenser att ta med"
|
||||
|
||||
msgid "references to exclude"
|
||||
msgstr "referenser att utesluta"
|
||||
|
||||
msgid "git patch-id [--stable | --unstable | --verbatim]"
|
||||
msgstr "git patch-id [--stable | --unstable | --verbatim]"
|
||||
|
||||
@@ -9372,6 +9311,12 @@ msgstr "tvinga överskrivning av lokal gren"
|
||||
msgid "number of submodules pulled in parallel"
|
||||
msgstr "antal undermoduler som hämtas parallellt"
|
||||
|
||||
msgid "use IPv4 addresses only"
|
||||
msgstr "använd endast IPv4-adresser"
|
||||
|
||||
msgid "use IPv6 addresses only"
|
||||
msgstr "använd endast IPv6-adresser"
|
||||
|
||||
msgid ""
|
||||
"There is no candidate for rebasing against among the refs that you just "
|
||||
"fetched."
|
||||
@@ -9632,37 +9577,38 @@ msgstr ""
|
||||
|
||||
msgid ""
|
||||
"Updates were rejected because the tip of your current branch is behind\n"
|
||||
"its remote counterpart. Integrate the remote changes (e.g.\n"
|
||||
"'git pull ...') before pushing again.\n"
|
||||
"its remote counterpart. If you want to integrate the remote changes,\n"
|
||||
"use 'git pull' before pushing again.\n"
|
||||
"See the 'Note about fast-forwards' in 'git push --help' for details."
|
||||
msgstr ""
|
||||
"Uppdateringar avvisades då änden på din befintliga gren är bakom\n"
|
||||
"dess fjärrmotsvarighet. Integrera fjärrändringarna (t.ex\n"
|
||||
"\"git pull ....\") innan du sänder igen.\n"
|
||||
"dess fjärrmotsvarighet. Om du vill integrera fjärrändringarna,\n"
|
||||
"använd \"git pull\" innan du sänder igen.\t\n"
|
||||
"Se avsnittet \"Note about fast-forward\" i \"git push --help\" för detaljer."
|
||||
|
||||
msgid ""
|
||||
"Updates were rejected because a pushed branch tip is behind its remote\n"
|
||||
"counterpart. Check out this branch and integrate the remote changes\n"
|
||||
"(e.g. 'git pull ...') before pushing again.\n"
|
||||
"counterpart. If you want to integrate the remote changes, use 'git pull'\n"
|
||||
"before pushing again.\n"
|
||||
"See the 'Note about fast-forwards' in 'git push --help' for details."
|
||||
msgstr ""
|
||||
"Uppdateringar avvisades då änden på en gren som sänds in är bakom dess\n"
|
||||
"fjärrmotsvarighet. Checka ut grenen och integrera fjärrändringarna (t.ex.\n"
|
||||
"\"git pull ...\") innan du sänder igen.\n"
|
||||
"fjärrmotsvarighet. Om du vill integrera fjärrändringarna, använd \"git pull"
|
||||
"\"\n"
|
||||
"innan du sänder igen.\n"
|
||||
"Se avsnittet \"Note about fast-forward\" i \"git push --help\" för detaljer."
|
||||
|
||||
msgid ""
|
||||
"Updates were rejected because the remote contains work that you do\n"
|
||||
"not have locally. This is usually caused by another repository pushing\n"
|
||||
"to the same ref. You may want to first integrate the remote changes\n"
|
||||
"(e.g., 'git pull ...') before pushing again.\n"
|
||||
"Updates were rejected because the remote contains work that you do not\n"
|
||||
"have locally. This is usually caused by another repository pushing to\n"
|
||||
"the same ref. If you want to integrate the remote changes, use\n"
|
||||
"'git pull' before pushing again.\n"
|
||||
"See the 'Note about fast-forwards' in 'git push --help' for details."
|
||||
msgstr ""
|
||||
"Uppdateringar avvisades då fjärren innehåller ändringar som du inte\n"
|
||||
"har lokalt. Det beror oftast på att ett annat arkiv har sänt in samma\n"
|
||||
"referenser. Det kan vara en idé att först integrera fjärrändringarna\n"
|
||||
"(t.ex. \"git pull ...\") innan du sänder igen.\n"
|
||||
"referenser. Om du vill integrera fjärrändringarna, använd \"git pull\"\n"
|
||||
"innan du sänder igen.\n"
|
||||
"Se avsnittet \"Note about fast-forwards\" i \"git push --help\" för detaljer."
|
||||
|
||||
msgid "Updates were rejected because the tag already exists in the remote."
|
||||
@@ -9679,15 +9625,15 @@ msgstr ""
|
||||
"\"--force\".\n"
|
||||
|
||||
msgid ""
|
||||
"Updates were rejected because the tip of the remote-tracking\n"
|
||||
"branch has been updated since the last checkout. You may want\n"
|
||||
"to integrate those changes locally (e.g., 'git pull ...')\n"
|
||||
"before forcing an update.\n"
|
||||
"Updates were rejected because the tip of the remote-tracking branch has\n"
|
||||
"been updated since the last checkout. If you want to integrate the\n"
|
||||
"remote changes, use 'git pull' before pushing again.\n"
|
||||
"See the 'Note about fast-forwards' in 'git push --help' for details."
|
||||
msgstr ""
|
||||
"Uppdateringar avvisades då änden på den fjärrspårande grenen\n"
|
||||
"har uppdaterats sedan senaste utcheckning. Integrera\n"
|
||||
"fjärrändringarna lokalt (t.ex \"git pull ....\") innan du\n"
|
||||
"tvingar en uppdatering.\n"
|
||||
"Uppdateringar avvisades då änden på din befintliga gren är bakom\n"
|
||||
"dess fjärrmotsvarighet. Om du vill integrera fjärrändringarna,\n"
|
||||
"använd \"git pull\" innan du sänder igen.\n"
|
||||
"Se avsnittet \"Note about fast-forward\" i \"git push --help\" för detaljer."
|
||||
|
||||
#, c-format
|
||||
msgid "Pushing to %s\n"
|
||||
@@ -10541,11 +10487,12 @@ msgstr "okänt argument till mirror: %s"
|
||||
msgid "fetch the remote branches"
|
||||
msgstr "hämta fjärrgrenarna"
|
||||
|
||||
msgid "import all tags and associated objects when fetching"
|
||||
msgstr "importera alla taggar och associerade objekt vid hämtning"
|
||||
|
||||
msgid "or do not fetch any tag at all (--no-tags)"
|
||||
msgstr "eller hämta inte några taggar alls (--no-tags)"
|
||||
msgid ""
|
||||
"import all tags and associated objects when fetching\n"
|
||||
"or do not fetch any tag at all (--no-tags)"
|
||||
msgstr ""
|
||||
"importera alla taggar och associerade objekt vid hämtning\n"
|
||||
"eller hämta inte några taggar alls (--no-tags)"
|
||||
|
||||
msgid "branch(es) to track"
|
||||
msgstr "gren(ar) att spåra"
|
||||
@@ -12467,6 +12414,10 @@ msgstr "Hoppar över ej sammanslagen undermodul %s"
|
||||
msgid "Skipping submodule '%s'"
|
||||
msgstr "Hoppar över undermodulen \"%s\""
|
||||
|
||||
#, c-format
|
||||
msgid "cannot clone submodule '%s' without a URL"
|
||||
msgstr "kan inte klona undermodulen \"%s\" utan en URL"
|
||||
|
||||
#, c-format
|
||||
msgid "Failed to clone '%s'. Retry scheduled"
|
||||
msgstr "Misslyckades klona \"%s\". Nytt försök planlagt"
|
||||
@@ -13203,10 +13154,11 @@ msgstr "visa innehåll för tag"
|
||||
|
||||
msgid ""
|
||||
"git worktree add [-f] [--detach] [--checkout] [--lock [--reason <string>]]\n"
|
||||
" [-b <new-branch>] <path> [<commit-ish>]"
|
||||
" [--orphan] [(-b | -B) <new-branch>] <path> [<commit-ish>]"
|
||||
msgstr ""
|
||||
"git worktree add [-f] [--detach] [--checkout] [--lock [--reason <sträng>]]\n"
|
||||
" [-b <ny-gren>] <sökväg> [<incheckning-igt>]"
|
||||
" [--orphan] [(-b | -B) <ny-gren>] <sökväg> [<incheckning-"
|
||||
"igt>]"
|
||||
|
||||
msgid "git worktree list [-v | --porcelain [-z]]"
|
||||
msgstr "git worktree list [-v | --porcelain [-z]]"
|
||||
@@ -13229,6 +13181,37 @@ msgstr "git worktree repair [<sökväg>...]"
|
||||
msgid "git worktree unlock <worktree>"
|
||||
msgstr "git worktree unlock <arbetskatalog>"
|
||||
|
||||
msgid "No possible source branch, inferring '--orphan'"
|
||||
msgstr "Ingen möjlig källgren, använder \"--orphan\""
|
||||
|
||||
#, c-format
|
||||
msgid ""
|
||||
"If you meant to create a worktree containing a new orphan branch\n"
|
||||
"(branch with no commits) for this repository, you can do so\n"
|
||||
"using the --orphan flag:\n"
|
||||
"\n"
|
||||
" git worktree add --orphan -b %s %s\n"
|
||||
msgstr ""
|
||||
"Om meningen var att skapa en arbetskatalog från en ny föräldrals\n"
|
||||
"gren (gren utan incheckningar) för det här arkivet kan du göra\n"
|
||||
"det med flaggan --orphan:\n"
|
||||
"\n"
|
||||
" git worktree add --orphan -b %s %s\n"
|
||||
|
||||
#, c-format
|
||||
msgid ""
|
||||
"If you meant to create a worktree containing a new orphan branch\n"
|
||||
"(branch with no commits) for this repository, you can do so\n"
|
||||
"using the --orphan flag:\n"
|
||||
"\n"
|
||||
" git worktree add --orphan %s\n"
|
||||
msgstr ""
|
||||
"Om meningen var att skapa en arbetskatalog från en ny föräldrals\n"
|
||||
"gren (gren utan incheckningar) för det här arkivet kan du göra\n"
|
||||
"det med flaggan --orphan:\n"
|
||||
"\n"
|
||||
" git worktree add --orphan %s\n"
|
||||
|
||||
#, c-format
|
||||
msgid "Removing %s/%s: %s"
|
||||
msgstr "Tar bort %s/%s: %s"
|
||||
@@ -13299,10 +13282,36 @@ msgstr "Förbereder arbetskatalog (återställer gren \"%s\"; var på %s)"
|
||||
msgid "Preparing worktree (checking out '%s')"
|
||||
msgstr "Förbereder arbetskatalog (checkar ut \"%s\")"
|
||||
|
||||
#, c-format
|
||||
msgid "unreachable: invalid reference: %s"
|
||||
msgstr "onåbar: felaktig referens: %s"
|
||||
|
||||
#, c-format
|
||||
msgid "Preparing worktree (detached HEAD %s)"
|
||||
msgstr "Förbereder arbetskatalog (frånkopplat HEAD %s)"
|
||||
|
||||
#, c-format
|
||||
msgid ""
|
||||
"HEAD points to an invalid (or orphaned) reference.\n"
|
||||
"HEAD path: '%s'\n"
|
||||
"HEAD contents: '%s'"
|
||||
msgstr ""
|
||||
"HEAD pekar på en ogiltig (eller övergiven) referens.\n"
|
||||
"HEAD-sökväg: \"%s\"\n"
|
||||
"HEAD-innehåll: \"%s\""
|
||||
|
||||
msgid ""
|
||||
"No local or remote refs exist despite at least one remote\n"
|
||||
"present, stopping; use 'add -f' to overide or fetch a remote first"
|
||||
msgstr ""
|
||||
"Ingen lokal eller fjärr-referens finns trots att åtminstone en fjärr\n"
|
||||
"finns, avslutar; använd \"add -f\" för att överstyra eller hämta från en "
|
||||
"fjärr först"
|
||||
|
||||
#, c-format
|
||||
msgid "'%s' and '%s' cannot be used together"
|
||||
msgstr "\"%s\" och \"%s\" kan inte användas samtidigt"
|
||||
|
||||
msgid "checkout <branch> even if already checked out in other worktree"
|
||||
msgstr ""
|
||||
"checka ut <gren> även om den redan är utcheckad i en annan arbetskatalog"
|
||||
@@ -13313,6 +13322,9 @@ msgstr "skapa en ny gren"
|
||||
msgid "create or reset a branch"
|
||||
msgstr "skapa eller återställ en gren"
|
||||
|
||||
msgid "create unborn/orphaned branch"
|
||||
msgstr "skapa en ofödd/övergiven gren"
|
||||
|
||||
msgid "populate the new working tree"
|
||||
msgstr "befolka den nya arbetskatalogen"
|
||||
|
||||
@@ -13332,6 +13344,13 @@ msgstr "försök träffa namn på ny gren mot en fjärrspårande gren"
|
||||
msgid "options '%s', '%s', and '%s' cannot be used together"
|
||||
msgstr "flaggorna \"%s\", \"%s\" och \"%s\" kan inte användas samtidigt"
|
||||
|
||||
#, c-format
|
||||
msgid "options '%s', and '%s' cannot be used together"
|
||||
msgstr "flaggorna \"%s\" och \"%s\" kan inte användas samtidigt"
|
||||
|
||||
msgid "<commit-ish>"
|
||||
msgstr "<incheckning-igt>"
|
||||
|
||||
msgid "added with --lock"
|
||||
msgstr "lagt till med --lock"
|
||||
|
||||
@@ -13560,6 +13579,14 @@ msgid_plural "The bundle requires these %<PRIuMAX> refs:"
|
||||
msgstr[0] "Bunten kräver denna referens:"
|
||||
msgstr[1] "Bunten kräver dessa %<PRIuMAX> referenser:"
|
||||
|
||||
#, c-format
|
||||
msgid "The bundle uses this hash algorithm: %s"
|
||||
msgstr "Bunten använder denna hashningsalgoritm: %s"
|
||||
|
||||
#, c-format
|
||||
msgid "The bundle uses this filter: %s"
|
||||
msgstr "Bunten använder detta filter. %s"
|
||||
|
||||
msgid "unable to dup bundle descriptor"
|
||||
msgstr "kan inte duplicera bunthandtag"
|
||||
|
||||
@@ -13785,8 +13812,8 @@ msgstr "Visa rader som motsvarar mönster"
|
||||
msgid "A portable graphical interface to Git"
|
||||
msgstr "Ett portabelt grafiskt gränssnitt för Git"
|
||||
|
||||
msgid "Compute object ID and optionally creates a blob from a file"
|
||||
msgstr "Beräkna objekt-id och möjligen skapa en blob från en fil"
|
||||
msgid "Compute object ID and optionally create an object from a file"
|
||||
msgstr "Beräkna objekt-ID och möjligen skapa ett objekt från en fil"
|
||||
|
||||
msgid "Display help information about Git"
|
||||
msgstr "Visa hjälpinformation om Git"
|
||||
@@ -14192,6 +14219,10 @@ msgstr "incheckningsgrafen har inga bas-graf-stycken"
|
||||
msgid "commit-graph chain does not match"
|
||||
msgstr "incheckningsgrafens kedja stämmer inte"
|
||||
|
||||
#, c-format
|
||||
msgid "commit count in base graph too high: %<PRIuMAX>"
|
||||
msgstr "antalet incheckningar i basgrafen för högt: %<PRIuMAX>"
|
||||
|
||||
#, c-format
|
||||
msgid "invalid commit-graph chain: line '%s' not a hash"
|
||||
msgstr "ogiltig incheckingsgrafkedja: rad \"%s\" är inte ett hash-värde"
|
||||
@@ -14275,6 +14306,14 @@ msgstr "kunde inte byta namn på bas-incheckingsgraffilen"
|
||||
msgid "failed to rename temporary commit-graph file"
|
||||
msgstr "kunde inte byta namn på temporär incheckningsgraffil"
|
||||
|
||||
#, c-format
|
||||
msgid "cannot merge graphs with %<PRIuMAX>, %<PRIuMAX> commits"
|
||||
msgstr "kan inte slå ihop grafer med %<PRIuMAX>, %<PRIuMAX> incheckningar"
|
||||
|
||||
#, c-format
|
||||
msgid "cannot merge graph %s, too many commits: %<PRIuMAX>"
|
||||
msgstr "kan inte slå ihop grafen %s, med för många incheckningar: %<PRIuMAX>"
|
||||
|
||||
msgid "Scanning merged commits"
|
||||
msgstr "Söker sammanslagna incheckningar"
|
||||
|
||||
@@ -14306,9 +14345,6 @@ msgstr ""
|
||||
msgid "failed to parse commit %s from commit-graph"
|
||||
msgstr "kunde inte tolka incheckning %s från incheckningsgraf"
|
||||
|
||||
msgid "Verifying commits in commit graph"
|
||||
msgstr "Bekräftar incheckningar i incheckningsgrafen"
|
||||
|
||||
#, c-format
|
||||
msgid "failed to parse commit %s from object database for commit-graph"
|
||||
msgstr ""
|
||||
@@ -14357,6 +14393,9 @@ msgstr ""
|
||||
"incheckningsdatumet för incheckningen %s i incheckningsgrafen är %<PRIuMAX> !"
|
||||
"= %<PRIuMAX>"
|
||||
|
||||
msgid "Verifying commits in commit graph"
|
||||
msgstr "Bekräftar incheckningar i incheckningsgrafen"
|
||||
|
||||
#, c-format
|
||||
msgid "%s %s is not a commit!"
|
||||
msgstr "%s %s är inte en incheckning!"
|
||||
@@ -15301,6 +15340,12 @@ msgstr "ingen sammanslagningsbas hittades"
|
||||
msgid "multiple merge bases found"
|
||||
msgstr "flera sammanslagningsbaser hittades"
|
||||
|
||||
msgid "cannot compare stdin to a directory"
|
||||
msgstr "kan inte jämföra standard in med en katalog"
|
||||
|
||||
msgid "cannot compare a named pipe to a directory"
|
||||
msgstr "kan inte jämföra ett namngivet rör med en katalog"
|
||||
|
||||
msgid "git diff --no-index [<options>] <path> <path>"
|
||||
msgstr "git diff --no-index [<flaggor>] <sökväg> <sökväg>"
|
||||
|
||||
@@ -15358,6 +15403,13 @@ msgstr ""
|
||||
msgid "external diff died, stopping at %s"
|
||||
msgstr "extern diff dog, stannar vid %s"
|
||||
|
||||
msgid "--follow requires exactly one pathspec"
|
||||
msgstr "--follow kräver exakt en sökvägsangivelse"
|
||||
|
||||
#, c-format
|
||||
msgid "pathspec magic not supported by --follow: %s"
|
||||
msgstr "sökvägs-magi stöds inte av --follow: %s"
|
||||
|
||||
#, c-format
|
||||
msgid "options '%s', '%s', '%s', and '%s' cannot be used together"
|
||||
msgstr ""
|
||||
@@ -15376,9 +15428,6 @@ msgstr ""
|
||||
"flaggorna \"%s\" och \"%s\" kan inte användas samtidigt, använd \"%s\" med "
|
||||
"\"%s\" och \"%s\""
|
||||
|
||||
msgid "--follow requires exactly one pathspec"
|
||||
msgstr "--follow kräver exakt en sökvägsangivelse"
|
||||
|
||||
#, c-format
|
||||
msgid "invalid --stat value: %s"
|
||||
msgstr "ogiltigt värde för --stat: %s"
|
||||
@@ -18226,6 +18275,13 @@ msgstr "misslyckades skapa diff"
|
||||
msgid "could not parse log for '%s'"
|
||||
msgstr "kunde inte tolka loggen för \"%s\""
|
||||
|
||||
#, c-format
|
||||
msgid "invalid extra cruft tip: '%s'"
|
||||
msgstr "ogiltig extra överbliven ände: \"%s\""
|
||||
|
||||
msgid "unable to enumerate additional recent objects"
|
||||
msgstr "kan inte räkna ytterligare nyliga objekt"
|
||||
|
||||
#, c-format
|
||||
msgid "will not add file alias '%s' ('%s' already exists in index)"
|
||||
msgstr "lägger inte till filalias \"%s\" (\"%s\" finns redan i indexet)"
|
||||
@@ -18377,6 +18433,14 @@ msgstr "kan inte rätta behörighetsbitar på \"%s\""
|
||||
msgid "%s: cannot drop to stage #0"
|
||||
msgstr "%s: kan inte återgå till kö 0"
|
||||
|
||||
#, c-format
|
||||
msgid "unexpected diff status %c"
|
||||
msgstr "diff-status %c förväntades inte"
|
||||
|
||||
#, c-format
|
||||
msgid "remove '%s'\n"
|
||||
msgstr "ta bort \"%s\"\n"
|
||||
|
||||
msgid ""
|
||||
"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
|
||||
"continue'.\n"
|
||||
@@ -18580,6 +18644,22 @@ msgstr "okänt %%(trailers)-argument: %s"
|
||||
msgid "positive value expected contents:lines=%s"
|
||||
msgstr "positivt värde förväntat contents:lines=%s"
|
||||
|
||||
#, c-format
|
||||
msgid "argument expected for %s"
|
||||
msgstr "argument förväntades för %s"
|
||||
|
||||
#, c-format
|
||||
msgid "positive value expected %s=%s"
|
||||
msgstr "positivt värde förväntat %s=%s"
|
||||
|
||||
#, c-format
|
||||
msgid "cannot fully parse %s=%s"
|
||||
msgstr "kan inte helt tolka %s=%s"
|
||||
|
||||
#, c-format
|
||||
msgid "value expected %s="
|
||||
msgstr "vädre förväntades %s="
|
||||
|
||||
#, c-format
|
||||
msgid "positive value expected '%s' in %%(%s)"
|
||||
msgstr "positivt värde förväntat \"%s\" i %%(%s)"
|
||||
@@ -18654,6 +18734,9 @@ msgstr "kommandot förkastar atom %%(%.*s)"
|
||||
msgid "--format=%.*s cannot be used with --python, --shell, --tcl"
|
||||
msgstr "--format=%.*s kan inte användas med --python, --shell, --tcl"
|
||||
|
||||
msgid "failed to run 'describe'"
|
||||
msgstr "misslyckades att köra \"describe\""
|
||||
|
||||
#, c-format
|
||||
msgid "(no branch, rebasing %s)"
|
||||
msgstr "(ingen gren, ombaserar %s)"
|
||||
@@ -18715,6 +18798,9 @@ msgstr "nyckel"
|
||||
msgid "field name to sort on"
|
||||
msgstr "fältnamn att sortera på"
|
||||
|
||||
msgid "exclude refs which match pattern"
|
||||
msgstr "uteslut referenser som motsvarar mönster"
|
||||
|
||||
#, c-format
|
||||
msgid "not a reflog: %s"
|
||||
msgstr "inte en referenslogg: %s"
|
||||
@@ -19154,8 +19240,10 @@ msgstr[1] ""
|
||||
"Din gren och \"%s\" har divergerat,\n"
|
||||
"och har %d respektive %d olika incheckningar.\n"
|
||||
|
||||
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
|
||||
msgstr " (använd \"git pull\" för att slå ihop fjärrgrenen med din egen)\n"
|
||||
msgid ""
|
||||
" (use \"git pull\" if you want to integrate the remote branch with yours)\n"
|
||||
msgstr ""
|
||||
" (använd \"git pull\" om du vill integrera fjärrgrenen med din egen)\n"
|
||||
|
||||
#, c-format
|
||||
msgid "cannot parse expected object name '%s'"
|
||||
@@ -19266,6 +19354,10 @@ msgstr "kunde inte hämta incheckning för \"ancestry-path\"-argumentet %s"
|
||||
msgid "--unpacked=<packfile> no longer supported"
|
||||
msgstr "--unpacked=<paketfil> stöds inte längre"
|
||||
|
||||
#, c-format
|
||||
msgid "invalid option '%s' in --stdin mode"
|
||||
msgstr "ogiltig flagga \"%s\" i --stdin-läge"
|
||||
|
||||
msgid "your current branch appears to be broken"
|
||||
msgstr "din nuvarande gren verkar vara trasig"
|
||||
|
||||
@@ -20411,6 +20503,77 @@ msgstr "\"fork\" misslyckades"
|
||||
msgid "setsid failed"
|
||||
msgstr "\"setsid\" misslyckades"
|
||||
|
||||
#, c-format
|
||||
msgid "cannot stat template '%s'"
|
||||
msgstr "kan inte ta status på mallen \"%s\""
|
||||
|
||||
#, c-format
|
||||
msgid "cannot opendir '%s'"
|
||||
msgstr "kan inte öppna katalogen (opendir) \"%s\""
|
||||
|
||||
#, c-format
|
||||
msgid "cannot readlink '%s'"
|
||||
msgstr "kan inte läsa länk (readlink) \"%s\""
|
||||
|
||||
#, c-format
|
||||
msgid "cannot symlink '%s' '%s'"
|
||||
msgstr "kan inte skapa symbolisk länk \"%s\" \"%s\""
|
||||
|
||||
#, c-format
|
||||
msgid "cannot copy '%s' to '%s'"
|
||||
msgstr "kan inte kopiera \"%s\" till \"%s\""
|
||||
|
||||
#, c-format
|
||||
msgid "ignoring template %s"
|
||||
msgstr "ignorerar mallen %s"
|
||||
|
||||
#, c-format
|
||||
msgid "templates not found in %s"
|
||||
msgstr "mallarna hittades inte i %s"
|
||||
|
||||
#, c-format
|
||||
msgid "not copying templates from '%s': %s"
|
||||
msgstr "kopierade inte mallar från \"%s\": %s"
|
||||
|
||||
#, c-format
|
||||
msgid "invalid initial branch name: '%s'"
|
||||
msgstr "ogiltigt namn på första gren: \"%s\""
|
||||
|
||||
#, c-format
|
||||
msgid "unable to handle file type %d"
|
||||
msgstr "kan inte hantera filtyp %d"
|
||||
|
||||
#, c-format
|
||||
msgid "unable to move %s to %s"
|
||||
msgstr "kan inte flytta %s till %s"
|
||||
|
||||
msgid "attempt to reinitialize repository with different hash"
|
||||
msgstr "försöker initiera arkivet på nytt med annan hash"
|
||||
|
||||
#, c-format
|
||||
msgid "%s already exists"
|
||||
msgstr "%s finns redan"
|
||||
|
||||
#, c-format
|
||||
msgid "re-init: ignored --initial-branch=%s"
|
||||
msgstr "re-init: ignorerade --initial-branch=%s"
|
||||
|
||||
#, c-format
|
||||
msgid "Reinitialized existing shared Git repository in %s%s\n"
|
||||
msgstr "Ominitierade befintligt delat Git-arkiv i %s%s\n"
|
||||
|
||||
#, c-format
|
||||
msgid "Reinitialized existing Git repository in %s%s\n"
|
||||
msgstr "Ominitierade befintligt Git-arkiv i %s%s\n"
|
||||
|
||||
#, c-format
|
||||
msgid "Initialized empty shared Git repository in %s%s\n"
|
||||
msgstr "Initierade tomt delat Git-arkiv i %s%s\n"
|
||||
|
||||
#, c-format
|
||||
msgid "Initialized empty Git repository in %s%s\n"
|
||||
msgstr "Initierade tomt Git-arkiv i %s%s\n"
|
||||
|
||||
#, c-format
|
||||
msgid "index entry is a directory, but not sparse (%08x)"
|
||||
msgstr "indexposten är en katalog, men inte gles (%08x)"
|
||||
|
||||
490
po/tr.po
490
po/tr.po
@@ -39,6 +39,8 @@
|
||||
# mark | im(lemek) #
|
||||
# merge | birleştirme(k) #
|
||||
# octopus | ahtapot #
|
||||
# orphan | yetim #
|
||||
# orphaned | yetim bırakılmış #
|
||||
# overlay | yerpaylaşım #
|
||||
# pack | paket #
|
||||
# parent | üst öge #
|
||||
@@ -92,8 +94,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Git Turkish Localization Project\n"
|
||||
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
|
||||
"POT-Creation-Date: 2023-05-20 12:55+0300\n"
|
||||
"PO-Revision-Date: 2023-05-20 14:00+0300\n"
|
||||
"POT-Creation-Date: 2023-08-16 14:34+0300\n"
|
||||
"PO-Revision-Date: 2023-08-16 15:00+0300\n"
|
||||
"Last-Translator: Emir SARI <emir_sari@icloud.com>\n"
|
||||
"Language-Team: Turkish (https://github.com/bitigchi/git-po/)\n"
|
||||
"Language: tr\n"
|
||||
@@ -718,9 +720,10 @@ msgstr "Çekme yapılamaz; birleştirmesi tamamlanmamış dosyalarınız var."
|
||||
msgid "Reverting is not possible because you have unmerged files."
|
||||
msgstr "Geriye al yapılamaz; birleştirmesi tamamlanmamış dosyalarınız var."
|
||||
|
||||
#, c-format
|
||||
msgid "It is not possible to %s because you have unmerged files."
|
||||
msgstr "%s yapılamıyor; birleştirmesi tamamlanmamış dosyalarınız var."
|
||||
msgid "Rebasing is not possible because you have unmerged files."
|
||||
msgstr ""
|
||||
"Yeniden temellendirme yapılamaz; birleştirmesi tamamlanmamış dosyalarınız "
|
||||
"var."
|
||||
|
||||
msgid ""
|
||||
"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
|
||||
@@ -866,6 +869,12 @@ msgstr "'%s' ve '%s' seçenekleri birlikte kullanılamaz"
|
||||
msgid "'%s' outside a repository"
|
||||
msgstr "'%s' bir depo dışında"
|
||||
|
||||
msgid "failed to read patch"
|
||||
msgstr "yama okunamadı"
|
||||
|
||||
msgid "patch too large"
|
||||
msgstr "yama pek büyük"
|
||||
|
||||
#, c-format
|
||||
msgid "Cannot prepare timestamp regexp %s"
|
||||
msgstr "Zaman damgası düzenli ifadesi %s hazırlanamıyor"
|
||||
@@ -1760,8 +1769,10 @@ msgid "a branch named '%s' already exists"
|
||||
msgstr "'%s' adında bir dal halihazırda var"
|
||||
|
||||
#, c-format
|
||||
msgid "cannot force update the branch '%s' checked out at '%s'"
|
||||
msgstr "'%s' dalı zorla güncellenemiyor, '%s' konumunda çıkış yapılmış"
|
||||
msgid "cannot force update the branch '%s' used by worktree at '%s'"
|
||||
msgstr ""
|
||||
"şuradaki çalışma ağacı tarafından kullanılan '%s' dalı zorla "
|
||||
"güncellenemiyor: '%s'"
|
||||
|
||||
#, c-format
|
||||
msgid "cannot set up tracking information; starting point '%s' is not a branch"
|
||||
@@ -1829,17 +1840,6 @@ msgstr "git add [<seçenekler>] [--] <yol-blrtç>..."
|
||||
msgid "cannot chmod %cx '%s'"
|
||||
msgstr "%cx '%s' chmod yapılamıyor"
|
||||
|
||||
#, c-format
|
||||
msgid "unexpected diff status %c"
|
||||
msgstr "beklenmedik diff durumu %c"
|
||||
|
||||
msgid "updating files failed"
|
||||
msgstr "dosyaları güncelleme başarısız"
|
||||
|
||||
#, c-format
|
||||
msgid "remove '%s'\n"
|
||||
msgstr "kaldır: '%s'\n"
|
||||
|
||||
msgid "Unstaged changes after refreshing the index:"
|
||||
msgstr "İndeksi yeniledikten sonra hazırlanmamış değişiklikler:"
|
||||
|
||||
@@ -2270,10 +2270,6 @@ msgstr "'git-mailinfo'ya -m bayrağını geçir"
|
||||
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
|
||||
msgstr "'git-mailsplit'e mbox biçimi için --keep-cr bayrağını geçir"
|
||||
|
||||
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
|
||||
msgstr ""
|
||||
"'git-mailsplit'e 'am.keepcr'dan bağımsız olarak --keep-cr bayrağını geçirme"
|
||||
|
||||
msgid "strip everything before a scissors line"
|
||||
msgstr "bir kesim çizgisinden önceki her şeyi çıkar"
|
||||
|
||||
@@ -3305,12 +3301,12 @@ msgid ""
|
||||
"git cat-file (--batch | --batch-check | --batch-command) [--batch-all-"
|
||||
"objects]\n"
|
||||
" [--buffer] [--follow-symlinks] [--unordered]\n"
|
||||
" [--textconv | --filters] [-z]"
|
||||
" [--textconv | --filters] [-Z]"
|
||||
msgstr ""
|
||||
"git cat-file (--batch | --batch-check | --batch-command) [--batch-all-"
|
||||
"objects]\n"
|
||||
" [--buffer] [--follow-symlinks] [--unordered]\n"
|
||||
" [--textconv | --filters] [-z]"
|
||||
" [--textconv | --filters] [-Z]"
|
||||
|
||||
msgid ""
|
||||
"git cat-file (--textconv | --filters)\n"
|
||||
@@ -3355,6 +3351,9 @@ msgstr "--batch gibi; ancak <içerik> yayma"
|
||||
msgid "stdin is NUL-terminated"
|
||||
msgstr "stdin, NUL ile sonlandırılmış"
|
||||
|
||||
msgid "stdin and stdout is NUL-terminated"
|
||||
msgstr "stdin ve stdout NUL ile sonlandırılmış"
|
||||
|
||||
msgid "read commands from stdin"
|
||||
msgstr "komutları stdin'den oku"
|
||||
|
||||
@@ -4216,12 +4215,6 @@ msgstr "sunucuya özel"
|
||||
msgid "option to transmit"
|
||||
msgstr "iletme seçeneği"
|
||||
|
||||
msgid "use IPv4 addresses only"
|
||||
msgstr "yalnızca IPv4 adresleri kullan"
|
||||
|
||||
msgid "use IPv6 addresses only"
|
||||
msgstr "yalnızca IPv6 adresleri kullan"
|
||||
|
||||
msgid "apply partial clone filters to submodules"
|
||||
msgstr "altmodüllere kısımsal klon süzgeçlerini uygula"
|
||||
|
||||
@@ -4661,6 +4654,9 @@ msgstr ""
|
||||
"\tgit cherry-pick --skip\n"
|
||||
"\n"
|
||||
|
||||
msgid "updating files failed"
|
||||
msgstr "dosyaları güncelleme başarısız"
|
||||
|
||||
msgid "failed to unpack HEAD tree object"
|
||||
msgstr "HEAD ağaç nesnesi açılamadı"
|
||||
|
||||
@@ -4720,8 +4716,8 @@ msgstr ""
|
||||
"karakteri seçilemiyor"
|
||||
|
||||
#, c-format
|
||||
msgid "could not lookup commit %s"
|
||||
msgstr "%s işlemesi aranamadı"
|
||||
msgid "could not lookup commit '%s'"
|
||||
msgstr "'%s' işlemesi aranamadı"
|
||||
|
||||
#, c-format
|
||||
msgid "(reading log message from standard input)\n"
|
||||
@@ -7325,77 +7321,6 @@ msgstr "--verify ile bir paket dosyası adı verilmedi"
|
||||
msgid "fsck error in pack objects"
|
||||
msgstr "paket nesnelerinde fsck hatası"
|
||||
|
||||
#, c-format
|
||||
msgid "cannot stat template '%s'"
|
||||
msgstr "'%s' şablonunun bilgileri alınamıyor"
|
||||
|
||||
#, c-format
|
||||
msgid "cannot opendir '%s'"
|
||||
msgstr "'%s' opendir yapılamıyor"
|
||||
|
||||
#, c-format
|
||||
msgid "cannot readlink '%s'"
|
||||
msgstr "'%s' readlink yapılamıyor"
|
||||
|
||||
#, c-format
|
||||
msgid "cannot symlink '%s' '%s'"
|
||||
msgstr "'%s', '%s' ögesine sembolik bağla bağlanamıyor"
|
||||
|
||||
#, c-format
|
||||
msgid "cannot copy '%s' to '%s'"
|
||||
msgstr "'%s' şuraya kopyalanamıyor: '%s'"
|
||||
|
||||
#, c-format
|
||||
msgid "ignoring template %s"
|
||||
msgstr "%s şablonu yok sayılıyor"
|
||||
|
||||
#, c-format
|
||||
msgid "templates not found in %s"
|
||||
msgstr "şablonlar %s içinde bulunamadı"
|
||||
|
||||
#, c-format
|
||||
msgid "not copying templates from '%s': %s"
|
||||
msgstr "şablonlar '%s' konumundan kopyalanmıyor: %s"
|
||||
|
||||
#, c-format
|
||||
msgid "invalid initial branch name: '%s'"
|
||||
msgstr "geçersiz başlangıç dalı adı: '%s'"
|
||||
|
||||
#, c-format
|
||||
msgid "unable to handle file type %d"
|
||||
msgstr "%d dosya türü ele alınamıyor"
|
||||
|
||||
#, c-format
|
||||
msgid "unable to move %s to %s"
|
||||
msgstr "%s şuraya taşınamıyor: %s"
|
||||
|
||||
msgid "attempt to reinitialize repository with different hash"
|
||||
msgstr "depoyu başka bir sağlama ile yeniden ilklendirme deneniyor"
|
||||
|
||||
#, c-format
|
||||
msgid "%s already exists"
|
||||
msgstr "%s halihazırda var"
|
||||
|
||||
#, c-format
|
||||
msgid "re-init: ignored --initial-branch=%s"
|
||||
msgstr "re-init: --initial-branch=%s yok sayıldı"
|
||||
|
||||
#, c-format
|
||||
msgid "Reinitialized existing shared Git repository in %s%s\n"
|
||||
msgstr "%s%s içindeki var olan paylaşılan Git deposu yeniden ilklendirildi\n"
|
||||
|
||||
#, c-format
|
||||
msgid "Reinitialized existing Git repository in %s%s\n"
|
||||
msgstr "%s%s içindeki var olan Git deposu yeniden ilklendirildi\n"
|
||||
|
||||
#, c-format
|
||||
msgid "Initialized empty shared Git repository in %s%s\n"
|
||||
msgstr "%s%s içinde paylaşılan boş Git deposu ilklendirildi\n"
|
||||
|
||||
#, c-format
|
||||
msgid "Initialized empty Git repository in %s%s\n"
|
||||
msgstr "%s%s içinde boş Git deposu ilklendirildi\n"
|
||||
|
||||
msgid ""
|
||||
"git init [-q | --quiet] [--bare] [--template=<template-directory>]\n"
|
||||
" [--separate-git-dir <git-dir>] [--object-format=<format>]\n"
|
||||
@@ -7825,6 +7750,10 @@ msgid ""
|
||||
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
|
||||
msgstr "İzlenen bir uzak dal bulunamadı, lütfen el ile <üstkaynak> belirtin.\n"
|
||||
|
||||
#, c-format
|
||||
msgid "could not get object info about '%s'"
|
||||
msgstr "'%s' hakkında nesne bilgisi alınamadı"
|
||||
|
||||
#, c-format
|
||||
msgid "bad ls-files format: element '%s' does not start with '('"
|
||||
msgstr "hatalı ls-files biçimi: '%s' ögesi, '(' ile başlamıyor"
|
||||
@@ -7967,10 +7896,6 @@ msgstr "işaret ettiği nesneye ek olarak altında yatan başvuruyu göster"
|
||||
msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
|
||||
msgstr "git ls-tree [<seçenekler>] <ağacımsı> [<yol>...]"
|
||||
|
||||
#, c-format
|
||||
msgid "could not get object info about '%s'"
|
||||
msgstr "'%s' hakkında nesne bilgisi alınamadı"
|
||||
|
||||
#, c-format
|
||||
msgid "bad ls-tree format: element '%s' does not start with '('"
|
||||
msgstr "hatalı ls-tree biçimi: '%s' ögesi '(' ile başlamıyor"
|
||||
@@ -8695,21 +8620,25 @@ msgid "git notes [--ref <notes-ref>] [list [<object>]]"
|
||||
msgstr "git notes [--ref <not-bşvr>] [list [<nesne>]]"
|
||||
|
||||
msgid ""
|
||||
"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
|
||||
"| (-c | -C) <object>] [<object>]"
|
||||
"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [--[no-]separator|--"
|
||||
"separator=<paragraph-break>] [--[no-]stripspace] [-m <msg> | -F <file> | (-c "
|
||||
"| -C) <object>] [<object>]"
|
||||
msgstr ""
|
||||
"git notes [--ref <not-bşvr>] add [-f] [--allow-empty] [-m <ileti> | -F "
|
||||
"<dosya> | (-c | -C) <nesne>] [<nesne>]"
|
||||
"git notes [--ref <not-bşv>] add [-f] [--allow-empty] [--[no-]separator|--"
|
||||
"separator=<paragraf-sonu>] [--[no-]stripspace] [-m <ilet> | -F <dosya> | (-c "
|
||||
"| -C) <nesne>] [<nesne>]"
|
||||
|
||||
msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
|
||||
msgstr "git notes [--ref <not-bşvr>] copy [-f] <nesneden> <nesneye>"
|
||||
|
||||
msgid ""
|
||||
"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
|
||||
"(-c | -C) <object>] [<object>]"
|
||||
"git notes [--ref <notes-ref>] append [--allow-empty] [--[no-]separator|--"
|
||||
"separator=<paragraph-break>] [--[no-]stripspace] [-m <msg> | -F <file> | (-c "
|
||||
"| -C) <object>] [<object>]"
|
||||
msgstr ""
|
||||
"git notes [--ref <not-bşvr>] append [--allow-empty] [-m <ileti> | -F <dosya> "
|
||||
"| (-c | -C) <nesne>] [<nesne>]"
|
||||
"git notes [--ref <not-bşv>] append [--allow-empty] [--[no-]separator|--"
|
||||
"separator=<paragraf-sonu>] [--[no-]stripspace] [-m <ileti> | -F <dosya> | (-"
|
||||
"c | -C) <nesne>] [<nesne>]"
|
||||
|
||||
msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
|
||||
msgstr "git notes [--ref <not-bşvr>] edit [--allow-empty] [<nesne>]"
|
||||
@@ -8840,6 +8769,15 @@ msgstr "boş not depolamasına izin ver"
|
||||
msgid "replace existing notes"
|
||||
msgstr "var olan notları başkalarıyla değiştir"
|
||||
|
||||
msgid "<paragraph-break>"
|
||||
msgstr "<paragraf-sonu>"
|
||||
|
||||
msgid "insert <paragraph-break> between paragraphs"
|
||||
msgstr "paragraflar arasında <paragraf-sonu> ekle"
|
||||
|
||||
msgid "remove unnecessary whitespace"
|
||||
msgstr "gereksiz boşlukları kaldır"
|
||||
|
||||
#, c-format
|
||||
msgid ""
|
||||
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
|
||||
@@ -9392,8 +9330,12 @@ msgstr ""
|
||||
msgid "refusing to run without --i-still-use-this"
|
||||
msgstr "--i-still-use-this olmadan çalıştırma reddediliyor"
|
||||
|
||||
msgid "git pack-refs [--all] [--no-prune]"
|
||||
msgstr "git pack-refs [--all] [--no-prune]"
|
||||
msgid ""
|
||||
"git pack-refs [--all] [--no-prune] [--include <pattern>] [--exclude "
|
||||
"<pattern>]"
|
||||
msgstr ""
|
||||
"git pack-refs [--all] [--no-prune]git pack-refs [--all] [--no-prune] [--"
|
||||
"include <dizgi>] [--exclude <dizgi>]"
|
||||
|
||||
msgid "pack everything"
|
||||
msgstr "her şeyi paketle"
|
||||
@@ -9401,6 +9343,12 @@ msgstr "her şeyi paketle"
|
||||
msgid "prune loose refs (default)"
|
||||
msgstr "gevşek başvuruları buda (öntanımlı)"
|
||||
|
||||
msgid "references to include"
|
||||
msgstr "içerilecek başvurular"
|
||||
|
||||
msgid "references to exclude"
|
||||
msgstr "dışarıda tutulacak başvurular"
|
||||
|
||||
msgid "git patch-id [--stable | --unstable | --verbatim]"
|
||||
msgstr "git patch-id [--stable | --unstable | --verbatim]"
|
||||
|
||||
@@ -9459,6 +9407,12 @@ msgstr "zorla yerel dalın üzerine yaz"
|
||||
msgid "number of submodules pulled in parallel"
|
||||
msgstr "paralelde çekilen altmodüllerin sayısı"
|
||||
|
||||
msgid "use IPv4 addresses only"
|
||||
msgstr "yalnızca IPv4 adresleri kullan"
|
||||
|
||||
msgid "use IPv6 addresses only"
|
||||
msgstr "yalnızca IPv6 adresleri kullan"
|
||||
|
||||
msgid ""
|
||||
"There is no candidate for rebasing against among the refs that you just "
|
||||
"fetched."
|
||||
@@ -9717,39 +9671,39 @@ msgstr ""
|
||||
|
||||
msgid ""
|
||||
"Updates were rejected because the tip of your current branch is behind\n"
|
||||
"its remote counterpart. Integrate the remote changes (e.g.\n"
|
||||
"'git pull ...') before pushing again.\n"
|
||||
"its remote counterpart. If you want to integrate the remote changes,\n"
|
||||
"use 'git pull' before pushing again.\n"
|
||||
"See the 'Note about fast-forwards' in 'git push --help' for details."
|
||||
msgstr ""
|
||||
"Güncellemeler reddedildi; çünkü geçerli dalınızın ucu kendisinin\n"
|
||||
"uzak konum karşıtından geride. Yeniden itmeden önce uzak konumdaki\n"
|
||||
"değişiklikleri tümleştirin (örn. 'git pull ...').\n"
|
||||
"uzak konum karşıtından geride. Uzaktaki değişiklikleri tümleştirmek\n"
|
||||
"istiyorsanız yeniden itmeden önce 'git pull' yapın.\n"
|
||||
"Ayrıntılar için 'git push --help' içinde 'Notes about fast-forwards'a\n"
|
||||
"bakın."
|
||||
|
||||
msgid ""
|
||||
"Updates were rejected because a pushed branch tip is behind its remote\n"
|
||||
"counterpart. Check out this branch and integrate the remote changes\n"
|
||||
"(e.g. 'git pull ...') before pushing again.\n"
|
||||
"counterpart. If you want to integrate the remote changes, use 'git pull'\n"
|
||||
"before pushing again.\n"
|
||||
"See the 'Note about fast-forwards' in 'git push --help' for details."
|
||||
msgstr ""
|
||||
"Güncellemeler reddedildi; çünkü itilmiş bir dal ucu kendisinin\n"
|
||||
"uzak konum karşıtından geride. Yeniden itmeden önce bu dalı çıkış\n"
|
||||
"yapın ve uzak konumdaki değişiklikleri tümleştirin (örn. 'git pull\n"
|
||||
"...'). Ayrıntılar için 'git push --help' içinde 'Notes about\n"
|
||||
"fast-forwards'a bakın."
|
||||
"uzak konum karşıtından geride. Uzaktaki değişiklikleri tümleştirmek\n"
|
||||
"istiyorsanız yeniden itmeden önce 'git pull' yapın.\n"
|
||||
"Ayrıntılar için 'git push --help' içinde 'Notes about fast-forwards'a\n"
|
||||
"bakın."
|
||||
|
||||
msgid ""
|
||||
"Updates were rejected because the remote contains work that you do\n"
|
||||
"not have locally. This is usually caused by another repository pushing\n"
|
||||
"to the same ref. You may want to first integrate the remote changes\n"
|
||||
"(e.g., 'git pull ...') before pushing again.\n"
|
||||
"Updates were rejected because the remote contains work that you do not\n"
|
||||
"have locally. This is usually caused by another repository pushing to\n"
|
||||
"the same ref. If you want to integrate the remote changes, use\n"
|
||||
"'git pull' before pushing again.\n"
|
||||
"See the 'Note about fast-forwards' in 'git push --help' for details."
|
||||
msgstr ""
|
||||
"Güncellemeler reddedildi; çünkü uzak konumda henüz yerelde sizde olmayan\n"
|
||||
"değişiklikler var. Bu genelde başka bir deponun aynı başvuruya itmesinden\n"
|
||||
"dolayı olur. Yeniden itmeden önce uzak konumdaki değişiklikleri tümleş-\n"
|
||||
"tirmek isteyebilirsiniz (örn. 'git pull ...').\n"
|
||||
"dolayı olur. Uzaktaki değişiklikleri tümleştirmek istiyorsanız yeniden\n"
|
||||
"itmeden önce 'git pull' yapın..\n"
|
||||
"Ayrıntılar için 'git push --help' içinde 'Notes about fast-forwards'a\n"
|
||||
"bakın."
|
||||
|
||||
@@ -9766,19 +9720,20 @@ msgstr ""
|
||||
"olmayan bir nesneye işaret etmesini sağlaması için güncelleyemezsiniz.\n"
|
||||
|
||||
msgid ""
|
||||
"Updates were rejected because the tip of the remote-tracking\n"
|
||||
"branch has been updated since the last checkout. You may want\n"
|
||||
"to integrate those changes locally (e.g., 'git pull ...')\n"
|
||||
"before forcing an update.\n"
|
||||
"Updates were rejected because the tip of the remote-tracking branch has\n"
|
||||
"been updated since the last checkout. If you want to integrate the\n"
|
||||
"remote changes, use 'git pull' before pushing again.\n"
|
||||
"See the 'Note about fast-forwards' in 'git push --help' for details."
|
||||
msgstr ""
|
||||
"Güncellemeler reddedildi; çünkü uzak izleme dalının ucu son\n"
|
||||
"çıkıştan bu yana güncellenmiş. Bir güncellemeyi zorlamadan\n"
|
||||
"önce bu değişiklikleri yerel olarak tümleştirmek isteye-\n"
|
||||
"bilirsiniz (örn. 'git pull ...'\n"
|
||||
"Güncellemeler reddedildi; çünkü geçerli dalınızın ucu kendisinin\n"
|
||||
"uzak konum karşıtından geride. Uzaktaki değişiklikleri tümleştirmek\n"
|
||||
"istiyorsanız yeniden itmeden önce 'git pull' yapın.\n"
|
||||
"Ayrıntılar için 'git push --help' içinde 'Notes about fast-forwards'a\n"
|
||||
"bakın."
|
||||
|
||||
#, c-format
|
||||
msgid "Pushing to %s\n"
|
||||
msgstr "İtme konumu: %s\n"
|
||||
msgstr "Şuraya itiliyor: %s\n"
|
||||
|
||||
#, c-format
|
||||
msgid "failed to push some refs to '%s'"
|
||||
@@ -10636,11 +10591,12 @@ msgstr "bilinmeyen yansı argümanı: %s"
|
||||
msgid "fetch the remote branches"
|
||||
msgstr "uzak konum dallarını getir"
|
||||
|
||||
msgid "import all tags and associated objects when fetching"
|
||||
msgstr "getirirken tüm etiketleri ve ilişkili nesneleri içe aktar"
|
||||
|
||||
msgid "or do not fetch any tag at all (--no-tags)"
|
||||
msgstr "veya hiçbir etiketi getirme (--no-tags)"
|
||||
msgid ""
|
||||
"import all tags and associated objects when fetching\n"
|
||||
"or do not fetch any tag at all (--no-tags)"
|
||||
msgstr ""
|
||||
"getirirken tüm etiketleri ve ilişkili nesneleri\n"
|
||||
"içe aktar veya etiketleri hiç içe aktarma (--no-tags)"
|
||||
|
||||
msgid "branch(es) to track"
|
||||
msgstr "izlenecek dal(lar)"
|
||||
@@ -12569,6 +12525,10 @@ msgstr "Birleştirilmemiş altmodül %s atlanıyor"
|
||||
msgid "Skipping submodule '%s'"
|
||||
msgstr "'%s' altmodülü atlanıyor"
|
||||
|
||||
#, c-format
|
||||
msgid "cannot clone submodule '%s' without a URL"
|
||||
msgstr "bir URL olmadan '%s' altmodülü içe aktarılamıyor"
|
||||
|
||||
#, c-format
|
||||
msgid "Failed to clone '%s'. Retry scheduled"
|
||||
msgstr "'%s' klonlanamadı. Yeniden deneme zamanlandı"
|
||||
@@ -13306,10 +13266,10 @@ msgstr "etiket içeriğini yazdır"
|
||||
|
||||
msgid ""
|
||||
"git worktree add [-f] [--detach] [--checkout] [--lock [--reason <string>]]\n"
|
||||
" [-b <new-branch>] <path> [<commit-ish>]"
|
||||
" [--orphan] [(-b | -B) <new-branch>] <path> [<commit-ish>]"
|
||||
msgstr ""
|
||||
"git worktree add [-f] [--detach] [--checkout] [--lock [--reason <dizi>]]\n"
|
||||
" [-b <yeni-dal>] <yol> [<işlememsi>]"
|
||||
" [--orphan] [(-b | -B) <yeni-dal>] <yol> [<işlememsi>]"
|
||||
|
||||
msgid "git worktree list [-v | --porcelain [-z]]"
|
||||
msgstr "git worktree list [-v | --porcelain [-z]]"
|
||||
@@ -13332,6 +13292,37 @@ msgstr "git worktree repair [<yol>...]"
|
||||
msgid "git worktree unlock <worktree>"
|
||||
msgstr "git worktree unlock <çalışma-ağacı>"
|
||||
|
||||
msgid "No possible source branch, inferring '--orphan'"
|
||||
msgstr "Olası kaynak dal yok, '--orphan' anlamı çıkarılıyor"
|
||||
|
||||
#, c-format
|
||||
msgid ""
|
||||
"If you meant to create a worktree containing a new orphan branch\n"
|
||||
"(branch with no commits) for this repository, you can do so\n"
|
||||
"using the --orphan flag:\n"
|
||||
"\n"
|
||||
" git worktree add --orphan -b %s %s\n"
|
||||
msgstr ""
|
||||
"Bu depo için yeni bir yetim dal içeren (işlemesiz dal) bir\n"
|
||||
"çalışma ağacı oluşturmak istediyseniz bunu --orphan bayrağı\n"
|
||||
"ile yapabilirsiniz:\n"
|
||||
"\n"
|
||||
" git worktree add --orphan -b %s %s\n"
|
||||
|
||||
#, c-format
|
||||
msgid ""
|
||||
"If you meant to create a worktree containing a new orphan branch\n"
|
||||
"(branch with no commits) for this repository, you can do so\n"
|
||||
"using the --orphan flag:\n"
|
||||
"\n"
|
||||
" git worktree add --orphan %s\n"
|
||||
msgstr ""
|
||||
"Bu depo için yeni bir yetim dal içeren (işlemesiz dal) bir\n"
|
||||
"çalışma ağacı oluşturmak istediyseniz bunu --orphan bayrağı\n"
|
||||
"ile yapabilirsiniz:\n"
|
||||
"\n"
|
||||
" git worktree add --orphan %s\n"
|
||||
|
||||
#, c-format
|
||||
msgid "Removing %s/%s: %s"
|
||||
msgstr "%s/%s kaldırılıyor: %s"
|
||||
@@ -13398,10 +13389,36 @@ msgstr "Çalışma ağacı hazırlanıyor ('%s' dalı sıfırlanıyor; %s konumu
|
||||
msgid "Preparing worktree (checking out '%s')"
|
||||
msgstr "Çalışma ağacı hazırlanıyor ('%s' çıkış yapılıyor)"
|
||||
|
||||
#, c-format
|
||||
msgid "unreachable: invalid reference: %s"
|
||||
msgstr "erişilemiyor: geçersiz başvuru: %s"
|
||||
|
||||
#, c-format
|
||||
msgid "Preparing worktree (detached HEAD %s)"
|
||||
msgstr "Çalışma ağacı hazırlanıyor (ayrık HEAD %s)"
|
||||
|
||||
#, c-format
|
||||
msgid ""
|
||||
"HEAD points to an invalid (or orphaned) reference.\n"
|
||||
"HEAD path: '%s'\n"
|
||||
"HEAD contents: '%s'"
|
||||
msgstr ""
|
||||
"HEAD, geçersiz (veya yetim bırakılmış bir başvuruya işaret ediyor.\n"
|
||||
"HEAD yolu: '%s'\n"
|
||||
"HEAD içeriği: '%s'"
|
||||
|
||||
msgid ""
|
||||
"No local or remote refs exist despite at least one remote\n"
|
||||
"present, stopping; use 'add -f' to overide or fetch a remote first"
|
||||
msgstr ""
|
||||
"Bir uzak konum olmasına rağmen hiçbir yerel veya uzak başvuru\n"
|
||||
"yok, durduruluyor; geçersiz kılmak için 'add -f' kullanın veya\n"
|
||||
"önce bir uzak konum getirin"
|
||||
|
||||
#, c-format
|
||||
msgid "'%s' and '%s' cannot be used together"
|
||||
msgstr "'%s' ve '%s' birlikte kullanılamaz"
|
||||
|
||||
msgid "checkout <branch> even if already checked out in other worktree"
|
||||
msgstr "diğer çalışma ağacında çıkış yapılmış olsa bile <dal> çıkışını yap"
|
||||
|
||||
@@ -13411,6 +13428,9 @@ msgstr "yeni bir dal oluştur"
|
||||
msgid "create or reset a branch"
|
||||
msgstr "yeni bir dal oluştur veya sıfırla"
|
||||
|
||||
msgid "create unborn/orphaned branch"
|
||||
msgstr "doğmamış/yetim bırakılmış dal oluştur"
|
||||
|
||||
msgid "populate the new working tree"
|
||||
msgstr "yeni çalışma ağacını doldur"
|
||||
|
||||
@@ -13430,6 +13450,13 @@ msgstr "yeni dalın adını bir uzak izleme dalıyla eşleştirmeyi dene"
|
||||
msgid "options '%s', '%s', and '%s' cannot be used together"
|
||||
msgstr "'%s', '%s' ve '%s' seçenekleri birlikte kullanılamaz"
|
||||
|
||||
#, c-format
|
||||
msgid "options '%s', and '%s' cannot be used together"
|
||||
msgstr "'%s' ve '%s' seçenekleri birlikte kullanılamaz"
|
||||
|
||||
msgid "<commit-ish>"
|
||||
msgstr "<işlememsi>"
|
||||
|
||||
msgid "added with --lock"
|
||||
msgstr "--lock ile eklendi"
|
||||
|
||||
@@ -13657,6 +13684,14 @@ msgid_plural "The bundle requires these %<PRIuMAX> refs:"
|
||||
msgstr[0] "Demet bu başvuruyu gerektiriyor:"
|
||||
msgstr[1] "Demet bu %<PRIuMAX> başvuruyu gerektiriyor:"
|
||||
|
||||
#, c-format
|
||||
msgid "The bundle uses this hash algorithm: %s"
|
||||
msgstr "Demet, bu sağlama algoritmasını kullanıyor: %s"
|
||||
|
||||
#, c-format
|
||||
msgid "The bundle uses this filter: %s"
|
||||
msgstr "Demet, bu süzgeci kullanıyor: %s"
|
||||
|
||||
msgid "unable to dup bundle descriptor"
|
||||
msgstr "demet açıklayıcısı çoğaltılamıyor"
|
||||
|
||||
@@ -13881,8 +13916,8 @@ msgstr "Bir dizgi ile eşleşen satırları yazdır"
|
||||
msgid "A portable graphical interface to Git"
|
||||
msgstr "Git için taşınabilir bir grafik arabirim"
|
||||
|
||||
msgid "Compute object ID and optionally creates a blob from a file"
|
||||
msgstr "Sağlamayı hesapla ve isteğe göre dosyadan ikili oluştur"
|
||||
msgid "Compute object ID and optionally create an object from a file"
|
||||
msgstr "Nesne kimliğini hesapla/dosyadan isteğe bağlı nesne oluştur"
|
||||
|
||||
msgid "Display help information about Git"
|
||||
msgstr "Git yardım bilgisini görüntüle"
|
||||
@@ -14288,6 +14323,10 @@ msgstr "commit-graph temel grafiği iri parçasına iye değil"
|
||||
msgid "commit-graph chain does not match"
|
||||
msgstr "commit-graph zinciri eşleşmiyor"
|
||||
|
||||
#, c-format
|
||||
msgid "commit count in base graph too high: %<PRIuMAX>"
|
||||
msgstr "temel grafikteki işleme sayısı pek yüksek: %<PRIuMAX>"
|
||||
|
||||
#, c-format
|
||||
msgid "invalid commit-graph chain: line '%s' not a hash"
|
||||
msgstr "geçersiz commit-graph zinciri: '%s'. satır bir sağlama değil"
|
||||
@@ -14372,6 +14411,14 @@ msgstr "temel commit-graph dosyası yeniden adlandırılamadı"
|
||||
msgid "failed to rename temporary commit-graph file"
|
||||
msgstr "geçici commit-graph dosyası yeniden adlandırılamadı"
|
||||
|
||||
#, c-format
|
||||
msgid "cannot merge graphs with %<PRIuMAX>, %<PRIuMAX> commits"
|
||||
msgstr "%<PRIuMAX>, %<PRIuMAX> işlemeli grafikler birleştirilemiyor"
|
||||
|
||||
#, c-format
|
||||
msgid "cannot merge graph %s, too many commits: %<PRIuMAX>"
|
||||
msgstr "%s grafiği birleştirilemiyor, pek çok işleme: %<PRIuMAX>"
|
||||
|
||||
msgid "Scanning merged commits"
|
||||
msgstr "Birleştirilen işlemeler taranıyor"
|
||||
|
||||
@@ -14401,9 +14448,6 @@ msgstr "commit-graph hatalı fanout değerine iye: fanout[%d] = %u != %u"
|
||||
msgid "failed to parse commit %s from commit-graph"
|
||||
msgstr "%s işlemesi commit-graph'tan ayrıştırılamadı"
|
||||
|
||||
msgid "Verifying commits in commit graph"
|
||||
msgstr "İşleme grafiğindeki işlemeler doğrulanıyor"
|
||||
|
||||
#, c-format
|
||||
msgid "failed to parse commit %s from object database for commit-graph"
|
||||
msgstr ""
|
||||
@@ -14449,6 +14493,9 @@ msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
|
||||
msgstr ""
|
||||
"%s işlemesi için commit-graph içindeki işleme tarihi %<PRIuMAX> != %<PRIuMAX>"
|
||||
|
||||
msgid "Verifying commits in commit graph"
|
||||
msgstr "İşleme grafiğindeki işlemeler doğrulanıyor"
|
||||
|
||||
#, c-format
|
||||
msgid "%s %s is not a commit!"
|
||||
msgstr "%s %s bir işleme değil!"
|
||||
@@ -15396,6 +15443,12 @@ msgstr "bir birleştirme temeli bulunamadı"
|
||||
msgid "multiple merge bases found"
|
||||
msgstr "birden çok birleştirme temeli bulundu"
|
||||
|
||||
msgid "cannot compare stdin to a directory"
|
||||
msgstr "stdin, bir dizinle karşılaştırılamıyor"
|
||||
|
||||
msgid "cannot compare a named pipe to a directory"
|
||||
msgstr "adlandırılmış bir veriyolu bir dizinle karşılaştırılamıyor"
|
||||
|
||||
msgid "git diff --no-index [<options>] <path> <path>"
|
||||
msgstr "git diff --no-index [<seçenekler>] <yol> <yol>"
|
||||
|
||||
@@ -15452,6 +15505,13 @@ msgstr ""
|
||||
msgid "external diff died, stopping at %s"
|
||||
msgstr "dış diff sonlandı, %s konumunda durdu"
|
||||
|
||||
msgid "--follow requires exactly one pathspec"
|
||||
msgstr "--follow tam olarak yalnızca bir yol belirteci gerektiriyor"
|
||||
|
||||
#, c-format
|
||||
msgid "pathspec magic not supported by --follow: %s"
|
||||
msgstr "yol belirteci sihri --follow tarafından desteklenmiyor: %s"
|
||||
|
||||
#, c-format
|
||||
msgid "options '%s', '%s', '%s', and '%s' cannot be used together"
|
||||
msgstr "'%s', '%s', '%s' ve '%s' seçenekleri birlikte kullanılamaz"
|
||||
@@ -15469,9 +15529,6 @@ msgstr ""
|
||||
"'%s' ve '%s' seçenekleri birlikte kullanılamaz, '%s' seçeneğini '%s' ve '%s' "
|
||||
"ile kullanın"
|
||||
|
||||
msgid "--follow requires exactly one pathspec"
|
||||
msgstr "--follow tam olarak yalnızca bir yol belirteci gerektiriyor"
|
||||
|
||||
#, c-format
|
||||
msgid "invalid --stat value: %s"
|
||||
msgstr "geçersiz --stat değeri: %s"
|
||||
@@ -18330,6 +18387,13 @@ msgstr "diff oluşturulamadı"
|
||||
msgid "could not parse log for '%s'"
|
||||
msgstr "'%s' günlüğü ayrıştırılamadı"
|
||||
|
||||
#, c-format
|
||||
msgid "invalid extra cruft tip: '%s'"
|
||||
msgstr "geçersiz ek süprüntü ucu: '%s'"
|
||||
|
||||
msgid "unable to enumerate additional recent objects"
|
||||
msgstr "ek son kullanılan nesneler numaralandırılamıyor"
|
||||
|
||||
#, c-format
|
||||
msgid "will not add file alias '%s' ('%s' already exists in index)"
|
||||
msgstr "dosya arması '%s' eklenmeyecek ('%s' indekste halihazırda var)"
|
||||
@@ -18481,6 +18545,14 @@ msgstr "'%s' üzerindeki izin bitleri onarılamıyor"
|
||||
msgid "%s: cannot drop to stage #0"
|
||||
msgstr "%s: #0 numaralı hazırlama alanına bırakılamıyor"
|
||||
|
||||
#, c-format
|
||||
msgid "unexpected diff status %c"
|
||||
msgstr "beklenmedik diff durumu %c"
|
||||
|
||||
#, c-format
|
||||
msgid "remove '%s'\n"
|
||||
msgstr "kaldır: '%s'\n"
|
||||
|
||||
msgid ""
|
||||
"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
|
||||
"continue'.\n"
|
||||
@@ -18676,6 +18748,22 @@ msgstr "bilinmeyen %%(trailers) argümanı: %s"
|
||||
msgid "positive value expected contents:lines=%s"
|
||||
msgstr "pozitif değer şunu bekliyordu: contents:lines=%s"
|
||||
|
||||
#, c-format
|
||||
msgid "argument expected for %s"
|
||||
msgstr "%s için argüman bekleniyordu"
|
||||
|
||||
#, c-format
|
||||
msgid "positive value expected %s=%s"
|
||||
msgstr "pozitif değer şunu bekliyordu: %s=%s"
|
||||
|
||||
#, c-format
|
||||
msgid "cannot fully parse %s=%s"
|
||||
msgstr "tümüyle ayrıştırılamıyor: %s=%s"
|
||||
|
||||
#, c-format
|
||||
msgid "value expected %s="
|
||||
msgstr "değer şunu bekliyordu: %s="
|
||||
|
||||
#, c-format
|
||||
msgid "positive value expected '%s' in %%(%s)"
|
||||
msgstr "pozitif değer şurada '%s' bekliyordu: %%(%s)"
|
||||
@@ -18750,6 +18838,9 @@ msgstr "bu komut atom %%(%.*s) reddediyor"
|
||||
msgid "--format=%.*s cannot be used with --python, --shell, --tcl"
|
||||
msgstr "--format=%.*s, --python, --shell ve --tcl ile kullanılamaz"
|
||||
|
||||
msgid "failed to run 'describe'"
|
||||
msgstr "'describe' çalıştırılamadı"
|
||||
|
||||
#, c-format
|
||||
msgid "(no branch, rebasing %s)"
|
||||
msgstr "(dal yok, %s yeniden temellendiriliyor)"
|
||||
@@ -18811,6 +18902,9 @@ msgstr "anahtar"
|
||||
msgid "field name to sort on"
|
||||
msgstr "üzerine sıralanacak alan adı"
|
||||
|
||||
msgid "exclude refs which match pattern"
|
||||
msgstr "dizgiyle eşleşen başvuruları dışarıda bırak"
|
||||
|
||||
#, c-format
|
||||
msgid "not a reflog: %s"
|
||||
msgstr "bir başvuru günlüğü değil: %s"
|
||||
@@ -19252,8 +19346,11 @@ msgstr[1] ""
|
||||
"Sizin dalınız ve '%s' birbirinden uzaklaşmış ve sırasıyla\n"
|
||||
"her birinde %d ve %d işleme var.\n"
|
||||
|
||||
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
|
||||
msgstr " (uzak dalı kendi dalınıza birleştirmek için \"git pull\" kullanın)\n"
|
||||
msgid ""
|
||||
" (use \"git pull\" if you want to integrate the remote branch with yours)\n"
|
||||
msgstr ""
|
||||
" (uzak dalı kendi dalınızla birleştirmek istiyorsanız \"git pull\" "
|
||||
"kullanın)\n"
|
||||
|
||||
#, c-format
|
||||
msgid "cannot parse expected object name '%s'"
|
||||
@@ -19365,6 +19462,10 @@ msgstr "soy yolu argümanı %s için işleme alınamadı"
|
||||
msgid "--unpacked=<packfile> no longer supported"
|
||||
msgstr "--unpacked=<paketdosyası> artık desteklenmiyor"
|
||||
|
||||
#, c-format
|
||||
msgid "invalid option '%s' in --stdin mode"
|
||||
msgstr "--stdin kipinde geçersiz seçenek '%s'"
|
||||
|
||||
msgid "your current branch appears to be broken"
|
||||
msgstr "geçerli dalınız bozuk gibi görünüyor"
|
||||
|
||||
@@ -20507,6 +20608,77 @@ msgstr "çatallama başarısız"
|
||||
msgid "setsid failed"
|
||||
msgstr "setsid başarısız"
|
||||
|
||||
#, c-format
|
||||
msgid "cannot stat template '%s'"
|
||||
msgstr "'%s' şablonunun bilgileri alınamıyor"
|
||||
|
||||
#, c-format
|
||||
msgid "cannot opendir '%s'"
|
||||
msgstr "'%s' opendir yapılamıyor"
|
||||
|
||||
#, c-format
|
||||
msgid "cannot readlink '%s'"
|
||||
msgstr "'%s' readlink yapılamıyor"
|
||||
|
||||
#, c-format
|
||||
msgid "cannot symlink '%s' '%s'"
|
||||
msgstr "'%s', '%s' ögesine sembolik bağla bağlanamıyor"
|
||||
|
||||
#, c-format
|
||||
msgid "cannot copy '%s' to '%s'"
|
||||
msgstr "'%s' şuraya kopyalanamıyor: '%s'"
|
||||
|
||||
#, c-format
|
||||
msgid "ignoring template %s"
|
||||
msgstr "%s şablonu yok sayılıyor"
|
||||
|
||||
#, c-format
|
||||
msgid "templates not found in %s"
|
||||
msgstr "şablonlar %s içinde bulunamadı"
|
||||
|
||||
#, c-format
|
||||
msgid "not copying templates from '%s': %s"
|
||||
msgstr "şablonlar '%s' konumundan kopyalanmıyor: %s"
|
||||
|
||||
#, c-format
|
||||
msgid "invalid initial branch name: '%s'"
|
||||
msgstr "geçersiz başlangıç dalı adı: '%s'"
|
||||
|
||||
#, c-format
|
||||
msgid "unable to handle file type %d"
|
||||
msgstr "%d dosya türü ele alınamıyor"
|
||||
|
||||
#, c-format
|
||||
msgid "unable to move %s to %s"
|
||||
msgstr "%s şuraya taşınamıyor: %s"
|
||||
|
||||
msgid "attempt to reinitialize repository with different hash"
|
||||
msgstr "depoyu başka bir sağlama ile yeniden ilklendirme deneniyor"
|
||||
|
||||
#, c-format
|
||||
msgid "%s already exists"
|
||||
msgstr "%s halihazırda var"
|
||||
|
||||
#, c-format
|
||||
msgid "re-init: ignored --initial-branch=%s"
|
||||
msgstr "re-init: --initial-branch=%s yok sayıldı"
|
||||
|
||||
#, c-format
|
||||
msgid "Reinitialized existing shared Git repository in %s%s\n"
|
||||
msgstr "%s%s içindeki var olan paylaşılan Git deposu yeniden ilklendirildi\n"
|
||||
|
||||
#, c-format
|
||||
msgid "Reinitialized existing Git repository in %s%s\n"
|
||||
msgstr "%s%s içindeki var olan Git deposu yeniden ilklendirildi\n"
|
||||
|
||||
#, c-format
|
||||
msgid "Initialized empty shared Git repository in %s%s\n"
|
||||
msgstr "%s%s içinde paylaşılan boş Git deposu ilklendirildi\n"
|
||||
|
||||
#, c-format
|
||||
msgid "Initialized empty Git repository in %s%s\n"
|
||||
msgstr "%s%s içinde boş Git deposu ilklendirildi\n"
|
||||
|
||||
#, c-format
|
||||
msgid "index entry is a directory, but not sparse (%08x)"
|
||||
msgstr "indeks girdisi bir dizin; ancak aralıklı değil (%08x)"
|
||||
|
||||
566
po/zh_CN.po
566
po/zh_CN.po
@@ -14,6 +14,7 @@
|
||||
# - 依云 <lilydjwg AT gmail.com>
|
||||
# - Yichao Yu <yyc1992 AT gmail.com>
|
||||
# - Zhuang Ya <zhuangya AT me.com>
|
||||
# - Teng Long <dyroneteng AT gmail.com>
|
||||
#
|
||||
# Git glossary for Chinese translators
|
||||
#
|
||||
@@ -76,6 +77,7 @@
|
||||
# index entry | 索引条目
|
||||
# loose object | 松散对象
|
||||
# loose refs | 松散引用
|
||||
# magic | 神奇前缀（路径规格支持的一种前缀表达式）
|
||||
# master | master（默认分支名）
|
||||
# merge | 合并
|
||||
# object | 对象
|
||||
@@ -85,6 +87,7 @@
|
||||
# object type | 对象类型
|
||||
# octopus | 章鱼式合并（两分支以上的合并）
|
||||
# origin | origin（默认的远程名称）
|
||||
# orphan | 孤立（一般指孤立分支，即没有任何提交的分支）
|
||||
# pack | 包
|
||||
# pack index | 包索引
|
||||
# packfile | 包文件
|
||||
@@ -148,8 +151,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Git\n"
|
||||
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
|
||||
"POT-Creation-Date: 2023-05-20 12:27+0800\n"
|
||||
"PO-Revision-Date: 2023-05-20 12:38+0800\n"
|
||||
"POT-Creation-Date: 2023-08-18 10:21+0800\n"
|
||||
"PO-Revision-Date: 2023-08-18 19:29+0800\n"
|
||||
"Last-Translator: Teng Long <dyroneteng@gmail.com>\n"
|
||||
"Language-Team: GitHub <https://github.com/dyrone/git/>\n"
|
||||
"Language: zh_CN\n"
|
||||
@@ -891,9 +894,8 @@ msgid "Reverting is not possible because you have unmerged files."
|
||||
msgstr "无法回退，因为您有未合并的文件。"
|
||||
|
||||
#: advice.c
|
||||
#, c-format
|
||||
msgid "It is not possible to %s because you have unmerged files."
|
||||
msgstr "无法 %s，因为您有未合并的文件。"
|
||||
msgid "Rebasing is not possible because you have unmerged files."
|
||||
msgstr "无法变基，因为您有未合并的文件。"
|
||||
|
||||
#: advice.c
|
||||
msgid ""
|
||||
@@ -1060,6 +1062,14 @@ msgstr "选项 '%s' 和 '%s' 不能同时使用"
|
||||
msgid "'%s' outside a repository"
|
||||
msgstr "'%s' 在仓库之外"
|
||||
|
||||
#: apply.c
|
||||
msgid "failed to read patch"
|
||||
msgstr "无法读取补丁"
|
||||
|
||||
#: apply.c
|
||||
msgid "patch too large"
|
||||
msgstr "补丁过大"
|
||||
|
||||
#: apply.c
|
||||
#, c-format
|
||||
msgid "Cannot prepare timestamp regexp %s"
|
||||
@@ -2157,8 +2167,8 @@ msgstr "一个名为 '%s' 的分支已经存在"
|
||||
|
||||
#: branch.c
|
||||
#, c-format
|
||||
msgid "cannot force update the branch '%s' checked out at '%s'"
|
||||
msgstr "无法强制更新检出于 '%2$s' 的分支 '%1$s'"
|
||||
msgid "cannot force update the branch '%s' used by worktree at '%s'"
|
||||
msgstr "无法强制更新被工作区 '%2$s' 所使用的分支 '%1$s'"
|
||||
|
||||
#: branch.c
|
||||
#, c-format
|
||||
@@ -2236,20 +2246,6 @@ msgstr "git add [<选项>] [--] <路径规格>..."
|
||||
msgid "cannot chmod %cx '%s'"
|
||||
msgstr "不能 chmod %cx '%s'"
|
||||
|
||||
#: builtin/add.c
|
||||
#, c-format
|
||||
msgid "unexpected diff status %c"
|
||||
msgstr "意外的差异状态 %c"
|
||||
|
||||
#: builtin/add.c builtin/commit.c
|
||||
msgid "updating files failed"
|
||||
msgstr "更新文件失败"
|
||||
|
||||
#: builtin/add.c
|
||||
#, c-format
|
||||
msgid "remove '%s'\n"
|
||||
msgstr "删除 '%s'\n"
|
||||
|
||||
#: builtin/add.c
|
||||
msgid "Unstaged changes after refreshing the index:"
|
||||
msgstr "刷新索引之后尚未被暂存的变更："
|
||||
@@ -2776,10 +2772,6 @@ msgstr "向 git-mailinfo 传递 -m 参数"
|
||||
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
|
||||
msgstr "针对 mbox 格式，向 git-mailsplit 传递 --keep-cr 参数"
|
||||
|
||||
#: builtin/am.c
|
||||
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
|
||||
msgstr "不向 git-mailsplit 传递 --keep-cr 参数，覆盖 am.keepcr 的设置"
|
||||
|
||||
#: builtin/am.c
|
||||
msgid "strip everything before a scissors line"
|
||||
msgstr "丢弃裁切线前的所有内容"
|
||||
@@ -4080,12 +4072,12 @@ msgid ""
|
||||
"git cat-file (--batch | --batch-check | --batch-command) [--batch-all-"
|
||||
"objects]\n"
|
||||
" [--buffer] [--follow-symlinks] [--unordered]\n"
|
||||
" [--textconv | --filters] [-z]"
|
||||
" [--textconv | --filters] [-Z]"
|
||||
msgstr ""
|
||||
"git cat-file (--batch | --batch-check | --batch-command) [--batch-all-"
|
||||
"objects]\n"
|
||||
" [--buffer] [--follow-symlinks] [--unordered]\n"
|
||||
" [--textconv | --filters] [-z]"
|
||||
" [--textconv | --filters] [-Z]"
|
||||
|
||||
#: builtin/cat-file.c
|
||||
msgid ""
|
||||
@@ -4143,6 +4135,10 @@ msgstr "类似于 --batch，但不输出 <内容>"
|
||||
msgid "stdin is NUL-terminated"
|
||||
msgstr "标准输入以 NUL 字符分隔"
|
||||
|
||||
#: builtin/cat-file.c
|
||||
msgid "stdin and stdout is NUL-terminated"
|
||||
msgstr "标准输入和标准输出以 NUL 字符分隔"
|
||||
|
||||
#: builtin/cat-file.c
|
||||
msgid "read commands from stdin"
|
||||
msgstr "从标准输入读取命令"
|
||||
@@ -5039,7 +5035,8 @@ msgid "remove whole directories"
|
||||
msgstr "删除整个目录"
|
||||
|
||||
#: builtin/clean.c builtin/describe.c builtin/grep.c builtin/log.c
|
||||
#: builtin/ls-files.c builtin/name-rev.c builtin/show-ref.c
|
||||
#: builtin/ls-files.c builtin/name-rev.c builtin/pack-refs.c builtin/show-ref.c
|
||||
#: ref-filter.h
|
||||
msgid "pattern"
|
||||
msgstr "模式"
|
||||
|
||||
@@ -5209,14 +5206,6 @@ msgstr "server-specific"
|
||||
msgid "option to transmit"
|
||||
msgstr "传输选项"
|
||||
|
||||
#: builtin/clone.c builtin/fetch.c builtin/pull.c builtin/push.c
|
||||
msgid "use IPv4 addresses only"
|
||||
msgstr "只使用 IPv4 地址"
|
||||
|
||||
#: builtin/clone.c builtin/fetch.c builtin/pull.c builtin/push.c
|
||||
msgid "use IPv6 addresses only"
|
||||
msgstr "只使用 IPv6 地址"
|
||||
|
||||
#: builtin/clone.c
|
||||
msgid "apply partial clone filters to submodules"
|
||||
msgstr "对子模组使用部分克隆过滤器"
|
||||
@@ -5751,6 +5740,10 @@ msgstr ""
|
||||
" git cherry-pick --skip\n"
|
||||
"\n"
|
||||
|
||||
#: builtin/commit.c read-cache.c
|
||||
msgid "updating files failed"
|
||||
msgstr "更新文件失败"
|
||||
|
||||
#: builtin/commit.c
|
||||
msgid "failed to unpack HEAD tree object"
|
||||
msgstr "无法解包 HEAD 树对象"
|
||||
@@ -5826,8 +5819,8 @@ msgstr "无法选择一个未被当前提交说明使用的注释字符"
|
||||
|
||||
#: builtin/commit.c builtin/merge-tree.c
|
||||
#, c-format
|
||||
msgid "could not lookup commit %s"
|
||||
msgstr "不能查询提交 %s"
|
||||
msgid "could not lookup commit '%s'"
|
||||
msgstr "不能查询提交 '%s'"
|
||||
|
||||
#: builtin/commit.c builtin/shortlog.c
|
||||
#, c-format
|
||||
@@ -8050,7 +8043,7 @@ msgstr "对 %s 调用 fstat 失败：%s"
|
||||
msgid "failed to parse '%s' value '%s'"
|
||||
msgstr "无法解析 '%s' 值 '%s'"
|
||||
|
||||
#: builtin/gc.c builtin/init-db.c
|
||||
#: builtin/gc.c setup.c
|
||||
#, c-format
|
||||
msgid "cannot stat '%s'"
|
||||
msgstr "不能对 '%s' 调用 stat"
|
||||
@@ -9061,7 +9054,7 @@ msgstr "无法返回当前工作目录"
|
||||
msgid "bad %s"
|
||||
msgstr "错误选项 %s"
|
||||
|
||||
#: builtin/index-pack.c builtin/init-db.c
|
||||
#: builtin/index-pack.c builtin/init-db.c setup.c
|
||||
#, c-format
|
||||
msgid "unknown hash algorithm '%s'"
|
||||
msgstr "未知的哈希算法 '%s'"
|
||||
@@ -9078,95 +9071,6 @@ msgstr "--verify 没有提供包文件名参数"
|
||||
msgid "fsck error in pack objects"
|
||||
msgstr "在打包对象中 fsck 检查出错"
|
||||
|
||||
#: builtin/init-db.c
|
||||
#, c-format
|
||||
msgid "cannot stat template '%s'"
|
||||
msgstr "不能对模版 '%s' 调用 stat"
|
||||
|
||||
#: builtin/init-db.c
|
||||
#, c-format
|
||||
msgid "cannot opendir '%s'"
|
||||
msgstr "不能打开目录 '%s'"
|
||||
|
||||
#: builtin/init-db.c
|
||||
#, c-format
|
||||
msgid "cannot readlink '%s'"
|
||||
msgstr "不能读取链接 '%s'"
|
||||
|
||||
#: builtin/init-db.c
|
||||
#, c-format
|
||||
msgid "cannot symlink '%s' '%s'"
|
||||
msgstr "不能自 '%s' 到 '%s' 创建符号链接"
|
||||
|
||||
#: builtin/init-db.c
|
||||
#, c-format
|
||||
msgid "cannot copy '%s' to '%s'"
|
||||
msgstr "不能拷贝 '%s' 至 '%s'"
|
||||
|
||||
#: builtin/init-db.c
|
||||
#, c-format
|
||||
msgid "ignoring template %s"
|
||||
msgstr "忽略模版 %s"
|
||||
|
||||
#: builtin/init-db.c
|
||||
#, c-format
|
||||
msgid "templates not found in %s"
|
||||
msgstr "没有在 %s 中找到模版"
|
||||
|
||||
#: builtin/init-db.c
|
||||
#, c-format
|
||||
msgid "not copying templates from '%s': %s"
|
||||
msgstr "没有从 '%s' 复制模版：%s"
|
||||
|
||||
#: builtin/init-db.c
|
||||
#, c-format
|
||||
msgid "invalid initial branch name: '%s'"
|
||||
msgstr "无效的初始分支名：'%s'"
|
||||
|
||||
#: builtin/init-db.c
|
||||
#, c-format
|
||||
msgid "unable to handle file type %d"
|
||||
msgstr "不能处理 %d 类型的文件"
|
||||
|
||||
#: builtin/init-db.c
|
||||
#, c-format
|
||||
msgid "unable to move %s to %s"
|
||||
msgstr "不能移动 %s 至 %s"
|
||||
|
||||
#: builtin/init-db.c
|
||||
msgid "attempt to reinitialize repository with different hash"
|
||||
msgstr "尝试用不同的哈希算法重新初始化仓库"
|
||||
|
||||
#: builtin/init-db.c
|
||||
#, c-format
|
||||
msgid "%s already exists"
|
||||
msgstr "%s 已经存在"
|
||||
|
||||
#: builtin/init-db.c
|
||||
#, c-format
|
||||
msgid "re-init: ignored --initial-branch=%s"
|
||||
msgstr "re-init：已忽略 --initial-branch=%s"
|
||||
|
||||
#: builtin/init-db.c
|
||||
#, c-format
|
||||
msgid "Reinitialized existing shared Git repository in %s%s\n"
|
||||
msgstr "重新初始化已存在的共享 Git 仓库于 %s%s\n"
|
||||
|
||||
#: builtin/init-db.c
|
||||
#, c-format
|
||||
msgid "Reinitialized existing Git repository in %s%s\n"
|
||||
msgstr "已重新初始化已存在的 Git 仓库于 %s%s\n"
|
||||
|
||||
#: builtin/init-db.c
|
||||
#, c-format
|
||||
msgid "Initialized empty shared Git repository in %s%s\n"
|
||||
msgstr "已初始化空的共享 Git 仓库于 %s%s\n"
|
||||
|
||||
#: builtin/init-db.c
|
||||
#, c-format
|
||||
msgid "Initialized empty Git repository in %s%s\n"
|
||||
msgstr "已初始化空的 Git 仓库于 %s%s\n"
|
||||
|
||||
#: builtin/init-db.c
|
||||
msgid ""
|
||||
"git init [-q | --quiet] [--bare] [--template=<template-directory>]\n"
|
||||
@@ -9714,6 +9618,11 @@ msgid ""
|
||||
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
|
||||
msgstr "不能找到跟踪的远程分支，请手工指定 <上游>。\n"
|
||||
|
||||
#: builtin/ls-files.c builtin/ls-tree.c
|
||||
#, c-format
|
||||
msgid "could not get object info about '%s'"
|
||||
msgstr "无法获得关于 '%s' 的对象信息"
|
||||
|
||||
#: builtin/ls-files.c
|
||||
#, c-format
|
||||
msgid "bad ls-files format: element '%s' does not start with '('"
|
||||
@@ -9899,11 +9808,6 @@ msgstr "除了显示指向的对象外，显示指向的引用名"
|
||||
msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
|
||||
msgstr "git ls-tree [<选项>] <树对象> [<路径>...]"
|
||||
|
||||
#: builtin/ls-tree.c
|
||||
#, c-format
|
||||
msgid "could not get object info about '%s'"
|
||||
msgstr "无法获得关于 '%s' 的对象信息"
|
||||
|
||||
#: builtin/ls-tree.c
|
||||
#, c-format
|
||||
msgid "bad ls-tree format: element '%s' does not start with '('"
|
||||
@@ -10829,11 +10733,13 @@ msgstr "git notes [--ref <注解引用>] [list [<对象>]]"
|
||||
|
||||
#: builtin/notes.c
|
||||
msgid ""
|
||||
"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
|
||||
"| (-c | -C) <object>] [<object>]"
|
||||
"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [--[no-]separator|--"
|
||||
"separator=<paragraph-break>] [--[no-]stripspace] [-m <msg> | -F <file> | (-c "
|
||||
"| -C) <object>] [<object>]"
|
||||
msgstr ""
|
||||
"git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> "
|
||||
"| (-c | -C) <对象>] [<对象>]"
|
||||
"git notes [--ref <注解引用>] add [-f] [--allow-empty] [--[no-]separator|--"
|
||||
"separator=<分段符>] [--[no-]stripspace] [-m <说明> | -F <文件> | (-c | -C) <"
|
||||
"对象>] [<对象>]"
|
||||
|
||||
#: builtin/notes.c
|
||||
msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
|
||||
@@ -10841,11 +10747,13 @@ msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>"
|
||||
|
||||
#: builtin/notes.c
|
||||
msgid ""
|
||||
"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
|
||||
"(-c | -C) <object>] [<object>]"
|
||||
"git notes [--ref <notes-ref>] append [--allow-empty] [--[no-]separator|--"
|
||||
"separator=<paragraph-break>] [--[no-]stripspace] [-m <msg> | -F <file> | (-c "
|
||||
"| -C) <object>] [<object>]"
|
||||
msgstr ""
|
||||
"git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | "
|
||||
"(-c | -C) <对象>] [<对象>]"
|
||||
"git notes [--ref <注解引用>] append [--allow-empty] [--[no-]separator|--"
|
||||
"separator=<分段符>] [--[no-]stripspace] [-m <说明> | -F <文件> | (-c | -C) <"
|
||||
"对象>] [<对象>]"
|
||||
|
||||
#: builtin/notes.c
|
||||
msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
|
||||
@@ -11013,6 +10921,18 @@ msgstr "允许保存空白注释"
|
||||
msgid "replace existing notes"
|
||||
msgstr "替换已存在的注解"
|
||||
|
||||
#: builtin/notes.c
|
||||
msgid "<paragraph-break>"
|
||||
msgstr "<分段符>"
|
||||
|
||||
#: builtin/notes.c
|
||||
msgid "insert <paragraph-break> between paragraphs"
|
||||
msgstr "在段落之间插入<分段符>"
|
||||
|
||||
#: builtin/notes.c
|
||||
msgid "remove unnecessary whitespace"
|
||||
msgstr "删除不必要的空白字符"
|
||||
|
||||
#: builtin/notes.c
|
||||
#, c-format
|
||||
msgid ""
|
||||
@@ -11691,8 +11611,11 @@ msgid "refusing to run without --i-still-use-this"
|
||||
msgstr "拒绝在未指定 --i-still-use-this 选项时运行"
|
||||
|
||||
#: builtin/pack-refs.c
|
||||
msgid "git pack-refs [--all] [--no-prune]"
|
||||
msgstr "git pack-refs [--all] [--no-prune]"
|
||||
msgid ""
|
||||
"git pack-refs [--all] [--no-prune] [--include <pattern>] [--exclude "
|
||||
"<pattern>]"
|
||||
msgstr ""
|
||||
"git pack-refs [--all] [--no-prune] [--include <模式>] [--exclude <模式>]"
|
||||
|
||||
#: builtin/pack-refs.c
|
||||
msgid "pack everything"
|
||||
@@ -11702,6 +11625,14 @@ msgstr "打包一切"
|
||||
msgid "prune loose refs (default)"
|
||||
msgstr "清除松散的引用（默认）"
|
||||
|
||||
#: builtin/pack-refs.c
|
||||
msgid "references to include"
|
||||
msgstr "需包含的引用"
|
||||
|
||||
#: builtin/pack-refs.c
|
||||
msgid "references to exclude"
|
||||
msgstr "需排除的引用"
|
||||
|
||||
#: builtin/patch-id.c
|
||||
msgid "git patch-id [--stable | --unstable | --verbatim]"
|
||||
msgstr "git patch-id [--stable | --unstable | --verbatim]"
|
||||
@@ -11778,6 +11709,14 @@ msgstr "强制覆盖本地分支"
|
||||
msgid "number of submodules pulled in parallel"
|
||||
msgstr "并发拉取的子模组的数量"
|
||||
|
||||
#: builtin/pull.c parse-options.h
|
||||
msgid "use IPv4 addresses only"
|
||||
msgstr "只使用 IPv4 地址"
|
||||
|
||||
#: builtin/pull.c parse-options.h
|
||||
msgid "use IPv6 addresses only"
|
||||
msgstr "只使用 IPv6 地址"
|
||||
|
||||
#: builtin/pull.c
|
||||
msgid ""
|
||||
"There is no candidate for rebasing against among the refs that you just "
|
||||
@@ -12059,36 +11998,36 @@ msgstr ""
|
||||
#: builtin/push.c
|
||||
msgid ""
|
||||
"Updates were rejected because the tip of your current branch is behind\n"
|
||||
"its remote counterpart. Integrate the remote changes (e.g.\n"
|
||||
"'git pull ...') before pushing again.\n"
|
||||
"its remote counterpart. If you want to integrate the remote changes,\n"
|
||||
"use 'git pull' before pushing again.\n"
|
||||
"See the 'Note about fast-forwards' in 'git push --help' for details."
|
||||
msgstr ""
|
||||
"更新被拒绝，因为您当前分支的最新提交落后于其对应的远程分支。\n"
|
||||
"再次推送前，先与远程变更合并（如 'git pull ...'）。详见\n"
|
||||
"'git push --help' 中的 'Note about fast-forwards' 小节。"
|
||||
"如果您希望先与远程变更合并，请在推送前执行 'git pull'。\n"
|
||||
"详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
|
||||
|
||||
#: builtin/push.c
|
||||
msgid ""
|
||||
"Updates were rejected because a pushed branch tip is behind its remote\n"
|
||||
"counterpart. Check out this branch and integrate the remote changes\n"
|
||||
"(e.g. 'git pull ...') before pushing again.\n"
|
||||
"counterpart. If you want to integrate the remote changes, use 'git pull'\n"
|
||||
"before pushing again.\n"
|
||||
"See the 'Note about fast-forwards' in 'git push --help' for details."
|
||||
msgstr ""
|
||||
"更新被拒绝，因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
|
||||
"检出该分支并整合远程变更（如 'git pull ...'），然后再推送。详见\n"
|
||||
"'git push --help' 中的 'Note about fast-forwards' 小节。"
|
||||
"如果您希望先与远程变更合并，请在推送前执行 'git pull'。\n"
|
||||
"详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
|
||||
|
||||
#: builtin/push.c
|
||||
msgid ""
|
||||
"Updates were rejected because the remote contains work that you do\n"
|
||||
"not have locally. This is usually caused by another repository pushing\n"
|
||||
"to the same ref. You may want to first integrate the remote changes\n"
|
||||
"(e.g., 'git pull ...') before pushing again.\n"
|
||||
"Updates were rejected because the remote contains work that you do not\n"
|
||||
"have locally. This is usually caused by another repository pushing to\n"
|
||||
"the same ref. If you want to integrate the remote changes, use\n"
|
||||
"'git pull' before pushing again.\n"
|
||||
"See the 'Note about fast-forwards' in 'git push --help' for details."
|
||||
msgstr ""
|
||||
"更新被拒绝，因为远程仓库包含您本地尚不存在的提交。这通常是因为另外\n"
|
||||
"一个仓库已向该引用进行了推送。再次推送前，您可能需要先整合远程变更\n"
|
||||
"（如 'git pull ...'）。\n"
|
||||
"一个仓库已向该引用进行了推送。如果您希望先与远程变更合并，请在推送\n"
|
||||
"前执行 'git pull'。\n"
|
||||
"详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
|
||||
|
||||
#: builtin/push.c
|
||||
@@ -12106,13 +12045,14 @@ msgstr ""
|
||||
|
||||
#: builtin/push.c
|
||||
msgid ""
|
||||
"Updates were rejected because the tip of the remote-tracking\n"
|
||||
"branch has been updated since the last checkout. You may want\n"
|
||||
"to integrate those changes locally (e.g., 'git pull ...')\n"
|
||||
"before forcing an update.\n"
|
||||
"Updates were rejected because the tip of the remote-tracking branch has\n"
|
||||
"been updated since the last checkout. If you want to integrate the\n"
|
||||
"remote changes, use 'git pull' before pushing again.\n"
|
||||
"See the 'Note about fast-forwards' in 'git push --help' for details."
|
||||
msgstr ""
|
||||
"更新被拒绝，因为远程跟踪分支的最新提交自从上次检出之后已被更新。\n"
|
||||
"在强制更新前，您可能想将这些变更整合到本地（如 'git pull ...'）。\n"
|
||||
"如果您希望先与远程变更合并，请在推送前执行 'git pull'。\n"
|
||||
"详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
|
||||
|
||||
#: builtin/push.c
|
||||
#, c-format
|
||||
@@ -13141,12 +13081,10 @@ msgid "fetch the remote branches"
|
||||
msgstr "抓取远程的分支"
|
||||
|
||||
#: builtin/remote.c
|
||||
msgid "import all tags and associated objects when fetching"
|
||||
msgstr "抓取时导入所有的标签和关联对象"
|
||||
|
||||
#: builtin/remote.c
|
||||
msgid "or do not fetch any tag at all (--no-tags)"
|
||||
msgstr "或不抓取任何标签（--no-tags）"
|
||||
msgid ""
|
||||
"import all tags and associated objects when fetching\n"
|
||||
"or do not fetch any tag at all (--no-tags)"
|
||||
msgstr "抓取时导入所有的标签和关联对象，或不抓取任何标签（--no-tags）"
|
||||
|
||||
#: builtin/remote.c
|
||||
msgid "branch(es) to track"
|
||||
@@ -15530,6 +15468,11 @@ msgstr "略过未合并的子模组 %s"
|
||||
msgid "Skipping submodule '%s'"
|
||||
msgstr "略过子模组 '%s'"
|
||||
|
||||
#: builtin/submodule--helper.c
|
||||
#, c-format
|
||||
msgid "cannot clone submodule '%s' without a URL"
|
||||
msgstr "无法在不提供 URL 时克隆子模组 '%s'"
|
||||
|
||||
#: builtin/submodule--helper.c
|
||||
#, c-format
|
||||
msgid "Failed to clone '%s'. Retry scheduled"
|
||||
@@ -16442,10 +16385,10 @@ msgstr "打印标签内容"
|
||||
#: builtin/worktree.c
|
||||
msgid ""
|
||||
"git worktree add [-f] [--detach] [--checkout] [--lock [--reason <string>]]\n"
|
||||
" [-b <new-branch>] <path> [<commit-ish>]"
|
||||
" [--orphan] [(-b | -B) <new-branch>] <path> [<commit-ish>]"
|
||||
msgstr ""
|
||||
"git worktree add [-f] [--detach] [--checkout] [--lock [--reason <字符串>]]\n"
|
||||
" [-b <新分支>] <路径> [<提交号>]"
|
||||
" [--orphan] [(-b | -B) <新分支>] <路径> [<提交号>]"
|
||||
|
||||
#: builtin/worktree.c
|
||||
msgid "git worktree list [-v | --porcelain [-z]]"
|
||||
@@ -16475,6 +16418,40 @@ msgstr "git worktree repair [<路径>...]"
|
||||
msgid "git worktree unlock <worktree>"
|
||||
msgstr "git worktree unlock <工作区>"
|
||||
|
||||
#: builtin/worktree.c
|
||||
msgid "No possible source branch, inferring '--orphan'"
|
||||
msgstr "没有可用的源分支，将基于 '--orphan' 选项进行推断"
|
||||
|
||||
#: builtin/worktree.c
|
||||
#, c-format
|
||||
msgid ""
|
||||
"If you meant to create a worktree containing a new orphan branch\n"
|
||||
"(branch with no commits) for this repository, you can do so\n"
|
||||
"using the --orphan flag:\n"
|
||||
"\n"
|
||||
" git worktree add --orphan -b %s %s\n"
|
||||
msgstr ""
|
||||
"如果你打算为此仓库创建一个包含新的孤立分支\n"
|
||||
"（没有提交的分支）的工作区，你可以使用选项\n"
|
||||
"--orphan 来执行此操作：\n"
|
||||
"\n"
|
||||
" git worktree add --orphan -b %s %s\n"
|
||||
|
||||
#: builtin/worktree.c
|
||||
#, c-format
|
||||
msgid ""
|
||||
"If you meant to create a worktree containing a new orphan branch\n"
|
||||
"(branch with no commits) for this repository, you can do so\n"
|
||||
"using the --orphan flag:\n"
|
||||
"\n"
|
||||
" git worktree add --orphan %s\n"
|
||||
msgstr ""
|
||||
"如果你打算为此仓库创建一个包含新的孤立分支\n"
|
||||
"（没有提交的分支）的工作区，你可以使用选项\n"
|
||||
"--orphan 来执行此操作：\n"
|
||||
"\n"
|
||||
" git worktree add --orphan %s\n"
|
||||
|
||||
#: builtin/worktree.c
|
||||
#, c-format
|
||||
msgid "Removing %s/%s: %s"
|
||||
@@ -16555,11 +16532,40 @@ msgstr "准备工作区（重置分支 '%s'，之前为 %s）"
|
||||
msgid "Preparing worktree (checking out '%s')"
|
||||
msgstr "准备工作区（检出 '%s'）"
|
||||
|
||||
#: builtin/worktree.c
|
||||
#, c-format
|
||||
msgid "unreachable: invalid reference: %s"
|
||||
msgstr "不可达：无效引用：%s"
|
||||
|
||||
#: builtin/worktree.c
|
||||
#, c-format
|
||||
msgid "Preparing worktree (detached HEAD %s)"
|
||||
msgstr "准备工作区（分离头指针 %s）"
|
||||
|
||||
#: builtin/worktree.c
|
||||
#, c-format
|
||||
msgid ""
|
||||
"HEAD points to an invalid (or orphaned) reference.\n"
|
||||
"HEAD path: '%s'\n"
|
||||
"HEAD contents: '%s'"
|
||||
msgstr ""
|
||||
"HEAD 指向了一个无用的（或孤立的）引用。\n"
|
||||
"HEAD 路径： '%s'\n"
|
||||
"HEAD 内容： '%s'"
|
||||
|
||||
#: builtin/worktree.c
|
||||
msgid ""
|
||||
"No local or remote refs exist despite at least one remote\n"
|
||||
"present, stopping; use 'add -f' to overide or fetch a remote first"
|
||||
msgstr ""
|
||||
"尽管已配置远程仓库，但不存在任何本地的或远程的引用，操作终止;\n"
|
||||
"请使用 'add -f' 来覆盖或拉取一个远程仓库"
|
||||
|
||||
#: builtin/worktree.c
|
||||
#, c-format
|
||||
msgid "'%s' and '%s' cannot be used together"
|
||||
msgstr "'%s' 和 '%s' 不能同时使用"
|
||||
|
||||
#: builtin/worktree.c
|
||||
msgid "checkout <branch> even if already checked out in other worktree"
|
||||
msgstr "检出 <分支>，即使已经被检出到其它工作区"
|
||||
@@ -16572,6 +16578,10 @@ msgstr "创建一个新分支"
|
||||
msgid "create or reset a branch"
|
||||
msgstr "创建或重置一个分支"
|
||||
|
||||
#: builtin/worktree.c
|
||||
msgid "create unborn/orphaned branch"
|
||||
msgstr "创建一个尚未诞生的/孤立的分支"
|
||||
|
||||
#: builtin/worktree.c
|
||||
msgid "populate the new working tree"
|
||||
msgstr "生成新的工作区"
|
||||
@@ -16597,6 +16607,15 @@ msgstr "尝试为新分支名匹配一个远程跟踪分支"
|
||||
msgid "options '%s', '%s', and '%s' cannot be used together"
|
||||
msgstr "选项 '%s'、'%s' 和 '%s' 不能同时使用"
|
||||
|
||||
#: builtin/worktree.c
|
||||
#, c-format
|
||||
msgid "options '%s', and '%s' cannot be used together"
|
||||
msgstr "选项 '%s'，与 '%s' 不能同时使用"
|
||||
|
||||
#: builtin/worktree.c
|
||||
msgid "<commit-ish>"
|
||||
msgstr "<提交号>"
|
||||
|
||||
#: builtin/worktree.c
|
||||
msgid "added with --lock"
|
||||
msgstr "由 --lock 添加"
|
||||
@@ -16877,6 +16896,16 @@ msgid_plural "The bundle requires these %<PRIuMAX> refs:"
|
||||
msgstr[0] "这个归档包需要这个引用："
|
||||
msgstr[1] "这个归档包需要 %<PRIuMAX> 个引用："
|
||||
|
||||
#: bundle.c
|
||||
#, c-format
|
||||
msgid "The bundle uses this hash algorithm: %s"
|
||||
msgstr "该归档包使用的哈希算法：%s"
|
||||
|
||||
#: bundle.c
|
||||
#, c-format
|
||||
msgid "The bundle uses this filter: %s"
|
||||
msgstr "归档包使用了过滤器：%s"
|
||||
|
||||
#: bundle.c
|
||||
msgid "unable to dup bundle descriptor"
|
||||
msgstr "无法复制归档包描述符"
|
||||
@@ -17174,8 +17203,8 @@ msgid "A portable graphical interface to Git"
|
||||
msgstr "一个便携的 Git 图形客户端"
|
||||
|
||||
#: command-list.h
|
||||
msgid "Compute object ID and optionally creates a blob from a file"
|
||||
msgstr "从一个文件计算对象 ID，并可以创建 blob 数据对象"
|
||||
msgid "Compute object ID and optionally create an object from a file"
|
||||
msgstr "从一个文件计算对象 ID，并支持可选地创建一个对象"
|
||||
|
||||
#: command-list.h
|
||||
msgid "Display help information about Git"
|
||||
@@ -17715,6 +17744,11 @@ msgstr "提交图形没有基础图形块"
|
||||
msgid "commit-graph chain does not match"
|
||||
msgstr "提交图形链不匹配"
|
||||
|
||||
#: commit-graph.c
|
||||
#, c-format
|
||||
msgid "commit count in base graph too high: %<PRIuMAX>"
|
||||
msgstr "基础图形中的提交数量过高：%<PRIuMAX>"
|
||||
|
||||
#: commit-graph.c
|
||||
#, c-format
|
||||
msgid "invalid commit-graph chain: line '%s' not a hash"
|
||||
@@ -17822,6 +17856,17 @@ msgstr "无法重命名基础提交图形文件"
|
||||
msgid "failed to rename temporary commit-graph file"
|
||||
msgstr "无法重命名临时提交图形文件"
|
||||
|
||||
#: commit-graph.c
|
||||
#, c-format
|
||||
msgid "cannot merge graphs with %<PRIuMAX>, %<PRIuMAX> commits"
|
||||
msgstr ""
|
||||
"无法合并提交图形，总共已累加提交数：%<PRIuMAX>，当前待累加提交数：%<PRIuMAX>"
|
||||
|
||||
#: commit-graph.c
|
||||
#, c-format
|
||||
msgid "cannot merge graph %s, too many commits: %<PRIuMAX>"
|
||||
msgstr "无法合并提交图形 %s, 提交过多：%<PRIuMAX>"
|
||||
|
||||
#: commit-graph.c
|
||||
msgid "Scanning merged commits"
|
||||
msgstr "正在扫描合并提交"
|
||||
@@ -17857,10 +17902,6 @@ msgstr "提交图形有不正确的扇出值：fanout[%d] = %u != %u"
|
||||
msgid "failed to parse commit %s from commit-graph"
|
||||
msgstr "无法从提交图形中解析提交 %s"
|
||||
|
||||
#: commit-graph.c
|
||||
msgid "Verifying commits in commit graph"
|
||||
msgstr "正在校验提交图中的提交"
|
||||
|
||||
#: commit-graph.c
|
||||
#, c-format
|
||||
msgid "failed to parse commit %s from object database for commit-graph"
|
||||
@@ -17908,6 +17949,10 @@ msgstr "提交图形中的提交 %s 的世代号是 %<PRIuMAX> < %<PRIuMAX>"
|
||||
msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
|
||||
msgstr "提交图形中提交 %s 的提交日期是 %<PRIuMAX> != %<PRIuMAX>"
|
||||
|
||||
#: commit-graph.c
|
||||
msgid "Verifying commits in commit graph"
|
||||
msgstr "正在校验提交图中的提交"
|
||||
|
||||
#: commit.c
|
||||
#, c-format
|
||||
msgid "%s %s is not a commit!"
|
||||
@@ -19064,6 +19109,14 @@ msgstr "未找到合并基线"
|
||||
msgid "multiple merge bases found"
|
||||
msgstr "找到了多条合并基线"
|
||||
|
||||
#: diff-no-index.c
|
||||
msgid "cannot compare stdin to a directory"
|
||||
msgstr "无法将标准输入和目录进行比较"
|
||||
|
||||
#: diff-no-index.c
|
||||
msgid "cannot compare a named pipe to a directory"
|
||||
msgstr "无法将命名管道和目录进行比较"
|
||||
|
||||
#: diff-no-index.c
|
||||
msgid "git diff --no-index [<options>] <path> <path>"
|
||||
msgstr "git diff --no-index [<选项>] <路径> <路径>"
|
||||
@@ -19128,6 +19181,15 @@ msgstr ""
|
||||
msgid "external diff died, stopping at %s"
|
||||
msgstr "外部 diff 退出，停止在 %s"
|
||||
|
||||
#: diff.c
|
||||
msgid "--follow requires exactly one pathspec"
|
||||
msgstr "--follow 明确要求只跟一个路径规格"
|
||||
|
||||
#: diff.c
|
||||
#, c-format
|
||||
msgid "pathspec magic not supported by --follow: %s"
|
||||
msgstr "指定 --follow: %s 的同时，不支持在路径规格中使用神奇前缀"
|
||||
|
||||
#: diff.c parse-options.c
|
||||
#, c-format
|
||||
msgid "options '%s', '%s', '%s', and '%s' cannot be used together"
|
||||
@@ -19144,10 +19206,6 @@ msgid ""
|
||||
"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"
|
||||
msgstr "选项 '%1$s'、'%2$s' 不能同时使用，与 '%4$s' 和 '%5$s' 一起使用 '%3$s'"
|
||||
|
||||
#: diff.c
|
||||
msgid "--follow requires exactly one pathspec"
|
||||
msgstr "--follow 明确要求只跟一个路径规格"
|
||||
|
||||
#: diff.c
|
||||
#, c-format
|
||||
msgid "invalid --stat value: %s"
|
||||
@@ -22607,6 +22665,15 @@ msgstr "无法生成 diff"
|
||||
msgid "could not parse log for '%s'"
|
||||
msgstr "不能解析 '%s' 的日志"
|
||||
|
||||
#: reachable.c
|
||||
#, c-format
|
||||
msgid "invalid extra cruft tip: '%s'"
|
||||
msgstr "无效的额外废弃提交版本：'%s'"
|
||||
|
||||
#: reachable.c
|
||||
msgid "unable to enumerate additional recent objects"
|
||||
msgstr "无法枚举额外的近期对象"
|
||||
|
||||
#: read-cache.c
|
||||
#, c-format
|
||||
msgid "will not add file alias '%s' ('%s' already exists in index)"
|
||||
@@ -22794,6 +22861,16 @@ msgstr "不能修复 '%s' 的权限位"
|
||||
msgid "%s: cannot drop to stage #0"
|
||||
msgstr "%s：不能落到暂存区 #0"
|
||||
|
||||
#: read-cache.c
|
||||
#, c-format
|
||||
msgid "unexpected diff status %c"
|
||||
msgstr "意外的差异状态 %c"
|
||||
|
||||
#: read-cache.c
|
||||
#, c-format
|
||||
msgid "remove '%s'\n"
|
||||
msgstr "删除 '%s'\n"
|
||||
|
||||
#: rebase-interactive.c
|
||||
msgid ""
|
||||
"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
|
||||
@@ -23007,6 +23084,26 @@ msgstr "未知的 %%(trailers) 参数：%s"
|
||||
msgid "positive value expected contents:lines=%s"
|
||||
msgstr "期望一个正数 contents:lines=%s"
|
||||
|
||||
#: ref-filter.c
|
||||
#, c-format
|
||||
msgid "argument expected for %s"
|
||||
msgstr "预期参数 %s"
|
||||
|
||||
#: ref-filter.c
|
||||
#, c-format
|
||||
msgid "positive value expected %s=%s"
|
||||
msgstr "预期正数参数值 %s=%s"
|
||||
|
||||
#: ref-filter.c
|
||||
#, c-format
|
||||
msgid "cannot fully parse %s=%s"
|
||||
msgstr "不能完整解析 %s=%s"
|
||||
|
||||
#: ref-filter.c
|
||||
#, c-format
|
||||
msgid "value expected %s="
|
||||
msgstr "预期值 %s="
|
||||
|
||||
#: ref-filter.c
|
||||
#, c-format
|
||||
msgid "positive value expected '%s' in %%(%s)"
|
||||
@@ -23098,6 +23195,10 @@ msgstr "这个命令拒绝元素 %%(%.*s)"
|
||||
msgid "--format=%.*s cannot be used with --python, --shell, --tcl"
|
||||
msgstr "--format=%.*s 不能和 --python、--shell、--tcl 同时使用"
|
||||
|
||||
#: ref-filter.c
|
||||
msgid "failed to run 'describe'"
|
||||
msgstr "无法运行 'describe'"
|
||||
|
||||
#: ref-filter.c
|
||||
#, c-format
|
||||
msgid "(no branch, rebasing %s)"
|
||||
@@ -23175,6 +23276,10 @@ msgstr "key"
|
||||
msgid "field name to sort on"
|
||||
msgstr "排序的字段名"
|
||||
|
||||
#: ref-filter.h
|
||||
msgid "exclude refs which match pattern"
|
||||
msgstr "排除与 <模式> 相匹配的引用"
|
||||
|
||||
#: reflog.c
|
||||
#, c-format
|
||||
msgid "not a reflog: %s"
|
||||
@@ -23704,8 +23809,9 @@ msgstr[1] ""
|
||||
|
||||
# 译者：注意保持前导空格
|
||||
#: remote.c
|
||||
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
|
||||
msgstr " （使用 \"git pull\" 来合并远程分支）\n"
|
||||
msgid ""
|
||||
" (use \"git pull\" if you want to integrate the remote branch with yours)\n"
|
||||
msgstr " （如果您想将远程分支与您的更改合并，请使用 \"git pull\"）\n"
|
||||
|
||||
#: remote.c
|
||||
#, c-format
|
||||
@@ -23845,6 +23951,11 @@ msgstr "无法获得 ancestry-path 参数 %s 的提交"
|
||||
msgid "--unpacked=<packfile> no longer supported"
|
||||
msgstr "不再支持 --unpacked=<packfile>"
|
||||
|
||||
#: revision.c
|
||||
#, c-format
|
||||
msgid "invalid option '%s' in --stdin mode"
|
||||
msgstr "在 --stdin 模式下的无效选项：'%s'"
|
||||
|
||||
#: revision.c
|
||||
msgid "your current branch appears to be broken"
|
||||
msgstr "您的当前分支好像被损坏"
|
||||
@@ -25233,6 +25344,95 @@ msgstr "fork 失败"
|
||||
msgid "setsid failed"
|
||||
msgstr "setsid 失败"
|
||||
|
||||
#: setup.c
|
||||
#, c-format
|
||||
msgid "cannot stat template '%s'"
|
||||
msgstr "不能对模版 '%s' 调用 stat"
|
||||
|
||||
#: setup.c
|
||||
#, c-format
|
||||
msgid "cannot opendir '%s'"
|
||||
msgstr "不能打开目录 '%s'"
|
||||
|
||||
#: setup.c
|
||||
#, c-format
|
||||
msgid "cannot readlink '%s'"
|
||||
msgstr "不能读取链接 '%s'"
|
||||
|
||||
#: setup.c
|
||||
#, c-format
|
||||
msgid "cannot symlink '%s' '%s'"
|
||||
msgstr "不能自 '%s' 到 '%s' 创建符号链接"
|
||||
|
||||
#: setup.c
|
||||
#, c-format
|
||||
msgid "cannot copy '%s' to '%s'"
|
||||
msgstr "不能拷贝 '%s' 至 '%s'"
|
||||
|
||||
#: setup.c
|
||||
#, c-format
|
||||
msgid "ignoring template %s"
|
||||
msgstr "忽略模版 %s"
|
||||
|
||||
#: setup.c
|
||||
#, c-format
|
||||
msgid "templates not found in %s"
|
||||
msgstr "没有在 %s 中找到模版"
|
||||
|
||||
#: setup.c
|
||||
#, c-format
|
||||
msgid "not copying templates from '%s': %s"
|
||||
msgstr "没有从 '%s' 复制模版：%s"
|
||||
|
||||
#: setup.c
|
||||
#, c-format
|
||||
msgid "invalid initial branch name: '%s'"
|
||||
msgstr "无效的初始分支名：'%s'"
|
||||
|
||||
#: setup.c
|
||||
#, c-format
|
||||
msgid "unable to handle file type %d"
|
||||
msgstr "不能处理 %d 类型的文件"
|
||||
|
||||
#: setup.c
|
||||
#, c-format
|
||||
msgid "unable to move %s to %s"
|
||||
msgstr "不能移动 %s 至 %s"
|
||||
|
||||
#: setup.c
|
||||
msgid "attempt to reinitialize repository with different hash"
|
||||
msgstr "尝试用不同的哈希算法重新初始化仓库"
|
||||
|
||||
#: setup.c
|
||||
#, c-format
|
||||
msgid "%s already exists"
|
||||
msgstr "%s 已经存在"
|
||||
|
||||
#: setup.c
|
||||
#, c-format
|
||||
msgid "re-init: ignored --initial-branch=%s"
|
||||
msgstr "re-init：已忽略 --initial-branch=%s"
|
||||
|
||||
#: setup.c
|
||||
#, c-format
|
||||
msgid "Reinitialized existing shared Git repository in %s%s\n"
|
||||
msgstr "重新初始化已存在的共享 Git 仓库于 %s%s\n"
|
||||
|
||||
#: setup.c
|
||||
#, c-format
|
||||
msgid "Reinitialized existing Git repository in %s%s\n"
|
||||
msgstr "已重新初始化已存在的 Git 仓库于 %s%s\n"
|
||||
|
||||
#: setup.c
|
||||
#, c-format
|
||||
msgid "Initialized empty shared Git repository in %s%s\n"
|
||||
msgstr "已初始化空的共享 Git 仓库于 %s%s\n"
|
||||
|
||||
#: setup.c
|
||||
#, c-format
|
||||
msgid "Initialized empty Git repository in %s%s\n"
|
||||
msgstr "已初始化空的 Git 仓库于 %s%s\n"
|
||||
|
||||
#: sparse-index.c
|
||||
#, c-format
|
||||
msgid "index entry is a directory, but not sparse (%08x)"
|
||||
|
||||
603
po/zh_TW.po
603
po/zh_TW.po
@@ -21,12 +21,13 @@
|
||||
#
|
||||
# Yi-Jyun Pan <pan93412@gmail.com>, 2021, 2022, 2023.
|
||||
# Kaiyang Wu <self@origincode.me>, 2022.
|
||||
# lumynou5 <lumynou5.tw@gmail.com>, 2023.
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Git\n"
|
||||
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
|
||||
"POT-Creation-Date: 2023-05-19 19:57+0000\n"
|
||||
"PO-Revision-Date: 2023-05-31 23:41+0800\n"
|
||||
"POT-Creation-Date: 2023-08-20 21:51+0800\n"
|
||||
"PO-Revision-Date: 2023-08-20 21:58+0800\n"
|
||||
"Last-Translator: Yi-Jyun Pan <pan93412@gmail.com>\n"
|
||||
"Language-Team: Chinese (Traditional) <http://weblate.slat.org/projects/git-"
|
||||
"po/git-cli/zh_Hant/>\n"
|
||||
@@ -35,7 +36,7 @@ msgstr ""
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Plural-Forms: nplurals=1; plural=0;\n"
|
||||
"X-Generator: Poedit 3.3.1\n"
|
||||
"X-Generator: Poedit 3.3.2\n"
|
||||
"X-ZhConverter: 繁化姬 dict-f4bc617e-r910 @ 2019/11/16 20:23:12 | https://"
|
||||
"zhconvert.org\n"
|
||||
|
||||
@@ -126,7 +127,7 @@ msgstr "忽略未合併項目：%s"
|
||||
#: add-interactive.c add-patch.c
|
||||
#, c-format
|
||||
msgid "Only binary files changed.\n"
|
||||
msgstr "只變更二進位檔案。\n"
|
||||
msgstr "只有二進位檔案更動了。\n"
|
||||
|
||||
#: add-interactive.c add-patch.c
|
||||
#, c-format
|
||||
@@ -770,9 +771,8 @@ msgid "Reverting is not possible because you have unmerged files."
|
||||
msgstr "無法還原提交，有未合併的檔案。"
|
||||
|
||||
#: advice.c
|
||||
#, c-format
|
||||
msgid "It is not possible to %s because you have unmerged files."
|
||||
msgstr "無法 %s，有未合併的檔案。"
|
||||
msgid "Rebasing is not possible because you have unmerged files."
|
||||
msgstr "無法重定基底，有未合併的檔案。"
|
||||
|
||||
#: advice.c
|
||||
msgid ""
|
||||
@@ -941,6 +941,14 @@ msgstr "無法同時使用 “%s” 和 “%s” 選項"
|
||||
msgid "'%s' outside a repository"
|
||||
msgstr "“%s” 在版本庫之外"
|
||||
|
||||
#: apply.c
|
||||
msgid "failed to read patch"
|
||||
msgstr "無法讀取修補檔"
|
||||
|
||||
#: apply.c
|
||||
msgid "patch too large"
|
||||
msgstr "修補檔過大"
|
||||
|
||||
#: apply.c
|
||||
#, c-format
|
||||
msgid "Cannot prepare timestamp regexp %s"
|
||||
@@ -1585,7 +1593,7 @@ msgstr "無法讀取 “%s”"
|
||||
#: archive.c
|
||||
#, c-format
|
||||
msgid "pathspec '%s' matches files outside the current directory"
|
||||
msgstr "符合路徑規格「%s」的檔案在目前目錄之外"
|
||||
msgstr "符合路徑規格 “%s” 的檔案在目前目錄之外"
|
||||
|
||||
#: archive.c builtin/add.c builtin/rm.c
|
||||
#, c-format
|
||||
@@ -2030,8 +2038,8 @@ msgstr "已有同名 “%s” 分支"
|
||||
|
||||
#: branch.c
|
||||
#, c-format
|
||||
msgid "cannot force update the branch '%s' checked out at '%s'"
|
||||
msgstr "無法強制更新在 “%2$s” 簽出的 “%1$s” 分支"
|
||||
msgid "cannot force update the branch '%s' used by worktree at '%s'"
|
||||
msgstr "無法強制更新被位於 “%2$s” 的工作區使用的 “%1$s” 分支"
|
||||
|
||||
#: branch.c
|
||||
#, c-format
|
||||
@@ -2110,20 +2118,6 @@ msgstr "git add [<options>] [--] <pathspec>..."
|
||||
msgid "cannot chmod %cx '%s'"
|
||||
msgstr "無法 chmod %cx '%s'"
|
||||
|
||||
#: builtin/add.c
|
||||
#, c-format
|
||||
msgid "unexpected diff status %c"
|
||||
msgstr "非預期的 diff 狀態 %c"
|
||||
|
||||
#: builtin/add.c builtin/commit.c
|
||||
msgid "updating files failed"
|
||||
msgstr "更新檔案失敗"
|
||||
|
||||
#: builtin/add.c
|
||||
#, c-format
|
||||
msgid "remove '%s'\n"
|
||||
msgstr "移除 “%s”\n"
|
||||
|
||||
#: builtin/add.c
|
||||
msgid "Unstaged changes after refreshing the index:"
|
||||
msgstr "重新整理索引之後，尚未被暫存的更動："
|
||||
@@ -2656,10 +2650,6 @@ msgstr "向 git-mailinfo 傳入 -m 參數"
|
||||
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
|
||||
msgstr "若為 mbox 格式，向 git-mailsplit 傳入 --keep-cr 標記"
|
||||
|
||||
#: builtin/am.c
|
||||
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
|
||||
msgstr "不向 git-mailsplit 傳入 --keep-cr 標記，無視 am.keepcr 的設定"
|
||||
|
||||
#: builtin/am.c
|
||||
msgid "strip everything before a scissors line"
|
||||
msgstr "截掉裁切線前的所有內容"
|
||||
@@ -3085,7 +3075,7 @@ msgstr "好的修訂版回傳偽造的錯誤碼 %d"
|
||||
#: builtin/bisect.c
|
||||
#, c-format
|
||||
msgid "bisect run failed: exit code %d from %s is < 0 or >= 128"
|
||||
msgstr "二分搜尋執行失敗：%2$s 回傳的離開碼 %1$d 小於 0 或大於 128"
|
||||
msgstr "二分搜尋執行失敗：%2$s 回傳的結束代碼 %1$d 小於 0 或大於 128"
|
||||
|
||||
#: builtin/bisect.c
|
||||
#, c-format
|
||||
@@ -3964,12 +3954,12 @@ msgid ""
|
||||
"git cat-file (--batch | --batch-check | --batch-command) [--batch-all-"
|
||||
"objects]\n"
|
||||
" [--buffer] [--follow-symlinks] [--unordered]\n"
|
||||
" [--textconv | --filters] [-z]"
|
||||
" [--textconv | --filters] [-Z]"
|
||||
msgstr ""
|
||||
"git cat-file (--batch | --batch-check | --batch-command) [--batch-all-"
|
||||
"objects]\n"
|
||||
" [--buffer] [--follow-symlinks] [--unordered]\n"
|
||||
" [--textconv | --filters] [-z]"
|
||||
" [--textconv | --filters] [-Z]"
|
||||
|
||||
#: builtin/cat-file.c
|
||||
msgid ""
|
||||
@@ -4027,6 +4017,10 @@ msgstr "類似 --batch 但不輸出 <contents>"
|
||||
msgid "stdin is NUL-terminated"
|
||||
msgstr "stdin 以 NUL 字元終止"
|
||||
|
||||
#: builtin/cat-file.c
|
||||
msgid "stdin and stdout is NUL-terminated"
|
||||
msgstr "stdin 和 stdout 以 NUL 字元終止"
|
||||
|
||||
#: builtin/cat-file.c
|
||||
msgid "read commands from stdin"
|
||||
msgstr "從 stdin 讀取命令"
|
||||
@@ -4914,7 +4908,8 @@ msgid "remove whole directories"
|
||||
msgstr "移除整個目錄"
|
||||
|
||||
#: builtin/clean.c builtin/describe.c builtin/grep.c builtin/log.c
|
||||
#: builtin/ls-files.c builtin/name-rev.c builtin/show-ref.c
|
||||
#: builtin/ls-files.c builtin/name-rev.c builtin/pack-refs.c builtin/show-ref.c
|
||||
#: ref-filter.h
|
||||
msgid "pattern"
|
||||
msgstr "pattern"
|
||||
|
||||
@@ -5084,14 +5079,6 @@ msgstr "server-specific"
|
||||
msgid "option to transmit"
|
||||
msgstr "傳輸選項"
|
||||
|
||||
#: builtin/clone.c builtin/fetch.c builtin/pull.c builtin/push.c
|
||||
msgid "use IPv4 addresses only"
|
||||
msgstr "只使用 IPv4 位址"
|
||||
|
||||
#: builtin/clone.c builtin/fetch.c builtin/pull.c builtin/push.c
|
||||
msgid "use IPv6 addresses only"
|
||||
msgstr "只使用 IPv6 位址"
|
||||
|
||||
#: builtin/clone.c
|
||||
msgid "apply partial clone filters to submodules"
|
||||
msgstr "將部分複製過濾器套用至子模組"
|
||||
@@ -5626,6 +5613,10 @@ msgstr ""
|
||||
" git cherry-pick --skip\n"
|
||||
"\n"
|
||||
|
||||
#: builtin/commit.c read-cache.c
|
||||
msgid "updating files failed"
|
||||
msgstr "更新檔案失敗"
|
||||
|
||||
#: builtin/commit.c
|
||||
msgid "failed to unpack HEAD tree object"
|
||||
msgstr "解包 HEAD 樹狀物件失敗"
|
||||
@@ -5701,8 +5692,8 @@ msgstr "無法選擇一個未被目前提交說明使用的備註字元"
|
||||
|
||||
#: builtin/commit.c builtin/merge-tree.c
|
||||
#, c-format
|
||||
msgid "could not lookup commit %s"
|
||||
msgstr "不能查詢提交 %s"
|
||||
msgid "could not lookup commit '%s'"
|
||||
msgstr "無法查詢提交 “%s”"
|
||||
|
||||
#: builtin/commit.c builtin/shortlog.c
|
||||
#, c-format
|
||||
@@ -7936,7 +7927,7 @@ msgstr "對 %s 呼叫 fstat 失敗：%s"
|
||||
msgid "failed to parse '%s' value '%s'"
|
||||
msgstr "無法解析 '%s' 值 '%s'"
|
||||
|
||||
#: builtin/gc.c builtin/init-db.c
|
||||
#: builtin/gc.c setup.c
|
||||
#, c-format
|
||||
msgid "cannot stat '%s'"
|
||||
msgstr "不能對 '%s' 呼叫 stat"
|
||||
@@ -8940,7 +8931,7 @@ msgstr "無法返回目前工作目錄"
|
||||
msgid "bad %s"
|
||||
msgstr "錯誤選項 %s"
|
||||
|
||||
#: builtin/index-pack.c builtin/init-db.c
|
||||
#: builtin/index-pack.c builtin/init-db.c setup.c
|
||||
#, c-format
|
||||
msgid "unknown hash algorithm '%s'"
|
||||
msgstr "未知的「%s」雜湊算法"
|
||||
@@ -8957,95 +8948,6 @@ msgstr "--verify 沒有提供 packfile 名稱參數"
|
||||
msgid "fsck error in pack objects"
|
||||
msgstr "在打包物件中 fsck 檢查發生錯誤"
|
||||
|
||||
#: builtin/init-db.c
|
||||
#, c-format
|
||||
msgid "cannot stat template '%s'"
|
||||
msgstr "不能對範本 '%s' 呼叫 stat"
|
||||
|
||||
#: builtin/init-db.c
|
||||
#, c-format
|
||||
msgid "cannot opendir '%s'"
|
||||
msgstr "不能開啟目錄 '%s'"
|
||||
|
||||
#: builtin/init-db.c
|
||||
#, c-format
|
||||
msgid "cannot readlink '%s'"
|
||||
msgstr "不能讀取連結 '%s'"
|
||||
|
||||
#: builtin/init-db.c
|
||||
#, c-format
|
||||
msgid "cannot symlink '%s' '%s'"
|
||||
msgstr "不能自 '%s' 到 '%s' 建立符號連結"
|
||||
|
||||
#: builtin/init-db.c
|
||||
#, c-format
|
||||
msgid "cannot copy '%s' to '%s'"
|
||||
msgstr "不能複製 '%s' 至 '%s'"
|
||||
|
||||
#: builtin/init-db.c
|
||||
#, c-format
|
||||
msgid "ignoring template %s"
|
||||
msgstr "忽略範本 %s"
|
||||
|
||||
#: builtin/init-db.c
|
||||
#, c-format
|
||||
msgid "templates not found in %s"
|
||||
msgstr "沒有在 %s 中找到範本"
|
||||
|
||||
#: builtin/init-db.c
|
||||
#, c-format
|
||||
msgid "not copying templates from '%s': %s"
|
||||
msgstr "沒有從 '%s' 複製範本：%s"
|
||||
|
||||
#: builtin/init-db.c
|
||||
#, c-format
|
||||
msgid "invalid initial branch name: '%s'"
|
||||
msgstr "無效的初始分支名稱：'%s'"
|
||||
|
||||
#: builtin/init-db.c
|
||||
#, c-format
|
||||
msgid "unable to handle file type %d"
|
||||
msgstr "不能處理 %d 類型的檔案"
|
||||
|
||||
#: builtin/init-db.c
|
||||
#, c-format
|
||||
msgid "unable to move %s to %s"
|
||||
msgstr "不能移動 %s 至 %s"
|
||||
|
||||
#: builtin/init-db.c
|
||||
msgid "attempt to reinitialize repository with different hash"
|
||||
msgstr "嘗試以不同的雜湊值重新初始化版本庫"
|
||||
|
||||
#: builtin/init-db.c
|
||||
#, c-format
|
||||
msgid "%s already exists"
|
||||
msgstr "%s 已經存在"
|
||||
|
||||
#: builtin/init-db.c
|
||||
#, c-format
|
||||
msgid "re-init: ignored --initial-branch=%s"
|
||||
msgstr "re-init: 忽略 --initial-branch=%s"
|
||||
|
||||
#: builtin/init-db.c
|
||||
#, c-format
|
||||
msgid "Reinitialized existing shared Git repository in %s%s\n"
|
||||
msgstr "重新初始化已存在的共享 Git 版本庫於 %s%s\n"
|
||||
|
||||
#: builtin/init-db.c
|
||||
#, c-format
|
||||
msgid "Reinitialized existing Git repository in %s%s\n"
|
||||
msgstr "重新初始化已存在的 Git 版本庫於 %s%s\n"
|
||||
|
||||
#: builtin/init-db.c
|
||||
#, c-format
|
||||
msgid "Initialized empty shared Git repository in %s%s\n"
|
||||
msgstr "已初始化空的共享 Git 版本庫於 %s%s\n"
|
||||
|
||||
#: builtin/init-db.c
|
||||
#, c-format
|
||||
msgid "Initialized empty Git repository in %s%s\n"
|
||||
msgstr "已初始化空的 Git 版本庫於 %s%s\n"
|
||||
|
||||
#: builtin/init-db.c
|
||||
msgid ""
|
||||
"git init [-q | --quiet] [--bare] [--template=<template-directory>]\n"
|
||||
@@ -9593,6 +9495,11 @@ msgid ""
|
||||
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
|
||||
msgstr "不能找到追蹤的遠端分支，請手動指定 <上游>。\n"
|
||||
|
||||
#: builtin/ls-files.c builtin/ls-tree.c
|
||||
#, c-format
|
||||
msgid "could not get object info about '%s'"
|
||||
msgstr "無法取得「%s」相關的物件資訊"
|
||||
|
||||
#: builtin/ls-files.c
|
||||
#, c-format
|
||||
msgid "bad ls-files format: element '%s' does not start with '('"
|
||||
@@ -9777,11 +9684,6 @@ msgstr "除了顯示指向的物件外，顯示指向的引用名"
|
||||
msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
|
||||
msgstr "git ls-tree [<選項>] <樹或提交> [<路徑>...]"
|
||||
|
||||
#: builtin/ls-tree.c
|
||||
#, c-format
|
||||
msgid "could not get object info about '%s'"
|
||||
msgstr "無法取得「%s」相關的物件資訊"
|
||||
|
||||
#: builtin/ls-tree.c
|
||||
#, c-format
|
||||
msgid "bad ls-tree format: element '%s' does not start with '('"
|
||||
@@ -10707,11 +10609,13 @@ msgstr "git notes [--ref <註解引用>] [list [<物件>]]"
|
||||
|
||||
#: builtin/notes.c
|
||||
msgid ""
|
||||
"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
|
||||
"| (-c | -C) <object>] [<object>]"
|
||||
"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [--[no-]separator|--"
|
||||
"separator=<paragraph-break>] [--[no-]stripspace] [-m <msg> | -F <file> | (-c "
|
||||
"| -C) <object>] [<object>]"
|
||||
msgstr ""
|
||||
"git notes [--ref <註解引用>] add [-f] [--allow-empty] [-m <說明> | -F <檔案> "
|
||||
"| (-c | -C) <物件>] [<物件>]"
|
||||
"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [--[no-]separator|--"
|
||||
"separator=<paragraph-break>] [--[no-]stripspace] [-m <msg> | -F <file> | (-c "
|
||||
"| -C) <object>] [<object>]"
|
||||
|
||||
#: builtin/notes.c
|
||||
msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
|
||||
@@ -10719,11 +10623,13 @@ msgstr "git notes [--ref <註解引用>] copy [-f] <來源物件> <目標物件>
|
||||
|
||||
#: builtin/notes.c
|
||||
msgid ""
|
||||
"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
|
||||
"(-c | -C) <object>] [<object>]"
|
||||
"git notes [--ref <notes-ref>] append [--allow-empty] [--[no-]separator|--"
|
||||
"separator=<paragraph-break>] [--[no-]stripspace] [-m <msg> | -F <file> | (-c "
|
||||
"| -C) <object>] [<object>]"
|
||||
msgstr ""
|
||||
"git notes [--ref <註解引用>] append [--allow-empty] [-m <說明> | -F <檔案> | "
|
||||
"(-c | -C) <物件>] [<物件>]"
|
||||
"git notes [--ref <notes-ref>] append [--allow-empty] [--[no-]separator|--"
|
||||
"separator=<paragraph-break>] [--[no-]stripspace] [-m <msg> | -F <file> | (-c "
|
||||
"| -C) <object>] [<object>]"
|
||||
|
||||
#: builtin/notes.c
|
||||
msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
|
||||
@@ -10891,6 +10797,18 @@ msgstr "允許儲存空白備註"
|
||||
msgid "replace existing notes"
|
||||
msgstr "取代已存在的註解"
|
||||
|
||||
#: builtin/notes.c
|
||||
msgid "<paragraph-break>"
|
||||
msgstr "<paragraph-break>"
|
||||
|
||||
#: builtin/notes.c
|
||||
msgid "insert <paragraph-break> between paragraphs"
|
||||
msgstr "在段落間插入 <paragraph-break>"
|
||||
|
||||
#: builtin/notes.c
|
||||
msgid "remove unnecessary whitespace"
|
||||
msgstr "移除不必要的空白字元"
|
||||
|
||||
#: builtin/notes.c
|
||||
#, c-format
|
||||
msgid ""
|
||||
@@ -11570,8 +11488,12 @@ msgid "refusing to run without --i-still-use-this"
|
||||
msgstr "傳入 --i-still-use-this 前拒絕執行"
|
||||
|
||||
#: builtin/pack-refs.c
|
||||
msgid "git pack-refs [--all] [--no-prune]"
|
||||
msgstr "git pack-refs [--all] [--no-prune]"
|
||||
msgid ""
|
||||
"git pack-refs [--all] [--no-prune] [--include <pattern>] [--exclude "
|
||||
"<pattern>]"
|
||||
msgstr ""
|
||||
"git pack-refs [--all] [--no-prune] [--include <pattern>] [--exclude "
|
||||
"<pattern>]"
|
||||
|
||||
#: builtin/pack-refs.c
|
||||
msgid "pack everything"
|
||||
@@ -11581,6 +11503,14 @@ msgstr "打包一切"
|
||||
msgid "prune loose refs (default)"
|
||||
msgstr "剪除鬆散引用（預設值）"
|
||||
|
||||
#: builtin/pack-refs.c
|
||||
msgid "references to include"
|
||||
msgstr "要包含的引用"
|
||||
|
||||
#: builtin/pack-refs.c
|
||||
msgid "references to exclude"
|
||||
msgstr "要排除的引用"
|
||||
|
||||
#: builtin/patch-id.c
|
||||
msgid "git patch-id [--stable | --unstable | --verbatim]"
|
||||
msgstr "git patch-id [--stable | --unstable | --verbatim]"
|
||||
@@ -11657,6 +11587,14 @@ msgstr "強制覆蓋本機分支"
|
||||
msgid "number of submodules pulled in parallel"
|
||||
msgstr "並行拉取的子模組數量"
|
||||
|
||||
#: builtin/pull.c parse-options.h
|
||||
msgid "use IPv4 addresses only"
|
||||
msgstr "只使用 IPv4 位址"
|
||||
|
||||
#: builtin/pull.c parse-options.h
|
||||
msgid "use IPv6 addresses only"
|
||||
msgstr "只使用 IPv6 位址"
|
||||
|
||||
#: builtin/pull.c
|
||||
msgid ""
|
||||
"There is no candidate for rebasing against among the refs that you just "
|
||||
@@ -11941,37 +11879,37 @@ msgstr ""
|
||||
#: builtin/push.c
|
||||
msgid ""
|
||||
"Updates were rejected because the tip of your current branch is behind\n"
|
||||
"its remote counterpart. Integrate the remote changes (e.g.\n"
|
||||
"'git pull ...') before pushing again.\n"
|
||||
"its remote counterpart. If you want to integrate the remote changes,\n"
|
||||
"use 'git pull' before pushing again.\n"
|
||||
"See the 'Note about fast-forwards' in 'git push --help' for details."
|
||||
msgstr ""
|
||||
"更新被拒絕，因為您目前分支的最新提交落後於其對應的遠端分支。\n"
|
||||
"再次推送前，先與遠端變更合併（如 'git pull ...'）。詳見\n"
|
||||
"'git push --help' 中的 'Note about fast-forwards' 小節。"
|
||||
"如果您想要整合遠端更動，請在再次推送前使用 “git pull”。詳見\n"
|
||||
"“git push --help” 中的〈Note about fast-forwards〉小節。"
|
||||
|
||||
#: builtin/push.c
|
||||
msgid ""
|
||||
"Updates were rejected because a pushed branch tip is behind its remote\n"
|
||||
"counterpart. Check out this branch and integrate the remote changes\n"
|
||||
"(e.g. 'git pull ...') before pushing again.\n"
|
||||
"counterpart. If you want to integrate the remote changes, use 'git pull'\n"
|
||||
"before pushing again.\n"
|
||||
"See the 'Note about fast-forwards' in 'git push --help' for details."
|
||||
msgstr ""
|
||||
"更新被拒絕，因為推送的一個分支的最新提交落後於其對應的遠端分支。\n"
|
||||
"簽出該分支並整合遠端變更（如 'git pull ...'），然後再推送。詳見\n"
|
||||
"'git push --help' 中的 'Note about fast-forwards' 小節。"
|
||||
"更新被拒絕，因為推送的某分支的最新提交落後於其對應的遠端分支。\n"
|
||||
"如果您想要整合遠端更動，請在再次推送前使用 “git pull”。詳見\n"
|
||||
"“git push --help” 中的〈Note about fast-forwards〉小節。"
|
||||
|
||||
#: builtin/push.c
|
||||
msgid ""
|
||||
"Updates were rejected because the remote contains work that you do\n"
|
||||
"not have locally. This is usually caused by another repository pushing\n"
|
||||
"to the same ref. You may want to first integrate the remote changes\n"
|
||||
"(e.g., 'git pull ...') before pushing again.\n"
|
||||
"Updates were rejected because the remote contains work that you do not\n"
|
||||
"have locally. This is usually caused by another repository pushing to\n"
|
||||
"the same ref. If you want to integrate the remote changes, use\n"
|
||||
"'git pull' before pushing again.\n"
|
||||
"See the 'Note about fast-forwards' in 'git push --help' for details."
|
||||
msgstr ""
|
||||
"因為遠端版本庫包含您本機尚不存在的提交，而導致更新被拒絕。這通常是因為另外\n"
|
||||
"一個版本庫已向該引用進行了推送。再次推送前，您可能需要先整合遠端變更\n"
|
||||
"（如 'git pull ...'）。\n"
|
||||
"詳見 'git push --help' 中的 'Note about fast-forwards' 小節。"
|
||||
"更新被拒絕，因為遠端包含您本機沒有的提交。這通常是因為\n"
|
||||
"另一個版本庫有推送更動到同個引用。如果您想要整合遠端更動，\n"
|
||||
"請在再次推送前使用 “git pull”。詳見 “git push --help” 中的\n"
|
||||
"〈Note about fast-forwards〉小節。"
|
||||
|
||||
#: builtin/push.c
|
||||
msgid "Updates were rejected because the tag already exists in the remote."
|
||||
@@ -11988,14 +11926,14 @@ msgstr ""
|
||||
|
||||
#: builtin/push.c
|
||||
msgid ""
|
||||
"Updates were rejected because the tip of the remote-tracking\n"
|
||||
"branch has been updated since the last checkout. You may want\n"
|
||||
"to integrate those changes locally (e.g., 'git pull ...')\n"
|
||||
"before forcing an update.\n"
|
||||
"Updates were rejected because the tip of the remote-tracking branch has\n"
|
||||
"been updated since the last checkout. If you want to integrate the\n"
|
||||
"remote changes, use 'git pull' before pushing again.\n"
|
||||
"See the 'Note about fast-forwards' in 'git push --help' for details."
|
||||
msgstr ""
|
||||
"更新被拒，因為遠端追蹤分支的最新指針繼上次簽出後有更新。\n"
|
||||
"您可能會希望先將這些變更整合至本地（例如：‘git pull …’)\n"
|
||||
"最後才強制更新。\n"
|
||||
"更新被拒絕，因為遠端追蹤分支的最新提交自上次簽出後有改變。\n"
|
||||
"如果您想要整合遠端更動，請在再次推送前使用 “git pull”。\n"
|
||||
"詳見 “git push --help” 中的〈Note about fast-forwards〉小節。"
|
||||
|
||||
#: builtin/push.c
|
||||
#, c-format
|
||||
@@ -13024,12 +12962,12 @@ msgid "fetch the remote branches"
|
||||
msgstr "抓取遠端的分支"
|
||||
|
||||
#: builtin/remote.c
|
||||
msgid "import all tags and associated objects when fetching"
|
||||
msgstr "抓取時匯入所有的標籤和關聯物件"
|
||||
|
||||
#: builtin/remote.c
|
||||
msgid "or do not fetch any tag at all (--no-tags)"
|
||||
msgstr "或不抓取任何標籤（--no-tags）"
|
||||
msgid ""
|
||||
"import all tags and associated objects when fetching\n"
|
||||
"or do not fetch any tag at all (--no-tags)"
|
||||
msgstr ""
|
||||
"抓取時匯入所有的標籤和關聯物件\n"
|
||||
"或者是完全不抓取所有標籤 (--no-tags)"
|
||||
|
||||
#: builtin/remote.c
|
||||
msgid "branch(es) to track"
|
||||
@@ -15410,6 +15348,11 @@ msgstr "略過未合併的子模組 %s"
|
||||
msgid "Skipping submodule '%s'"
|
||||
msgstr "略過子模組 '%s'"
|
||||
|
||||
#: builtin/submodule--helper.c
|
||||
#, c-format
|
||||
msgid "cannot clone submodule '%s' without a URL"
|
||||
msgstr "無法在沒有網址的情況下複製 “%s” 子模組"
|
||||
|
||||
#: builtin/submodule--helper.c
|
||||
#, c-format
|
||||
msgid "Failed to clone '%s'. Retry scheduled"
|
||||
@@ -16320,10 +16263,10 @@ msgstr "列印標籤內容"
|
||||
#: builtin/worktree.c
|
||||
msgid ""
|
||||
"git worktree add [-f] [--detach] [--checkout] [--lock [--reason <string>]]\n"
|
||||
" [-b <new-branch>] <path> [<commit-ish>]"
|
||||
" [--orphan] [(-b | -B) <new-branch>] <path> [<commit-ish>]"
|
||||
msgstr ""
|
||||
"git worktree add [-f] [--detach] [--checkout] [--lock [--reason <string>]]\n"
|
||||
" [-b <new-branch>] <path> [<commit-ish>]"
|
||||
" [--orphan] [(-b | -B) <new-branch>] <path> [<commit-ish>]"
|
||||
|
||||
#: builtin/worktree.c
|
||||
msgid "git worktree list [-v | --porcelain [-z]]"
|
||||
@@ -16353,6 +16296,40 @@ msgstr "git worktree repair [<路徑>...]"
|
||||
msgid "git worktree unlock <worktree>"
|
||||
msgstr "git worktree unlock <worktree>"
|
||||
|
||||
#: builtin/worktree.c
|
||||
msgid "No possible source branch, inferring '--orphan'"
|
||||
msgstr "沒有可能的來源分支，推測為 “--orphan”"
|
||||
|
||||
#: builtin/worktree.c
|
||||
#, c-format
|
||||
msgid ""
|
||||
"If you meant to create a worktree containing a new orphan branch\n"
|
||||
"(branch with no commits) for this repository, you can do so\n"
|
||||
"using the --orphan flag:\n"
|
||||
"\n"
|
||||
" git worktree add --orphan -b %s %s\n"
|
||||
msgstr ""
|
||||
"如果您是想要在這個版本庫建立一個工作區，裡面包含一個\n"
|
||||
"孤立分支（即沒有提交的分支），可以使用 --orphan 達到\n"
|
||||
"這個效果：\n"
|
||||
"\n"
|
||||
" git worktree add --orphan -b %s %s\n"
|
||||
|
||||
#: builtin/worktree.c
|
||||
#, c-format
|
||||
msgid ""
|
||||
"If you meant to create a worktree containing a new orphan branch\n"
|
||||
"(branch with no commits) for this repository, you can do so\n"
|
||||
"using the --orphan flag:\n"
|
||||
"\n"
|
||||
" git worktree add --orphan %s\n"
|
||||
msgstr ""
|
||||
"如果您是想要在這個版本庫建立一個工作區，裡面包含一個\n"
|
||||
"孤立分支（即沒有提交的分支），可以使用 --orphan 達到\n"
|
||||
"這個效果：\n"
|
||||
"\n"
|
||||
" git worktree add --orphan %s\n"
|
||||
|
||||
#: builtin/worktree.c
|
||||
#, c-format
|
||||
msgid "Removing %s/%s: %s"
|
||||
@@ -16433,11 +16410,40 @@ msgstr "準備工作區（重設分支 '%s'，之前為 %s）"
|
||||
msgid "Preparing worktree (checking out '%s')"
|
||||
msgstr "準備工作區（簽出 '%s'）"
|
||||
|
||||
#: builtin/worktree.c
|
||||
#, c-format
|
||||
msgid "unreachable: invalid reference: %s"
|
||||
msgstr "不可達：無效引用：%s"
|
||||
|
||||
#: builtin/worktree.c
|
||||
#, c-format
|
||||
msgid "Preparing worktree (detached HEAD %s)"
|
||||
msgstr "準備工作區（分離開頭指標 %s）"
|
||||
|
||||
#: builtin/worktree.c
|
||||
#, c-format
|
||||
msgid ""
|
||||
"HEAD points to an invalid (or orphaned) reference.\n"
|
||||
"HEAD path: '%s'\n"
|
||||
"HEAD contents: '%s'"
|
||||
msgstr ""
|
||||
"HEAD 指向無效（或孤立）引用。\n"
|
||||
"HEAD 路徑：“%s”\n"
|
||||
"HEAD 內容：“%s”"
|
||||
|
||||
#: builtin/worktree.c
|
||||
msgid ""
|
||||
"No local or remote refs exist despite at least one remote\n"
|
||||
"present, stopping; use 'add -f' to overide or fetch a remote first"
|
||||
msgstr ""
|
||||
"即使有提供一個遠端，卻不存在本機或遠端引用，\n"
|
||||
"故停止。使用 “add -f” 先覆蓋或抓取遠端"
|
||||
|
||||
#: builtin/worktree.c
|
||||
#, c-format
|
||||
msgid "'%s' and '%s' cannot be used together"
|
||||
msgstr "無法同時使用 “%s” 和 “%s”"
|
||||
|
||||
#: builtin/worktree.c
|
||||
msgid "checkout <branch> even if already checked out in other worktree"
|
||||
msgstr "簽出 <分支>，即使已經被簽出到其它工作區"
|
||||
@@ -16450,6 +16456,10 @@ msgstr "建立一個新分支"
|
||||
msgid "create or reset a branch"
|
||||
msgstr "建立或重設一個分支"
|
||||
|
||||
#: builtin/worktree.c
|
||||
msgid "create unborn/orphaned branch"
|
||||
msgstr "建立尚無內容（孤立）的分支"
|
||||
|
||||
#: builtin/worktree.c
|
||||
msgid "populate the new working tree"
|
||||
msgstr "生成新的工作區"
|
||||
@@ -16475,6 +16485,15 @@ msgstr "嘗試為新分支名符合一個遠端追蹤分支"
|
||||
msgid "options '%s', '%s', and '%s' cannot be used together"
|
||||
msgstr "「%s」、「%s」和「%s」選項不得同時使用"
|
||||
|
||||
#: builtin/worktree.c
|
||||
#, c-format
|
||||
msgid "options '%s', and '%s' cannot be used together"
|
||||
msgstr "無法同時使用 “%s” 和 “%s” 選項"
|
||||
|
||||
#: builtin/worktree.c
|
||||
msgid "<commit-ish>"
|
||||
msgstr "<提交指示元>"
|
||||
|
||||
#: builtin/worktree.c
|
||||
msgid "added with --lock"
|
||||
msgstr "已使用 --lock 加入"
|
||||
@@ -16753,6 +16772,16 @@ msgid "The bundle requires this ref:"
|
||||
msgid_plural "The bundle requires these %<PRIuMAX> refs:"
|
||||
msgstr[0] "這個套件包需要這 %<PRIuMAX> 個引用："
|
||||
|
||||
#: bundle.c
|
||||
#, c-format
|
||||
msgid "The bundle uses this hash algorithm: %s"
|
||||
msgstr "本套件包採用此雜湊演算法：%s"
|
||||
|
||||
#: bundle.c
|
||||
#, c-format
|
||||
msgid "The bundle uses this filter: %s"
|
||||
msgstr "本套件包使用此過濾器：%s"
|
||||
|
||||
#: bundle.c
|
||||
msgid "unable to dup bundle descriptor"
|
||||
msgstr "無法複製套件包描述元"
|
||||
@@ -17050,8 +17079,8 @@ msgid "A portable graphical interface to Git"
|
||||
msgstr "一個便攜的 Git 圖形用戶端"
|
||||
|
||||
#: command-list.h
|
||||
msgid "Compute object ID and optionally creates a blob from a file"
|
||||
msgstr "從一個檔案計算物件 ID，並可以建立 blob 資料物件"
|
||||
msgid "Compute object ID and optionally create an object from a file"
|
||||
msgstr "從一個檔案計算物件 ID，也能順帶建立一個物件"
|
||||
|
||||
#: command-list.h
|
||||
msgid "Display help information about Git"
|
||||
@@ -17591,6 +17620,11 @@ msgstr "提交圖形沒有基礎圖形區塊"
|
||||
msgid "commit-graph chain does not match"
|
||||
msgstr "提交圖形鏈不符合"
|
||||
|
||||
#: commit-graph.c
|
||||
#, c-format
|
||||
msgid "commit count in base graph too high: %<PRIuMAX>"
|
||||
msgstr "基礎圖 (base graph) 中的提交數過多：%<PRIuMAX>"
|
||||
|
||||
#: commit-graph.c
|
||||
#, c-format
|
||||
msgid "invalid commit-graph chain: line '%s' not a hash"
|
||||
@@ -17696,6 +17730,16 @@ msgstr "無法重新命名基礎提交圖形檔案"
|
||||
msgid "failed to rename temporary commit-graph file"
|
||||
msgstr "無法重新命名暫時提交圖形檔案"
|
||||
|
||||
#: commit-graph.c
|
||||
#, c-format
|
||||
msgid "cannot merge graphs with %<PRIuMAX>, %<PRIuMAX> commits"
|
||||
msgstr "無法將圖與 %<PRIuMAX>, %<PRIuMAX> 個提交進行合併"
|
||||
|
||||
#: commit-graph.c
|
||||
#, c-format
|
||||
msgid "cannot merge graph %s, too many commits: %<PRIuMAX>"
|
||||
msgstr "無法合併 %s 圖，太多提交：%<PRIuMAX>"
|
||||
|
||||
#: commit-graph.c
|
||||
msgid "Scanning merged commits"
|
||||
msgstr "正在掃描合併提交"
|
||||
@@ -17731,10 +17775,6 @@ msgstr "提交圖形有不正確的扇出值：fanout[%d] = %u != %u"
|
||||
msgid "failed to parse commit %s from commit-graph"
|
||||
msgstr "無法從提交圖形中解析提交 %s"
|
||||
|
||||
#: commit-graph.c
|
||||
msgid "Verifying commits in commit graph"
|
||||
msgstr "正在驗證提交圖中的提交"
|
||||
|
||||
#: commit-graph.c
|
||||
#, c-format
|
||||
msgid "failed to parse commit %s from object database for commit-graph"
|
||||
@@ -17782,6 +17822,10 @@ msgstr "提交 %s 的提交圖形處於 %<PRIuMAX> < %<PRIuMAX> 世代"
|
||||
msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
|
||||
msgstr "提交圖形中提交 %s 的提交日期是 %<PRIuMAX> != %<PRIuMAX>"
|
||||
|
||||
#: commit-graph.c
|
||||
msgid "Verifying commits in commit graph"
|
||||
msgstr "正在驗證提交圖中的提交"
|
||||
|
||||
#: commit.c
|
||||
#, c-format
|
||||
msgid "%s %s is not a commit!"
|
||||
@@ -18928,6 +18972,14 @@ msgstr "找不到合併基底"
|
||||
msgid "multiple merge bases found"
|
||||
msgstr "找到多個合併基底"
|
||||
|
||||
#: diff-no-index.c
|
||||
msgid "cannot compare stdin to a directory"
|
||||
msgstr "無法比對 stdin 和目錄"
|
||||
|
||||
#: diff-no-index.c
|
||||
msgid "cannot compare a named pipe to a directory"
|
||||
msgstr "無法比對命名管線 (pipe) 和目錄"
|
||||
|
||||
#: diff-no-index.c
|
||||
msgid "git diff --no-index [<options>] <path> <path>"
|
||||
msgstr "git diff --no-index [<選項>] <路徑> <路徑>"
|
||||
@@ -18992,6 +19044,15 @@ msgstr ""
|
||||
msgid "external diff died, stopping at %s"
|
||||
msgstr "外部 diff 離開，停止在 %s"
|
||||
|
||||
#: diff.c
|
||||
msgid "--follow requires exactly one pathspec"
|
||||
msgstr "--follow 明確要求只跟一個路徑規格"
|
||||
|
||||
#: diff.c
|
||||
#, c-format
|
||||
msgid "pathspec magic not supported by --follow: %s"
|
||||
msgstr "--follow 不支援路徑規格魔法：%s"
|
||||
|
||||
#: diff.c parse-options.c
|
||||
#, c-format
|
||||
msgid "options '%s', '%s', '%s', and '%s' cannot be used together"
|
||||
@@ -19008,10 +19069,6 @@ msgid ""
|
||||
"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"
|
||||
msgstr "「%s」和「%s」選項不得同時使用，請使用「%s」搭配「%s」、「%s」"
|
||||
|
||||
#: diff.c
|
||||
msgid "--follow requires exactly one pathspec"
|
||||
msgstr "--follow 明確要求只跟一個路徑規格"
|
||||
|
||||
#: diff.c
|
||||
#, c-format
|
||||
msgid "invalid --stat value: %s"
|
||||
@@ -22470,6 +22527,15 @@ msgstr "生成 diff 失敗"
|
||||
msgid "could not parse log for '%s'"
|
||||
msgstr "不能解析 '%s' 的日誌"
|
||||
|
||||
#: reachable.c
|
||||
#, c-format
|
||||
msgid "invalid extra cruft tip: '%s'"
|
||||
msgstr "無效的額外廢棄提交修訂版：“%s”"
|
||||
|
||||
#: reachable.c
|
||||
msgid "unable to enumerate additional recent objects"
|
||||
msgstr "無法列舉多出來的近期物件"
|
||||
|
||||
#: read-cache.c
|
||||
#, c-format
|
||||
msgid "will not add file alias '%s' ('%s' already exists in index)"
|
||||
@@ -22658,6 +22724,16 @@ msgstr "不能修復 '%s' 的權限位"
|
||||
msgid "%s: cannot drop to stage #0"
|
||||
msgstr "%s：不能落到暫存區 #0"
|
||||
|
||||
#: read-cache.c
|
||||
#, c-format
|
||||
msgid "unexpected diff status %c"
|
||||
msgstr "非預期的 diff 狀態 %c"
|
||||
|
||||
#: read-cache.c
|
||||
#, c-format
|
||||
msgid "remove '%s'\n"
|
||||
msgstr "移除 “%s”\n"
|
||||
|
||||
#: rebase-interactive.c
|
||||
msgid ""
|
||||
"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
|
||||
@@ -22869,6 +22945,26 @@ msgstr "未知的 %%(trailers) 參數：%s"
|
||||
msgid "positive value expected contents:lines=%s"
|
||||
msgstr "期望一個正數 contents:lines=%s"
|
||||
|
||||
#: ref-filter.c
|
||||
#, c-format
|
||||
msgid "argument expected for %s"
|
||||
msgstr "引數預期 %s"
|
||||
|
||||
#: ref-filter.c
|
||||
#, c-format
|
||||
msgid "positive value expected %s=%s"
|
||||
msgstr "期望一個正數 %s=%s"
|
||||
|
||||
#: ref-filter.c
|
||||
#, c-format
|
||||
msgid "cannot fully parse %s=%s"
|
||||
msgstr "無法完全解析 %s=%s"
|
||||
|
||||
#: ref-filter.c
|
||||
#, c-format
|
||||
msgid "value expected %s="
|
||||
msgstr "數值預期 %s="
|
||||
|
||||
#: ref-filter.c
|
||||
#, c-format
|
||||
msgid "positive value expected '%s' in %%(%s)"
|
||||
@@ -22960,6 +23056,10 @@ msgstr "本命令拒絕 atom %%(%.*s)"
|
||||
msgid "--format=%.*s cannot be used with --python, --shell, --tcl"
|
||||
msgstr "--format=%.*s 不能和 --python、--shell、--tcl 一起使用"
|
||||
|
||||
#: ref-filter.c
|
||||
msgid "failed to run 'describe'"
|
||||
msgstr "無法執行 “describe”"
|
||||
|
||||
#: ref-filter.c
|
||||
#, c-format
|
||||
msgid "(no branch, rebasing %s)"
|
||||
@@ -23037,6 +23137,10 @@ msgstr "key"
|
||||
msgid "field name to sort on"
|
||||
msgstr "排序的欄位名"
|
||||
|
||||
#: ref-filter.h
|
||||
msgid "exclude refs which match pattern"
|
||||
msgstr "排除符合模式的引用"
|
||||
|
||||
#: reflog.c
|
||||
#, c-format
|
||||
msgid "not a reflog: %s"
|
||||
@@ -23566,8 +23670,9 @@ msgstr[0] ""
|
||||
|
||||
# 譯者：請維持前導空格
|
||||
#: remote.c
|
||||
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
|
||||
msgstr " （使用 \"git pull\" 來合併遠端分支）\n"
|
||||
msgid ""
|
||||
" (use \"git pull\" if you want to integrate the remote branch with yours)\n"
|
||||
msgstr " （使用 “git pull” 來將遠端分支整合進您的分支）\n"
|
||||
|
||||
#: remote.c
|
||||
#, c-format
|
||||
@@ -23707,6 +23812,11 @@ msgstr "無法取得 ancestry-path 引數 %s 的提交"
|
||||
msgid "--unpacked=<packfile> no longer supported"
|
||||
msgstr "--unpacked=<packfile> 已不受支援"
|
||||
|
||||
#: revision.c
|
||||
#, c-format
|
||||
msgid "invalid option '%s' in --stdin mode"
|
||||
msgstr "在 --stdin 模式下，“%s” 選項無效"
|
||||
|
||||
#: revision.c
|
||||
msgid "your current branch appears to be broken"
|
||||
msgstr "您的目前分支好像被損壞"
|
||||
@@ -25098,6 +25208,95 @@ msgstr "fork 失敗"
|
||||
msgid "setsid failed"
|
||||
msgstr "setsid 失敗"
|
||||
|
||||
#: setup.c
|
||||
#, c-format
|
||||
msgid "cannot stat template '%s'"
|
||||
msgstr "不能對範本 '%s' 呼叫 stat"
|
||||
|
||||
#: setup.c
|
||||
#, c-format
|
||||
msgid "cannot opendir '%s'"
|
||||
msgstr "不能開啟目錄 '%s'"
|
||||
|
||||
#: setup.c
|
||||
#, c-format
|
||||
msgid "cannot readlink '%s'"
|
||||
msgstr "不能讀取連結 '%s'"
|
||||
|
||||
#: setup.c
|
||||
#, c-format
|
||||
msgid "cannot symlink '%s' '%s'"
|
||||
msgstr "不能自 '%s' 到 '%s' 建立符號連結"
|
||||
|
||||
#: setup.c
|
||||
#, c-format
|
||||
msgid "cannot copy '%s' to '%s'"
|
||||
msgstr "不能複製 '%s' 至 '%s'"
|
||||
|
||||
#: setup.c
|
||||
#, c-format
|
||||
msgid "ignoring template %s"
|
||||
msgstr "忽略範本 %s"
|
||||
|
||||
#: setup.c
|
||||
#, c-format
|
||||
msgid "templates not found in %s"
|
||||
msgstr "沒有在 %s 中找到範本"
|
||||
|
||||
#: setup.c
|
||||
#, c-format
|
||||
msgid "not copying templates from '%s': %s"
|
||||
msgstr "沒有從 '%s' 複製範本：%s"
|
||||
|
||||
#: setup.c
|
||||
#, c-format
|
||||
msgid "invalid initial branch name: '%s'"
|
||||
msgstr "無效的初始分支名稱：'%s'"
|
||||
|
||||
#: setup.c
|
||||
#, c-format
|
||||
msgid "unable to handle file type %d"
|
||||
msgstr "不能處理 %d 類型的檔案"
|
||||
|
||||
#: setup.c
|
||||
#, c-format
|
||||
msgid "unable to move %s to %s"
|
||||
msgstr "不能移動 %s 至 %s"
|
||||
|
||||
#: setup.c
|
||||
msgid "attempt to reinitialize repository with different hash"
|
||||
msgstr "嘗試以不同的雜湊值重新初始化版本庫"
|
||||
|
||||
#: setup.c
|
||||
#, c-format
|
||||
msgid "%s already exists"
|
||||
msgstr "%s 已經存在"
|
||||
|
||||
#: setup.c
|
||||
#, c-format
|
||||
msgid "re-init: ignored --initial-branch=%s"
|
||||
msgstr "re-init: 忽略 --initial-branch=%s"
|
||||
|
||||
#: setup.c
|
||||
#, c-format
|
||||
msgid "Reinitialized existing shared Git repository in %s%s\n"
|
||||
msgstr "重新初始化已存在的共享 Git 版本庫於 %s%s\n"
|
||||
|
||||
#: setup.c
|
||||
#, c-format
|
||||
msgid "Reinitialized existing Git repository in %s%s\n"
|
||||
msgstr "重新初始化已存在的 Git 版本庫於 %s%s\n"
|
||||
|
||||
#: setup.c
|
||||
#, c-format
|
||||
msgid "Initialized empty shared Git repository in %s%s\n"
|
||||
msgstr "已初始化空的共享 Git 版本庫於 %s%s\n"
|
||||
|
||||
#: setup.c
|
||||
#, c-format
|
||||
msgid "Initialized empty Git repository in %s%s\n"
|
||||
msgstr "已初始化空的 Git 版本庫於 %s%s\n"
|
||||
|
||||
#: sparse-index.c
|
||||
#, c-format
|
||||
msgid "index entry is a directory, but not sparse (%08x)"
|
||||
@@ -27305,6 +27504,26 @@ msgstr "略過 %s 含備份後綴 '%s'。\n"
|
||||
msgid "Do you really want to send %s? [y|N]: "
|
||||
msgstr "您真的要傳送 %s？[y|N]： "
|
||||
|
||||
#, c-format
|
||||
#~ msgid "It is not possible to %s because you have unmerged files."
|
||||
#~ msgstr "無法 %s，有未合併的檔案。"
|
||||
|
||||
#~ msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
|
||||
#~ msgstr "不向 git-mailsplit 傳入 --keep-cr 標記，無視 am.keepcr 的設定"
|
||||
|
||||
#~ msgid ""
|
||||
#~ "Updates were rejected because the tip of the remote-tracking\n"
|
||||
#~ "branch has been updated since the last checkout. You may want\n"
|
||||
#~ "to integrate those changes locally (e.g., 'git pull ...')\n"
|
||||
#~ "before forcing an update.\n"
|
||||
#~ msgstr ""
|
||||
#~ "更新被拒，因為遠端追蹤分支的最新指針繼上次簽出後有更新。\n"
|
||||
#~ "您可能會希望先將這些變更整合至本地（例如：‘git pull …’)\n"
|
||||
#~ "最後才強制更新。\n"
|
||||
|
||||
#~ msgid "or do not fetch any tag at all (--no-tags)"
|
||||
#~ msgstr "或不抓取任何標籤（--no-tags）"
|
||||
|
||||
#~ msgid "current working directory is untracked"
|
||||
#~ msgstr "尚未追蹤目前的工作目錄"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user