Merge branch 'maint'

[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..500d0a0ea75215696481523010c6b33c9cd0786e 100644 (file)
--- a/po/glossary/git-gui-glossary.txt
+++ b/po/glossary/git-gui-glossary.txt
@@ -16,10 +16,11 @@
 "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"       ""