{"thread":{"id":"11512","subject":"[PATCH] git-gui: Update glossary; update German translation","startedAt":"2008-01-07T21:08:50Z","lastAt":"2008-01-07T21:08:50Z","messageCount":1,"participants":["Christian Stimming"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"64670","messageId":"200801072208.51943.stimming@tuhh.de","threadId":"11512","inReplyTo":null,"subject":"[PATCH] git-gui: Update glossary; update German translation","fromName":"Christian Stimming","fromEmail":"stimming@tuhh.de","sentAt":"2008-01-07T21:08:50Z","receivedAt":"2008-01-07T21:08:50Z","isPatch":true,"sender":{"key":"stimming@tuhh.de","avatar":"https://avatars.githubusercontent.com/u/227778?v=4"},"body":"---\n po/glossary/git-gui-glossary.pot |    6 +++++-\n po/glossary/git-gui-glossary.txt |    1 +\n 2 files changed, 6 insertions(+), 1 deletions(-)\n\nAdditionally, I've updated the German translation, but due to fear of whitespace\nmangling I'm just adding that patch and this one in the attached tarball. Hope that's ok.\n\nThanks a lot! - Christian\n\n\ndiff --git a/po/glossary/git-gui-glossary.pot b/po/glossary/git-gui-glossary.pot\nindex 48af803..40eb3e9 100644\n--- a/po/glossary/git-gui-glossary.pot\n+++ b/po/glossary/git-gui-glossary.pot\n@@ -6,7 +6,7 @@\n msgid \"\"\n msgstr \"\"\n \"Project-Id-Version: PACKAGE VERSION\\n\"\n-\"POT-Creation-Date: 2007-10-19 21:43+0200\\n\"\n+\"POT-Creation-Date: 2008-01-07 21:20+0100\\n\"\n \"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\\n\"\n \"Last-Translator: FULL NAME <EMAIL@ADDRESS>\\n\"\n \"Language-Team: LANGUAGE <LL@li.org>\\n\"\n@@ -70,6 +70,10 @@ msgstr \"\"\n msgid \"fetch\"\n msgstr \"\"\n \n+#. \"One context of consecutive lines in a whole patch, which consists of many such hunks\"\n+msgid \"hunk\"\n+msgstr \"\"\n+\n #. \"A collection of files. The index is a stored version of your working tree.\"\n msgid \"index (in git-gui: staging area)\"\n msgstr \"\"\ndiff --git a/po/glossary/git-gui-glossary.txt b/po/glossary/git-gui-glossary.txt\nindex 500d0a0..9b31f69 100644\n--- a/po/glossary/git-gui-glossary.txt\n+++ b/po/glossary/git-gui-glossary.txt\n@@ -12,6 +12,7 @@\n \"diff [verb]\"\t\"\"\n \"fast forward merge\"\t\"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.\"\n \"fetch\"\t\"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.\"\n+\"hunk\"\t\"One context of consecutive lines in a whole patch, which consists of many such hunks\"\n \"index (in git-gui: staging area)\"\t\"A collection of files. The index is a stored version of your working tree.\"\n \"merge [noun]\"\t\"A successful merge results in the creation of a new commit representing the result of the merge.\"\n \"merge [verb]\"\t\"To bring the contents of another branch into the current branch.\"\n-- \n1.5.3.4.206.g58ba4\n\n"}]}