Skip to content

Commit d9f4059

Browse files
gitstergitster
committed
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
2 parents 5f7003b + cfb5e10 commit d9f4059

File tree

9 files changed

+1248
-1057
lines changed

9 files changed

+1248
-1057
lines changed

‎git-gui/Makefile‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ endif
4343
RM_RF ?= rm -rf
4444
RMDIR ?= rmdir
4545

46-
INSTALL_D0 = $(INSTALL) -d -m755 # space is required here
46+
INSTALL_D0 = $(INSTALL) -d -m 755 # space is required here
4747
INSTALL_D1 =
48-
INSTALL_R0 = $(INSTALL) -m644 # space is required here
48+
INSTALL_R0 = $(INSTALL) -m 644 # space is required here
4949
INSTALL_R1 =
50-
INSTALL_X0 = $(INSTALL) -m755 # space is required here
50+
INSTALL_X0 = $(INSTALL) -m 755 # space is required here
5151
INSTALL_X1 =
5252
INSTALL_A0 = find # space is required here
5353
INSTALL_A1 = | cpio -pud
@@ -71,11 +71,11 @@ ifndef V
7171
QUIET_2DEVNULL = 2>/dev/null
7272

7373
INSTALL_D0 = dir=
74-
INSTALL_D1 = && echo ' ' DEST $$dir && $(INSTALL) -d -m755 "$$dir"
74+
INSTALL_D1 = && echo ' ' DEST $$dir && $(INSTALL) -d -m 755 "$$dir"
7575
INSTALL_R0 = src=
76-
INSTALL_R1 = && echo ' ' INSTALL 644 `basename $$src` && $(INSTALL) -m644 $$src
76+
INSTALL_R1 = && echo ' ' INSTALL 644 `basename $$src` && $(INSTALL) -m 644 $$src
7777
INSTALL_X0 = src=
78-
INSTALL_X1 = && echo ' ' INSTALL 755 `basename $$src` && $(INSTALL) -m755 $$src
78+
INSTALL_X1 = && echo ' ' INSTALL 755 `basename $$src` && $(INSTALL) -m 755 $$src
7979
INSTALL_A0 = src=
8080
INSTALL_A1 = && echo ' ' INSTALL ' ' `basename "$$src"` && find "$$src" | cpio -pud
8181

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

217217
lib/tclIndex: $(ALL_LIBFILES) GIT-GUI-VARS
218218
$(QUIET_INDEX)if echo \

‎git-gui/lib/commit.tcl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ You must stage at least 1 file before you can commit.
184184
185185
A good commit message has the following format:
186186
187-
- First line: Describe in one sentance what you did.
187+
- First line: Describe in one sentence what you did.
188188
- Second line: Blank
189189
- Remaining lines: Describe why this change is good.
190190
"]

‎git-gui/lib/git-gui.ico‎

3.24 KB
Binary file not shown.

0 commit comments

Comments
 (0)