Skip to content

Commit

Permalink
Merge branch 'master' of git://repo.or.cz/git-gui
Browse files Browse the repository at this point in the history
* '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
  • Loading branch information
Junio C Hamano committed Dec 7, 2007
2 parents 5f7003b + cfb5e10 commit d9f4059
Show file tree
Hide file tree
Showing 9 changed files with 1,248 additions and 1,057 deletions.
14 changes: 7 additions & 7 deletions git-gui/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@ endif
RM_RF ?= rm -rf
RMDIR ?= rmdir

INSTALL_D0 = $(INSTALL) -d -m755 # space is required here
INSTALL_D0 = $(INSTALL) -d -m 755 # space is required here
INSTALL_D1 =
INSTALL_R0 = $(INSTALL) -m644 # space is required here
INSTALL_R0 = $(INSTALL) -m 644 # space is required here
INSTALL_R1 =
INSTALL_X0 = $(INSTALL) -m755 # space is required here
INSTALL_X0 = $(INSTALL) -m 755 # space is required here
INSTALL_X1 =
INSTALL_A0 = find # space is required here
INSTALL_A1 = | cpio -pud
Expand All @@ -71,11 +71,11 @@ ifndef V
QUIET_2DEVNULL = 2>/dev/null

INSTALL_D0 = dir=
INSTALL_D1 = && echo ' ' DEST $$dir && $(INSTALL) -d -m755 "$$dir"
INSTALL_D1 = && echo ' ' DEST $$dir && $(INSTALL) -d -m 755 "$$dir"
INSTALL_R0 = src=
INSTALL_R1 = && echo ' ' INSTALL 644 `basename $$src` && $(INSTALL) -m644 $$src
INSTALL_R1 = && echo ' ' INSTALL 644 `basename $$src` && $(INSTALL) -m 644 $$src
INSTALL_X0 = src=
INSTALL_X1 = && echo ' ' INSTALL 755 `basename $$src` && $(INSTALL) -m755 $$src
INSTALL_X1 = && echo ' ' INSTALL 755 `basename $$src` && $(INSTALL) -m 755 $$src
INSTALL_A0 = src=
INSTALL_A1 = && echo ' ' INSTALL ' ' `basename "$$src"` && find "$$src" | cpio -pud

Expand Down Expand Up @@ -212,7 +212,7 @@ $(PO_TEMPLATE): $(SCRIPT_SH) $(ALL_LIBFILES)
update-po:: $(PO_TEMPLATE)
$(foreach p, $(ALL_POFILES), echo Updating $p ; msgmerge -U $p $(PO_TEMPLATE) ; )
$(ALL_MSGFILES): %.msg : %.po
$(QUIET_MSGFMT0)$(MSGFMT) --statistics --tcl $< -l $(basename $(notdir $<)) -d $(dir $@) $(QUIET_MSGFMT1)
$(QUIET_MSGFMT0)$(MSGFMT) --statistics --tcl -l $(basename $(notdir $<)) -d $(dir $@) $< $(QUIET_MSGFMT1)

lib/tclIndex: $(ALL_LIBFILES) GIT-GUI-VARS
$(QUIET_INDEX)if echo \
Expand Down
2 changes: 1 addition & 1 deletion git-gui/lib/commit.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -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.
"]
Expand Down
Binary file modified git-gui/lib/git-gui.ico
Binary file not shown.
Loading

0 comments on commit d9f4059

Please sign in to comment.