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

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 v2] l10n: de.po: translate 27 new messages

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 v3] l10n: de.po: translate 28 new messages

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 v4] l10n: de.po: translate 28 new messages

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

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

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

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

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 v4] l10n: de.po: translate 28 new messages

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

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

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

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

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

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: translate 2 messages

Signed-off-by: Ralf Thielow --- I already sent a pull request with this change due to lack of time because the messages were fairly easy to translate. If there's something wrong with these translations, we need to fix it in a separate patch. po/de.po | 4 +--- 1 file changed, 1 insertion(

Re: [L10N] please review a batch l10n update for Git 2.2.0 final

> > NOTE for Ralf: After I updated de.po, there are 3 fuzzies instead of one. > I can only fix one of them. > I just send a pull-request to you. It seems I have forgotten one git.pot update. Sorry -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord

[PATCH] l10n: de.po: fix typos

From: Hartmut Henkel Signed-off-by: Hartmut Henkel Signed-off-by: Ralf Thielow --- Junio, please apply this patch directly to your tree. Thanks! po/de.po | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/po/de.po b/po/de.po index 56263b4..5a93ea8 100644

[PATCH] for-each-ref: correct spelling of Tcl in option description

Tcl is conventionally spelled "Tcl". The description of option "--tcl", however, spells it "tcl". Let's follow the convention. Reported-by: Hartmut Henkel Signed-off-by: Ralf Thielow --- builtin/for-each-ref.c | 2 +- 1 file changed, 1 insertion(+), 1 deletio

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

Am 23. November 2014 um 17:41 schrieb Ralf Thielow : > From: Hartmut Henkel > > Signed-off-by: Hartmut Henkel > Signed-off-by: Ralf Thielow > --- > Junio, > > please apply this patch directly to your > tree. I'll send a pull-request to the l10n coordinator wi

[PATCH] completion: add git-tag options

Add completion for git-tag options including all options that are currently shown in "git tag -h". Signed-off-by: Ralf Thielow --- contrib/completion/git-completion.bash | 10 ++ 1 file changed, 10 insertions(+) diff --git a/contrib/completion/git-completion.bash b/contrib/

Re: Enhancement Request: "locale" git option

Hi Ulrich, 2014-12-04 8:32 GMT+01:00 Ulrich Windl : > Hi! > > I'm native German, but German git messages confuse me (yopu'll have to > correlate them with the man pages). At the moment git uses the What in particular makes the German git messages confusing you? What `git version` do you use? May

Re: Enhancement Request: "locale" git option

2014-12-05 16:45 GMT+01:00 Torsten Bögershausen : > > I do not know who was first, and who came later, but > > > uses "versioniert" as "tracked" > > > LANG=de_DE.UTF-8 git status > gives: > nichts zum Commit

[PATCH] l10n: de.po: translate "track" as "versionieren"

Suggested-by: Torsten Bögershausen Signed-off-by: Ralf Thielow --- po/de.po | 40 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/po/de.po b/po/de.po index 5a93ea8..bf11225 100644 --- a/po/de.po +++ b/po/de.po @@ -690,7 +690,7 @@ msgstr

Re: [PATCH] l10n: de.po: translate "track" as "versionieren"

Hi Phillip Am 6. Dezember 2014 um 20:34 schrieb phillip : > > > Hi, > > for my feeling Beobachten is better then Versionieren. Its more natural and > easier to understand, but okey ;) > I think it's OK as Git is all about versioning content. In other cases "beobachten" might be the better choice

[PATCH] l10n: de.po: fix typo

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 5a93ea8..bf7a13b 100644 --- a/po/de.po +++ b/po/de.po @@ -7802,7 +7802,7 @@ msgstr "zu viele Parameter" #: builtin/notes.c:387 builtin/notes.c:646 #

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

Translate 13 new messages came from git.pot update in beb691f (l10n: git.pot: v2.3.0 round 1 (13 new, 11 removed)). Signed-off-by: Ralf Thielow --- po/de.po | 39 +++ 1 file changed, 15 insertions(+), 24 deletions(-) diff --git a/po/de.po b/po/de.po index

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

Am 16. Januar 2015 um 23:31 schrieb phillip : > > looks good! > Thanks for review! -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

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

Signed-off-by: Ralf Thielow --- po/de.po | 15 ++- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/po/de.po b/po/de.po index 38183fb..0b93b0f 100644 --- a/po/de.po +++ b/po/de.po @@ -6595,14 +6595,12 @@ msgid "trailer(s) to add" msgstr "Anhang/Anh

[PATCH] show-branch: fix indentation of usage string

