diff options
Diffstat (limited to 'third_party/git/git-gui/po/glossary')
| -rw-r--r-- | third_party/git/git-gui/po/glossary/Makefile | 9 | ||||
| -rw-r--r-- | third_party/git/git-gui/po/glossary/bg.po | 287 | ||||
| -rw-r--r-- | third_party/git/git-gui/po/glossary/de.po | 430 | ||||
| -rw-r--r-- | third_party/git/git-gui/po/glossary/el.po | 171 | ||||
| -rw-r--r-- | third_party/git/git-gui/po/glossary/fr.po | 166 | ||||
| -rw-r--r-- | third_party/git/git-gui/po/glossary/git-gui-glossary.pot | 398 | ||||
| -rw-r--r-- | third_party/git/git-gui/po/glossary/git-gui-glossary.txt | 96 | ||||
| -rw-r--r-- | third_party/git/git-gui/po/glossary/it.po | 184 | ||||
| -rw-r--r-- | third_party/git/git-gui/po/glossary/pt_br.po | 169 | ||||
| -rw-r--r-- | third_party/git/git-gui/po/glossary/pt_pt.po | 293 | ||||
| -rwxr-xr-x | third_party/git/git-gui/po/glossary/txt-to-pot.sh | 48 | ||||
| -rw-r--r-- | third_party/git/git-gui/po/glossary/zh_cn.po | 170 |
12 files changed, 0 insertions, 2421 deletions
diff --git a/third_party/git/git-gui/po/glossary/Makefile b/third_party/git/git-gui/po/glossary/Makefile deleted file mode 100644 index 749aa2e7ec1b..000000000000 --- a/third_party/git/git-gui/po/glossary/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -PO_TEMPLATE = git-gui-glossary.pot - -ALL_POFILES = $(wildcard *.po) - -$(PO_TEMPLATE): $(subst .pot,.txt,$(PO_TEMPLATE)) - ./txt-to-pot.sh $< > $@ - -update-po:: git-gui-glossary.pot - $(foreach p, $(ALL_POFILES), echo Updating $p ; msgmerge -U $p $(PO_TEMPLATE) ; ) diff --git a/third_party/git/git-gui/po/glossary/bg.po b/third_party/git/git-gui/po/glossary/bg.po deleted file mode 100644 index 8b71fad9a590..000000000000 --- a/third_party/git/git-gui/po/glossary/bg.po +++ /dev/null @@ -1,287 +0,0 @@ -# Bulgarian translation of git-gui-glossary po-file. -# Copyright (C) 2012, 2013, 2014 Alexander Shopov <ash@kambanaria.org>. -# This file is distributed under the same license as the git package. -# Alexander Shopov <ash@kambanaria.org>, 2012, 2013, 2014. -# -# -msgid "" -msgstr "" -"Project-Id-Version: git-gui-glossary master\n" -"POT-Creation-Date: 2014-01-13 21:39+0200\n" -"PO-Revision-Date: 2014-01-13 21:39+0200\n" -"Last-Translator: Alexander Shopov <ash@kambanaria.org>\n" -"Language-Team: Bulgarian <dict@fsa-bg.org>\n" -"Language: bg\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#. "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.)" -msgid "" -"English Term (Dear translator: This file will never be visible to the user!)" -msgstr "Термин" - -#. "" -msgid "amend" -msgstr "поправям" - -#. "" -msgid "annotate" -msgstr "анотирам" - -#. "A 'branch' is an active line of development." -msgid "branch [noun]" -msgstr "клон, разклонение [съществително]" - -#. "" -msgid "branch [verb]" -msgstr "разклонявам [глагол]" - -#. "" -msgid "checkout [noun]" -msgstr "изтегляне [съществително]" - -#. "The action of updating the working tree to a revision which was stored in the object database." -msgid "checkout [verb]" -msgstr "изтегляне [глагол]" - -#. "" -msgid "clone [verb]" -msgstr "клонирам [глагол]" - -#. "A single point in the git history." -msgid "commit [noun]" -msgstr "подаване [съществително]" - -#. "The action of storing a new snapshot of the project's state in the git history." -msgid "commit [verb]" -msgstr "подавам [съществително]" - -#. "" -msgid "diff [noun]" -msgstr "разлика/промени [съществително]" - -#. "" -msgid "diff [verb]" -msgstr "изчислявам разлика/промени [глагол]" - -#. "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 "доставяне" - -#. "One context of consecutive lines in a whole patch, which consists of many such hunks" -msgid "hunk" -msgstr "парче" - -#. "A collection of files. The index is a stored version of your working tree." -msgid "index (in git-gui: staging area)" -msgstr "скеле/индекс/изба" - -#. "A successful merge results in the creation of a new commit representing the result of the merge." -msgid "merge [noun]" -msgstr "сливане/обединяване [съществително]" - -#. "To bring the contents of another branch into the current branch." -msgid "merge [verb]" -msgstr "сливам/обединявам [глагол]" - -#. "" -msgid "message" -msgstr "съобщение" - -#. "Deletes all stale tracking branches under <name>. These stale branches have already been removed from the remote repository referenced by <name>, but are still locally available in 'remotes/<name>'." -msgid "prune" -msgstr "окастрям" - -#. "Pulling a branch means to fetch it and merge it." -msgid "pull" -msgstr "издърпвам" - -#. "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 "изтласквам" - -#. "" -msgid "redo" -msgstr "повтарям/правя наново" - -#. "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?)" -msgid "repository" -msgstr "хранилище" - -#. "" -msgid "reset" -msgstr "занулявам/отменям" - -#. "" -msgid "revert" -msgstr "връщам/отменям" - -#. "A particular state of files and directories which was stored in the object database." -msgid "revision" -msgstr "версия" - -#. "" -msgid "sign off" -msgstr "подписвам" - -#. "" -msgid "staging area" -msgstr "скеле/индекс/изба" - -#. "" -msgid "status" -msgstr "състояние" - -#. "A ref pointing to a tag or commit object" -msgid "tag [noun]" -msgstr "етикет [съществително]" - -#. "" -msgid "tag [verb]" -msgstr "задавам етикет [глагол]" - -#. "A regular git branch that is used to follow changes from another repository." -msgid "tracking branch" -msgstr "следящ клон" - -#. "" -msgid "undo" -msgstr "отменям" - -#. "" -msgid "update" -msgstr "обновявам" - -#. "" -msgid "verify" -msgstr "проверявам" - -#. "The tree of actual checked out files." -msgid "working copy, working tree" -msgstr "работно копие/работно дърво" - -#. "a commit that succeeds the current one in git's graph of commits (not necessarily directly)" -msgid "ancestor" -msgstr "предшественик" - -#. "prematurely stop and abandon an operation" -msgid "abort" -msgstr "преустановявам" - -#. "a repository with only .git directory, without working directory" -msgid "bare repository" -msgstr "голо хранилище" - -#. "a parent version of the current file" -msgid "base" -msgstr "родителска версия" - -#. "get the authors responsible for each line in a file" -msgid "blame" -msgstr "анотирам/анотиране" - -#. "to select and apply a single commit without merging" -msgid "cherry-pick" -msgstr "отбирам" - -#. "a commit that directly succeeds the current one in git's graph of commits" -msgid "child" -msgstr "дете" - -#. "clean the state of the git repository, often after manually stopped operation" -msgid "cleanup" -msgstr "зачиствам" - -#. "a message that gets attached with any commit" -msgid "commit message" -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 a some head" -msgid "detached checkout" -msgstr "несвързано изтегляне" - -#. "any merge strategy that works on a file by file basis" -msgid "file level merging" -msgstr "пофайлово сливане" - -#. "the last revision in a branch" -msgid "head" -msgstr "глава/връх (на клон, разработка)" - -#. "script that gets executed automatically on some event" -msgid "hook" -msgstr "кука/автоматичен скрипт" - -#. "the first checkout during a clone operation" -msgid "initial checkout" -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 remote called by convention 'origin' that the current git repository has been cloned from" -msgid "origin" -msgstr "хранилище-източник" - -#. "a file containing many git objects packed together" -msgid "pack [noun]" -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" -msgstr "родител" - -#. "the log file containing all states of the HEAD reference (in other words past pristine states of the working copy)" -msgid "reflog" -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 "връщане на оригинала" - -#. "expression that signifies a revision in git" -msgid "revision expression" -msgstr "израз за версия" - -#. "add some content of files and directories to the staging area in preparation for a commit" -msgid "stage/unstage" -msgstr "(добавяне) към скелето за подаване/изваждане от скелето за подаване" - -#. "temporarily save changes in a stack without committing" -msgid "stash" -msgstr "скатавам промени" - -#. "file whose content is tracked/not tracked by git" -msgid "tracked/untracked" -msgstr "следен/неследен" diff --git a/third_party/git/git-gui/po/glossary/de.po b/third_party/git/git-gui/po/glossary/de.po deleted file mode 100644 index 4c5f233ee52d..000000000000 --- a/third_party/git/git-gui/po/glossary/de.po +++ /dev/null @@ -1,430 +0,0 @@ -# Translation of git-gui glossary to German -# Copyright (C) 2007 Shawn Pearce, et al. -# This file is distributed under the same license as the git package. -# Christian Stimming <stimming@tuhh.de>, 2007 -# -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" -"Last-Translator: Christian Stimming <stimming@tuhh.de>\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" - -#. "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.)" -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 " -"(username=guest, password empty, gut),\n" -" http://msdn.microsoft.com/de-de/library/ms181038(vs.80).aspx (MS Visual " -"Source Safe, kommerziell),\n" -" http://cvsbook.red-bean.com/translations/german/Kap_06.html " -"(mittelmäßig),\n" -" http://tortoisecvs.cvs.sourceforge.net/tortoisecvs/po/TortoiseCVS/de_DE.po?" -"view=markup (mittelmäßig),\n" -" 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" - -#. "" -msgid "branch [verb]" -msgstr "branchen" - -#. "" -msgid "checkout [noun]" -msgstr "" -"Arbeitskopie (Checkout; Erstellung einer Arbeitskopie; Auscheck? 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" - -#. "" -msgid "clone [verb]" -msgstr "klonen" - -#. "A single point in the git history." -msgid "commit [noun]" -msgstr "Commit (Version?)" - -#. "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?)" - -#. "" -msgid "diff [noun]" -msgstr "Vergleich (Diff? 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" - -#. "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?)" - -#. "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" - -#. "A successful merge results in the creation of a new commit representing the result of the merge." -msgid "merge [noun]" -msgstr "Zusammenführung" - -#. "To bring the contents of another branch into the current branch." -msgid "merge [verb]" -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 <name>. These stale branches have already been removed from the remote repository referenced by <name>, but are still locally available in 'remotes/<name>'." -msgid "prune" -msgstr "veraltete Branches entfernen (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)" - -#. "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" - -#. "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" - -#. "" -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?)" - -#. "" -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" - -#. "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)" - -#. "" -msgid "sign off" -msgstr "abzeichnen (signieren? gegenzeichnen?, freizeichnen?)" - -#. "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." -msgid "tag [noun]" -msgstr "Tag (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" - -#. "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" - -#. "" -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" -msgstr "Arbeitskopie" diff --git a/third_party/git/git-gui/po/glossary/el.po b/third_party/git/git-gui/po/glossary/el.po deleted file mode 100644 index 1d3cc818d5ef..000000000000 --- a/third_party/git/git-gui/po/glossary/el.po +++ /dev/null @@ -1,171 +0,0 @@ -# Translation of git-gui glossary to Greek -# Copyright (C) 2009 Jimmy Angelakos -# This file is distributed under the same license as the git-gui package. -# Jimmy Angelakos <vyruss@hellug.gr>, 2009. -msgid "" -msgstr "" -"Project-Id-Version: git-gui-glossary\n" -"POT-Creation-Date: 2008-01-07 21:20+0100\n" -"PO-Revision-Date: 2009-06-23 20:41+0300\n" -"Last-Translator: Jimmy Angelakos <vyruss@hellug.gr>\n" -"Language-Team: Greek <i18n@lists.hellug.gr>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 0.3\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#. "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.)" -msgid "English Term (Dear translator: This file will never be visible to the user!)" -msgstr "" - -#. "" -msgid "amend" -msgstr "διόρθωση" - -#. "" -msgid "annotate" -msgstr "σχολιασμός" - -#. "A 'branch' is an active line of development." -msgid "branch [noun]" -msgstr "κλάδος [αντικείμενο]" - -#. "" -msgid "branch [verb]" -msgstr "διακλάδωση [ενέργεια]" - -#. "" -msgid "checkout [noun]" -msgstr "εξαγωγή [αντικείμενο]" - -#. "The action of updating the working tree to a revision which was stored in the object database." -msgid "checkout [verb]" -msgstr "εξαγωγή [ενέργεια]" - -#. "" -msgid "clone [verb]" -msgstr "κλωνοποίηση [ενέργεια]" - -#. "A single point in the git history." -msgid "commit [noun]" -msgstr "υποβολή [αντικείμενο] " - -#. "The action of storing a new snapshot of the project's state in the git history." -msgid "commit [verb]" -msgstr "υποβολή [ενέργεια]" - -#. "" -msgid "diff [noun]" -msgstr "διαφορά [αντικείμενο] " - -#. "" -msgid "diff [verb]" -msgstr "διαφορά [ενέργεια]" - -#. "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 "ανάκτηση" - -#. "One context of consecutive lines in a whole patch, which consists of many such hunks" -msgid "hunk" -msgstr "κομμάτι" - -#. "A collection of files. The index is a stored version of your working tree." -msgid "index (in git-gui: staging area)" -msgstr "ευρετήριο (στο git-gui: περιοχή σταδιοποίησης)" - -#. "A successful merge results in the creation of a new commit representing the result of the merge." -msgid "merge [noun]" -msgstr "συγχώνευση [αντικείμενο]" - -#. "To bring the contents of another branch into the current branch." -msgid "merge [verb]" -msgstr "συγχώνευση [ενέργεια]" - -#. "" -msgid "message" -msgstr "μήνυμα" - -#. "Deletes all stale tracking branches under <name>. These stale branches have already been removed from the remote repository referenced by <name>, but are still locally available in 'remotes/<name>'." -msgid "prune" -msgstr "κλάδεμα" - -#. "Pulling a branch means to fetch it and merge it." -msgid "pull" -msgstr "λήψη" - -#. "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 "ώθηση" - -#. "" -msgid "redo" -msgstr "ξανά" - -#. "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?)" -msgid "repository" -msgstr "αποθετήριο" - -#. "" -msgid "reset" -msgstr "επαναφορά" - -#. "" -msgid "revert" -msgstr "αναίρεση" - -#. "A particular state of files and directories which was stored in the object database." -msgid "revision" -msgstr "αναθεώρηση" - -#. "" -#, fuzzy -msgid "sign off" -msgstr "αποσύνδεση" - -#. "" -msgid "staging area" -msgstr "περιοχή σταδιοποίησης" - -#. "" -msgid "status" -msgstr "κατάσταση" - -#. "A ref pointing to a tag or commit object" -msgid "tag [noun]" -msgstr "ετικέτα [αντικείμενο]" - -#. "" -msgid "tag [verb]" -msgstr "ετικέτα [ενέργεια]" - -#. "A regular git branch that is used to follow changes from another repository." -msgid "tracking branch" -msgstr "κλάδος παρακολούθησης" - -#. "" -msgid "undo" -msgstr "αναίρεση" - -#. "" -msgid "update" -msgstr "ενημέρωση" - -#. "" -msgid "verify" -msgstr "επαλήθευση" - -#. "The tree of actual checked out files." -msgid "working copy, working tree" -msgstr "αντίγραφο εργασίας" - - diff --git a/third_party/git/git-gui/po/glossary/fr.po b/third_party/git/git-gui/po/glossary/fr.po deleted file mode 100644 index 27c006abb2ad..000000000000 --- a/third_party/git/git-gui/po/glossary/fr.po +++ /dev/null @@ -1,166 +0,0 @@ -# translation of fr.po to French -# Translation of git-gui glossary to French -# Copyright (C) 2008 Shawn Pearce, et al. -# -# Christian Couder <chriscool@tuxfamily.org>, 2008. -msgid "" -msgstr "" -"Project-Id-Version: fr\n" -"POT-Creation-Date: 2008-01-15 21:04+0100\n" -"PO-Revision-Date: 2008-01-15 21:17+0100\n" -"Last-Translator: Christian Couder <chriscool@tuxfamily.org>\n" -"Language-Team: French\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.4\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" - -#. "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.)" -msgid "English Term (Dear translator: This file will never be visible to the user!)" -msgstr "" - -#. "" -msgid "amend" -msgstr "corriger" - -#. "" -msgid "annotate" -msgstr "annoter" - -#. "A 'branch' is an active line of development." -msgid "branch [noun]" -msgstr "branche" - -#. "" -msgid "branch [verb]" -msgstr "créer une branche" - -#. "" -msgid "checkout [noun]" -msgstr "emprunt" - -#. "The action of updating the working tree to a revision which was stored in the object database." -msgid "checkout [verb]" -msgstr "emprunter" - -#. "" -msgid "clone [verb]" -msgstr "cloner" - -#. "A single point in the git history." -msgid "commit [noun]" -msgstr "commit" - -#. "The action of storing a new snapshot of the project's state in the git history." -msgid "commit [verb]" -msgstr "commiter" - -#. "" -msgid "diff [noun]" -msgstr "différence" - -#. "" -msgid "diff [verb]" -msgstr "comparer" - -#. "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 "fusion par avance rapide" - -#. "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 "récupérer" - -#. "A collection of files. The index is a stored version of your working tree." -msgid "index (in git-gui: staging area)" -msgstr "pré-commit" - -#. "A successful merge results in the creation of a new commit representing the result of the merge." -msgid "merge [noun]" -msgstr "fusion" - -#. "To bring the contents of another branch into the current branch." -msgid "merge [verb]" -msgstr "fusionner" - -#. "" -msgid "message" -msgstr "message" - -#. "Deletes all stale tracking branches under <name>. These stale branches have already been removed from the remote repository referenced by <name>, but are still locally available in 'remotes/<name>'." -msgid "prune" -msgstr "nettoyer" - -#. "Pulling a branch means to fetch it and merge it." -msgid "pull" -msgstr "tirer" - -#. "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 "pousser" - -#. "" -msgid "redo" -msgstr "refaire" - -#. "An other repository ('remote'). One might have a set of remotes whose branches one tracks." -msgid "remote" -msgstr "référentiel distant" - -#. "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 "référentiel" - -#. "" -msgid "reset" -msgstr "réinitialiser" - -#. "" -msgid "revert" -msgstr "inverser" - -#. "A particular state of files and directories which was stored in the object database." -msgid "revision" -msgstr "révision" - -#. "" -msgid "sign off" -msgstr "signer" - -#. "" -msgid "staging area" -msgstr "pré-commit" - -#. "" -msgid "status" -msgstr "état" - -#. "A ref pointing to a tag or commit object" -msgid "tag [noun]" -msgstr "marque" - -#. "" -msgid "tag [verb]" -msgstr "marquer" - -#. "A regular git branch that is used to follow changes from another repository." -msgid "tracking branch" -msgstr "branche de suivi" - -#. "" -msgid "undo" -msgstr "défaire" - -#. "" -msgid "update" -msgstr "mise à jour" - -#. "" -msgid "verify" -msgstr "vérifier" - -#. "The tree of actual checked out files." -msgid "working copy, working tree" -msgstr "copie de travail, arborescence de travail" - 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 deleted file mode 100644 index 4e66e0da3a9c..000000000000 --- a/third_party/git/git-gui/po/glossary/git-gui-glossary.pot +++ /dev/null @@ -1,398 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR Free Software Foundation, Inc. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2020-01-26 22:26+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: ENCODING\n" - -#. "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.)" -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 "" - -#. "" -msgid "branch [verb]" -msgstr "" - -#. "" -msgid "checkout [noun]" -msgstr "" - -#. "The action of updating the working tree to a revision which was stored in the object database." -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 "" - -#. "A single point in the git history." -msgid "commit [noun]" -msgstr "" - -#. "The action of storing a new snapshot of the project's state in the git history." -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 "" - -#. "" -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" -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 "" - -#. "A collection of files. The index is a stored version of your working tree." -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 "" - -#. "To bring the contents of another branch into the current branch." -msgid "merge [verb]" -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 <name>. These stale branches have already been removed from the remote repository referenced by <name>, but are still locally available in 'remotes/<name>'." -msgid "prune" -msgstr "" - -#. "Pulling a branch means to fetch it and merge it." -msgid "pull" -msgstr "" - -#. "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 "" - -#. "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" -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?)" -msgid "repository" -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 "" - -#. "" -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." -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" -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 deleted file mode 100644 index 48b9f10e57d3..000000000000 --- a/third_party/git/git-gui/po/glossary/git-gui-glossary.txt +++ /dev/null @@ -1,96 +0,0 @@ -"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." -"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 <name>. These stale branches have already been removed from the remote repository referenced by <name>, but are still locally available in 'remotes/<name>'." -"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." -"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" -"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" -"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." diff --git a/third_party/git/git-gui/po/glossary/it.po b/third_party/git/git-gui/po/glossary/it.po deleted file mode 100644 index bb46b48d6b84..000000000000 --- a/third_party/git/git-gui/po/glossary/it.po +++ /dev/null @@ -1,184 +0,0 @@ -# Translation of git-gui glossary to Italian -# Copyright (C) 2007 Shawn Pearce, et al. -# This file is distributed under the same license as the git package. -# Christian Stimming <stimming@tuhh.de>, 2007 -# -msgid "" -msgstr "" -"Project-Id-Version: git-gui glossary\n" -"POT-Creation-Date: 2007-10-19 21:43+0200\n" -"PO-Revision-Date: 2007-10-10 15:24+0200\n" -"Last-Translator: Michele Ballabio <barra_cuda@katamail.com>\n" -"Language-Team: Italian \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. "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.)" -msgid "" -"English Term (Dear translator: This file will never be visible to the user!)" -msgstr "" -"Traduzione italiana.\n" -"Altri SCM in italiano:\n" -" http://tortoisesvn.tigris.org/svn/tortoisesvn/trunk/Languages/Tortoise_it." -"po (username=guest, password empty),\n" -" http://tortoisecvs.cvs.sourceforge.net/tortoisecvs/po/TortoiseCVS/it_IT.po?" -"view=markup ,\n" -" http://rapidsvn.tigris.org/svn/rapidsvn/trunk/src/locale/it_IT/rapidsvn.po " -"(username=guest, password empty)" - -#. "" -msgid "amend" -msgstr "correggere, correzione" - -#. "" -msgid "annotate" -msgstr "annotare, annotazione" - -#. "A 'branch' is an active line of development." -msgid "branch [noun]" -msgstr "ramo, diramazione, ramificazione" - -#. "" -msgid "branch [verb]" -msgstr "creare ramo, ramificare, diramare" - -#. "" -msgid "checkout [noun]" -msgstr "attivazione, checkout, revisione attiva, prelievo (TortoiseCVS)?" - -#. "The action of updating the working tree to a revision which was stored in the object database." -msgid "checkout [verb]" -msgstr "" -"attivare, effettuare un checkout, attivare revisione, prelevare " -"(TortoiseCVS), ritirare (TSVN)?" - -#. "" -msgid "clone [verb]" -msgstr "clonare" - -#. "A single point in the git history." -msgid "commit [noun]" -msgstr "revisione, commit, deposito (TortoiseCVS), invio (TSVN)?" - -#. "The action of storing a new snapshot of the project's state in the git history." -msgid "commit [verb]" -msgstr "" -"creare una nuova revisione, archiviare, effettuare un commit, depositare " -"(nel server), fare un deposito (TortoiseCVS), inviare (TSVN)?" - -#. "" -msgid "diff [noun]" -msgstr "differenza, confronto, comparazione, raffronto" - -#. "" -msgid "diff [verb]" -msgstr "confronta, mostra le differenze" - -#. "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 "fusione in 'fast-forward', fusione in avanti veloce" - -#. "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 "recuperare, prelevare, prendere da, recuperare (TSVN)" - -#. "A collection of files. The index is a stored version of your working tree." -msgid "index (in git-gui: staging area)" -msgstr "indice" - -#. "A successful merge results in the creation of a new commit representing the result of the merge." -msgid "merge [noun]" -msgstr "fusione, unione" - -#. "To bring the contents of another branch into the current branch." -msgid "merge [verb]" -msgstr "effettuare la fusione, unire, fondere, eseguire la fusione" - -#. "" -msgid "message" -msgstr "messaggio, commento" - -#. "Deletes all stale tracking branches under <name>. These stale branches have already been removed from the remote repository referenced by <name>, but are still locally available in 'remotes/<name>'." -msgid "prune" -msgstr "potatura" - -#. "Pulling a branch means to fetch it and merge it." -msgid "pull" -msgstr "" -"prendi (recupera) e fondi (unisci)? (in pratica una traduzione di fetch + " -"merge)" - -#. "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 "propaga" - -#. "" -msgid "redo" -msgstr "ripeti, rifai" - -#. "An other repository ('remote'). One might have a set of remotes whose branches one tracks." -msgid "remote" -msgstr "remoto" - -#. "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 "archivio, repository, database? deposito (rapidsvn)?" - -#. "" -msgid "reset" -msgstr "ripristinare, annullare, azzerare, ripristinare" - -#. "" -msgid "revert" -msgstr "" -"annullare, inverti (rapidsvn), ritorna allo stato precedente, annulla le " -"modifiche della revisione" - -#. "A particular state of files and directories which was stored in the object database." -msgid "revision" -msgstr "revisione (TortoiseSVN)" - -#. "" -msgid "sign off" -msgstr "sign off, firma" - -#. "" -msgid "staging area" -msgstr "" -"area di preparazione, zona di preparazione, modifiche in preparazione? " -"modifiche in allestimento?" - -#. "" -msgid "status" -msgstr "stato" - -#. "A ref pointing to a tag or commit object" -msgid "tag [noun]" -msgstr "etichetta, etichettatura (TortoiseCVS)" - -#. "" -msgid "tag [verb]" -msgstr "etichettare" - -#. "A regular git branch that is used to follow changes from another repository." -msgid "tracking branch" -msgstr "" -"duplicato locale di ramo remoto, ramo in 'tracking', ramo inseguitore? ramo " -"di {inseguimento,allineamento,rilevamento,puntamento}?" - -#. "" -msgid "undo" -msgstr "annulla" - -#. "" -msgid "update" -msgstr "aggiornamento, aggiornare" - -#. "" -msgid "verify" -msgstr "verifica, verificare" - -#. "The tree of actual checked out files." -msgid "working copy, working tree" -msgstr "directory di lavoro, copia di lavoro" diff --git a/third_party/git/git-gui/po/glossary/pt_br.po b/third_party/git/git-gui/po/glossary/pt_br.po deleted file mode 100644 index eb039b2b4952..000000000000 --- a/third_party/git/git-gui/po/glossary/pt_br.po +++ /dev/null @@ -1,169 +0,0 @@ -# Translation of git-gui to Brazilian Portuguese -# Copyright (C) 2007 Shawn Pearce, et al. -# This file is distributed under the same license as the git-gui package. -# -# Alexandre Erwin Ittner <alexandre@ittner.com.br>, 2010. -msgid "" -msgstr "" -"Project-Id-Version: git-gui\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-26 15:47-0800\n" -"PO-Revision-Date: 2010-09-18 11:09-0300\n" -"Last-Translator: Alexandre Erwin Ittner <alexandre@ittner.com.br>\n" -"Language-Team: Brazilian Portuguese <>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. "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.)" -msgid "" -"English Term (Dear translator: This file will never be visible to the user!)" -msgstr "" - -#. "" -msgid "amend" -msgstr "corrigir" - -#. "" -msgid "annotate" -msgstr "anotar" - -#. "A 'branch' is an active line of development." -msgid "branch [noun]" -msgstr "ramo" - -#. "" -msgid "branch [verb]" -msgstr "ramificar" - -#. "" -msgid "checkout [noun]" -msgstr "checkout" - -#. "The action of updating the working tree to a revision which was stored in the object database." -msgid "checkout [verb]" -msgstr "efetuar checkout" - -#. "" -msgid "clone [verb]" -msgstr "clonar" - -#. "A single point in the git history." -msgid "commit [noun]" -msgstr "revisão" - -#. "The action of storing a new snapshot of the project's state in the git history." -msgid "commit [verb]" -msgstr "salvar revisão" - -#. "" -msgid "diff [noun]" -msgstr "diff" - -#. "" -msgid "diff [verb]" -msgstr "comparar" - -#. "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 "mesclagem rápida" - -#. "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 "receber" - -#. "One context of consecutive lines in a whole patch, which consists of many such hunks" -msgid "hunk" -msgstr "trecho" - -#. "A collection of files. The index is a stored version of your working tree." -msgid "index (in git-gui: staging area)" -msgstr "índice" - -#. "A successful merge results in the creation of a new commit representing the result of the merge." -msgid "merge [noun]" -msgstr "mesclagem" - -#. "To bring the contents of another branch into the current branch." -msgid "merge [verb]" -msgstr "mesclar" - -#. "" -msgid "message" -msgstr "descrição da revisão" - -#. "Deletes all stale tracking branches under <name>. These stale branches have already been removed from the remote repository referenced by <name>, but are still locally available in 'remotes/<name>'." -msgid "prune" -msgstr "limpar" - -#. "Pulling a branch means to fetch it and merge it." -msgid "pull" -msgstr "receber e mesclar" - -#. "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 "enviar" - -#. "" -msgid "redo" -msgstr "refazer" - -#. "An other repository ('remote'). One might have a set of remotes whose branches one tracks." -msgid "remote" -msgstr "repositório remoto" - -#. "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 "repositório" - -#. "" -msgid "reset" -msgstr "descartar, redefinir" - -#. "" -msgid "revert" -msgstr "reverter" - -#. "A particular state of files and directories which was stored in the object database." -msgid "revision" -msgstr "revisão" - -#. "" -msgid "sign off" -msgstr "assinar embaixo" - -#. "" -msgid "staging area" -msgstr "???" - -#. "" -msgid "status" -msgstr "status" - -#. "A ref pointing to a tag or commit object" -msgid "tag [noun]" -msgstr "etiqueta" - -#. "" -msgid "tag [verb]" -msgstr "marcar etiqueta" - -#. "A regular git branch that is used to follow changes from another repository." -msgid "tracking branch" -msgstr "ramo de rastreamento" - -#. "" -msgid "undo" -msgstr "desfazer" - -#. "" -msgid "update" -msgstr "atualizar" - -#. "" -msgid "verify" -msgstr "verificar" - -#. "The tree of actual checked out files." -msgid "working copy, working tree" -msgstr "cópia de trabalho, árvore de trabalho" diff --git a/third_party/git/git-gui/po/glossary/pt_pt.po b/third_party/git/git-gui/po/glossary/pt_pt.po deleted file mode 100644 index adc3b542a610..000000000000 --- a/third_party/git/git-gui/po/glossary/pt_pt.po +++ /dev/null @@ -1,293 +0,0 @@ -# Portuguese translations for git-gui glossary. -# Copyright (C) 2016 Shawn Pearce, et al. -# This file is distributed under the same license as the git package. -# Vasco Almeida <vascomalmeida@sapo.pt>, 2016. -msgid "" -msgstr "" -"Project-Id-Version: git-gui glossary\n" -"POT-Creation-Date: 2016-05-06 10:22+0000\n" -"PO-Revision-Date: 2016-05-06 12:32+0000\n" -"Last-Translator: Vasco Almeida <vascomalmeida@sapo.pt>\n" -"Language-Team: Portuguese\n" -"Language: pt\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Virtaal 0.7.1\n" - -#. "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.)" -msgid "" -"English Term (Dear translator: This file will never be visible to the user!)" -msgstr "" -"Outro SCM em português:\n" -"http://svn.code.sf.net/p/tortoisesvn/code/trunk/Languages/pt/TortoiseUI.po e " -"\n" -"http://svn.code.sf.net/p/tortoisesvn/code/trunk/Languages/pt/TortoiseDoc.po\n" -" em html: https://tortoisesvn.net/docs/release/TortoiseSVN_pt/index.html\n" -"\n" -"https://translations.launchpad.net/tortoisehg (medíocre)" - -#. "" -msgid "amend" -msgstr "emendar" - -#. "" -msgid "annotate" -msgstr "anotar" - -#. "A 'branch' is an active line of development." -msgid "branch [noun]" -msgstr "ramo" - -#. "" -msgid "branch [verb]" -msgstr "criar ramo" - -#. "" -msgid "checkout [noun]" -msgstr "extração" - -#. "The action of updating the working tree to a revision which was stored in the object database." -msgid "checkout [verb]" -msgstr "extrair" - -#. "" -msgid "clone [verb]" -msgstr "clonar" - -#. "A single point in the git history." -msgid "commit [noun]" -msgstr "commit" - -#. "The action of storing a new snapshot of the project's state in the git history." -msgid "commit [verb]" -msgstr "submeter" - -#. "" -msgid "diff [noun]" -msgstr "diferenças" - -#. "" -msgid "diff [verb]" -msgstr "mostrar diferenças" - -#. "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 "integração por avanço rápido" - -#. "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 "obter" - -#. "One context of consecutive lines in a whole patch, which consists of many such hunks" -msgid "hunk" -msgstr "excerto" - -#. "A collection of files. The index is a stored version of your working tree." -msgid "index (in git-gui: staging area)" -msgstr "índice" - -#. "A successful merge results in the creation of a new commit representing the result of the merge." -msgid "merge [noun]" -msgstr "integração" - -#. "To bring the contents of another branch into the current branch." -msgid "merge [verb]" -msgstr "integrar" - -#. "" -msgid "message" -msgstr "mensagem" - -#. "Deletes all stale tracking branches under <name>. These stale branches have already been removed from the remote repository referenced by <name>, but are still locally available in 'remotes/<name>'." -msgid "prune" -msgstr "podar" - -#. "Pulling a branch means to fetch it and merge it." -msgid "pull" -msgstr "puxar" - -#. "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 "publicar" - -#. "" -msgid "redo" -msgstr "refazer" - -#. "An other repository ('remote'). One might have a set of remotes whose branches one tracks." -msgid "remote" -msgstr "remoto" - -#. "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 "repositório" - -#. "" -msgid "reset" -msgstr "repor" - -#. "" -msgid "revert" -msgstr "reverter" - -#. "A particular state of files and directories which was stored in the object database." -msgid "revision" -msgstr "revisão" - -#. "" -msgid "sign off" -msgstr "assinar por baixo" - -#. "" -msgid "staging area" -msgstr "área de estágio" - -#. "" -msgid "status" -msgstr "estado" - -#. "A ref pointing to a tag or commit object" -msgid "tag [noun]" -msgstr "tag" - -#. "" -msgid "tag [verb]" -msgstr "criar tag" - -#. "A regular git branch that is used to follow changes from another repository." -msgid "tracking branch" -msgstr "ramo de monitorização" - -#. "" -msgid "undo" -msgstr "desfazer" - -#. "" -msgid "update" -msgstr "atualizar" - -#. "" -msgid "verify" -msgstr "verificar" - -#. "The tree of actual checked out files." -msgid "working copy, working tree" -msgstr "cópia de trabalho, árvore de trabalho" - -#. "a commit that succeeds the current one in git's graph of commits (not necessarily directly)" -msgid "ancestor" -msgstr "antecessor" - -#. "prematurely stop and abandon an operation" -msgid "abort" -msgstr "abortar" - -#. "a repository with only .git directory, without working directory" -msgid "bare repository" -msgstr "repositório nu" - -#. "a parent version of the current file" -msgid "base" -msgstr "base" - -#. "get the authors responsible for each line in a file" -msgid "blame" -msgstr "culpar" - -#. "to select and apply a single commit without merging" -msgid "cherry-pick" -msgstr "efetuar cherry-pick (escolher-a-dedo?, selecionar?)" - -#. "a commit that directly succeeds the current one in git's graph of commits" -msgid "child" -msgstr "filho" - -#. "clean the state of the git repository, often after manually stopped operation" -msgid "cleanup" -msgstr "limpar" - -#. "a message that gets attached with any commit" -msgid "commit message" -msgstr "mensagem de commit" - -#. "a commit that precedes the current one in git's graph of commits (not necessarily directly)" -msgid "descendant" -msgstr "descendente" - -#. "checkout of a revision rather than a some head" -msgid "detached checkout" -msgstr "extração destacada" - -#. "any merge strategy that works on a file by file basis" -msgid "file level merging" -msgstr "integração ao nível de ficheiros" - -#. "the last revision in a branch" -msgid "head" -msgstr "cabeça" - -#. "script that gets executed automatically on some event" -msgid "hook" -msgstr "gancho" - -#. "the first checkout during a clone operation" -msgid "initial checkout" -msgstr "extração inicial" - -#. "a branch that resides in the local git repository" -msgid "local branch" -msgstr "ramo local" - -#. "a Git object that is not part of any pack" -msgid "loose object" -msgstr "objeto solto" - -#. "a branch called by convention 'master' that exists in a newly created git repository" -msgid "master branch" -msgstr "ramo mestre" - -#. "a remote called by convention 'origin' that the current git repository has been cloned from" -msgid "origin" -msgstr "origem" - -#. "a file containing many git objects packed together" -msgid "pack [noun]" -msgstr "pacote" - -#. "a Git object part of some pack" -msgid "packed object" -msgstr "objeto compactado" - -#. "a commit that directly precedes the current one in git's graph of commits" -msgid "parent" -msgstr "pai" - -#. "the log file containing all states of the HEAD reference (in other words past pristine states of the working copy)" -msgid "reflog" -msgstr "reflog" - -#. "decide which changes from alternative versions of a file should persist in Git" -msgid "resolve (a conflict)" -msgstr "resolver (um conflito)" - -#. "abandon changes and go to pristine version" -msgid "revert changes" -msgstr "reverter alterações" - -#. "expression that signifies a revision in git" -msgid "revision expression" -msgstr "expressão de revisão" - -#. "add some content of files and directories to the staging area in preparation for a commit" -msgid "stage/unstage" -msgstr "preparar/retirar" - -#. "temporarily save changes in a stack without committing" -msgid "stash" -msgstr "empilhar" - -#. "file whose content is tracked/not tracked by git" -msgid "tracked/untracked" -msgstr "controlado/não controlado" diff --git a/third_party/git/git-gui/po/glossary/txt-to-pot.sh b/third_party/git/git-gui/po/glossary/txt-to-pot.sh deleted file mode 100755 index 8249915d3c6c..000000000000 --- a/third_party/git/git-gui/po/glossary/txt-to-pot.sh +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/sh -# This is a very, _very_, simple script to convert a tab-separated -# .txt file into a .pot/.po. -# Its not clever but it took me 2 minutes to write :) -# Michael Twomey <michael.twomey@ireland.sun.com> -# 23 March 2001 -# with slight GnuCash modifications by Christian Stimming <stimming@tuhh.de> -# 19 Aug 2001, 23 Jul 2007 - -#check args -if [ $# -eq 0 ] -then - cat <<! -Usage: $(basename $0) git-gui-glossary.txt > git-gui-glossary.pot -! - exit 1; -fi - -GLOSSARY_CSV="$1"; - -if [ ! -f "$GLOSSARY_CSV" ] -then - echo "Can't find $GLOSSARY_CSV."; - exit 1; -fi - -cat <<! -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR Free Software Foundation, Inc. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: $(date +'%Y-%m-%d %H:%M%z')\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: ENCODING\n" - -! - -#Yes this is the most simple awk script you've ever seen :) -awk -F'\t' '{if ($2 != "") print "#. "$2; print "msgid "$1; print "msgstr \"\"\n"}' \ -$GLOSSARY_CSV diff --git a/third_party/git/git-gui/po/glossary/zh_cn.po b/third_party/git/git-gui/po/glossary/zh_cn.po deleted file mode 100644 index 158835b5c1c9..000000000000 --- a/third_party/git/git-gui/po/glossary/zh_cn.po +++ /dev/null @@ -1,170 +0,0 @@ -# Translation of git-gui glossary to Simplified Chinese -# Copyright (C) 2007 Shawn Pearce, et al. -# This file is distributed under the same license as the git package. -# Xudong Guan <xudong.guan@gmail.com> and the zh-kernel.org mailing list, 2007 -# -msgid "" -msgstr "" -"Project-Id-Version: git-gui glossary\n" -"PO-Revision-Date: 2007-07-23 22:07+0200\n" -"Last-Translator: Xudong Guan <xudong.guan@gmail.com>\n" -"Language-Team: Simplified Chinese \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. "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.)" -msgid "" -"English Term (Dear translator: This file will never be visible to the user!)" -msgstr "注：这个文件是为了帮助翻译人员统一名词术语。最终用户不会关心这个文件。" - -#. "" -#. amend指用户修改最近一次commit的操作，修订？修改？修正？ -#. [WANG Cong]: 根据我的了解，这个词似乎翻译成“修订”多一些。“修正”也可以，“修改”再次之。 -#. [ZHANG Le]: 修订，感觉一般指对一些大型出版物的大规模升级，比如修订新华字典 -# 修正，其实每次amend的结果也不一定就是最后结果，说不定还需要修改。所以不 -# 如就叫修改 -msgid "amend" -msgstr "修订" - -#. "" -#. git annotate 文件名：用来标注文件的每一行在什么时候被谁最后修改。 -#. [WANG Cong]: "标记"一般是mark。;) -#. [ZHANG Le]: 标注，或者干脆用原意：注解，或注释 -msgid "annotate" -msgstr "标注" - -#. "A 'branch' is an active line of development." -msgid "branch [noun]" -msgstr "分支" - -#. "" -msgid "branch [verb]" -msgstr "建立分支" - -#. "" -#. [WANG Cong]: 网上有人翻译成“检出”，我感觉更好一些，毕竟把check的意思翻译出来了。 -#. [ZHNAG Le]: 提取吧，提取分支／版本 -#. [rae l]: 签出。subversion软件中的大多词汇已有翻译，既然git与subversion同是SCM管理，可以参考同类软件的翻译也不错。 -msgid "checkout [noun]" -msgstr "签出" - -#. "The action of updating the working tree to a revision which was stored in the object database." -msgid "checkout [verb]" -msgstr "签出" - -#. "A single point in the git history." -msgid "commit [noun]" -msgstr "提交" - -#. "The action of storing a new snapshot of the project's state in the git history." -msgid "commit [verb]" -msgstr "提交" - -#. "" -#. 差异？差别？ -#. [ZHANG Le]: 个人感觉差别更加中性一些 -msgid "diff [noun]" -msgstr "差别" - -#. "" -msgid "diff [verb]" -msgstr "比较" - -#. "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." -#. 获取？取得？下载？更新？注意和update的区分 -msgid "fetch" -msgstr "获取" - -#. "A collection of files. The index is a stored version of your working tree." -#. index是working tree和repository之间的缓存 -msgid "index (in git-gui: staging area)" -msgstr "工作缓存？" - -#. "A successful merge results in the creation of a new commit representing the result of the merge." -msgid "merge [noun]" -msgstr "合并" - -#. "To bring the contents of another branch into the current branch." -msgid "merge [verb]" -msgstr "合并" - -#. "" -#. message是指commit中的文字信息 -msgid "message" -msgstr "描述" - -#. "Pulling a branch means to fetch it and merge it." -msgid "pull" -msgstr "获取＋合并" - -#. "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 "推入" - -#. "" -msgid "redo" -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?)" -msgid "repository" -msgstr "仓库" - -#. "" -msgid "reset" -msgstr "重置" - -#. "" -msgid "revert" -msgstr "恢复" - -#. "A particular state of files and directories which was stored in the object database." -msgid "revision" -msgstr "版本" - -#. "" -msgid "sign off" -msgstr "签名" - -#. "" -#. 似乎是git-gui里面显示的本次提交的文件清单区域 -msgid "staging area" -msgstr "提交暂存区" - -#. "" -msgid "status" -msgstr "状态" - -#. "A ref pointing to a tag or commit object" -msgid "tag [noun]" -msgstr "标签" - -#. "" -msgid "tag [verb]" -msgstr "添加标签" - -#. "A regular git branch that is used to follow changes from another repository." -msgid "tracking branch" -msgstr "跟踪分支" - -#. "" -msgid "undo" -msgstr "撤销" - -#. "" -msgid "update" -msgstr "更新。注意和fetch的区分" - -#. "" -msgid "verify" -msgstr "验证" - -#. "The tree of actual checked out files." -#. "工作副本？工作区域？工作目录" -#. [LI Yang]: 当前副本， 当前源码树？ -msgid "working copy, working tree" -msgstr "工作副本，工作源码树" |