From: al_shopov@yahoo.com
To: git@vger.kernel.org
Cc: Pat Thoyts <patthoyts@users.sourceforge.net>,
Alexander Shopov <ash@kambanaria.org>
Subject: [PATCH 3/3] git-gui l10n: Add 29 more terms to glossary
Date: Wed, 15 Jan 2014 13:07:57 +0200 [thread overview]
Message-ID: <1389784077-8105-4-git-send-email-lists@kambanaria.org> (raw)
In-Reply-To: <1389784077-8105-1-git-send-email-lists@kambanaria.org>
From: Alexander Shopov <ash@kambanaria.org>
Signed-off-by: Alexander Shopov <ash@kambanaria.org>
---
po/glossary/git-gui-glossary.txt | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
diff --git a/po/glossary/git-gui-glossary.txt b/po/glossary/git-gui-glossary.txt
index 9b31f69..4093046 100644
--- a/po/glossary/git-gui-glossary.txt
+++ b/po/glossary/git-gui-glossary.txt
@@ -36,3 +36,32 @@
"update" ""
"verify" ""
"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"
--
1.8.4.2
prev parent reply other threads:[~2014-01-15 11:14 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-15 11:07 [PATCH 0/3] Bulgarian glossary & translation + terms for git-gui al_shopov
2014-01-15 11:07 ` [PATCH 1/3] git-gui i18n: Initial glossary in Bulgarian al_shopov
2014-01-15 11:07 ` [PATCH 2/3] git-gui i18n: Added Bulgarian translation al_shopov
2014-01-15 11:07 ` al_shopov [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1389784077-8105-4-git-send-email-lists@kambanaria.org \
--to=al_shopov@yahoo.com \
--cc=ash@kambanaria.org \
--cc=git@vger.kernel.org \
--cc=patthoyts@users.sourceforge.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).