Noticed-by: Jean-Noël Avila Signed-off-by: Ralf Thielow --- Jiang Xin wrote: > 2015-01-18 23:53 GMT+08:00 Jean-Noël AVILA : > Yes, it's wrong to using mixed tabs and spaces in the message. It comes > from commit v2.0.5-5-g9990273, and it should be fixed. This also breaks the inde

[PATCH] l10n: de.po: fix typo

From: Benedikt Heine Signed-off-by: Benedikt Heine 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 b2d4639..596f486 100644 --- a/po/de.po +++ b/po/de.po @@ -4295,8 +4295,8 @@ msgstr "" "

Re: [PATCH 1/2] l10n: de.po: translate "leave behind" correctly

2015-01-26 16:34 GMT+01:00 Michael J Gruber : > This message is about leaving orphaned commits behind, not about > behing behind an upstream branch. Try to make this clear. > > Signed-off-by: Michael J Gruber Thanks for both patches! -- To unsubscribe from this list: send the line "unsubscribe gi

Re: German translation errors

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

Re: German translation errors

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

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

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

Bug? Files are losing history after subtree merge

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

Re: Bug? Files are losing history after subtree merge

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

Re: Bug? Files are losing history after subtree merge

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: [PATCH] clone: do not segfault when specifying a nonexistent branch

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 "

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

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

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

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

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

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

Re: Help creating git alias

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: git status: minor output format error

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

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

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

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

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

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 "&

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

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 v3] l10n: de.po: translate 68 new messages

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

Re: [PATCH] l10n: de.po: fix negation for commit -a with paths

2015-02-27 17:30 GMT+01:00 Michael J Gruber : > Signed-off-by: Michael J Gruber > --- > po/de.po | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/po/de.po b/po/de.po > index 11fbd0f..aff3109 100644 > --- a/po/de.po > +++ b/po/de.po > @@ -4613,7 +4613,7 @@ msgstr "Ungültige

Re: [PATCH 1/1] l10n: de.po: use "bla …" instead of "bla..."

Am 21. März 2015 um 13:52 schrieb Phillip Sz : > > I think we should use it like this, as most open-source projects do. > Also we should use a space before the three dots as per > http://www.duden.de/sprachwissen/rechtschreibregeln/auslassungspunkte > I don't think this rule of ellipsis applies h

Re: [PATCH 1/1] l10n: de.po: use "bla …" instead of "bla..."

Michael J Gruber wrote: > Ralf Thielow venit, vidit, dixit 21.03.2015 22:21: > > Am 21. März 2015 um 13:52 schrieb Phillip Sz : > >> > >> I think we should use it like this, as most open-source projects do. > >> Also we should use a space before the three d

Re: [PATCH 1/1] l10n: de.po: use "bla …" instead of "bla..."

2015-03-24 18:10 GMT+01:00 Ralf Thielow : > Let's apply this instead. > > -- >8 -- > #: builtin/notes.c:51 > msgid "git notes copy --stdin [ ]..." > -msgstr "git notes copy --stdin [ ]..." > +msgstr "git notes copy --stdin [ ] ...&qu

Re: [PATCH 1/1] l10n: de.po: use "bla …" instead of "bla..."

2015-03-24 18:32 GMT+01:00 Junio C Hamano : > Ralf Thielow writes: > >> diff --git a/po/de.po b/po/de.po >> index 11fbd0f..9fa3f4c 100644 >> --- a/po/de.po >> +++ b/po/de.po >> @@ -616,7 +616,7 @@ msgstr "" >> #: help.c:373 >> #, c-forma

[PATCH 2/2] l10n: de.po: fix messages with abbreviated hashs

The three dots in messages where the hash is abbreviated were misinterpreted and are fixed with this commit. Noticed-by: Junio C Hamano 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 7b30f62..f818350

[PATCH 1/2] l10n: de.po: add space before ellipsis

From: Phillip Sz Signed-off-by: Phillip Sz 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 11fbd0f..7b30f62 100644 --- a/po/de.po +++ b/po/de.po @@ -616,7 +616,7 @@ msgstr

[PATCH v2] l10n: de.po: fix messages with abbreviated hashs

The three dots in messages where the hash is abbreviated were misinterpreted and are fixed with this commit. Noticed-by: Junio C Hamano Signed-off-by: Ralf Thielow --- In v2 there's a space added between dots and brackets. po/de.po | 4 ++-- 1 file changed, 2 insertions(+), 2 dele

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

