From: Christian Stimming <stimming@tuhh.de>
To: "Shawn O. Pearce" <spearce@spearce.org>
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>, git@vger.kernel.org
Subject: [PATCH 1/2] git-gui: Add more terms to glossary.
Date: Sat, 20 Oct 2007 15:30:53 +0200 [thread overview]
Message-ID: <200710201530.53483.stimming@tuhh.de> (raw)
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
next prev parent reply other threads:[~2007-10-20 13:33 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-10-05 20:39 [PATCH 1/4] git-gui i18n: Add more words to glossary Christian Stimming
2007-10-05 20:39 ` [PATCH 2/4] git-gui i18n: Update German glossary according to mailing list discussion Christian Stimming
2007-10-05 20:40 ` [PATCH 3/4] git-gui i18n: Incorporate glossary changes into existing German translation Christian Stimming
2007-10-05 20:41 ` [PATCH 4/4] git-gui i18n: Update German translation, including latest glossary changes Christian Stimming
2007-10-07 18:05 ` [PATCH 1/4] git-gui i18n: Add more words to glossary Shawn O. Pearce
2007-10-07 20:42 ` Christian Stimming
2007-10-07 23:12 ` Shawn O. Pearce
2007-10-07 23:31 ` Johannes Schindelin
2007-10-07 23:39 ` Shawn O. Pearce
2007-10-08 19:43 ` Christian Stimming
2007-10-10 6:03 ` Shawn O. Pearce
2007-10-10 16:01 ` Johannes Schindelin
2007-10-20 13:30 ` Christian Stimming [this message]
2007-10-20 13:31 ` [PATCH 2/2] git-gui: Update German translation Christian Stimming
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=200710201530.53483.stimming@tuhh.de \
--to=stimming@tuhh.de \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=spearce@spearce.org \
/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).