From: Christian Stimming <stimming@tuhh.de>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>,
"Shawn Pearce" <spearce@spearce.org>
Cc: git@vger.kernel.org
Subject: [PATCH 1/4] git-gui i18n: Add more words to glossary.
Date: Fri, 5 Oct 2007 22:39:01 +0200 [thread overview]
Message-ID: <200710052239.02492.stimming@tuhh.de> (raw)
Signed-off-by: Christian Stimming <stimming@tuhh.de>
---
po/glossary/git-gui-glossary.pot | 12 ++++++++++--
po/glossary/git-gui-glossary.txt | 2 ++
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/po/glossary/git-gui-glossary.pot b/po/glossary/git-gui-glossary.pot
index c955b46..a2e5c73 100644
--- a/po/glossary/git-gui-glossary.pot
+++ b/po/glossary/git-gui-glossary.pot
@@ -6,12 +6,12 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2007-07-27 19:21+0200\n"
+"POT-Creation-Date: 2007-10-05 22:30+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"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: ENCODING\n"
#. "English Definition (Dear translator: This file will never be visible to the user! It should only serve as a tool for you, the translator. Nothing more.)"
@@ -42,6 +42,10 @@ msgstr ""
msgid "checkout [verb]"
msgstr ""
+#. ""
+msgid "clone [verb]"
+msgstr ""
+
#. "A single point in the git history."
msgid "commit [noun]"
msgstr ""
@@ -82,6 +86,10 @@ msgstr ""
msgid "message"
msgstr ""
+#. ""
+msgid "prune"
+msgstr ""
+
#. "Pulling a branch means to fetch it and merge it."
msgid "pull"
msgstr ""
diff --git a/po/glossary/git-gui-glossary.txt b/po/glossary/git-gui-glossary.txt
index bb55aa8..b53740d 100644
--- a/po/glossary/git-gui-glossary.txt
+++ b/po/glossary/git-gui-glossary.txt
@@ -5,6 +5,7 @@
"branch [verb]" ""
"checkout [noun]" ""
"checkout [verb]" "The action of updating the working tree to a revision which was stored in the object database."
+"clone [verb]" ""
"commit [noun]" "A single point in the git history."
"commit [verb]" "The action of storing a new snapshot of the project's state in the git history."
"diff [noun]" ""
@@ -15,6 +16,7 @@
"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" ""
"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" ""
--
1.5.3.rc2.6.g40240
next reply other threads:[~2007-10-05 20:16 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-10-05 20:39 Christian Stimming [this message]
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 ` [PATCH 1/2] git-gui: Add more terms " Christian Stimming
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=200710052239.02492.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).