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 : > 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" > >> #: b

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

2014-09-23 Thread Ralf Thielow
Am 23. September 2014 14:00 schrieb Phillip Sz : > 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 majord...@vger.kernel.o

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

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

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 : > Changes all Email to E-Mail, as this is the correct form in german. > Thanks! > Phillip > > Signed-off-by: Phillip Sz > --- > po/de.po | 14 +++--- > 1 file changed, 7 insertions(+), 7 deletions(-) > > diff --git a/po/de.po b/po/de.po > index e5

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 : > Hi, > >> #: archive.c:351 builtin/archive.c:91 >> msgid "retrieve the archive from remote repository " >> -msgstr "ruft das Archiv von Remote-Repository ab" >> +msgstr "Archiv von Remote-Repository abrufen" >> > > "Archiv vom Remote-Reposit

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

2014-09-19 Thread Ralf Thielow
Signed-off-by: Ralf Thielow --- 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 +7942,11 @@ msgstr "

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

2014-09-19 Thread Ralf Thielow
Signed-off-by: Ralf Thielow --- 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 +3228,31 @@ msgstr

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

2014-09-19 Thread Ralf Thielow
Signed-off-by: Ralf Thielow --- 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 +4648,31 @@ msgstr

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

2014-09-19 Thread Ralf Thielow
e applying. 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:

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

2014-09-19 Thread Ralf Thielow
Signed-off-by: Ralf Thielow --- 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 @@ msgstr "P

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

2014-09-19 Thread Ralf Thielow
Signed-off-by: Ralf Thielow --- 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 +9479,35 @@ msgstr "Sy

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

2014-09-19 Thread Ralf Thielow
Signed-off-by: Ralf Thielow --- 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 @@ msgstr "Au

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

2014-09-19 Thread Ralf Thielow
Signed-off-by: Ralf Thielow --- 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 +5588,83 @@ msgstr "kan

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

2014-09-05 Thread Ralf Thielow
Signed-off-by: Ralf Thielow --- 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 Christian Stimming Phillip Szelat

