git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 1/2] git-gui: Add more terms to glossary.

From
Christian Stimming <stimming@tuhh.de>
Date
Oct 20, 2007, 13:30 UTC
Message-ID
<200710201530.53483.stimming@tuhh.de>
In-Reply-To
<20071010060328.GO2137@spearce.org>

--- Based on git-gui.git's master.

 po/glossary/git-gui-glossary.pot |    8 ++++++--
 po/glossary/git-gui-glossary.txt |    3 ++-
 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"	""
-- 
1.5.3.4.206.g58ba4
Previous: Johannes SchindelinNext: Christian Stimming
Message 13 of 14 in “git-gui i18n: Add more words to glossary.”
  1. 1/4 git-gui i18n: Add more words to glossary.Christian Stimming, Oct 5, 2007
  2. 2/4 git-gui i18n: Update German glossary according to mailing list discussion.Christian Stimming, Oct 5, 2007
  3. 3/4 git-gui i18n: Incorporate glossary changes into existing German translation.Christian Stimming, Oct 5, 2007
  4. 4/4 git-gui i18n: Update German translation, including latest glossary changes.Christian Stimming, Oct 5, 2007
  5. Shawn O. PearceOct 7, 2007
  6. Christian StimmingOct 7, 2007
  7. Shawn O. PearceOct 7, 2007
  8. Johannes SchindelinOct 7, 2007
  9. Shawn O. PearceOct 7, 2007
  10. Christian StimmingOct 8, 2007
  11. Shawn O. PearceOct 10, 2007
  12. Johannes SchindelinOct 10, 2007
  13. 1/2 git-gui: Add more terms to glossary.Christian Stimming, Oct 20, 2007
  14. Christian StimmingOct 20, 2007

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.