git-gui: Update glossary: add term "hunk"
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Christian Stimming committed
Jan 7, 2008 at 21:48 UTC
b3125ad3c10402de680cbdd7945574a1cc30a379
2 files changed
+6
-1
po/glossary/git-gui-glossary.pot
+5
-1
@@ -6,7 +6,7 @@
6
msgid ""
7
msgstr ""
8
"Project-Id-Version: PACKAGE VERSION\n"
9
-"POT-Creation-Date: 2007-10-19 21:43+0200\n"
9
+"POT-Creation-Date: 2008-01-07 21:20+0100\n"
10
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
11
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -70,6 +70,10 @@ msgstr ""
70
msgid "fetch"
71
msgstr ""
72
73
+#. "One context of consecutive lines in a whole patch, which consists of many such hunks"
74
+msgid "hunk"
75
+msgstr ""
76
+
77
#. "A collection of files. The index is a stored version of your working tree."
78
msgid "index (in git-gui: staging area)"
79
msgstr ""
po/glossary/git-gui-glossary.txt
+1
@@ -12,6 +12,7 @@
12
"diff [verb]" ""
13
"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."
14
"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."
15
+"hunk" "One context of consecutive lines in a whole patch, which consists of many such hunks"
16
"index (in git-gui: staging area)" "A collection of files. The index is a stored version of your working tree."
17
"merge [noun]" "A successful merge results in the creation of a new commit representing the result of the merge."
18
"merge [verb]" "To bring the contents of another branch into the current branch."