Skip to content

Commit 6636b88

Browse files
paulusmackpaulusmack
committed
Merge branch 'master' into dev
2 parents 476ca63 + f0c8426 commit 6636b88

File tree

3 files changed

+68
-55
lines changed

3 files changed

+68
-55
lines changed

‎Makefile‎

Lines changed: 38 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,52 @@
1-
# Set the installation directories; this section is needed only in
2-
# gitk.git but probably not in git.git.
3-
ifndef gitexecdir
4-
gitexecdir := $(shell git --exec-path)
5-
endif
6-
ifndef sharedir
7-
sharedir := $(dir $(gitexecdir))share
8-
endif
1+
# The default target of this Makefile is...
2+
all::
93

10-
# From here on, these are needed in git.git/gitk/Makefile.
4+
prefix ?= $(HOME)
5+
bindir ?= $(prefix)/bin
6+
sharedir ?= $(prefix)/share
117
gitk_libdir ?= $(sharedir)/gitk/lib
128
msgsdir ?= $(gitk_libdir)/msgs
139
msgsdir_SQ = $(subst ','\'',$(msgsdir))
1410

15-
## Beginning of po-file creation rules
11+
TCLTK_PATH ?= wish
12+
INSTALL ?= install
13+
RM ?= rm -f
14+
15+
DESTDIR_SQ = $(subst ','\'',$(DESTDIR))
16+
bindir_SQ = $(subst ','\'',$(bindir))
17+
TCLTK_PATH_SQ = $(subst ','\'',$(TCLTK_PATH))
18+
19+
## po-file creation rules
1620
XGETTEXT ?= xgettext
1721
MSGFMT ?= msgfmt
1822
PO_TEMPLATE = po/gitk.pot
1923
ALL_POFILES = $(wildcard po/*.po)
2024
ALL_MSGFILES = $(subst .po,.msg,$(ALL_POFILES))
2125

22-
all:: $(ALL_MSGFILES)
26+
ifndef V
27+
QUIET = @
28+
QUIET_GEN = $(QUIET)echo ' ' GEN $@ &&
29+
endif
30+
31+
all:: gitk-wish $(ALL_MSGFILES)
32+
33+
install:: all
34+
$(INSTALL) gitk-wish '$(DESTDIR_SQ)$(bindir_SQ)'/gitk
35+
$(INSTALL) -d '$(DESTDIR_SQ)$(msgsdir_SQ)'
36+
$(foreach p,$(ALL_MSGFILES), $(INSTALL) $p '$(DESTDIR_SQ)$(msgsdir_SQ)' &&) true
37+
38+
uninstall::
39+
$(foreach p,$(ALL_MSGFILES), $(RM) '$(DESTDIR_SQ)$(msgsdir_SQ)'/$(notdir $p) &&) true
40+
$(RM) '$(DESTDIR_SQ)$(bindir_SQ)'/gitk
41+
42+
clean::
43+
$(RM) gitk-wish po/*.msg
44+
45+
gitk-wish: gitk
46+
$(QUIET_GEN)$(RM) $@ $@+ && \
47+
sed -e '1,3s|^exec .* "$$0"|exec $(subst |,'\|',$(TCLTK_PATH_SQ)) "$$0"|' <gitk >$@+ && \
48+
chmod +x $@+ && \
49+
mv -f $@+ $@
2350

2451
$(PO_TEMPLATE): gitk
2552
$(XGETTEXT) -kmc -LTcl -o $@ gitk
@@ -29,17 +56,3 @@ $(ALL_MSGFILES): %.msg : %.po
2956
@echo Generating catalog $@
3057
$(MSGFMT) --statistics --tcl $< -l $(basename $(notdir $<)) -d $(dir $@)
3158

32-
clean::
33-
rm -f $(ALL_PROGRAMS) po/*.msg
34-
## End of po-file creation rules
35-
36-
# Install rules for po-files
37-
install: all
38-
$(QUIET)$(INSTALL_D0)'$(DESTDIR_SQ)$(msgsdir_SQ)' $(INSTALL_D1)
39-
$(QUIET)$(foreach p,$(ALL_MSGFILES), $(INSTALL_R0)$p $(INSTALL_R1) '$(DESTDIR_SQ)$(msgsdir_SQ)' &&) true
40-
41-
uninstall:
42-
$(QUIET)$(foreach p,$(ALL_MSGFILES), $(REMOVE_F0)'$(DESTDIR_SQ)$(msgsdir_SQ)'/$(notdir $p) $(REMOVE_F1) &&) true
43-
$(QUIET)$(REMOVE_D0)'$(DESTDIR_SQ)$(msgsdir_SQ)' $(REMOVE_D1)
44-
$(QUIET)$(REMOVE_D0)'$(DESTDIR_SQ)$(libdir_SQ)' $(REMOVE_D1)
45-
$(QUIET)$(REMOVE_D0)`dirname '$(DESTDIR_SQ)$(libdir_SQ)'` $(REMOVE_D1)

‎gitk‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2606,7 +2606,7 @@ proc editview {} {
26062606
}
26072607

26082608
proc vieweditor {top n title} {
2609-
global newviewname newviewperm viewfiles
2609+
global newviewname newviewperm viewfiles bgcolor
26102610

26112611
toplevel $top
26122612
wm title $top $title
@@ -2620,12 +2620,12 @@ proc vieweditor {top n title} {
26202620
-text [mc "Commits to include (arguments to git rev-list):"]
26212621
grid $top.al - -sticky w -pady 5
26222622
entry $top.args -width 50 -textvariable newviewargs($n) \
2623-
-background white
2623+
-background $bgcolor
26242624
grid $top.args - -sticky ew -padx 5
26252625
message $top.l -aspect 1000 \
26262626
-text [mc "Enter files and directories to include, one per line:"]
26272627
grid $top.l - -sticky w
2628-
text $top.t -width 40 -height 10 -background white -font uifont
2628+
text $top.t -width 40 -height 10 -background $bgcolor -font uifont
26292629
if {[info exists viewfiles($n)]} {
26302630
foreach f $viewfiles($n) {
26312631
$top.t insert end $f

‎po/de.po‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
# Translation of gitk to German.
2-
# Copyright (C) 2007 Paul Mackerras and Christian Stimming.
3-
# This file is distributed under the same license as the git package.
2+
# Copyright (C) 2007 Paul Mackerras.
3+
# This file is distributed under the same license as the gitk package.
44
# Christian Stimming <stimming@tuhh.de>, 2007
55
#
66
msgid ""
77
msgstr ""
88
"Project-Id-Version: git-gui\n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2007-11-07 12:27+0100\n"
11-
"PO-Revision-Date: 2007-11-07 12:36+0100\n"
10+
"POT-Creation-Date: 2007-12-21 12:04+0100\n"
11+
"PO-Revision-Date: 2008-01-08 21:48+0100\n"
1212
"Last-Translator: Christian Stimming <stimming@tuhh.de>\n"
1313
"Language-Team: German\n"
1414
"MIME-Version: 1.0\n"
@@ -321,11 +321,11 @@ msgstr ""
321321

322322
#: gitk:2883
323323
msgid "Local changes checked in to index but not committed"
324-
msgstr ""
324+
msgstr "Lokale Änderungen bereitgestellt, aber nicht eingetragen"
325325

326326
#: gitk:2913
327327
msgid "Local uncommitted changes, not checked in to index"
328-
msgstr ""
328+
msgstr "Lokale Änderungen, nicht bereitgestellt"
329329

330330
#: gitk:4264
331331
msgid "Searching"
@@ -496,15 +496,15 @@ msgstr "Zurücksetzen bestätigen"
496496
#: gitk:6357
497497
#, tcl-format
498498
msgid "Reset branch %s to %s?"
499-
msgstr ""
499+
msgstr "Zweig »%s« auf »%s« zurücksetzen?"
500500

501501
#: gitk:6361
502502
msgid "Reset type:"
503503
msgstr "Art des Zurücksetzens:"
504504

505505
#: gitk:6365
506506
msgid "Soft: Leave working tree and index untouched"
507-
msgstr "Weich: Arbeitskopie und Bereitstellung unverändert"
507+
msgstr "Harmlos: Arbeitskopie und Bereitstellung unverändert"
508508

509509
#: gitk:6368
510510
msgid "Mixed: Leave working tree untouched, reset index"
@@ -526,11 +526,11 @@ msgstr "Zurücksetzen"
526526

527527
#: gitk:6444
528528
msgid "Checking out"
529-
msgstr ""
529+
msgstr "Umstellen"
530530

531531
#: gitk:6474
532532
msgid "Cannot delete the currently checked-out branch"
533-
msgstr ""
533+
msgstr "Der Zweig, auf den die Arbeitskopie momentan umgestellt ist, kann nicht gelöscht werden."
534534

535535
#: gitk:6480
536536
#, tcl-format
@@ -580,40 +580,40 @@ msgstr "Gitk Einstellungen"
580580

581581
#: gitk:7960
582582
msgid "Commit list display options"
583-
msgstr ""
583+
msgstr "Anzeige Versionsliste"
584584

585585
#: gitk:7964
586586
msgid "Maximum graph width (lines)"
587-
msgstr ""
587+
msgstr "Maximale Graphenbreite (Zeilen)"
588588

589589
#: gitk:7968
590590
#, tcl-format
591591
msgid "Maximum graph width (% of pane)"
592-
msgstr ""
592+
msgstr "Maximale Graphenbreite (% des Fensters)"
593593

594594
#: gitk:7973
595595
msgid "Show local changes"
596-
msgstr ""
596+
msgstr "Lokale Änderungen anzeigen"
597597

598598
#: gitk:7978
599599
msgid "Diff display options"
600-
msgstr ""
600+
msgstr "Anzeige Vergleich"
601601

602602
#: gitk:7981
603603
msgid "Tab spacing"
604-
msgstr ""
604+
msgstr "Tabulatorbreite"
605605

606606
#: gitk:7985
607607
msgid "Display nearby tags"
608608
msgstr ""
609609

610610
#: gitk:7990
611611
msgid "Limit diffs to listed paths"
612-
msgstr ""
612+
msgstr "Vergleich nur für angezeigte Pfade"
613613

614614
#: gitk:7995
615615
msgid "Colors: press to choose"
616-
msgstr ""
616+
msgstr "Farben: Klicken zum Wählen"
617617

618618
#: gitk:7999
619619
msgid "Background"
@@ -625,40 +625,40 @@ msgstr "Hintergrund"
625625

626626
#: gitk:8007
627627
msgid "Diff: old lines"
628-
msgstr ""
628+
msgstr "Vergleich: Alte Zeilen"
629629

630630
#: gitk:8012
631631
msgid "Diff: new lines"
632-
msgstr ""
632+
msgstr "Vergleich: Neue Zeilen"
633633

634634
#: gitk:8017
635635
msgid "Diff: hunk header"
636-
msgstr ""
636+
msgstr "Vergleich: Änderungstitel"
637637

638638
#: gitk:8023
639639
msgid "Select bg"
640640
msgstr "Hintergrundfarbe Auswählen"
641641

642642
#: gitk:8027
643643
msgid "Fonts: press to choose"
644-
msgstr ""
644+
msgstr "Schriftart: Klicken zum Wählen"
645645

646646
#: gitk:8030
647647
msgid "Main font"
648-
msgstr ""
648+
msgstr "Programmschriftart"
649649

650650
#: gitk:8031
651651
msgid "Diff display font"
652-
msgstr ""
652+
msgstr "Vergleich"
653653

654654
#: gitk:8032
655655
msgid "User interface font"
656-
msgstr ""
656+
msgstr "Beschriftungen"
657657

658658
#: gitk:8050
659659
#, tcl-format
660660
msgid "Gitk: choose color for %s"
661-
msgstr ""
661+
msgstr "Gitk: Farbe wählen für %s"
662662

663663
#: gitk:8431
664664
msgid ""
@@ -668,7 +668,7 @@ msgstr ""
668668

669669
#: gitk:8516
670670
msgid "Cannot find a git repository here."
671-
msgstr ""
671+
msgstr "Kein Git-Projektarchiv gefunden."
672672

673673
#: gitk:8520
674674
#, tcl-format

0 commit comments

Comments
 (0)