summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Stimming <stimming@tuhh.de>2007-10-20 13:30:53 (GMT)
committerShawn O. Pearce <spearce@spearce.org>2007-10-21 00:45:10 (GMT)
commitfb6cf213a3929744fc89e6a444dcd7d4b2fa3c66 (patch)
treee20cf39aad29d49c40acb3315ba8f78dd804f676
parentc9dcc7f865fb7891f4f6d068230663eb2cb586a7 (diff)
downloadgit-fb6cf213a3929744fc89e6a444dcd7d4b2fa3c66.zip
git-fb6cf213a3929744fc89e6a444dcd7d4b2fa3c66.tar.gz
git-fb6cf213a3929744fc89e6a444dcd7d4b2fa3c66.tar.bz2
git-gui: Add more terms to glossary.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
-rw-r--r--po/glossary/git-gui-glossary.pot8
-rw-r--r--po/glossary/git-gui-glossary.txt3
2 files changed, 8 insertions, 3 deletions
diff --git a/po/glossary/git-gui-glossary.pot b/po/glossary/git-gui-glossary.pot
index a2e5c73..48af803 100644
--- a/po/glossary/git-gui-glossary.pot
+++ b/po/glossary/git-gui-glossary.pot
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2007-10-05 22:30+0200\n"
+"POT-Creation-Date: 2007-10-19 21:43+0200\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"
@@ -86,7 +86,7 @@ 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 ""
@@ -102,6 +102,10 @@ 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 ""
diff --git a/po/glossary/git-gui-glossary.txt b/po/glossary/git-gui-glossary.txt
index b53740d..500d0a0 100644
--- 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" ""