Translate 99 messages came from git.pot update in c2ea120 (l10n: git.pot: v2.4.0 round 1 (99 new, 92 removed)). Signed-off-by: Ralf Thielow --- po/de.po | 289 ++- 1 file changed, 101 insertions(+), 188 deletions(-) diff --git a/po

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

2015-03-28 20:38 GMT+01:00 Ralf Thielow : > > #: builtin/rm.c:17 > -#, fuzzy > msgid "git rm [] [--] ..." > -msgstr "git rm [Optionen] [--] [...]" > +msgstr "git rm [] [--] [...]" > The argument is not optional. Will be fixed in a rero

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

Hi, 2015-03-29 17:48 GMT+02:00 Phillip Sz : > Hi, > >> #: builtin/apply.c:3238 >> -#, fuzzy, c-format >> +#, c-format >> msgid "reading from '%s' beyond a symbolic link" >> -msgstr "Pfadspezifikation '%s' ist hinter einem symbolischen Verweis" >> +msgstr "Lese von '%s' hinter einem symbolischen

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

Translate 99 messages came from git.pot update in c2ea120 (l10n: git.pot: v2.4.0 round 1 (99 new, 92 removed)). Signed-off-by: Ralf Thielow --- po/de.po | 289 ++- 1 file changed, 101 insertions(+), 188 deletions(-) diff --git a/po

[PATCH] l10n: de.po: translate 'symbolic link' as 'symbolische Verknüpfung'

From: Matthias Rüster The use of 'symbolische Verknüpfung' for 'symbolic link' is more common than 'symbolischer Verweis'. Signed-off-by: Matthias Rüster Signed-off-by: Ralf Thielow --- po/de.po | 18 +- 1 file changed, 9 insertions(+), 9 deletio

[PATCH] send-pack: unify error messages for unsupported capabilities

If --signed is not supported, the error message names the remote "receiving end". If --atomic is not supported, the error message names the remote "server". Unify the naming to "receiving end" as we're in the context of "push". Signed-off-by: Ralf Thi

[PATCH] l10n: de.po: translate one message

Translate one message came from git.pot update in 6eebb35 (l10n: git.pot: v2.4.0 round 2 (1 update)). 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 49f35fe..2feaec1 100644 --- a/po/de.po +++ b/po/de.po

Re: [PATCH] sequencer.c: abbreviate hashs placed in the middle of messages

Eric Sunshine wrote: > On Fri, May 8, 2015 at 12:53 PM, Ralf Thielow wrote: >> sequencer.c: abbreviate hashs placed in the middle of messages > > s/hashs/hashes/ Thanks > >> Printing a 40 character sha1 hash in the middle of a message >> stretches the sentenc

Re: [PATCH] sequencer.c: abbreviate hashs placed in the middle of messages

Junio C Hamano wrote: > If identifying the exact commit has value, on the other hand, we can > rephrase it like this: > > error(_("no -m option was given to pick a merge '%s'", ...)); > > to place it not in the middle. We can do similar rephrasing for > other messages as well. > >>> -

Re: [PATCH] sequencer.c: abbreviate hashs placed in the middle of messages

Junio C Hamano wrote: > And shortening the output feels to me a more expedient thing to do > because we do not have to analyse the ramification of possible > information loss (your "It has value since..."). If we analyse the > issue well, we might realize that there is little point in showing >

Re: [PATCH 1/3] l10: de.po: grammar fix

2015-05-20 10:55 GMT+02:00 Michael J Gruber : > Stefan Beller venit, vidit, dixit 19.05.2015 23:46: >> On Tue, May 19, 2015 at 1:51 AM, Michael J Gruber >> wrote: >>> Signed-off-by: Michael J Gruber >>> --- >>> po/de.po | 2 +- >>> 1 file changed, 1 insertion(+), 1 deletion(-) >>> >>> diff --git

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

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

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

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)

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

Re: redundant message in builtin/rm.c

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

[PATCH] push: fix typo in advice message

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

[PATCH] git-rebase: fix typo

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] l10n: de.po: translate 99 new messages

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 v2] l10n: de.po: translate 99 new messages

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 5 messages

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] Documentation/git-merge-file: document option "--diff3"

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] rebase --preserve-merges: ignore "merge.log" config

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

Re: What's cooking in git.git (Nov 2012, #02; Fri, 9)

On Fri, Nov 9, 2012 at 8:23 PM, Jeff King wrote: > > You can find the changes described here in the integration branches of > my repository at: > > git://github.com/peff/git.git It seems that the repo doesn't contain the integration branches?!? $ git remote add peff git://github.com/peff/git.g

Re: What's cooking in git.git (Nov 2012, #02; Fri, 9)

