Skip to content

Commit d96ca27

Browse files
gitstergitster
committed
Merge git://repo.or.cz/git-gui
* git://repo.or.cz/git-gui: git-gui: Adapt discovery of oguilib to execdir 'libexec/git-core' git-gui: add a part about format strings in po/README git-gui: update po/it.po git-gui: update Japanese translation git-gui: Update swedish translation. git-gui: Update git-gui.pot for 0.11 nearing release git-gui: Update German translation
2 parents 847d10f + 9534c9f commit d96ca27

File tree

7 files changed

+1211
-999
lines changed

7 files changed

+1211
-999
lines changed

‎git-gui/git-gui.sh‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,11 @@ catch {rename send {}} ; # What an evil concept...
5252
set oguilib {@@GITGUI_LIBDIR@@}
5353
set oguirel {@@GITGUI_RELATIVE@@}
5454
if {$oguirel eq {1}} {
55-
set oguilib [file dirname [file dirname [file normalize $argv0]]]
55+
set oguilib [file dirname [file normalize $argv0]]
56+
if {[file tail $oguilib] eq {git-core}} {
57+
set oguilib [file dirname $oguilib]
58+
}
59+
set oguilib [file dirname $oguilib]
5660
set oguilib [file join $oguilib share git-gui lib]
5761
set oguimsg [file join $oguilib msgs]
5862
} elseif {[string match @@* $oguirel]} {

‎git-gui/po/README‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ matching msgid lines. A few tips:
101101
"printf()"-like functions. Make sure "%s", "%d", and "%%" in your
102102
translated messages match the original.
103103

104-
When you have to change the order of words, you can add "<number>\$"
104+
When you have to change the order of words, you can add "<number>$"
105105
between '%' and the conversion ('s', 'd', etc.) to say "<number>-th
106106
parameter to the format string is used at this point". For example,
107107
if the original message is like this:
@@ -111,12 +111,17 @@ matching msgid lines. A few tips:
111111
and if for whatever reason your translation needs to say weight first
112112
and then length, you can say something like:
113113

114-
"WEIGHT IS %2\$d, LENGTH IS %1\$d"
114+
"WEIGHT IS %2$d, LENGTH IS %1$d"
115115

116-
The reason you need a backslash before dollar sign is because
117-
this is a double quoted string in Tcl language, and without
118-
it the letter introduces a variable interpolation, which you
119-
do not want here.
116+
A format specification with a '*' (asterisk) refers to *two* arguments
117+
instead of one, hence the succeeding argument number is two higher
118+
instead of one. So, a message like this
119+
120+
"%s ... %*i of %*i %s (%3i%%)"
121+
122+
is equivalent to
123+
124+
"%1$s ... %2$*i of %4$*i %6$s (%7$3i%%)"
120125

121126
- A long message can be split across multiple lines by ending the
122127
string with a double quote, and starting another string on the next

‎git-gui/po/de.po‎

Lines changed: 70 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: git-gui\n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2008-03-14 07:18+0100\n"
11-
"PO-Revision-Date: 2008-05-01 11:51+0200\n"
10+
"POT-Creation-Date: 2008-08-02 08:58+0200\n"
11+
"PO-Revision-Date: 2008-08-02 09:09+0200\n"
1212
"Last-Translator: Christian Stimming <stimming@tuhh.de>\n"
1313
"Language-Team: German\n"
1414
"MIME-Version: 1.0\n"
@@ -134,18 +134,11 @@ msgstr "Konfliktauflösung nötig"
134134
msgid "Starting gitk... please wait..."
135135
msgstr "Gitk wird gestartet... bitte warten."
136136

137-
#: git-gui.sh:1653
138-
#, tcl-format
139-
msgid ""
140-
"Unable to start gitk:\n"
141-
"\n"
142-
"%s does not exist"
143-
msgstr ""
144-
"Gitk kann nicht gestartet werden:\n"
145-
"\n"
146-
"%s existiert nicht"
137+
#: git-gui.sh:1698
138+
msgid "Couldn't find gitk in PATH"
139+
msgstr "Gitk kann im PATH nicht gefunden werden."
147140

148-
#: git-gui.sh:1860 lib/choose_repository.tcl:36
141+
#: git-gui.sh:1948 lib/choose_repository.tcl:36
149142
msgid "Repository"
150143
msgstr "Projektarchiv"
151144

@@ -294,7 +287,15 @@ msgstr "Aus der Bereitstellung herausnehmen"
294287
msgid "Revert Changes"
295288
msgstr "Änderungen verwerfen"
296289

297-
#: git-gui.sh:2049 git-gui.sh:2368 git-gui.sh:2467
290+
#: git-gui.sh:2141 git-gui.sh:2702
291+
msgid "Show Less Context"
292+
msgstr "Weniger Zeilen anzeigen"
293+
294+
#: git-gui.sh:2145 git-gui.sh:2706
295+
msgid "Show More Context"
296+
msgstr "Mehr Zeilen anzeigen"
297+
298+
#: git-gui.sh:2151 git-gui.sh:2470 git-gui.sh:2569
298299
msgid "Sign Off"
299300
msgstr "Abzeichnen"
300301

@@ -314,11 +315,7 @@ msgstr "Zusammenführen abbrechen..."
314315
msgid "Push..."
315316
msgstr "Versenden..."
316317

317-
#: git-gui.sh:2092 lib/choose_repository.tcl:41
318-
msgid "Apple"
319-
msgstr "Apple"
320-
321-
#: git-gui.sh:2095 git-gui.sh:2117 lib/about.tcl:14
318+
#: git-gui.sh:2197 git-gui.sh:2219 lib/about.tcl:14
322319
#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:50
323320
#, tcl-format
324321
msgid "About %s"
@@ -403,15 +400,11 @@ msgstr "Datei:"
403400
msgid "Apply/Reverse Hunk"
404401
msgstr "Kontext anwenden/umkehren"
405402

406-
#: git-gui.sh:2595
407-
msgid "Show Less Context"
408-
msgstr "Weniger Zeilen anzeigen"
403+
#: git-gui.sh:2696
404+
msgid "Apply/Reverse Line"
405+
msgstr "Zeile anwenden/umkehren"
409406

410-
#: git-gui.sh:2602
411-
msgid "Show More Context"
412-
msgstr "Mehr Zeilen anzeigen"
413-
414-
#: git-gui.sh:2610
407+
#: git-gui.sh:2711
415408
msgid "Refresh"
416409
msgstr "Aktualisieren"
417410

@@ -427,11 +420,19 @@ msgstr "Schriftgröße vergrößern"
427420
msgid "Unstage Hunk From Commit"
428421
msgstr "Kontext aus Bereitstellung herausnehmen"
429422

430-
#: git-gui.sh:2648
423+
#: git-gui.sh:2748
424+
msgid "Unstage Line From Commit"
425+
msgstr "Zeile aus der Bereitstellung herausnehmen"
426+
427+
#: git-gui.sh:2750
431428
msgid "Stage Hunk For Commit"
432429
msgstr "Kontext zur Bereitstellung hinzufügen"
433430

434-
#: git-gui.sh:2667
431+
#: git-gui.sh:2751
432+
msgid "Stage Line For Commit"
433+
msgstr "Zeile zur Bereitstellung hinzufügen"
434+
435+
#: git-gui.sh:2771
435436
msgid "Initializing..."
436437
msgstr "Initialisieren..."
437438

@@ -493,7 +494,11 @@ msgstr "Version:"
493494
msgid "Copy Commit"
494495
msgstr "Version kopieren"
495496

496-
#: lib/blame.tcl:384
497+
#: lib/blame.tcl:260
498+
msgid "Do Full Copy Detection"
499+
msgstr "Volle Kopie-Erkennung"
500+
501+
#: lib/blame.tcl:388
497502
#, tcl-format
498503
msgid "Reading %s..."
499504
msgstr "%s lesen..."
@@ -514,7 +519,19 @@ msgstr "Annotierungen für ursprünglichen Ort werden geladen..."
514519
msgid "Annotation complete."
515520
msgstr "Annotierung vollständig."
516521

517-
#: lib/blame.tcl:746
522+
#: lib/blame.tcl:737
523+
msgid "Busy"
524+
msgstr "Verarbeitung läuft"
525+
526+
#: lib/blame.tcl:738
527+
msgid "Annotation process is already running."
528+
msgstr "Annotierung läuft bereits."
529+
530+
#: lib/blame.tcl:777
531+
msgid "Running thorough copy detection..."
532+
msgstr "Intensive Kopie-Erkennung läuft..."
533+
534+
#: lib/blame.tcl:827
518535
msgid "Loading annotation..."
519536
msgstr "Annotierung laden..."
520537

@@ -759,7 +776,12 @@ msgstr "Schließen"
759776
msgid "Branch '%s' does not exist."
760777
msgstr "Zweig »%s« existiert nicht."
761778

762-
#: lib/checkout_op.tcl:206
779+
#: lib/checkout_op.tcl:193
780+
#, tcl-format
781+
msgid "Failed to configure simplified git-pull for '%s'."
782+
msgstr "Fehler beim Einrichten der vereinfachten git-pull für »%s«."
783+
784+
#: lib/checkout_op.tcl:228
763785
#, tcl-format
764786
msgid ""
765787
"Branch '%s' already exists.\n"
@@ -1485,6 +1507,14 @@ msgstr ""
14851507
msgid "Failed to stage selected hunk."
14861508
msgstr "Fehler beim Bereitstellen des gewählten Kontexts."
14871509

1510+
#: lib/diff.tcl:386
1511+
msgid "Failed to unstage selected line."
1512+
msgstr "Fehler beim Herausnehmen der gewählten Zeile aus der Bereitstellung."
1513+
1514+
#: lib/diff.tcl:394
1515+
msgid "Failed to stage selected line."
1516+
msgstr "Fehler beim Bereitstellen der gewählten Zeile."
1517+
14881518
#: lib/error.tcl:20 lib/error.tcl:114
14891519
msgid "error"
14901520
msgstr "Fehler"
@@ -1750,6 +1780,14 @@ msgid "Match Tracking Branches"
17501780
msgstr "Passend zu Übernahmezweig"
17511781

17521782
#: lib/option.tcl:126
1783+
msgid "Blame Copy Only On Changed Files"
1784+
msgstr "Kopie-Annotieren nur bei geänderten Dateien"
1785+
1786+
#: lib/option.tcl:127
1787+
msgid "Minimum Letters To Blame Copy On"
1788+
msgstr "Mindestzahl Zeichen für Kopie-Annotieren"
1789+
1790+
#: lib/option.tcl:128
17531791
msgid "Number of Diff Context Lines"
17541792
msgstr "Anzahl der Kontextzeilen beim Vergleich"
17551793

0 commit comments

Comments
 (0)