git-gui: Update glossary: add term "hunk"

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

diff --git a/po/glossary/git-gui-glossary.pot b/po/glossary/git-gui-glossary.pot
index 48af80331413f1f19dcba87b1db65a7f474bbc23..40eb3e9c07a4d39091972655d8a99110fd361be5 100644 (file)
--- 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 500d0a0ea75215696481523010c6b33c9cd0786e..9b31f69152025e484ddf467d7884c2bf2140a894 100644 (file)
--- 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."