From 93ba78d6f4632ef1c5228965e3edc8c0faf88c1e Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Tue, 26 May 2020 00:06:52 +0100 Subject: revert(3p/git): Revert merge of git upstream at v2.26.2 This causes cgit to serve error pages, which is undesirable. This reverts commit 5229c9b232de5bfa959ad6ebbb4c8192ac513352, reversing changes made to f2b211131f2347342dde63975b09cf603149f1a3. --- third_party/git/git-gui/po/glossary/de.po | 315 +++------------------ .../git/git-gui/po/glossary/git-gui-glossary.pot | 250 +--------------- .../git/git-gui/po/glossary/git-gui-glossary.txt | 101 +++---- 3 files changed, 83 insertions(+), 583 deletions(-) (limited to 'third_party/git/git-gui/po/glossary') diff --git a/third_party/git/git-gui/po/glossary/de.po b/third_party/git/git-gui/po/glossary/de.po index 4c5f233ee52d..35764d1d22da 100644 --- a/third_party/git/git-gui/po/glossary/de.po +++ b/third_party/git/git-gui/po/glossary/de.po @@ -6,11 +6,10 @@ msgid "" msgstr "" "Project-Id-Version: git-gui glossary\n" -"POT-Creation-Date: 2020-01-26 22:26+0100\n" -"PO-Revision-Date: 2020-02-09 21:22+0100\n" +"POT-Creation-Date: 2008-01-07 21:20+0100\n" +"PO-Revision-Date: 2008-02-16 21:48+0100\n" "Last-Translator: Christian Stimming \n" "Language-Team: German \n" -"Language: de_DE\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -20,9 +19,6 @@ msgid "" "English Term (Dear translator: This file will never be visible to the user!)" msgstr "" "Deutsche Übersetzung.\n" -"Git-core glossary:\n" -" https://github.com/ruester/git-po-de/wiki/Translation-Guidelines\n" -"\n" "Andere deutsche SCM:\n" " http://tortoisesvn.net/docs/release/TortoiseSVN_de/index.html und http://" "tortoisesvn.tigris.org/svn/tortoisesvn/trunk/Languages/Tortoise_de.po " @@ -36,77 +32,33 @@ msgstr "" " http://rapidsvn.tigris.org/svn/rapidsvn/trunk/src/locale/de/rapidsvn.po " "(username=guest, password empty, schlecht)" -#. "prematurely stop and abandon an operation" -msgid "abort" -msgstr "abbrechen" - #. "" msgid "amend" msgstr "nachbessern (ergänzen)" -#. "a commit that succeeds the current one in git's graph of commits (not necessarily directly)" -msgid "ancestor" -msgstr "Vorgänger-Commit" - #. "" msgid "annotate" msgstr "annotieren" -#. "The person who initially created (authored) a commit" -msgid "author" -msgstr "Autor" - -#. "a repository with only .git directory, without working directory" -msgid "bare repository" -msgstr "bloßes Projektarchiv" - -#. "a parent version of the current file" -msgid "base" -msgstr "Ursprung" - -#. "" -msgid "bisect" -msgstr "binäre Suche [noun], binäre Suche benutzen [verb]" - -#. "get the authors responsible for each line in a file" -msgid "blame" -msgstr "annotieren" - -#. "" -msgid "blob" -msgstr "Blob" - #. "A 'branch' is an active line of development." msgid "branch [noun]" -msgstr "Branch" +msgstr "Zweig" #. "" msgid "branch [verb]" -msgstr "branchen" +msgstr "verzweigen" #. "" msgid "checkout [noun]" msgstr "" -"Arbeitskopie (Checkout; Erstellung einer Arbeitskopie; Auscheck? Source " -"Safe: Auscheckvorgang)" +"Arbeitskopie (Erstellung einer Arbeitskopie; Auscheck? Ausspielung? Abruf? " +"Source Safe: Auscheckvorgang)" #. "The action of updating the working tree to a revision which was stored in the object database." msgid "checkout [verb]" msgstr "" -"Arbeitskopie erstellen; Branch auschecken [checkout a branch] (umstellen? " -"Source Safe: auschecken)" - -#. "to select and apply a single commit to the current HEAD without merging" -msgid "cherry-pick" -msgstr "cherry-pick (pflücken?)" - -#. "a commit that directly succeeds the current one in git's graph of commits" -msgid "child commit" -msgstr "Kind-Commit" - -#. "clean the state of the git repository, often after manually stopped operation" -msgid "cleanup" -msgstr "aufräumen" +"Arbeitskopie erstellen; Zweig umstellen [checkout a branch] (auschecken? " +"ausspielen? abrufen? Source Safe: auschecken)" #. "" msgid "clone [verb]" @@ -114,98 +66,39 @@ msgstr "klonen" #. "A single point in the git history." msgid "commit [noun]" -msgstr "Commit (Version?)" +msgstr "" +"Version; Eintragung; Änderung (Buchung?, Eintragung?, Übertragung?, " +"Sendung?, Übergabe?, Einspielung?, Ablagevorgang?)" #. "The action of storing a new snapshot of the project's state in the git history." msgid "commit [verb]" msgstr "" -"committen (eintragen?, TortoiseSVN: übertragen; Source Safe: einchecken)" - -#. "a message that gets attached with any commit" -msgid "commit message" -msgstr "Commit-Beschreibung (Meldung?, Nachricht?; Source Safe: Kommentar)" - -#. "The person who committed a commit (to the current branch), which might be different than the author." -msgid "committer" -msgstr "Committer" - -#. "a commit that precedes the current one in git's graph of commits (not necessarily directly)" -msgid "descendant" -msgstr "Nachfolger-Commit" - -#. "checkout of a revision rather than some head" -msgid "detached HEAD" -msgstr "losgelöster HEAD / Branchspitze" - -#. "checkout of a revision rather than some head" -msgid "detached checkout" -msgstr "losgelöster Commit (von Branch losgelöster Commit?)" +"eintragen (TortoiseSVN: übertragen; Source Safe: einchecken; senden?, " +"übergeben?, einspielen?, einpflegen?, ablegen?)" #. "" msgid "diff [noun]" -msgstr "Vergleich (Diff? Source Safe: Unterschiede)" +msgstr "Vergleich (Source Safe: Unterschiede)" #. "" msgid "diff [verb]" msgstr "vergleichen" -#. "" -msgid "directory" -msgstr "Verzeichnis" - -#. "A fast-forward merge is a special type of merge where you have a revision and you are merging another branch's changes that happen to be a descendant of what you have." -msgid "fast-forward" -msgstr "vorspulen" +#. "A fast-forward is a special type of merge where you have a revision and you are merging another branch's changes that happen to be a descendant of what you have." +msgid "fast forward merge" +msgstr "Schnellzusammenführung" #. "Fetching a branch means to get the branch's head from a remote repository, to find out which objects are missing from the local object database, and to get them, too." msgid "fetch" msgstr "anfordern (holen?)" -#. "any merge strategy that works on a file by file basis" -msgid "file level merging" -msgstr "Datei-basiertes zusammenführen" - -#. "" -msgid "file" -msgstr "Datei" - -#. "the last revision in a branch" -msgid "head" -msgstr "HEAD / Branchspitze" - -#. "script that gets executed automatically on some event" -msgid "hook" -msgstr "Hook (in der dt. Informatik wohl als Einschubmethode bezeichnet)" - #. "One context of consecutive lines in a whole patch, which consists of many such hunks" msgid "hunk" -msgstr "Patch-Block (Kontext?)" +msgstr "Kontext" #. "A collection of files. The index is a stored version of your working tree." msgid "index (in git-gui: staging area)" -msgstr "" -"Bereitstellung (sofern der git index gemeint ist. In git-gui sowieso: " -"staging area)" - -#. "the first checkout during a clone operation" -msgid "initial checkout" -msgstr "Erstellen der Arbeitskopie, auschecken" - -#. "The very first commit in a repository" -msgid "initial commit" -msgstr "Allererster Commit" - -#. "a branch that resides in the local git repository" -msgid "local branch" -msgstr "Lokaler Branch" - -#. "a Git object that is not part of any pack" -msgid "loose object" -msgstr "loses Objekt" - -#. "a branch called by convention 'master' that exists in a newly created git repository" -msgid "master branch" -msgstr "Master-Branch" +msgstr "Bereitstellung" #. "A successful merge results in the creation of a new commit representing the result of the merge." msgid "merge [noun]" @@ -219,212 +112,78 @@ msgstr "zusammenführen" msgid "message" msgstr "Beschreibung (Meldung?, Nachricht?; Source Safe: Kommentar)" -#. "a remote called by convention 'origin' that the current git repository has been cloned from" -msgid "origin" -msgstr "origin" - -#. "" -msgid "orphan commit" -msgstr "verwaister Commit" - -#. "" -msgid "orphan reference" -msgstr "verwaiste Referenz" - -#. "a file containing many git objects packed together" -msgid "pack [noun]" -msgstr "Pack-Datei" - -#. "the process of creating a pack file" -msgid "pack [verb]" -msgstr "Pack-Datei erstellen" - -#. "a Git object part of some pack" -msgid "packed object" -msgstr "gepacktes Objekt" - -#. "a commit that directly precedes the current one in git's graph of commits" -msgid "parent commit" -msgstr "Eltern-Commit" - -msgid "patch" -msgstr "Patch" - -#. "The path to a file" -msgid "path" -msgstr "Pfad" - -#. "Delete all stale tracking branches under . These stale branches have already been removed from the remote repository referenced by , but are still locally available in 'remotes/'." +#. "Deletes all stale tracking branches under . These stale branches have already been removed from the remote repository referenced by , but are still locally available in 'remotes/'." msgid "prune" -msgstr "veraltete Branches entfernen (aufräumen?, entfernen?)" +msgstr "aufräumen (entfernen?)" #. "Pulling a branch means to fetch it and merge it." msgid "pull" -msgstr "" -"übernehmen (pull? ziehen? Vorsicht: zusammenführen = merge, aber pull kann " -"auch rebase bewirken)" +msgstr "übernehmen (ziehen?)" #. "Pushing a branch means to get the branch's head ref from a remote repository, and ... (well, can someone please explain it for mere mortals?)" msgid "push" msgstr "versenden (ausliefern? hochladen? verschicken? schieben?)" -#. "The process of rebasing one set of commits on top of another branch's head" -msgid "rebase [noun]" -msgstr "der Rebase (das Umpflanzen)" - -#. "Re-apply one set of commits on top of another branch's head. Contrary to merge." -msgid "rebase [verb]" -msgstr "rebase (umpflanzen)" - #. "" msgid "redo" msgstr "wiederholen" -#. "" -msgid "reference" -msgstr "Referenz" - -#. "the log file containing all states of the HEAD reference (in other words past pristine states of the working copy)" -msgid "reflog" -msgstr "Commit-Log, »reflog«" - -msgid "refmap" -msgstr "Refmap" - -#. "" -msgid "refspec" -msgstr "Refspec" - -#. "The adjective for anything which is outside of the current (local) repository" -msgid "remote [adj]" -msgstr "Extern (Andere?, Gegenseite?, Entfernte?, Server?)" - -#. "A branch in any other ('remote') repository" -msgid "remote branch" -msgstr "Externer branch" - -#. "An other repository ('remote'). One might have a set of remotes whose branches one tracks." -msgid "remote repository" -msgstr "Externes Repository" +#. "An other repository ('remote'). One might have a set of remotes whose branches one tracks." +msgid "remote" +msgstr "Andere Archive (Gegenseite?, Entfernte?, Server?)" #. "A collection of refs (?) together with an object database containing all objects which are reachable from the refs... (oops, you've lost me here. Again, please an explanation for mere mortals?)" msgid "repository" -msgstr "Repository" +msgstr "Projektarchiv" #. "" msgid "reset" -msgstr "umsetzen (reset to commit), Änderungen verwerfen (reset to HEAD)" - -#. "decide which changes from alternative versions of a file should persist in Git" -msgid "resolve (a conflict)" -msgstr "auflösen (einen Konflikt)" - -#. "abandon changes and go to pristine version" -msgid "revert changes" -msgstr "" -"verwerfen (bei git-reset bzw. checkout), zurücknehmen (bei git-revert, also " -"mit neuem commit; umkehren?)" +msgstr "zurücksetzen (zurückkehren?)" #. "" msgid "revert" -msgstr "" -"verwerfen (bei git-reset bzw. checkout), zurücknehmen (bei git-revert, also " -"mit neuem commit; umkehren?)" - -#. "expression that signifies a revision in git" -msgid "revision expression" -msgstr "Version Regexp-Ausdruck" +msgstr "verwerfen (bei git-reset), revidieren (bei git-revert, also mit neuem commit)" #. "A particular state of files and directories which was stored in the object database." msgid "revision" -msgstr "" -"Version (aber was macht das Wort revision hier im Git?? TortoiseSVN: " -"Revision; Source Safe: Version)" +msgstr "Version (TortoiseSVN: Revision; Source Safe: Version)" #. "" msgid "sign off" -msgstr "abzeichnen (signieren? gegenzeichnen?, freizeichnen?)" +msgstr "abzeichnen (gegenzeichnen?, freizeichnen?, absegnen?)" -#. "see: staging area. In some areas of git this is called 'index'." -msgid "stage [noun], index" -msgstr "Bereitstellung" - -#. "add some content of files and directories to the staging area in preparation for a commit" -msgid "stage [verb]" -msgstr "bereitstellen" - -#. "The place where changes from files are marked to be included for the next commit. In some areas of git this is called 'index'." +#. "" msgid "staging area" msgstr "Bereitstellung" -#. "The place (stack) where changes can be temporarily saved without committing" -msgid "stash [noun]" -msgstr "der Stash" - -#. "temporarily save changes in a stack without committing" -msgid "stash [verb]" -msgstr "in Stash speichern; \"stash\" benutzen" - #. "" msgid "status" msgstr "Status" -#. "" -msgid "submodule" -msgstr "Submodul (Untermodul?)" - -#. "A ref pointing to some commit object. In other words: A label on a specific commit." +#. "A ref pointing to a tag or commit object" msgid "tag [noun]" -msgstr "Tag (Markierung?)" +msgstr "Markierung" -#. "The process of creating a tag at a specific commit object" +#. "" msgid "tag [verb]" -msgstr "taggen (markieren?)" - -#. "The person who created a tag" -msgid "tagger" -msgstr "Tag-Ersteller (Markierungs-Ersteller?)" - -#. "file whose content is tracked/not tracked by git" -msgid "tracked/untracked" -msgstr "versioniert/unversioniert" +msgstr "markieren" #. "A regular git branch that is used to follow changes from another repository." msgid "tracking branch" -msgstr "Tracking-Branch (Verfolgungsbranch? Übernahmebranch?)" - -#. "" -msgid "trailer" -msgstr "Anhang" - -#. "1. tree object, 2. directory tree" -msgid "tree" -msgstr "1. Baum-Objekt, 2. Verzeichnisbaum" +msgstr "Übernahmezweig" #. "" msgid "undo" msgstr "rückgängig" -#. "Remove content of files from the staging area again so that it will not be part of the next commit" -msgid "unstage" -msgstr "aus Bereitstellung herausnehmen" - -#. "Retrieving the temporarily saved changes back again from the stash" -msgid "unstash [verb]" -msgstr "aus Stash zurückladen" - #. "" msgid "update" msgstr "aktualisieren" -#. "" -msgid "upstream branch" -msgstr "Upstream-Branch" - #. "" msgid "verify" msgstr "überprüfen" #. "The tree of actual checked out files." -msgid "working directory, working copy, working tree" +msgid "working copy, working tree" msgstr "Arbeitskopie" diff --git a/third_party/git/git-gui/po/glossary/git-gui-glossary.pot b/third_party/git/git-gui/po/glossary/git-gui-glossary.pot index 4e66e0da3a9c..40eb3e9c07a4 100644 --- a/third_party/git/git-gui/po/glossary/git-gui-glossary.pot +++ b/third_party/git/git-gui/po/glossary/git-gui-glossary.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2020-01-26 22:26+0100\n" +"POT-Creation-Date: 2008-01-07 21:20+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,46 +18,14 @@ msgstr "" msgid "English Term (Dear translator: This file will never be visible to the user!)" msgstr "" -#. "prematurely stop and abandon an operation" -msgid "abort" -msgstr "" - #. "" msgid "amend" msgstr "" -#. "a commit that succeeds the current one in git's graph of commits (not necessarily directly)" -msgid "ancestor" -msgstr "" - #. "" msgid "annotate" msgstr "" -#. "The person who initially created (authored) a commit" -msgid "author" -msgstr "" - -#. "a repository with only .git directory, without working directory" -msgid "bare repository" -msgstr "" - -#. "a parent version of the current file" -msgid "base" -msgstr "" - -#. "" -msgid "bisect" -msgstr "" - -#. "get the authors responsible for each line in a file" -msgid "blame" -msgstr "" - -#. "" -msgid "blob" -msgstr "" - #. "A 'branch' is an active line of development." msgid "branch [noun]" msgstr "" @@ -74,18 +42,6 @@ msgstr "" msgid "checkout [verb]" msgstr "" -#. "to select and apply a single commit to the current HEAD without merging" -msgid "cherry-pick" -msgstr "" - -#. "a commit that directly succeeds the current one in git's graph of commits" -msgid "child commit" -msgstr "" - -#. "clean the state of the git repository, often after manually stopped operation" -msgid "cleanup" -msgstr "" - #. "" msgid "clone [verb]" msgstr "" @@ -98,26 +54,6 @@ msgstr "" msgid "commit [verb]" msgstr "" -#. "a message that gets attached with any commit" -msgid "commit message" -msgstr "" - -#. "The person who committed a commit (to the current branch), which might be different than the author." -msgid "committer" -msgstr "" - -#. "a commit that precedes the current one in git's graph of commits (not necessarily directly)" -msgid "descendant" -msgstr "" - -#. "checkout of a revision rather than some head" -msgid "detached HEAD" -msgstr "" - -#. "checkout of a revision rather than some head" -msgid "detached checkout" -msgstr "" - #. "" msgid "diff [noun]" msgstr "" @@ -126,34 +62,14 @@ msgstr "" msgid "diff [verb]" msgstr "" -#. "" -msgid "directory" -msgstr "" - -#. "A fast-forward merge is a special type of merge where you have a revision and you are merging another branch's changes that happen to be a descendant of what you have." -msgid "fast-forward" +#. "A fast-forward is a special type of merge where you have a revision and you are merging another branch's changes that happen to be a descendant of what you have." +msgid "fast forward merge" msgstr "" #. "Fetching a branch means to get the branch's head from a remote repository, to find out which objects are missing from the local object database, and to get them, too." msgid "fetch" msgstr "" -#. "any merge strategy that works on a file by file basis" -msgid "file level merging" -msgstr "" - -#. "" -msgid "file" -msgstr "" - -#. "the last revision in a branch" -msgid "head" -msgstr "" - -#. "script that gets executed automatically on some event" -msgid "hook" -msgstr "" - #. "One context of consecutive lines in a whole patch, which consists of many such hunks" msgid "hunk" msgstr "" @@ -162,26 +78,6 @@ msgstr "" msgid "index (in git-gui: staging area)" msgstr "" -#. "the first checkout during a clone operation" -msgid "initial checkout" -msgstr "" - -#. "The very first commit in a repository" -msgid "initial commit" -msgstr "" - -#. "a branch that resides in the local git repository" -msgid "local branch" -msgstr "" - -#. "a Git object that is not part of any pack" -msgid "loose object" -msgstr "" - -#. "a branch called by convention 'master' that exists in a newly created git repository" -msgid "master branch" -msgstr "" - #. "A successful merge results in the creation of a new commit representing the result of the merge." msgid "merge [noun]" msgstr "" @@ -194,42 +90,7 @@ msgstr "" msgid "message" msgstr "" -#. "a remote called by convention 'origin' that the current git repository has been cloned from" -msgid "origin" -msgstr "" - -#. "" -msgid "orphan commit" -msgstr "" - -#. "" -msgid "orphan reference" -msgstr "" - -#. "a file containing many git objects packed together" -msgid "pack [noun]" -msgstr "" - -#. "the process of creating a pack file" -msgid "pack [verb]" -msgstr "" - -#. "a Git object part of some pack" -msgid "packed object" -msgstr "" - -#. "a commit that directly precedes the current one in git's graph of commits" -msgid "parent commit" -msgstr "" - -msgid "patch" "" -msgstr "" - -#. "The path to a file" -msgid "path" -msgstr "" - -#. "Delete all stale tracking branches under . These stale branches have already been removed from the remote repository referenced by , but are still locally available in 'remotes/'." +#. "Deletes all stale tracking branches under . These stale branches have already been removed from the remote repository referenced by , but are still locally available in 'remotes/'." msgid "prune" msgstr "" @@ -241,43 +102,12 @@ msgstr "" msgid "push" msgstr "" -#. "The process of rebasing one set of commits on top of another branch's head" -msgid "rebase [noun]" -msgstr "" - -#. "Re-apply one set of commits on top of another branch's head. Contrary to merge." -msgid "rebase [verb]" -msgstr "" - #. "" msgid "redo" msgstr "" -#. "" -msgid "reference" -msgstr "" - -#. "the log file containing all states of the HEAD reference (in other words past pristine states of the working copy)" -msgid "reflog" -msgstr "" - -msgid "refmap" "" -msgstr "" - -#. "" -msgid "refspec" -msgstr "" - -#. "The adjective for anything which is outside of the current (local) repository" -msgid "remote [adj]" -msgstr "" - -#. "A branch in any other ('remote') repository" -msgid "remote branch" -msgstr "" - -#. "An other repository ('remote'). One might have a set of remotes whose branches one tracks." -msgid "remote repository" +#. "An other repository ('remote'). One might have a set of remotes whose branches one tracks." +msgid "remote" msgstr "" #. "A collection of refs (?) together with an object database containing all objects which are reachable from the refs... (oops, you've lost me here. Again, please an explanation for mere mortals?)" @@ -288,22 +118,10 @@ msgstr "" msgid "reset" msgstr "" -#. "decide which changes from alternative versions of a file should persist in Git" -msgid "resolve (a conflict)" -msgstr "" - -#. "abandon changes and go to pristine version" -msgid "revert changes" -msgstr "" - #. "" msgid "revert" msgstr "" -#. "expression that signifies a revision in git" -msgid "revision expression" -msgstr "" - #. "A particular state of files and directories which was stored in the object database." msgid "revision" msgstr "" @@ -312,87 +130,39 @@ msgstr "" msgid "sign off" msgstr "" -#. "see: staging area. In some areas of git this is called 'index'." -msgid "stage [noun], index" -msgstr "" - -#. "add some content of files and directories to the staging area in preparation for a commit" -msgid "stage [verb]" -msgstr "" - -#. "The place where changes from files are marked to be included for the next commit. In some areas of git this is called 'index'." +#. "" msgid "staging area" msgstr "" -#. "The place (stack) where changes can be temporarily saved without committing" -msgid "stash [noun]" -msgstr "" - -#. "temporarily save changes in a stack without committing" -msgid "stash [verb]" -msgstr "" - #. "" msgid "status" msgstr "" -#. "" -msgid "submodule" -msgstr "" - -#. "A ref pointing to some commit object. In other words: A label on a specific commit." +#. "A ref pointing to a tag or commit object" msgid "tag [noun]" msgstr "" -#. "The process of creating a tag at a specific commit object" +#. "" msgid "tag [verb]" msgstr "" -#. "The person who created a tag" -msgid "tagger" -msgstr "" - -#. "file whose content is tracked/not tracked by git" -msgid "tracked/untracked" -msgstr "" - #. "A regular git branch that is used to follow changes from another repository." msgid "tracking branch" msgstr "" -#. "" -msgid "trailer" -msgstr "" - -#. "1. tree object, 2. directory tree" -msgid "tree" -msgstr "" - #. "" msgid "undo" msgstr "" -#. "Remove content of files from the staging area again so that it will not be part of the next commit" -msgid "unstage" -msgstr "" - -#. "Retrieving the temporarily saved changes back again from the stash" -msgid "unstash [verb]" -msgstr "" - #. "" msgid "update" msgstr "" -#. "" -msgid "upstream branch" -msgstr "" - #. "" msgid "verify" msgstr "" #. "The tree of actual checked out files." -msgid "working directory, working copy, working tree" +msgid "working copy, working tree" msgstr "" diff --git a/third_party/git/git-gui/po/glossary/git-gui-glossary.txt b/third_party/git/git-gui/po/glossary/git-gui-glossary.txt index 48b9f10e57d3..409304692dc1 100644 --- a/third_party/git/git-gui/po/glossary/git-gui-glossary.txt +++ b/third_party/git/git-gui/po/glossary/git-gui-glossary.txt @@ -1,96 +1,67 @@ "English Term (Dear translator: This file will never be visible to the user!)" "English Definition (Dear translator: This file will never be visible to the user! It should only serve as a tool for you, the translator. Nothing more.)" -"abort" "prematurely stop and abandon an operation" "amend" "" -"ancestor" "a commit that succeeds the current one in git's graph of commits (not necessarily directly)" "annotate" "" -"author" "The person who initially created (authored) a commit" -"bare repository" "a repository with only .git directory, without working directory" -"base" "a parent version of the current file" -"bisect" "" -"blame" "get the authors responsible for each line in a file" -"blob" "" "branch [noun]" "A 'branch' is an active line of development." "branch [verb]" "" "checkout [noun]" "" "checkout [verb]" "The action of updating the working tree to a revision which was stored in the object database." -"cherry-pick" "to select and apply a single commit to the current HEAD without merging" -"child commit" "a commit that directly succeeds the current one in git's graph of commits" -"cleanup" "clean the state of the git repository, often after manually stopped operation" "clone [verb]" "" "commit [noun]" "A single point in the git history." "commit [verb]" "The action of storing a new snapshot of the project's state in the git history." -"commit message" "a message that gets attached with any commit" -"committer" "The person who committed a commit (to the current branch), which might be different than the author." -"descendant" "a commit that precedes the current one in git's graph of commits (not necessarily directly)" -"detached HEAD" "checkout of a revision rather than some head" -"detached checkout" "checkout of a revision rather than some head" "diff [noun]" "" "diff [verb]" "" -"directory" "" -"fast-forward" "A fast-forward merge is a special type of merge where you have a revision and you are merging another branch's changes that happen to be a descendant of what you have." +"fast forward merge" "A fast-forward is a special type of merge where you have a revision and you are merging another branch's changes that happen to be a descendant of what you have." "fetch" "Fetching a branch means to get the branch's head from a remote repository, to find out which objects are missing from the local object database, and to get them, too." -"file level merging" "any merge strategy that works on a file by file basis" -"file" "" -"head" "the last revision in a branch" -"hook" "script that gets executed automatically on some event" "hunk" "One context of consecutive lines in a whole patch, which consists of many such hunks" "index (in git-gui: staging area)" "A collection of files. The index is a stored version of your working tree." -"initial checkout" "the first checkout during a clone operation" -"initial commit" "The very first commit in a repository" -"local branch" "a branch that resides in the local git repository" -"loose object" "a Git object that is not part of any pack" -"master branch" "a branch called by convention 'master' that exists in a newly created git repository" "merge [noun]" "A successful merge results in the creation of a new commit representing the result of the merge." "merge [verb]" "To bring the contents of another branch into the current branch." "message" "" -"origin" "a remote called by convention 'origin' that the current git repository has been cloned from" -"orphan commit" "" -"orphan reference" "" -"pack [noun]" "a file containing many git objects packed together" -"pack [verb]" "the process of creating a pack file" -"packed object" "a Git object part of some pack" -"parent commit" "a commit that directly precedes the current one in git's graph of commits" -"patch" "" -"path" "The path to a file" -"prune" "Delete all stale tracking branches under . These stale branches have already been removed from the remote repository referenced by , but are still locally available in 'remotes/'." +"prune" "Deletes all stale tracking branches under . These stale branches have already been removed from the remote repository referenced by , but are still locally available in 'remotes/'." "pull" "Pulling a branch means to fetch it and merge it." "push" "Pushing a branch means to get the branch's head ref from a remote repository, and ... (well, can someone please explain it for mere mortals?)" -"rebase [noun]" "The process of rebasing one set of commits on top of another branch's head" -"rebase [verb]" "Re-apply one set of commits on top of another branch's head. Contrary to merge." "redo" "" -"reference" "" -"reflog" "the log file containing all states of the HEAD reference (in other words past pristine states of the working copy)" -"refmap" "" -"refspec" "" -"remote [adj]" "The adjective for anything which is outside of the current (local) repository" -"remote branch" "A branch in any other ('remote') repository" -"remote repository" "An other repository ('remote'). One might have a set of remotes whose branches one tracks." +"remote" "An other repository ('remote'). One might have a set of remotes whose branches one tracks." "repository" "A collection of refs (?) together with an object database containing all objects which are reachable from the refs... (oops, you've lost me here. Again, please an explanation for mere mortals?)" "reset" "" -"resolve (a conflict)" "decide which changes from alternative versions of a file should persist in Git" -"revert changes" "abandon changes and go to pristine version" "revert" "" -"revision expression" "expression that signifies a revision in git" "revision" "A particular state of files and directories which was stored in the object database." "sign off" "" -"stage [noun], index" "see: staging area. In some areas of git this is called 'index'." -"stage [verb]" "add some content of files and directories to the staging area in preparation for a commit" -"staging area" "The place where changes from files are marked to be included for the next commit. In some areas of git this is called 'index'." -"stash [noun]" "The place (stack) where changes can be temporarily saved without committing" -"stash [verb]" "temporarily save changes in a stack without committing" +"staging area" "" "status" "" -"submodule" "" -"tag [noun]" "A ref pointing to some commit object. In other words: A label on a specific commit." -"tag [verb]" "The process of creating a tag at a specific commit object" -"tagger" "The person who created a tag" -"tracked/untracked" "file whose content is tracked/not tracked by git" +"tag [noun]" "A ref pointing to a tag or commit object" +"tag [verb]" "" "tracking branch" "A regular git branch that is used to follow changes from another repository." -"trailer" "" -"tree" "1. tree object, 2. directory tree" "undo" "" -"unstage" "Remove content of files from the staging area again so that it will not be part of the next commit" -"unstash [verb]" "Retrieving the temporarily saved changes back again from the stash" "update" "" -"upstream branch" "" "verify" "" -"working directory, working copy, working tree" "The tree of actual checked out files." +"working copy, working tree" "The tree of actual checked out files." +"ancestor" "a commit that succeeds the current one in git's graph of commits (not necessarily directly)" +"abort" "prematurely stop and abandon an operation" +"bare repository" "a repository with only .git directory, without working directory" +"base" "a parent version of the current file" +"blame" "get the authors responsible for each line in a file" +"cherry-pick" "to select and apply a single commit without merging" +"child" "a commit that directly succeeds the current one in git's graph of commits" +"cleanup" "clean the state of the git repository, often after manually stopped operation" +"commit message" "a message that gets attached with any commit" +"descendant" "a commit that precedes the current one in git's graph of commits (not necessarily directly)" +"detached checkout" "checkout of a revision rather than a some head" +"file level merging" "any merge strategy that works on a file by file basis" +"head" "the last revision in a branch" +"hook" "script that gets executed automatically on some event" +"initial checkout" "the first checkout during a clone operation" +"local branch" "a branch that resides in the local git repository" +"loose object" "a Git object that is not part of any pack" +"master branch" "a branch called by convention 'master' that exists in a newly created git repository" +"origin" "a remote called by convention 'origin' that the current git repository has been cloned from" +"pack [noun]" "a file containing many git objects packed together" +"packed object" "a Git object part of some pack" +"parent" "a commit that directly precedes the current one in git's graph of commits" +"reflog" "the log file containing all states of the HEAD reference (in other words past pristine states of the working copy)" +"resolve (a conflict)" "decide which changes from alternative versions of a file should persist in Git" +"revert changes" "abandon changes and go to pristine version" +"revision expression" "expression that signifies a revision in git" +"stage/unstage" "add some content of files and directories to the staging area in preparation for a commit" +"stash" "temporarily save changes in a stack without committing" +"tracked/untracked" "file whose content is tracked/not tracked by git" -- cgit 1.4.1