git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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] git-gui: Update glossary; update German translation
Date: Mon, 7 Jan 2008 22:08:50 +0100	[thread overview]
Message-ID: <200801072208.51943.stimming@tuhh.de> (raw)

[-- Attachment #1: Type: text/plain, Size: 2167 bytes --]

---
 po/glossary/git-gui-glossary.pot |    6 +++++-
 po/glossary/git-gui-glossary.txt |    1 +
 2 files changed, 6 insertions(+), 1 deletions(-)

Additionally, I've updated the German translation, but due to fear of whitespace
mangling I'm just adding that patch and this one in the attached tarball. Hope that's ok.

Thanks a lot! - Christian


diff --git a/po/glossary/git-gui-glossary.pot b/po/glossary/git-gui-glossary.pot
index 48af803..40eb3e9 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-19 21:43+0200\n"
+"POT-Creation-Date: 2008-01-07 21:20+0100\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"
@@ -70,6 +70,10 @@ msgstr ""
 msgid "fetch"
 msgstr ""
 
+#. "One context of consecutive lines in a whole patch, which consists of many such hunks"
+msgid "hunk"
+msgstr ""
+
 #. "A collection of files. The index is a stored version of your working tree."
 msgid "index (in git-gui: staging area)"
 msgstr ""
diff --git a/po/glossary/git-gui-glossary.txt b/po/glossary/git-gui-glossary.txt
index 500d0a0..9b31f69 100644
--- a/po/glossary/git-gui-glossary.txt
+++ b/po/glossary/git-gui-glossary.txt
@@ -12,6 +12,7 @@
 "diff [verb]"	""
 "fast forward merge"	"A fast-forward is a special type of merge where you have a revision and you are merging another branch's changes that happen to be a descendant of what you have."
 "fetch"	"Fetching a branch means to get the branch's head from a remote repository, to find out which objects are missing from the local object database, and to get them, too."
+"hunk"	"One context of consecutive lines in a whole patch, which consists of many such hunks"
 "index (in git-gui: staging area)"	"A collection of files. The index is a stored version of your working tree."
 "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."
-- 
1.5.3.4.206.g58ba4


[-- Attachment #2: git-gui-Update-German-translation.tgz --]
[-- Type: application/x-tgz, Size: 2884 bytes --]

                 reply	other threads:[~2008-01-07 21:11 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=200801072208.51943.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).