On Fri, Nov 9, 2012 at 9:01 PM, Ralf Thielow wrote: > On Fri, Nov 9, 2012 at 8:23 PM, Jeff King wrote: >> >> You can find the changes described here in the integration branches of >> my repository at: >> >> git://github.com/peff/git.git > > It

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

> Hi Ralf, > > This is the middle third of my review. Sorry for the long wait! I hope > it can still be useful. > Hi Thomas, no problem. Thanks for your review. Of course it's very useful. Some of the mistakes I made are so obvious that I can't say what I've had in mind when translation these m

[PATCH] completion: add options --single-branch and --branch to "git clone"

Signed-off-by: Ralf Thielow --- contrib/completion/git-completion.bash | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 48c3abd..cda095d 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib

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

Thanks Thomas and Michael! 2012/11/30 Thomas Rast : >> #: builtin/update-index.c:756 >> msgid "mark files as \"index-only\"" >> -msgstr "" >> +msgstr "markiert Dateien als \"index-only\"" > > Likewise, but here I don't even understand what the manpage is trying to > tell me, in particular I don

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

Translate 22 new messages came from git.pot updates in 9306b5b (l10n: Update git.pot (3 new, 6 removed messages)), fe52cd6 (l10n: Update git.pot (14 new, 3 removed messages)) and f9472e3 (l10n: Update git.pot (5 new, 1 removed messages)). Signed-off-by: Ralf Thielow --- po/de.po | 68

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

2012/12/3 Michael J Gruber : >> 1 file changed, 61 insertions(+), 62 deletions(-) > ... >> #: builtin/fsck.c:620 >> msgid "also consider packs and alternate objects" >> -msgstr "betrachtet auch Pakete und wechselnde Objekte" >> +msgstr "" > > Oops ;) > >> #: builtin/push.c:391 >> msgid "check"

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

Translate 22 new messages came from git.pot updates in 9306b5b (l10n: Update git.pot (3 new, 6 removed messages)), fe52cd6 (l10n: Update git.pot (14 new, 3 removed messages)) and f9472e3 (l10n: Update git.pot (5 new, 1 removed messages)). Signed-off-by: Ralf Thielow Reviewed-by: Michael J Gruber

[PATCH] commit: make default of "cleanup" option configurable

can be used to change the default of the "cleanup" option in "git commit". Signed-off-by: Ralf Thielow --- Documentation/config.txt | 4 builtin/commit.c | 29 ++--- 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/Docum

Re: [PATCH] commit: make default of "cleanup" option configurable

Hi, 2013/1/9 Jonathan Nieder : > Hi, > > Ralf Thielow wrote: > >> The default of the "cleanup" option in "git commit" >> is not configurable. Users who don't want to use the >> default have to pass this option on every commit since >>

[PATCHv2] commit: make default of "cleanup" option configurable

can be used to change the default of the "cleanup" option in "git commit". Signed-off-by: Ralf Thielow --- Changes in v2: - simplify implementation - mention configuration variable in documentation of "git commit --cleanup" - add an example usecase to documentio

[PATCHv3] commit: make default of "cleanup" option configurable

can be used to change the default of the "cleanup" option in "git commit". Signed-off-by: Ralf Thielow --- changes in v3: - remove extra blank line in builtin/commit.c - add newline at end of t/t7500/add-content-and-comment - improve documentation of commit.cleanup configuratio

[PATCH] Allow custom "comment char"

Signed-off-by: Junio C Hamano Signed-off-by: Ralf Thielow --- Documentation/config.txt | 6 Documentation/technical/api-strbuf.txt | 10 +++ builtin/branch.c | 10 +++ builtin/commit.c | 12 builtin/

Re: [PATCH] Allow custom "comment char"

2013/1/16 Junio C Hamano : >>> diff --git a/git-submodule.sh b/git-submodule.sh >>> index 22ec5b6..1b8d95f 100755 >>> --- a/git-submodule.sh >>> +++ b/git-submodule.sh >>> @@ -975,13 +975,19 @@ cmd_summary() { >>> echo >>> done | >>> if test -n "$for_status"; then >>> +

[PATCH v2] Allow custom "comment char"

Signed-off-by: Junio C Hamano Signed-off-by: Ralf Thielow --- Junio, thanks for the code in your reply to the first version. It works very well and looks nice. I was also unhappy about this "\n%c\n" thing and pretty unsure with the code in "git-submodule.sh". But with this, it

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

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

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

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

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: English/German terminology, git.git's de.po, and pro-git

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

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

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

<    1   2   3   4   >