[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 --- Am 26. August 2014 22:08 schrieb Phillip Sz : > > msgid "did not receive expected object %s" >>-msgstr "Kann Objekt

[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 --- This is a resend of an earlier patch [1] with an extended recipient list. [1] http://article.gmane.org/gmane.comp.version-control.git/254815 po

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

2014-08-26 Thread Ralf Thielow
Signed-off-by: Ralf Thielow --- 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 Members: Thomas Rast Jan Krüger

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

2014-08-23 Thread Ralf Thielow
anslations for v2.1.0 are ready. > 2014-08-06 1:51 GMT+08:00 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 >> --- >> po/de.po | 13

[PATCH] rebase: introduce "rebase.preserve" configuration option

2014-08-05 Thread Ralf Thielow
tch introduces a new configuration variable "rebase.preserve". If set to true, "--preserve-merges" option will be enabled in git-rebase by default. Signed-off-by: Ralf Thielow --- Documentation/config.txt | 3 +++ git-rebase.sh | 1 +

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

2014-08-05 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 --- po/de.po | 131 ++- 1 file changed, 62 insertions(+), 69 deletions(-) diff --git a/po

Re: [PATCH] l10n: de.po: fix typo

2014-08-01 Thread Ralf Thielow
e. I'll be sending a pull request (containing this patch) to the l10n coordinator when the other translations for this release are done. Ralf > Regards, Hartmut > > > On Wed, 11 Jun 2014, Ralf Thielow wrote: > >> Reported-by: Hartmut Henkel >> Signed-off-by: R

Re: [PATCH] rebase -i: Remember merge options beyond continue actions

2014-07-18 Thread Ralf Thielow
Hi, Thanks for the patch. I've had this issue today and the patch has fixed it. I hope the patch makes its way to Git. Ralf > Hi Eric, > > thanks a lot for the reference. > > I added the Reported-by: and Signed-off-by: lines to the commit message. > >Fabian > > -- >8 -- > Subject: rebase

Error running 'git status' with Git version of current 'next' branch

2014-07-09 Thread Ralf Thielow
Hi, I'm getting the following error when calling 'git status' on one of my projects. git: dir.c:739: last_exclude_matching_from_list: Assertion `x->baselen == 0 || x->base[x->baselen - 1] == '/'' failed. Aborted (core dumped) I'm using the current 'next', git version 2.0.1.664.g35b839c I have bi

[PATCH] l10n: de.po: improve message when switching branches

2014-06-12 Thread Ralf Thielow
Suggested-by: Stefan Beller Signed-off-by: Ralf Thielow --- Am 12. Juni 2014 19:59 schrieb Stefan Beller : > On 12.06.2014 18:12, Ralf Thielow wrote: >> Signed-off-by: Ralf Thielow >> #, c-format >> msgid "Switched to a new branch '%s'\n" >> -

[PATCH] l10n: de.po: fix typo

2014-06-12 Thread Ralf Thielow
Signed-off-by: Ralf Thielow --- po/de.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/de.po b/po/de.po index b777ef4..d7bc424 100644 --- a/po/de.po +++ b/po/de.po @@ -3503,7 +3503,7 @@ msgstr "Gewechselt zu umgesetzten Branch '%s'\n" #: builtin/ch

[PATCH] l10n: de.po: fix typo

2014-06-11 Thread Ralf Thielow
Reported-by: Hartmut Henkel Signed-off-by: Ralf Thielow --- po/de.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/de.po b/po/de.po index b777ef4..88d10ed 100644 --- a/po/de.po +++ b/po/de.po @@ -10551,13 +10551,13 @@ msgstr "Bitte committen Sie die Änderungen

[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 Acked-by: Thomas Rast --- po/de.po | 127 +-- 1 file changed, 50 insertions(+), 77

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

2014-04-25 Thread Ralf Thielow
Signed-off-by: Ralf Thielow --- 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 @@ -555,12 +555,12 @@

[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 --- po/de.po | 123 +-- 1 file changed, 49 insertions(+), 74 deletions(-) diff --git a/po

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

2014-04-12 Thread Ralf Thielow
Signed-off-by: Ralf Thielow --- 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 @@ -6108,7 +6108,7 @@ m

[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 --- Just noticed this while digging thro

[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 Signed-off-by: Ralf Thielow --- po/de.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po

[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 Signed-off-by: Ralf Thielow --- po/de.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po

[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 --- po/de.po | 99 1 file changed, 50

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 : > Ralf Thielow 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-o

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 : > Ralf Thielow writes: > >> 2014-02-08 20:22 GMT+01:00 David Kastrup : >>> "verberge keine aufgepfropften Commits" seems much more in the spirit of >>> the original terminology. "verbirgt keine Commits mit

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 : > "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 rather th

[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 --- v4 corrects some translations according to Thomas' review. Thanks for that. With this we also c

[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 --- v3 adds one new message from l10n rnd 2. po/de.po | 92

[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 --- 2014-01-24 Jiang Xin : > > Inconsistent ending colons, some have and some not. > Oops. Thanks! Here is v2. po/d

[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 --- po/de.po | 90 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/po

[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 --- po/de.po | 16 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/po/de.po b/po/de.po

Re: german translation bug

2013-12-26 Thread Ralf Thielow
On Wed, Dec 25, 2013 at 10:53 PM, Wolfgang Rohdewald 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 >

Re: german translation bug

2013-12-25 Thread Ralf Thielow
On Wed, Dec 25, 2013 at 8:53 PM, Wolfgang Rohdewald 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, Arbeitsver

Segfault when fetching from current git.git on GitHub

2013-12-03 Thread Ralf Thielow
Hi, I've fetched from the current git.git on GitHub minutes ago and got a segfault. I could reproduce it with the Git version of the current "next" branch (1.8.5.392.gf545f4d) with the steps below. The segfault does not appear with version 1.8.5. Steps to reproduce: git init tmp cd tmp git remote

feature request: consider picked commits in "branch --contains"

2013-11-29 Thread Ralf Thielow
Hi, there are development workflows where a feature or fix is by definition implemented in the dev branch and perhaps picked into a stable/rc branch. A question often being asked in such a workflow is "Is this fix in this stable branch?". Usually I would call "git branch -r --contains $commit" to

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

2013-11-10 Thread Ralf Thielow
Translate 68 new messages came from git.pot update in 727b957 (l10n: git.pot: v1.8.5 round 1 (68 new, 9 removed)). Signed-off-by: Ralf Thielow --- po/de.po | 191 --- 1 file changed, 86 insertions(+), 105 deletions(-) diff --git a/po

[PATCHv2] l10n: de.po: translate 68 new messages

2013-11-08 Thread Ralf Thielow
Translate 68 new messages came from git.pot update in 727b957 (l10n: git.pot: v1.8.5 round 1 (68 new, 9 removed)). Signed-off-by: Ralf Thielow --- v2 fixed a typo in the translation of the message from "builtin/repack.c:161". s/Fenster/Fensters po/d

[PATCH] l10n: de.po: improve error message when pushing to unknown upstream

2013-11-08 Thread Ralf Thielow
Signed-off-by: Ralf Thielow --- po/de.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/de.po b/po/de.po index a005dcc..8b824cc 100644 --- a/po/de.po +++ b/po/de.po @@ -7923,7 +7923,7 @@ msgid "" "to update which remote branch." msgstr "&

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

2013-11-08 Thread Ralf Thielow
Translate 68 new messages came from git.pot update in 727b957 (l10n: git.pot: v1.8.5 round 1 (68 new, 9 removed)). Signed-off-by: Ralf Thielow --- po/de.po | 191 --- 1 file changed, 86 insertions(+), 105 deletions(-) diff --git a/po

[PATCH] po/TEAMS: update Thomas Rast's email address

2013-11-08 Thread Ralf Thielow
Signed-off-by: Ralf Thielow --- po/TEAMS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/TEAMS b/po/TEAMS index 107aa59..f9a99ed 100644 --- a/po/TEAMS +++ b/po/TEAMS @@ -8,7 +8,7 @@ Leader: Byrial Jensen Language: de (German) Repository:https

Re: git status: minor output format error

2013-11-03 Thread Ralf Thielow
On Mon, Nov 4, 2013 at 2:46 AM, Duy Nguyen wrote: > On Mon, Nov 4, 2013 at 12:17 AM, Wolfgang Rohdewald > wrote: >> git version 1.8.3.2 >> >> git status in German says (extract) >> >> # geändert: kajongg.py >> # gelöscht:playfield.py >> >> as you can see, there is one space too

Re: Help creating git alias

2013-10-30 Thread Ralf Thielow
lg=!git log --pretty=format:'%h %ad %ae %s' --date=short | sed 's/@\\S*//g' should work. On Wed, Oct 30, 2013 at 8:34 PM, Eugene Sajine wrote: > Hi, > > I need some advice about creating the git command alias: > > I have this as the command: > > git log --pretty=format:"%h %ad %ae %s" --date=sho

Re: [PATCH] status: show commit sha1 in "You are currently cherry-picking" message

2013-10-11 Thread Ralf Thielow
On Fri, Oct 11, 2013 at 7:42 PM, Jonathan Nieder wrote: > Ralf Thielow wrote: > >> Especially helpful when cherry-picking multiple commits. > > Neat, thanks. > > [...] >> --- a/t/t7512-status-help.sh >> +++ b/t/t7512-status-help.sh >> @@ -626,9 +626,10

[PATCH] clone --branch: refuse to clone if upstream repo is empty

2013-10-11 Thread Ralf Thielow
Since 920b691 (clone: refuse to clone if --branch points to bogus ref) we refuse to clone with option "-b" if the specified branch does not exist in the (non-empty) upstream. If the upstream repository is empty, the branch doesn't exist, either. So refuse the clone too. Sign

[PATCH] status: show commit sha1 in "You are currently cherry-picking" message

2013-10-11 Thread Ralf Thielow
Signed-off-by: Ralf Thielow --- Especially helpful when cherry-picking multiple commits. t/t7512-status-help.sh | 10 ++ wt-status.c| 7 +-- wt-status.h| 1 + 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/t/t7512-status-help.sh b/t/t7512

Re: [PATCH] clone: do not segfault when specifying a nonexistent branch

2013-10-09 Thread Ralf Thielow
On Sat, Oct 5, 2013 at 1:55 AM, Duy Nguyen wrote: > On Fri, Oct 4, 2013 at 9:20 PM, Stefan Beller > wrote: >> I think we should emit a warning additionally? >> >> Signed-off-by: Stefan Beller > > I think it's nice to credit Robert for reporting the fault in the > commit message (something like "

Re: Bug? Files are losing history after subtree merge

2013-10-02 Thread Ralf Thielow
On Wed, Oct 2, 2013 at 10:21 PM, Matthieu Moy wrote: > Ralf Thielow writes: > >> Thanks for explanation. >> I knew the history of the repo is there, but the history of single files >> (and the ability to look at it) > > There is no such thing as "single fi

Re: Bug? Files are losing history after subtree merge

2013-10-02 Thread Ralf Thielow
On Wed, Oct 2, 2013 at 9:42 PM, Matthieu Moy wrote: > Ralf Thielow writes: > >> Hi, >> >> recently I did a merge where a complete repo shall be >> merged into a specific directory of another repo. I >> tried both the "subtree" merge strategy an

Bug? Files are losing history after subtree merge

2013-10-02 Thread Ralf Thielow
Hi, recently I did a merge where a complete repo shall be merged into a specific directory of another repo. I tried both the "subtree" merge strategy and the option "-Xsubtree=" of "recursive". I noticed that in both cases somehow the history of single files were lost during these merges (with his

[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 Signed-off-by: Ralf Thielow --- po/de.po | 22 +++--- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/po/de.po b/po/de.po index 11dde11..f4076fb 1

Re: German translation errors

2013-09-04 Thread Ralf Thielow
On Wed, Sep 4, 2013 at 3:20 PM, Dirk Heinrichs 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 that are that ter

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

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

2013-08-21 Thread Ralf Thielow
t; to the git-merge call. Signed-off-by: Ralf Thielow --- git-rebase--interactive.sh| 3 ++- t/t3409-rebase-preserve-merges.sh | 25 + 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index

[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 -

[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 --- po/de.po | 14 -- 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/po/de.po b/po/de.po index 7599f9c..11dde11 100644 --- a/po

[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 --- Hi Thomas, thanks for review! >   -"Arbeitsverzeichnis von Submodul in '$sm_path' enthält lokale Änderungen; " >   -&q

[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 --- po/de.po | 366 +++ 1 file changed, 180 insertions(+), 186 deletions(-) diff --git a

[PATCH] git-rebase: fix typo

2013-07-28 Thread Ralf Thielow
Signed-off-by: Ralf Thielow --- 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 () { die "$(eval_ge

[PATCH] push: fix typo in advice message

2013-07-28 Thread Ralf Thielow
Signed-off-by: Ralf Thielow --- 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 message_advice_ref_fetch_first

Re: redundant message in builtin/rm.c

2013-07-25 Thread Ralf Thielow
2013/7/26 Jiang Xin : > 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 translators. > >

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 : > This switches the translation from pure German to German+English. > > Signed-off-by: Ralf Thielow > --- > po/de.po | 568 > +++ > 1 file changed, 284 inserti

[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

[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

[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

Re: [PATCH] wt-status: give better advice when cherry-pick is in progress

2013-06-17 Thread Ralf Thielow
2013/6/17 Junio C Hamano : > Ralf Thielow writes: > >> When cherry-pick is in progress, 'git status' gives the advice to >> run "git commit" to finish the cherry-pick. However, this won't continue >> the sequencer. >> "git status&qu

[PATCH] wt-status: give better advice when cherry-pick is in progress

2013-06-16 Thread Ralf Thielow
When cherry-pick is in progress, 'git status' gives the advice to run "git commit" to finish the cherry-pick. However, this won't continue the sequencer. "git status" should give the advice of running "git cherry-pick --continue" or "git cherry-p

[PATCH 0/3] Switch German translation from pure German to German+English

2013-06-12 Thread Ralf Thielow
Hi, sorry for being slow. Here's the attempt to change the German translation from pure German to German+English. Because of the big changes in de.po, I have splitted one big commit into these three parts and will squash them after the review. Thanks for reading and comments. Ralf Ralf Th

[PATCH] l10n: de.po: Fix a typo

2013-06-05 Thread Ralf Thielow
From: Wieland Hoffmann Signed-off-by: Wieland Hoffmann --- po/de.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/de.po b/po/de.po index 4901488..cd6919f 100644 --- a/po/de.po +++ b/po/de.po @@ -885,7 +885,7 @@ msgstr[1] "Ihr Zweig ist vor '%s' um %d Versionen.\n" #:

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

2013-05-24 Thread Ralf Thielow
Hi all, thanks for all your comments. Here's an updated version of the glossary including (hopefully) all the changes you've suggested. Basic repository objects: blob = Blob tree = Baum-Objekt (bevorzugt), "Tree"-Objekt submodule = Submodul pack(noun)

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

2013-05-24 Thread Ralf Thielow
2013/5/23 Bernhard R. Link : > * Ralf Thielow [130522 17:17]: >> >> remote branch = Remote-Branch >> >> remote-tracking branch = Remote-Tracking-Branch >> >> upstream branch= Upstream-Branch >> > >> > Yes. Wha

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

2013-05-22 Thread Ralf Thielow
e that for the command line tool the criteria for choosing the translation > approach are different from those for a GUI tool. So I can very well envision > a good G+E translation for git core and subsequently all related books. > Thanks for your comments. > Am Sonntag, 19. Mai 2

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

2013-05-22 Thread Ralf Thielow
2013/5/20 Holger Hellmuth : > Am 19.05.2013 18:56, schrieb Ralf Thielow: > >> 2013/5/16 Holger Hellmuth (IKS) : >>> >>> >> [...] >>>> >>>> +reset = neu setzen (maybe "umsetzen"?) >>> >>> >>> >

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

2013-05-19 Thread Ralf Thielow
2013/5/16 Holger Hellmuth (IKS) : > [...] >> +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 th

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-Date

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

2013-05-19 Thread Ralf Thielow
2013/5/16 Thomas Rast : > Ralf Thielow 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 >&

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

2013-05-19 Thread Ralf Thielow
2013/5/16 Holger Hellmuth (IKS) : > >> +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 tracking

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

2013-05-15 Thread Ralf Thielow
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. Still without any reasoning for decisions (except HEAD). Thanks for reading. +Basic repository

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

2013-05-14 Thread Ralf Thielow
Hi all, I tried to merge these different glossaries together (based on git de.po) as a new wiki page [1]. You can see the diff against the current git de.po glossary at [2]. I've also created a branch in my repository which only contains the wiki page as a text file. This allows comments on each l

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

2013-05-13 Thread Ralf Thielow
e flogged that horse enough. See > e.g. [1] for previous threads on the git list about the transation. > > However, an unfortunate and unsatisfactory situation has developed: > Christian Stimming's git-gui de.po uses a Ger translation, and Ralf > Thielow built core git's de

[PATCHv2] l10n: de.po: translate 44 new messages

2013-05-06 Thread Ralf Thielow
Translate 44 new messages came from git.pot update in c6bc7d4 (l10n: git.pot: v1.8.3 round 2 (44 new, 12 removed)). Signed-off-by: Ralf Thielow Acked-by: Thomas Rast --- po/de.po | 138 +++ 1 file changed, 76 insertions(+), 62

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

2013-05-06 Thread Ralf Thielow
Translate 44 new messages came from git.pot update in c6bc7d4 (l10n: git.pot: v1.8.3 round 2 (44 new, 12 removed)). Signed-off-by: Ralf Thielow --- po/de.po | 139 +++ 1 file changed, 77 insertions(+), 62 deletions(-) diff --git a/po

[PATCHv2] l10n: de.po: translate 39 new messages

2013-04-18 Thread Ralf Thielow
Translate 39 new messages came from git.pot update in c138af5 (l10n: git.pot: v1.8.3 round 1 (54 new, 15 removed)). While at there, fix some small issues. Signed-off-by: Ralf Thielow Acked-by: Thomas Rast --- po/de.po | 206 +-- 1

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

2013-04-16 Thread Ralf Thielow
Hi, Thanks for review! 2013/4/16 Thomas Rast : > Ralf Thielow writes: > >> msgid "You are currently reverting commit %s." >> -msgstr "Sie sind gerade bei einer binären Suche in Zweig '%s'." >> +msgstr "Sie kehren gerade Version &#

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

2013-04-16 Thread Ralf Thielow
Hi, Thanks for Review! 2013/4/15 Christian Stimming : > Thanks for the regular update! This is great work. > > One issue with the plural form messages, though: > > Am Montag, 15. April 2013, 18:27:40 schrieb Ralf Thielow: >> #: bundle.c:186 >> -#, fuzzy, c-format >

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

2013-04-15 Thread Ralf Thielow
Translate 39 new messages came from git.pot update in c138af5 (l10n: git.pot: v1.8.3 round 1 (54 new, 15 removed)). Signed-off-by: Ralf Thielow --- po/de.po | 186 +-- 1 file changed, 97 insertions(+), 89 deletions(-) diff --git a/po

[PATCH 2/2] fmt-merge-msg: use core.commentchar in tag signatures completely

2013-04-07 Thread Ralf Thielow
Commit eff80a9 (Allow custom "comment char") introduced a custom comment character for commit messages but didn't use it completely in the tag signature part. This commit fixes that. Signed-off-by: Ralf Thielow --- builtin/fmt-merge-msg.c | 12 1 file changed, 8 i

[PATCH 1/2] fmt-merge-msg: respect core.commentchar in people credits

2013-04-07 Thread Ralf Thielow
Commit eff80a9 (Allow custom "comment char") introduced a custom comment character for commit messages but forgot to use it in people credits which can be a part of a commit message. With this commit, the custom comment character is also used in people credits. Signed-off-by: Ra

[PATCH] l10n: de.po: translate 1 new message

2013-03-04 Thread Ralf Thielow
Translate 1 new message came from git.pot update in ed1ddaf (l10n: git.pot: v1.8.2 round 4 (1 changed)). Signed-off-by: Ralf Thielow --- po/de.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/de.po b/po/de.po index 37aa24d..83c30b1 100644 --- a/po/de.po +++ b/po/de.po

[PATCHv2] l10n: de.po: correct translation of "bisect" messages

2013-02-23 Thread Ralf Thielow
The term "bisect" was translated as "halbieren", we should translate it as "binäre Suche" (binary search). While at there, we should leave "bisect run" untranslated since it's a subcommand of "git bisect". Suggested-by: Thoma

<    1   2   3   4   >