Re: german translation bug

2013-12-25 Thread Ralf Thielow
On Wed, Dec 25, 2013 at 8:53 PM, Wolfgang Rohdewald wolfg...@rohdewald.de wrote: Arbeitsverzeichnis leer means working directory empty which is obviously wrong. It should say Arbeitsverzeichnis sauber wr@s5:~/src/linux$ git status # Auf Zweig drm-intel-testing Nichts zum Einreichen,

Re: german translation bug

2013-12-26 Thread Ralf Thielow
On Wed, Dec 25, 2013 at 10:53 PM, Wolfgang Rohdewald wolfg...@rohdewald.de wrote: Am Mittwoch, 25. Dezember 2013, 21:59:10 schrieb Ralf Thielow: What version of Git do you use? What distro in what version do you use? freshly installed kubuntu 13.10. The package language-pack-de mentioned

[PATCH] l10n: de.po: fix translation of 'prefix'

2014-01-03 Thread Ralf Thielow
The word 'prefix' is currently translated as 'Prefix' which is not a German word. It should be translated as 'Präfix'. Signed-off-by: Ralf Thielow ralf.thie...@gmail.com --- po/de.po | 16 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/po/de.po b/po/de.po index

[PATCH] l10n: de.po: translate 27 new messages

2014-01-23 Thread Ralf Thielow
Translate 27 new messages came from git.pot update in df49095 (l10n: git.pot: v1.9 round 1 (27 new, 11 removed). Signed-off-by: Ralf Thielow ralf.thie...@gmail.com --- po/de.po | 90 1 file changed, 45 insertions(+), 45 deletions

[PATCH v2] l10n: de.po: translate 27 new messages

2014-01-26 Thread Ralf Thielow
Translate 27 new messages came from git.pot update in df49095 (l10n: git.pot: v1.9 round 1 (27 new, 11 removed). Signed-off-by: Ralf Thielow ralf.thie...@gmail.com --- 2014-01-24 Jiang Xin worldhello@gmail.com: Inconsistent ending colons, some have and some not. Oops. Thanks! Here is v2

[PATCH v3] l10n: de.po: translate 28 new messages

2014-02-04 Thread Ralf Thielow
Translate 28 new messages came from git.pot update in df49095 (l10n: git.pot: v1.9 round 1 (27 new, 11 removed) and d57b24b (l10n: git.pot: v1.9 round 2 (1 new)). Signed-off-by: Ralf Thielow ralf.thie...@gmail.com --- v3 adds one new message from l10n rnd 2. po/de.po | 92

[PATCH v4] l10n: de.po: translate 28 new messages

2014-02-08 Thread Ralf Thielow
Translate 28 new messages came from git.pot update in df49095 (l10n: git.pot: v1.9 round 1 (27 new, 11 removed) and d57b24b (l10n: git.pot: v1.9 round 2 (1 new)). Signed-off-by: Ralf Thielow ralf.thie...@gmail.com --- v4 corrects some translations according to Thomas' review. Thanks

Re: [PATCH] l10n: de.po: translate 27 new messages

2014-02-08 Thread Ralf Thielow
2014-02-08 20:22 GMT+01:00 David Kastrup d...@gnu.org: verberge keine aufgepfropften Commits seems much more in the spirit of the original terminology. verbirgt keine Commits mit künstlichen Vorgängern is plainly wrong anyway since it is not the commits _with_ grafts which are hidden but

Re: [PATCH] l10n: de.po: translate 27 new messages

2014-02-08 Thread Ralf Thielow
2014-02-08 20:59 GMT+01:00 David Kastrup d...@gnu.org: Ralf Thielow ralf.thie...@gmail.com writes: 2014-02-08 20:22 GMT+01:00 David Kastrup d...@gnu.org: verberge keine aufgepfropften Commits seems much more in the spirit of the original terminology. verbirgt keine Commits mit künstlichen

Re: [PATCH v4] l10n: de.po: translate 28 new messages

2014-02-08 Thread Ralf Thielow
2014-02-08 21:11 GMT+01:00 David Kastrup d...@gnu.org: Ralf Thielow ralf.thie...@gmail.com writes: Translate 28 new messages came from git.pot update in df49095 (l10n: git.pot: v1.9 round 1 (27 new, 11 removed) and d57b24b (l10n: git.pot: v1.9 round 2 (1 new)). Signed-off-by: Ralf Thielow

[PATCH v5] l10n: de.po: translate 28 new messages

2014-02-08 Thread Ralf Thielow
Translate 28 new messages came from git.pot update in df49095 (l10n: git.pot: v1.9 round 1 (27 new, 11 removed) and d57b24b (l10n: git.pot: v1.9 round 2 (1 new)). Signed-off-by: Ralf Thielow ralf.thie...@gmail.com --- po/de.po | 99

[PATCH] l10n: de.po: correct message when hiding commits by craft

2014-02-08 Thread Ralf Thielow
The recent translation was giving the idea that all commits based on a graft were meant to be hidden. Make it clear that it is the graft commit itself. Reported-by: David Kastrup d...@gnu.org Signed-off-by: Ralf Thielow ralf.thie...@gmail.com --- po/de.po | 2 +- 1 file changed, 1 insertion

[PATCH] l10n: de.po: correct message when hiding commits by craft

2014-02-08 Thread Ralf Thielow
The recent translation was giving the idea that all commits based on a graft were meant to be hidden. Make it clear that it is the graft commit itself. Reported-by: David Kastrup d...@gnu.org Signed-off-by: Ralf Thielow ralf.thie...@gmail.com --- po/de.po | 2 +- 1 file changed, 1 insertion

[PATCH] help.c: rename function pretty_print_string_list

2014-02-28 Thread Ralf Thielow
The part string_list of the name of function pretty_print_string_list is just an implementation detail. The function pretty-prints command names so rename it to pretty_print_cmdnames. Signed-off-by: Ralf Thielow ralf.thie...@gmail.com --- Just noticed this while digging through Git codebase

[PATCH] l10n: de.po: correct translation of completed after resolving deltas

2014-04-12 Thread Ralf Thielow
Signed-off-by: Ralf Thielow ralf.thie...@gmail.com --- I'll queue this fix as part of the German l10n changes for the next release. po/de.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/de.po b/po/de.po index 773ae87..3e01e72 100644 --- a/po/de.po +++ b/po/de.po

[PATCH] l10n: de.po: translate 45 new messages

2014-04-19 Thread Ralf Thielow
Translate 45 new messages came from git.pot update in 5e078fc (l10n: git.pot: v2.0.0 round 1 (45 new, 28 removed)). Signed-off-by: Ralf Thielow ralf.thie...@gmail.com --- po/de.po | 123 +-- 1 file changed, 49 insertions(+), 74

[PATCH] l10n: de.po: improve hint for autocorrected command execution

2014-04-25 Thread Ralf Thielow
Signed-off-by: Ralf Thielow ralf.thie...@gmail.com --- I'll queue this as part of the German l10n changes for the next release. po/de.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/de.po b/po/de.po index b777ef4..d143572 100644 --- a/po/de.po +++ b/po/de.po

[PATCH v2] l10n: de.po: translate 45 new messages

2014-04-27 Thread Ralf Thielow
Translate 45 new messages came from git.pot update in 5e078fc (l10n: git.pot: v2.0.0 round 1 (45 new, 28 removed)). Signed-off-by: Ralf Thielow ralf.thie...@gmail.com Acked-by: Thomas Rast t...@thomasrast.ch --- po/de.po | 127 +-- 1

Re: [PATCH] l10n: de.po: translate 38 new messages

2014-08-23 Thread Ralf Thielow
are ready. 2014-08-06 1:51 GMT+08:00 Ralf Thielow ralf.thie...@gmail.com: Translate 38 new messages came from git.pot update in fe05e19 (l10n: git.pot: v2.1.0 round 1 (38 new, 9 removed)). Signed-off-by: Ralf Thielow ralf.thie...@gmail.com --- po/de.po | 131

[PATCH] po/TEAMS: add new members to German translation team

2014-08-26 Thread Ralf Thielow
Signed-off-by: Ralf Thielow ralf.thie...@gmail.com --- po/TEAMS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/po/TEAMS b/po/TEAMS index 52c3d07..461cc14 100644 --- a/po/TEAMS +++ b/po/TEAMS @@ -15,6 +15,8 @@ Leader: Ralf Thielow ralf.thie...@googlemail.com Members

[PATCH] l10n: de.po: translate 38 new messages

2014-08-26 Thread Ralf Thielow
Translate 38 new messages came from git.pot update in fe05e19 (l10n: git.pot: v2.1.0 round 1 (38 new, 9 removed)). Signed-off-by: Ralf Thielow ralf.thie...@gmail.com --- This is a resend of an earlier patch [1] with an extended recipient list. [1] http://article.gmane.org/gmane.comp.version

[PATCH v2] l10n: de.po: translate 38 new messages

2014-08-27 Thread Ralf Thielow
Translate 38 new messages came from git.pot update in fe05e19 (l10n: git.pot: v2.1.0 round 1 (38 new, 9 removed)). Signed-off-by: Ralf Thielow ralf.thie...@gmail.com --- Am 26. August 2014 22:08 schrieb Phillip Sz phillip.sze...@gmail.com: msgid did not receive expected object %s -msgstr Kann

[PATCH] po/TEAMS: add new member to German translation team

2014-09-05 Thread Ralf Thielow
Signed-off-by: Ralf Thielow ralf.thie...@gmail.com --- po/TEAMS | 1 + 1 file changed, 1 insertion(+) diff --git a/po/TEAMS b/po/TEAMS index 461cc14..a33a38e 100644 --- a/po/TEAMS +++ b/po/TEAMS @@ -17,6 +17,7 @@ Members: Thomas Rast t...@thomasrast.ch Christian Stimming

[PATCH 7/7] part7: l10n: de.po: use imperative form for command options

2014-09-19 Thread Ralf Thielow
Signed-off-by: Ralf Thielow ralf.thie...@gmail.com --- po/de.po | 162 +++ 1 file changed, 81 insertions(+), 81 deletions(-) diff --git a/po/de.po b/po/de.po index 9ccd63b..dbac6f1 100644 --- a/po/de.po +++ b/po/de.po @@ -9479,35

[PATCH 5/7] part5: l10n: de.po: use imperative form for command options

2014-09-19 Thread Ralf Thielow
Signed-off-by: Ralf Thielow ralf.thie...@gmail.com --- po/de.po | 162 +++ 1 file changed, 81 insertions(+), 81 deletions(-) diff --git a/po/de.po b/po/de.po index 1abb5a3..e776d6f 100644 --- a/po/de.po +++ b/po/de.po @@ -6749,7 +6749,7

[PATCH 4/7] part4: l10n: de.po: use imperative form for command options

2014-09-19 Thread Ralf Thielow
Signed-off-by: Ralf Thielow ralf.thie...@gmail.com --- po/de.po | 192 +++ 1 file changed, 96 insertions(+), 96 deletions(-) diff --git a/po/de.po b/po/de.po index f7c160c..1abb5a3 100644 --- a/po/de.po +++ b/po/de.po @@ -5588,83

[PATCH 0/7] l10n: de.po: use imperative form for command options

2014-09-19 Thread Ralf Thielow
. Ralf Thielow (7): part1: l10n: de.po: use imperative form for command options part2: l10n: de.po: use imperative form for command options part3: l10n: de.po: use imperative form for command options part4: l10n: de.po: use imperative form for command options part5: l10n: de.po: use

[PATCH 2/7] part2: l10n: de.po: use imperative form for command options

2014-09-19 Thread Ralf Thielow
Signed-off-by: Ralf Thielow ralf.thie...@gmail.com --- po/de.po | 148 +++ 1 file changed, 74 insertions(+), 74 deletions(-) diff --git a/po/de.po b/po/de.po index 13b31bd..ca174c2 100644 --- a/po/de.po +++ b/po/de.po @@ -3228,31

[PATCH 1/7] part1: l10n: de.po: use imperative form for command options

2014-09-19 Thread Ralf Thielow
Signed-off-by: Ralf Thielow ralf.thie...@gmail.com --- po/de.po | 166 +++ 1 file changed, 83 insertions(+), 83 deletions(-) diff --git a/po/de.po b/po/de.po index e5d2b25..13b31bd 100644 --- a/po/de.po +++ b/po/de.po @@ -70,7 +70,7

[PATCH 3/7] part3: l10n: de.po: use imperative form for command options

2014-09-19 Thread Ralf Thielow
Signed-off-by: Ralf Thielow ralf.thie...@gmail.com --- po/de.po | 160 +++ 1 file changed, 80 insertions(+), 80 deletions(-) diff --git a/po/de.po b/po/de.po index ca174c2..f7c160c 100644 --- a/po/de.po +++ b/po/de.po @@ -4648,31

[PATCH 6/7] part6: l10n: de.po: use imperative form for command options

2014-09-19 Thread Ralf Thielow
Signed-off-by: Ralf Thielow ralf.thie...@gmail.com --- po/de.po | 156 +++ 1 file changed, 78 insertions(+), 78 deletions(-) diff --git a/po/de.po b/po/de.po index e776d6f..9ccd63b 100644 --- a/po/de.po +++ b/po/de.po @@ -7942,11

Re: [PATCH 1/7] part1: l10n: de.po: use imperative form for command options

2014-09-19 Thread Ralf Thielow
Hi Phillip, 2014-09-19 21:11 GMT+02:00 Phillip Sz phillip.sze...@gmail.com: Hi, #: archive.c:351 builtin/archive.c:91 msgid retrieve the archive from remote repository repo -msgstr ruft das Archiv von Remote-Repository Repository ab +msgstr Archiv von Remote-Repository Repository abrufen

Re: [PATCH] l10n: de.po: change Email to E-Mail

2014-09-21 Thread Ralf Thielow
2014-09-20 17:51 GMT+02:00 Phillip Sz phillip.sze...@gmail.com: Changes all Email to E-Mail, as this is the correct form in german. Thanks! Phillip Signed-off-by: Phillip Sz phillip.sze...@gmail.com --- po/de.po | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff

Re: [PATCH] de.po: Fixup one translation

2014-09-23 Thread Ralf Thielow
2014-09-23 10:43 GMT+02:00 Stefan Beller stefanbel...@gmail.com: On 23.09.2014 10:06, Eric Sunshine wrote: On Tue, Sep 23, 2014 at 3:37 AM, Stefan Beller stefanbel...@gmail.com wrote: English grammar with German words doesn't make it a German translation. ;) We also need to fix the

Re: [PATCH] l10n:de.po: use comma before um

2014-09-23 Thread Ralf Thielow
Am 23. September 2014 14:00 schrieb Phillip Sz phillip.sze...@gmail.com: Hi, this patch added a comma before the um. See: http://www.duden.de/sprachwissen/rechtschreibregeln/komma#K117 Thanks! -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to

Re: [PATCH 3/7] part3: l10n: de.po: use imperative form for command options

2014-09-25 Thread Ralf Thielow
Hi, 2014-09-23 12:24 GMT+02:00 Phillip Sz phillip.sze...@gmail.com: Hi, #: builtin/describe.c:395 msgid find the tag that comes after the commit -msgstr findet das Tag, das nach Commit kommt +msgstr das Tag finden, das nach Commit kommt das Tag finden, das nach dem Commit kommt #:

Re: [PATCH] de.po: Fixup one translation

2014-09-25 Thread Ralf Thielow
-by: Stefan Beller stefanbel...@gmail.com Signed-off-by: Ralf Thielow ralf.thie...@gmail.com --- po/de.po | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/po/de.po b/po/de.po index e5d2b25..fe940d1 100644 --- a/po/de.po +++ b/po/de.po @@ -3463,13 +3463,13 @@ msgid_plural \n

[PATCH v2] part1: l10n: de.po: use imperative form for command options

2014-10-24 Thread Ralf Thielow
Signed-off-by: Ralf Thielow ralf.thie...@gmail.com --- po/de.po | 166 +++ 1 file changed, 83 insertions(+), 83 deletions(-) diff --git a/po/de.po b/po/de.po index e5d2b25..1285d57 100644 --- a/po/de.po +++ b/po/de.po @@ -70,7 +70,7

[PATCH v2] part3: l10n: de.po: use imperative form for command options

2014-10-24 Thread Ralf Thielow
Signed-off-by: Ralf Thielow ralf.thie...@gmail.com --- po/de.po | 160 +++ 1 file changed, 80 insertions(+), 80 deletions(-) diff --git a/po/de.po b/po/de.po index b3a1762..dbcf6a9 100644 --- a/po/de.po +++ b/po/de.po @@ -4648,31

[PATCH v3 0/7] use imperative form for command

2014-11-07 Thread Ralf Thielow
v3 is rebased on top of git-po's master branch. Thanks for review, Phillip. Ralf Thielow (7): part1: l10n: de.po: use imperative form for command options part2: l10n: de.po: use imperative form for command options part3: l10n: de.po: use imperative form for command options part4: l10n

[PATCH v3 3/7] part3: l10n: de.po: use imperative form for command options

2014-11-07 Thread Ralf Thielow
Signed-off-by: Ralf Thielow ralf.thie...@gmail.com --- po/de.po | 160 +++ 1 file changed, 80 insertions(+), 80 deletions(-) diff --git a/po/de.po b/po/de.po index 47b2d68..8071fd1 100644 --- a/po/de.po +++ b/po/de.po @@ -4648,31

[PATCH v3 7/7] part7: l10n: de.po: use imperative form for command options

2014-11-07 Thread Ralf Thielow
Signed-off-by: Ralf Thielow ralf.thie...@gmail.com --- po/de.po | 162 +++ 1 file changed, 81 insertions(+), 81 deletions(-) diff --git a/po/de.po b/po/de.po index 5a1a61f..dea43e0 100644 --- a/po/de.po +++ b/po/de.po @@ -9479,35

[PATCH v3 2/7] part2: l10n: de.po: use imperative form for command options

2014-11-07 Thread Ralf Thielow
Signed-off-by: Ralf Thielow ralf.thie...@gmail.com --- po/de.po | 148 +++ 1 file changed, 74 insertions(+), 74 deletions(-) diff --git a/po/de.po b/po/de.po index 8782bd4..47b2d68 100644 --- a/po/de.po +++ b/po/de.po @@ -3228,31

[PATCH v3 1/7] part1: l10n: de.po: use imperative form for command options

2014-11-07 Thread Ralf Thielow
Signed-off-by: Ralf Thielow ralf.thie...@gmail.com --- po/de.po | 166 +++ 1 file changed, 83 insertions(+), 83 deletions(-) diff --git a/po/de.po b/po/de.po index c807967..8782bd4 100644 --- a/po/de.po +++ b/po/de.po @@ -70,7 +70,7

[PATCH v3 5/7] part5: l10n: de.po: use imperative form for command options

2014-11-07 Thread Ralf Thielow
Signed-off-by: Ralf Thielow ralf.thie...@gmail.com --- po/de.po | 162 +++ 1 file changed, 81 insertions(+), 81 deletions(-) diff --git a/po/de.po b/po/de.po index 64ee621..f94d46f 100644 --- a/po/de.po +++ b/po/de.po @@ -6749,7 +6749,7

[PATCH v3 4/7] part4: l10n: de.po: use imperative form for command options

2014-11-07 Thread Ralf Thielow
Signed-off-by: Ralf Thielow ralf.thie...@gmail.com --- po/de.po | 192 +++ 1 file changed, 96 insertions(+), 96 deletions(-) diff --git a/po/de.po b/po/de.po index 8071fd1..64ee621 100644 --- a/po/de.po +++ b/po/de.po @@ -5588,83

[PATCH] l10n: de.po: translate 62 new messages

2014-11-07 Thread Ralf Thielow
Translate 62 new messages came from git.pot update in 16742b0 (l10n: git.pot: proposed updates for v2.2.0 (+62)). Signed-off-by: Ralf Thielow ralf.thie...@gmail.com --- po/de.po | 178 +-- 1 file changed, 82 insertions(+), 96 deletions

[PATCH v2] l10n: de.po: translate 62 new messages

2014-11-12 Thread Ralf Thielow
Translate 62 new messages came from git.pot update in 16742b0 (l10n: git.pot: proposed updates for v2.2.0 (+62)). Signed-off-by: Ralf Thielow ralf.thie...@gmail.com --- po/de.po | 180 +-- 1 file changed, 83 insertions(+), 97 deletions

[PATCHv2 0/3] Switch German translation to G+E

2013-07-10 Thread Ralf Thielow
V2 corrects a message in the second and the third part. Ralf Thielow (3): l10n: de.po: switch from pure German to German+English (part 1) l10n: de.po: switch from pure German to German+English (part 2) l10n: de.po: switch from pure German to German+English (part 3) po/de.po | 1796

[PATCHv3 0/3] Switch German translation to G+E

2013-07-16 Thread Ralf Thielow
Thanks for your review Thomas! V3 fixes a couple of problems Thomas noticed. Ralf Thielow (3): l10n: de.po: switch from pure German to German+English (part 1) l10n: de.po: switch from pure German to German+English (part 2) l10n: de.po: switch from pure German to German+English (part 3

[PATCH v3 0/3] Switch German translation to G+E

2013-07-17 Thread Ralf Thielow
This is a resend of v3 because at least one patch was damaged last time for whatever reason. Ralf Thielow (3): l10n: de.po: switch from pure German to German+English (part 1) l10n: de.po: switch from pure German to German+English (part 2) l10n: de.po: switch from pure German to German

Re: [PATCH v3 1/3] l10n: de.po: switch from pure German to German+English (part 1)

2013-07-19 Thread Ralf Thielow
Am 17. Juli 2013 18:24 schrieb Ralf Thielow ralf.thie...@gmail.com: This switches the translation from pure German to German+English. Signed-off-by: Ralf Thielow ralf.thie...@gmail.com --- po/de.po | 568 +++ 1 file changed, 284

Re: redundant message in builtin/rm.c

2013-07-25 Thread Ralf Thielow
2013/7/26 Jiang Xin worldhello@gmail.com: Hi, Commit v1.8.3-1-g914dc02 (rm: better error message on failure for multiple files) introduced many messages need to be translated. I found two similar messages each has a slight typo, and the differences cause redundant works for l10n

[PATCH] push: fix typo in advice message

2013-07-28 Thread Ralf Thielow
Signed-off-by: Ralf Thielow ralf.thie...@gmail.com --- builtin/push.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/push.c b/builtin/push.c index 6d36c24..04abd2d 100644 --- a/builtin/push.c +++ b/builtin/push.c @@ -250,7 +250,7 @@ static const char

[PATCH] git-rebase: fix typo

2013-07-28 Thread Ralf Thielow
Signed-off-by: Ralf Thielow ralf.thie...@gmail.com --- git-rebase.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-rebase.sh b/git-rebase.sh index 0039ecf..8d7659a 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -159,7 +159,7 @@ finish_rebase

[PATCH] l10n: de.po: translate 99 new messages

2013-07-28 Thread Ralf Thielow
Translate 99 new messages came from git.pot update in 28b3cff (l10n: git.pot: v1.8.4 round 1 (99 new, 46 removed)). Signed-off-by: Ralf Thielow ralf.thie...@gmail.com --- po/de.po | 366 +++ 1 file changed, 180 insertions(+), 186

[PATCH v2] l10n: de.po: translate 99 new messages

2013-07-31 Thread Ralf Thielow
Translate 99 new messages came from git.pot update in 28b3cff (l10n: git.pot: v1.8.4 round 1 (99 new, 46 removed)). Signed-off-by: Ralf Thielow ralf.thie...@gmail.com --- Hi Thomas, thanks for review!   -Arbeitsverzeichnis von Submodul in '$sm_path' enthält lokale Änderungen;   -verwenden

[PATCH] l10n: de.po: translate 5 messages

2013-08-06 Thread Ralf Thielow
Translate 5 new messages came from git.pot update in b8ecf23 (l10n: git.pot: v1.8.4 round 2 (5 new, 3 removed)). Signed-off-by: Ralf Thielow ralf.thie...@gmail.com --- po/de.po | 14 -- 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/po/de.po b/po/de.po index 7599f9c

[PATCH] Documentation/git-merge-file: document option --diff3

2013-08-09 Thread Ralf Thielow
The option --diff3 was added to git merge-file in e0af48e (xdiff-merge: optionally show conflicts in diff3 -m style) but it was never documented in Documentation/git-merge-file.txt. Add documentation for this option. Signed-off-by: Ralf Thielow ralf.thie...@gmail.com --- Documentation/git-merge

[PATCH] rebase --preserve-merges: ignore merge.log config

2013-08-21 Thread Ralf Thielow
When merge.log config is set, rebase --preserve-merges will add the log lines to the message of the rebased merge commit. A rebase should not modify a commit message automatically. Teach git-rebase to ignore that configuration by passing --no-log to the git-merge call. Signed-off-by: Ralf

Re: German translation errors

2013-09-04 Thread Ralf Thielow
Hi, this is not an error but intention. From Git 1.8.4, the German translation switches from pure German to German+English. For me the most important reasons for that are that terms like Branch and Tag are well-known SCM/Git terms for many German people, and using Zweig and Marke could be more

Re: German translation errors

2013-09-04 Thread Ralf Thielow
On Wed, Sep 4, 2013 at 3:20 PM, Dirk Heinrichs dirk.heinri...@altum.de wrote: Am Mittwoch, 4. September 2013, 13:11:39 schrieben Sie: this is not an error but intention. From Git 1.8.4, the German translation switches from pure German to German+English. For me the most important reasons for

[PATCH] l10n: de.po: use das Tag instead of der Tag

2013-09-08 Thread Ralf Thielow
Use das Tag to avoid confusion with the German word Tag (day). Reported-by: Dirk Heinrichs dirk.heinri...@altum.de Signed-off-by: Ralf Thielow ralf.thie...@gmail.com --- po/de.po | 22 +++--- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/po/de.po b/po/de.po

Re: Git add on deleted file

2012-08-13 Thread Ralf Thielow
I think the message no changes added to commit (use git add and/or git commit -a) is not clear enough since it lacks on the git rm command which is shown above. # (use git add/rm file... to update what will be committed) Of course, applying this topic would solve this problem. Alternatively

Re: [RFH] .mailmap late summer cleaning

2012-08-30 Thread Ralf Thielow
On Wed, Aug 29, 2012 at 7:16 PM, Junio C Hamano gits...@pobox.com wrote: ... Martin von Zweigbergk martinv...@gmail.com y...@google.com I'll collect responses to this message, and update the file sometime late next week. Ralf Thielow ralf.thie...@gmail.com ralf.thie...@googlemail.com

Re: [PATCH 1/3] branch: introduce --set-upstream-to

2012-08-30 Thread Ralf Thielow
On Thu, Aug 30, 2012 at 7:23 PM, Carlos Martín Nieto c...@elego.de wrote: behaviour. To work around this, introduce --set-upstream-to which accepts a compulsory argument indicating what the new upstream branch should be and one optinal argument indicating which branch to change, defaulting to

Re: [PATCH 1/3] branch: introduce --set-upstream-to

2012-08-31 Thread Ralf Thielow
On Fri, Aug 31, 2012 at 5:22 PM, Carlos Martín Nieto c...@elego.de wrote: Ralf Thielow ralf.thie...@gmail.com writes: On Thu, Aug 30, 2012 at 7:23 PM, Carlos Martín Nieto c...@elego.de wrote: behaviour. To work around this, introduce --set-upstream-to which accepts a compulsory argument

[PATCH/RFC] l10n: de.po: translate 2 new messages

2012-09-05 Thread Ralf Thielow
Translate 2 new messages came from git.pot update in ccfca8d (l10n: Update git.pot (2 new, 4 removed messages)). Signed-off-by: Ralf Thielow ralf.thie...@gmail.com --- Hi German l10n team, please review this small update on German translation. This patch here is based on a preparation commit

Re: [PATCH/RFC] l10n: de.po: translate 2 new messages

2012-09-06 Thread Ralf Thielow
On Thu, Sep 6, 2012 at 6:44 PM, Thomas Rast tr...@inf.ethz.ch wrote: Ralf Thielow ralf.thie...@gmail.com writes: (the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n 'current' instead of 'simple' if you sometimes use older versions of Git) [...] +(Der Modus 'simple' wurde

Re: [PATCH/RFC] l10n: de.po: translate 2 new messages

2012-09-07 Thread Ralf Thielow
On Fri, Sep 7, 2012 at 12:31 PM, Jiang Xin worldhello@gmail.com wrote: I just notice that the 1st line of the orignal message below has only 56 characters, much shorter than other lines. It is because this is a warning message, and would add a prefix: warning: . #: builtin/push.c:151

Re: [PATCH/RFC] l10n: de.po: translate 2 new messages

2012-09-07 Thread Ralf Thielow
On Fri, Sep 7, 2012 at 6:36 PM, Ralf Thielow ralf.thie...@gmail.com wrote: On Fri, Sep 7, 2012 at 12:31 PM, Jiang Xin worldhello@gmail.com wrote: I just notice that the 1st line of the orignal message below has only 56 characters, much shorter than other lines. It is because

Re: [PATCH/RFC] l10n: de.po: translate 2 new messages

2012-09-07 Thread Ralf Thielow
On Fri, Sep 7, 2012 at 7:05 PM, Ralf Thielow ralf.thie...@gmail.com wrote: On Fri, Sep 7, 2012 at 6:36 PM, Ralf Thielow ralf.thie...@gmail.com wrote: On Fri, Sep 7, 2012 at 12:31 PM, Jiang Xin worldhello@gmail.com wrote: I just notice that the 1st line of the orignal message below has only

[PATCH 0/2] multiline prefixes on messages

2012-09-07 Thread Ralf Thielow
are acceptable, I think. If the series is basically acceptable, the usage: messages are also a cancidate for migration to this. Ralf Thielow (2): advice: extract function to print messages with prefix i18n: mark prefix warning: for translation advice.c | 14 ++ advice.h | 1

[PATCH 2/2] i18n: mark prefix warning: for translation

2012-09-07 Thread Ralf Thielow
Signed-off-by: Ralf Thielow ralf.thie...@gmail.com --- usage.c | 2 +- 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) diff --git a/usage.c b/usage.c index a2a6678..162a4b2 100644 --- a/usage.c +++ b/usage.c @@ -44,7 +44,7 @@ static void error_builtin(const char *err, va_list

[PATCH 1/2] advice: extract function to print messages with prefix

2012-09-07 Thread Ralf Thielow
Extract a function that allows to print messages with a prefix. Signed-off-by: Ralf Thielow ralf.thie...@gmail.com --- advice.c | 14 ++ advice.h | 1 + 2 Dateien geändert, 11 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-) diff --git a/advice.c b/advice.c index edfbd4a..e73d53b 100644

Re: [PATCH 1/2] advice: extract function to print messages with prefix

2012-09-07 Thread Ralf Thielow
On Fri, Sep 7, 2012 at 9:32 PM, Junio C Hamano gits...@pobox.com wrote: Ralf Thielow ralf.thie...@gmail.com writes: Extract a function that allows to print messages with a prefix. Signed-off-by: Ralf Thielow ralf.thie...@gmail.com --- advice.c | 14 ++ advice.h | 1 + 2

Re: [PATCH 1/2] advice: extract function to print messages with prefix

2012-09-07 Thread Ralf Thielow
On Fri, Sep 7, 2012 at 10:52 PM, Junio C Hamano gits...@pobox.com wrote: Ralf Thielow ralf.thie...@gmail.com writes: On Fri, Sep 7, 2012 at 9:32 PM, Junio C Hamano gits...@pobox.com wrote: - fprintf(stderr, _(hint: %.*s\n), (int)(np - cp), cp); + fprintf(stderr, %s

[PATCH/RFC] blame: respect core.ignorecase

2012-09-09 Thread Ralf Thielow
If core.ignorecase is true, git blame fails when the given path differs to the real path in case sensitivity. Signed-off-by: Ralf Thielow ralf.thie...@gmail.com --- .gitignore | 1 + Makefile | 3 +++ builtin/blame.c| 58

Re: [PATCH/RFC] blame: respect core.ignorecase

2012-09-09 Thread Ralf Thielow
On Sun, Sep 9, 2012 at 9:24 PM, Junio C Hamano gits...@pobox.com wrote: Ralf Thielow ralf.thie...@gmail.com writes: If core.ignorecase is true, git blame fails when the given path differs to the real path in case sensitivity. It is rather hard to respond to this request for comment because

is this behaviour expected for git clone --single-branch?

2012-09-13 Thread Ralf Thielow
Hi, I know people which have a separate directory for every branch. In this case it doesn't make sense to download the whole repo with all branches. So I guess the --single-branch option is the solution in that case!?! But I'm wondering about it's behaviour. # first clone the branch of the repo

[PATCH] clone: fix refspec on --single-branch option

2012-09-13 Thread Ralf Thielow
contains the ref of the branch which was cloned. Signed-off-by: Ralf Thielow ralf.thie...@gmail.com --- builtin/clone.c | 5 - 1 Datei geändert, 4 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) diff --git a/builtin/clone.c b/builtin/clone.c index 5e8f3ba..3e74d55 100644 --- a/builtin/clone.c +++ b

Re: [PATCH] clone: fix refspec on --single-branch option

2012-09-14 Thread Ralf Thielow
On Fri, Sep 14, 2012 at 3:10 PM, Nguyen Thai Ngoc Duy pclo...@gmail.com wrote: On Fri, Sep 14, 2012 at 1:48 PM, Junio C Hamano gits...@pobox.com wrote: Junio C Hamano gits...@pobox.com writes: Who guarantees at this point in the codepath that option_branch is set when option_single_branch is

[PATCHv2] clone: fix refspec on --single-branch option

2012-09-14 Thread Ralf Thielow
the user specified in the git clone command. Signed-off-by: Ralf Thielow ralf.thie...@gmail.com --- Alternatively, if you can move the logic to set up this configuration further down so that it happens after we talked to the other side and figured out remote_head_points_at, you could instead set

[PATCHv5] clone --single: limit the fetch refspec to fetched branch

2012-09-17 Thread Ralf Thielow
instead to correct this. Signed-off-by: Ralf Thielow ralf.thie...@gmail.com --- changes in v5: - extract a function to write refspec config - handle --mirror option (test added) - install correct refspec if the value of --branch is a tag (test added) Thanks to Junio for: - refactor tests - add

Re: [PATCHv5] clone --single: limit the fetch refspec to fetched branch

2012-09-17 Thread Ralf Thielow
On Mon, Sep 17, 2012 at 10:18 PM, Junio C Hamano gits...@pobox.com wrote: Ralf Thielow ralf.thie...@gmail.com writes: - handle --mirror option (test added) Handle how? I personally think erroring out is the right way to handle it, but if we care about people who have been misusing

Re: [PATCHv5] clone --single: limit the fetch refspec to fetched branch

2012-09-18 Thread Ralf Thielow
On Mon, Sep 17, 2012 at 11:39 PM, Junio C Hamano gits...@pobox.com wrote: Ralf Thielow ralf.thie...@gmail.com writes: - install correct refspec if the value of --branch is a tag (test added) What is the definition of correct? I see the documentation says --branch can also take tags

[PATCHv6] clone --single: limit the fetch refspec to fetched branch

2012-09-18 Thread Ralf Thielow
, then it'll cover all refs of the cloned repository. If --single is used with --branch that specifies a tag, then it'll cover only the ref for this tag. Signed-off-by: Ralf Thielow ralf.thie...@gmail.com --- changes in v6 - remove initial created tests (they tested in a too deep level) - add tests

Re: [PATCHv6] clone --single: limit the fetch refspec to fetched branch

2012-09-19 Thread Ralf Thielow
On Wed, Sep 19, 2012 at 9:36 AM, Nguyen Thai Ngoc Duy pclo...@gmail.com wrote: On Wed, Sep 19, 2012 at 2:14 AM, Ralf Thielow ralf.thie...@gmail.com wrote: +test_expect_success '--single-branch with explicit --branch tag' ' + ( + cd dir_tag git fetch + git

[PATCHv7] clone --single: limit the fetch refspec to fetched branch

2012-09-19 Thread Ralf Thielow
, then it'll cover all refs of the cloned repository. If --single is used with --branch that specifies a tag, then it'll cover only the ref for this tag. Signed-off-by: Ralf Thielow ralf.thie...@gmail.com --- Changes in v7: - remove a test which has shown that after the next git fetch the tags

[PATCHv8] clone --single: limit the fetch refspec to fetched branch

2012-09-20 Thread Ralf Thielow
, then it'll cover all refs of the cloned repository. If --single is used with --branch that specifies a tag, then it'll cover only the ref for this tag. Signed-off-by: Ralf Thielow ralf.thie...@gmail.com --- changes in v8: - remove unnecessary strbuf_reset - remove test from v7 which has shown that tags

Re: Message from 'git-rebase'; German translation

2012-09-23 Thread Ralf Thielow
On Sat, Sep 22, 2012 at 11:57 PM, Sascha Cunz sascha...@babbelbox.org wrote: As I know how hard translations can be, esp. with that much technical terms inside, I'm usually expecting _not_ to yield the same result when translating a software's translation back to English. Yeah, I think the

Re: Message from 'git-rebase'; German translation

2012-09-23 Thread Ralf Thielow
it to schützenswert. Noticed-by: Sascha Cunz sascha...@babbelbox.org Signed-off-by: Ralf Thielow ralf.thie...@gmail.com diff --git a/po/de.po b/po/de.po index 2739bc0..7fc0185 100644 --- a/po/de.po +++ b/po/de.po @@ -5756,8 +5756,8 @@ msgstr \t$cmd_live_rebase\n Wenn das nicht der Fall ist

[RFC/PATCH] l10n: de.po: correct translation of a 'rebase' message

2012-09-24 Thread Ralf Thielow
Noticed-by: Sascha Cunz sascha...@babbelbox.org Signed-off-by: Ralf Thielow ralf.thie...@gmail.com --- It turns out that one of the 'rebase' messages has a wrong translation. Please review this fix. Thanks The English original is: It seems that there is already a $state_dir_base directory

[PATCHv2] l10n: de.po: correct translation of one 'rebase' message

2012-09-24 Thread Ralf Thielow
Noticed-by: Sascha Cunz sascha...@babbelbox.org Signed-off-by: Ralf Thielow ralf.thie...@gmail.com --- Not very elegant yet, shouldn't it say something like als ob es das Verzeichnis ... bereits {gibt,gäbe} ? Yes, thanks. po/de.po | 10 +- 1 Datei geändert, 5 Zeilen hinzugefügt

[PATCH] l10n: de.po: fix a few minor typos

2012-10-04 Thread Ralf Thielow
From: Simon Ruderich si...@ruderich.org Signed-off-by: Simon Ruderich si...@ruderich.org Signed-off-by: Ralf Thielow ralf.thie...@gmail.com --- po/de.po | 14 +++--- 1 Datei geändert, 7 Zeilen hinzugefügt(+), 7 Zeilen entfernt(-) diff --git a/po/de.po b/po/de.po index a3cf695..9e9f2da

fixes of previous commit

2012-10-14 Thread Ralf Thielow
--- Hi Ralf Hi Thomas, thanks for your work! All your suggestions are very good. I just realized that, unfortunately, your original message is far beyond the message size limit on vger (10 bytes according to [1]). So nobody outside of the Cc list has seen it... Oops, I didn't

Re: English/German terminology, git.git's de.po, and pro-git

2013-05-19 Thread Ralf Thielow
2013/5/16 Holger Hellmuth (IKS) hellm...@ira.uka.de: +bare repository= bloßes Repository Since bloßes Rep. does not convey any sensible meaning to a german reader (at least it doesn't to me) it might as well be bare. Also bare is used as parameter to commands +remote

Re: English/German terminology, git.git's de.po, and pro-git

2013-05-19 Thread Ralf Thielow
2013/5/16 Thomas Rast tr...@inf.ethz.ch: Ralf Thielow ralf.thie...@gmail.com writes: Hi, I think the discussion might work better via ML than GitHub. This is the full glossary of git's de.po as it would look like with (hopefully) all the changes included that have been discussed here

Re: English/German terminology, git.git's de.po, and pro-git

2013-05-19 Thread Ralf Thielow
Hi, here's an updated version of the glossary. Comments are appreciated. Basic repository objects: blob = Blob tree = Baum, Baum-Objekt (bevorzugt), Tree-Objekt submodule = Submodul pack(noun) = Pack-Datei pack(verb) = packen (ggf. Pack-Datei

Re: English/German terminology, git.git's de.po, and pro-git

2013-05-19 Thread Ralf Thielow
2013/5/16 Holger Hellmuth (IKS) hellm...@ira.uka.de: [...] +reset = neu setzen (maybe umsetzen?) zurücksetzen reset can be used with every existing commit. zurücksetzen would imply that it have to be a recent commit, no? -- To unsubscribe from this list: send the line unsubscribe git in

  1   2   3   4   >