git-gui: mc cannot be used before msgcat has been loaded

[git.git] / po / glossary / git-gui-glossary.txt

diff --git a/po/glossary/git-gui-glossary.txt b/po/glossary/git-gui-glossary.txt
index b53740d48c6b86d94c790762764e99f2b2c1d4ec..9b31f69152025e484ddf467d7884c2bf2140a894 100644 (file)
--- a/po/glossary/git-gui-glossary.txt
+++ b/po/glossary/git-gui-glossary.txt
@@ -12,14 +12,16 @@
 "diff [verb]"  ""
 "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."
+"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."
 "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"      ""
-"prune"        ""
+"prune"        "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>'."
 "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?)"
 "redo" ""
+"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"        ""
 "revert"       ""