aboutsummaryrefslogtreecommitdiff
path: root/git-gui/lib
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-12-06 23:51:15 -0800
committerJunio C Hamano <gitster@pobox.com>2007-12-06 23:51:15 -0800
commitd9f405931fa3d96b2a80fe5ad8205eea7c443f56 (patch)
treeb1ebb40e8ede5b364eef9ddb70f92fbf51486c4d /git-gui/lib
parent5f7003b18cf84c0629eada39bca417d9c33cb132 (diff)
parentcfb5e104423b51aefb4d0e21a093bd9373b0af0b (diff)
downloadgit-d9f405931fa3d96b2a80fe5ad8205eea7c443f56.tar.gz
git-d9f405931fa3d96b2a80fe5ad8205eea7c443f56.tar.xz
Merge branch 'master' of git://repo.or.cz/git-gui
* 'master' of git://repo.or.cz/git-gui: Update Hungarian translation. 100% completed. Update ja.po for git-gui git-gui: Improve the application icon on Windows. git-gui: install-sh from automake does not like -m755 git-gui: Reorder msgfmt command-line arguments Update German translation. 100% completed. Update git-gui.pot with latest (few) string additions and changes. git-gui: update it.po and glossary/it.po git-gui: fix a typo in lib/commit.tcl
Diffstat (limited to 'git-gui/lib')
-rw-r--r--git-gui/lib/commit.tcl2
-rw-r--r--git-gui/lib/git-gui.icobin318 -> 3638 bytes
2 files changed, 1 insertions, 1 deletions
diff --git a/git-gui/lib/commit.tcl b/git-gui/lib/commit.tcl
index 10b0430f5..b2d2d5308 100644
--- a/git-gui/lib/commit.tcl
+++ b/git-gui/lib/commit.tcl
@@ -184,7 +184,7 @@ You must stage at least 1 file before you can commit.
A good commit message has the following format:
-- First line: Describe in one sentance what you did.
+- First line: Describe in one sentence what you did.
- Second line: Blank
- Remaining lines: Describe why this change is good.
"]
diff --git a/git-gui/lib/git-gui.ico b/git-gui/lib/git-gui.ico
index 563dd6623..334cfa5a1 100644
--- a/git-gui/lib/git-gui.ico
+++ b/git-gui/lib/git-gui.ico
Binary files differ