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)

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

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

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

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 >

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

[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

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

Re: [RFH] .mailmap late summer cleaning

2012-08-30 Thread Ralf Thielow
On Wed, Aug 29, 2012 at 7:16 PM, Junio C Hamano wrote: ... > Martin von Zweigbergk > > I'll collect responses to this message, and update the file sometime > late next week. > Ralf Thielow -- To unsubscribe from this list: send the line "unsubscribe git&quo

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

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 wrote: > Ralf Thielow writes: > >> On Thu, Aug 30, 2012 at 7:23 PM, Carlos Martín Nieto wrote: >>> behaviour. To work around this, introduce --set-upstream-to which >>> accepts a compulsory argument indicatin

[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 --- Hi German l10n team, please review this small update on German translation. This patch here is based on a preparation commit which just contains the

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

2012-09-05 Thread Ralf Thielow
On Wed, Sep 5, 2012 at 7:11 PM, Ralf Thielow wrote: > +" Modus 'current' anstatt 'simple', falls du gelegentlich ältere Versionen > von" > +" Git benutzt)" Oops, i've forgot a full stop before the closing bracket. I'll fix. -- To uns

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 wrote: > Ralf Thielow 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)&q

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 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 > msgid "" > "push.de

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 wrote: > On Fri, Sep 7, 2012 at 12:31 PM, Jiang Xin 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, a

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 wrote: > On Fri, Sep 7, 2012 at 6:36 PM, Ralf Thielow wrote: >> On Fri, Sep 7, 2012 at 12:31 PM, Jiang Xin wrote: >>> I just notice that the 1st line of the orignal message below has >>> only 56 characters, much shor

[PATCH 0/2] multiline prefixes on messages

2012-09-07 Thread Ralf Thielow
" codepaths, but "warning" messages 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:&qu

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

2012-09-07 Thread Ralf Thielow
Signed-off-by: Ralf Thielow --- 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 params) static void

[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 --- 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 --- a/advice.c +++ b

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 wrote: > Ralf Thielow writes: > >> Extract a function that allows to print messages >> with a prefix. >> >> Signed-off-by: Ralf Thielow >> --- >> advice.c | 14 ++ >> advice.h | 1 + >

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 wrote: > Ralf Thielow writes: > >> On Fri, Sep 7, 2012 at 9:32 PM, Junio C Hamano wrote: >> >>>> - fprintf(stderr, _("hint: %.*s\n"), (int)(np - cp), cp); >>>> + fpri

[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 --- .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 wrote: > Ralf Thielow 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 re

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

Re: is this behaviour expected for "git clone --single-branch"?

2012-09-13 Thread Ralf Thielow
On Thu, Sep 13, 2012 at 8:45 PM, Junio C Hamano wrote: > Ralf Thielow writes: > >> # looking again to my branches > > Don't look at your branches, but look at how the refspecs are > configured by "git clone" in .git/config; I suspect we just write > the de

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

2012-09-13 Thread Ralf Thielow
ngle-branch". Fixing the refspec that it just contains the ref of the branch which was cloned. Signed-off-by: Ralf Thielow --- 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 10064

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 wrote: > On Fri, Sep 14, 2012 at 1:48 PM, Junio C Hamano wrote: >> Junio C Hamano writes: >> >>> Who guarantees at this point in the codepath that option_branch is >>> set when option_single_branch is non-zero? Until we talk with the >>> rem

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

2012-09-14 Thread Ralf Thielow
the ref of the branch the user specified in the "git clone" command. Signed-off-by: Ralf Thielow --- > 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

[PATCHv3] clone: fix refspec on "--single-branch" option

2012-09-14 Thread Ralf Thielow
the ref of the branch the user specified in the "git clone" command. Signed-off-by: Ralf Thielow --- > As refspec maps names that appear on the source side to names that > appear on the destination side, and for fetch, the "soruce side" > is the remote, using "

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

2012-09-16 Thread Ralf Thielow
fspec to cover only the singly cloned ref instead to correct this. Signed-off-by: Ralf Thielow --- Changes to v3: - use commit message from Junio's topic branch - add comment for the 'detached HEAD' case (also from Junio's topic branch) (thanks for that) - add tests for the refspe

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

2012-09-17 Thread Ralf Thielow
On Mon, Sep 17, 2012 at 2:06 PM, Nguyen Thai Ngoc Duy wrote: > On Sun, Sep 16, 2012 at 3:13 PM, Ralf Thielow wrote: >> + if (option_mirror || !option_bare) { >> + strbuf_reset(&value); > > I think we should use a new strbuf local variable here to a

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

2012-09-17 Thread Ralf Thielow
fspec to cover only the singly cloned ref instead to correct this. Signed-off-by: Ralf Thielow --- 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

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 wrote: > Ralf Thielow 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 the > combinat

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 wrote: > Ralf Thielow 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 >>> &q

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

2012-09-18 Thread Ralf Thielow
x27;ll cover only the branch specified in the "--branch" option. If "--single" is combined with "--mirror", then it'll cover all refs of the cloned repository. If "--single" is used with "--branch" that specifies a tag, then it'll cover on

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 wrote: > On Wed, Sep 19, 2012 at 2:14 AM, Ralf Thielow wrote: >> +test_expect_success '--single-branch with explicit --branch tag' ' >> + ( >> + cd dir_tag && git fetch &

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

2012-09-19 Thread Ralf Thielow
x27;ll cover only the branch specified in the "--branch" option. If "--single" is combined with "--mirror", then it'll cover all refs of the cloned repository. If "--single" is used with "--branch" that specifies a tag, then it'll cover o

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

2012-09-20 Thread Ralf Thielow
x27;ll cover only the branch specified in the "--branch" option. If "--single" is combined with "--mirror", then it'll cover all refs of the cloned repository. If "--single" is used with "--branch" that specifies a tag, then it'll cover onl

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

2012-09-23 Thread Ralf Thielow
On Sat, Sep 22, 2012 at 11:57 PM, Sascha Cunz 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 goal is not making tra

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

2012-09-23 Thread Ralf Thielow
ord "still" was translated as "bereits", change it to "noch". "valuable" was translated as "nützlich" which is more like "useful" than "valuable", change it to "schützenswert". Noticed-by: Sascha Cunz Signed-off-b

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

2012-09-24 Thread Ralf Thielow
Noticed-by: Sascha Cunz Signed-off-by: Ralf Thielow --- 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, and\n" "I wonder if

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

2012-09-24 Thread Ralf Thielow
Noticed-by: Sascha Cunz Signed-off-by: Ralf Thielow --- >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(+), 5 Zeilen entfernt

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

2012-10-04 Thread Ralf Thielow
From: Simon Ruderich Signed-off-by: Simon Ruderich Signed-off-by: Ralf Thielow --- 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 100644 --- a/po/de.po +++ b/po/de.po @@ -55,7 +55,7

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

2012-07-06 Thread Ralf Thielow
On Fri, Jul 6, 2012 at 8:20 PM, Michael J Gruber wrote: > Ralf Thielow venit, vidit, dixit 05.07.2012 20:16: >>>>> Is "rebase" = "Neuaufbau"? My last thought on this wording was "rebase" = >>>>> "Umpflanzen". >>> &

Re: [RFC] l10n: de.po: translate 29 new messages

2012-07-06 Thread Ralf Thielow
> AFAIK it makes no senes to translate terms like "commit" to "Abzeichen" like > it is used > in git gui. I don't know *anybody* here in my IT business environment who > uses this word > or even would guess what it means. Everyone is used to the Denglisch Version > "committen" > or "einchecken"

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

2012-07-30 Thread Ralf Thielow
Translate 4 new messages came from git.pot update in 0bbe5b4 (l10n: Update git.pot (4 new, 3 removed messages)). Signed-off-by: Ralf Thielow --- Hi German l10n team, please review this small update on German translation. Thanks, Ralf po/de.po | 16 1 file changed, 8

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

2012-07-31 Thread Ralf Thielow
On Tue, Jul 31, 2012 at 10:13 AM, Jan Engelhardt wrote: > > On Monday 2012-07-30 18:08, Ralf Thielow wrote: > >>Translate 4 new messages came from git.pot update in 0bbe5b4 >>(l10n: Update git.pot (4 new, 3 removed messages)). >> >>Signed-off-by: Ralf Thi

Re: [PATCH] macos: lazily initialize iconv

2012-07-31 Thread Ralf Thielow
On Tue, Jul 31, 2012 at 7:52 PM, Junio C Hamano wrote: > + /* Avoid iconv_open()/iconv_close() if there is nothing to convert */ > + for (i = 0; i < argc; i++) { > + if (has_utf8(argv[i], (size_t)-1, NULL)) > + break; > + } > + if (i < ar

Re: [PATCH v2] macos: lazily initialize iconv

2012-07-31 Thread Ralf Thielow
On Tue, Jul 31, 2012 at 8:37 PM, Junio C Hamano wrote: > + /* Avoid iconv_open()/iconv_close() if there is nothing to convert */ > + for (i = 0; i < argc; i++) { > + if (has_utf8(argv[i], (size_t)-1, NULL)) > + break; > + } > + if (argc <

[PATCH] git-rebase.sh: fix typo

2012-08-01 Thread Ralf Thielow
Fix a typo in the error messages which is shown if it seems that a rebase is already in progress. 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 0e6fd09..15da926 100755 --- a/git-rebase.sh

[RFC] l10n: de.po: translate 76 new messages

2012-08-02 Thread Ralf Thielow
Translate 76 new messages came from git.pot update in 3b6137f (l10n: Update git.pot (76 new, 4 removed messages)). Signed-off-by: Ralf Thielow --- Hi German l10n team, please review this update of German translation. Please note that this patch is based on a preparation commit which just

Re: [PATCH] git-rebase.sh: fix typo

2012-08-02 Thread Ralf Thielow
On Wed, Aug 1, 2012 at 7:09 PM, Ralf Thielow wrote: > $(eval_gettext 'It seems that there is already a $state_dir_base directory, > and > -I wonder if you ware in the middle of another rebase. If that is the > +I wonder if you are in the middle of another rebase. If th

Re: [RFC] l10n: de.po: translate 76 new messages

2012-08-03 Thread Ralf Thielow
Hi Thomas, thanks for your review. On Fri, Aug 3, 2012 at 10:59 AM, Thomas Rast wrote: > > Ralf Thielow writes: > >> #: merge-recursive.c:497 >> -#, fuzzy >> msgid "diff setup failed" >> -msgstr "diff_setup_done fehlgeschlagen" &g

Re: [RFC] l10n: de.po: translate 76 new messages

2012-08-03 Thread Ralf Thielow
On Fri, Aug 3, 2012 at 2:16 PM, Thomas Rast wrote: >>> >>> KONFLIKT (rename/delete): foo gelöscht in bar und renamed in quux. Stand >>> ... >> >> Gah, I misunderstood the values of the placeholders. The reason why I haven't >> translate "delete" or "rename" is because they're part of the >> "KO

Re: [RFC] l10n: de.po: translate 76 new messages

2012-08-03 Thread Ralf Thielow
On Fri, Aug 3, 2012 at 10:59 AM, Thomas Rast wrote: >> #: merge-recursive.c:1918 >> #, c-format >> msgid "found %u common ancestor(s):" >> -msgstr "" >> +msgstr "%u gemeinsame Vorgänger gefunden" > Another TODO is to make two different messages in case that %u is one and bigger than one as it'

[RFCv2] l10n: de.po: translate 76 new messages

2012-08-05 Thread Ralf Thielow
Translate 76 new messages came from git.pot update in 3b6137f (l10n: Update git.pot (76 new, 4 removed messages)). Signed-off-by: Ralf Thielow Signed-off-by: Thomas Rast --- po/de.po | 216 ++- 1 file changed, 115 insertions(+), 101

[PATCH] merge-recursive: add hint for translators in handle_change_delete()

2012-08-05 Thread Ralf Thielow
The outputs in handle_change_delete() contain a lot of placeholders. This could end up in confusion to translators since two parts of them are translated separately. Add a hint for translators that they can easily understand it without study the code. Signed-off-by: Ralf Thielow --- This patch

[PATCH] merge-recursive: separate message for common ancestors

2012-08-05 Thread Ralf Thielow
The function "merge_recursive" prints the count of common ancestors as "found %u common ancestor(s):". At least for better translation, we should use a singular and a plural form of this message. Signed-off-by: Ralf Thielow --- merge-recursive.c | 5 - 1 file changed

Re: [PATCH] merge-recursive: separate message for common ancestors

2012-08-05 Thread Ralf Thielow
It would be nicer for translators to have two messages. In the end it's just a separation for singular and plural as it's done in diff.c (e.g. Q_(" %d file changed", " %d files changed", files)). On Sun, Aug 5, 2012 at 8:44 PM, Junio C Hamano wrote: > Ralf T

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

2012-08-06 Thread Ralf Thielow
Translate one new message came from git.pot update in bb2ba06 (l10n: Update one message in git.pot). Signed-off-by: Ralf Thielow --- Hi German l10n team, please review also this small update of German translation. I'll squash it with the last update and merge the commit messages tog

[PATCHv2] merge-recursive: add hint for translators in handle_change_delete()

2012-08-06 Thread Ralf Thielow
The outputs in handle_change_delete() contain a lot of placeholders. This could end up in confusion to translators. Add a hint for translators that they can easily understand it without study the code. Helped-by: Junio C Hamano Signed-off-by: Ralf Thielow --- The first version did only explain

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 ..." to update what will be committed) Of course, applying this topic would solve this problem. Alternativel

[PATCH] l10n: de.po: fix some minor issues

2013-01-21 Thread Ralf Thielow
This fixes some minor issues and improves the German translation a bit. The following things were changed: - use complete sentences in option related messages - translate "use" consistently as "verwendet" - don't translate "make sense" as "macht Sinn"

[PATCHv2] l10n: de.po: fix some minor issues

2013-01-21 Thread Ralf Thielow
This fixes some minor issues and improves the German translation a bit. The following things were changed: - use complete sentences in option related messages - translate "use" consistently as "verwendet" - don't translate "make sense" as "macht Sinn"

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

2013-01-27 Thread Ralf Thielow
Translate 11 new messages came from git.pot update in 46bc403 (l10n: Update git.pot (11 new, 7 removed messages)). Signed-off-by: Ralf Thielow --- po/de.po | 37 ++--- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/po/de.po b/po/de.po index

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

2013-01-28 Thread Ralf Thielow
On Mon, Jan 28, 2013 at 11:33:09AM +0100, Thomas Rast wrote: > Ralf Thielow writes: > > > #: builtin/reset.c:275 > > -#, fuzzy, c-format > > +#, c-format > > msgid "Failed to resolve '%s' as a valid revision." > > -msgstr "Konnte &

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

2013-01-28 Thread Ralf Thielow
On Mon, Jan 28, 2013 at 05:39:27PM +0100, Joachim Schmitz wrote: > Ralf Thielow wrote: > >Translate 11 new messages came from git.pot update > >in 46bc403 (l10n: Update git.pot (11 new, 7 removed > >messages)). > > > >Signed-off-by: Ralf

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

2013-01-28 Thread Ralf Thielow
Translate 11 new messages came from git.pot update in 46bc403 (l10n: Update git.pot (11 new, 7 removed messages)). Signed-off-by: Ralf Thielow Acked-by: Thomas Rast --- po/de.po | 37 ++--- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/po/de.po

[PATCH] l10n: de.po: translate "revision" consistently as "Version"

2013-01-28 Thread Ralf Thielow
In the German translation, we have translated "revision" as both "Revision" and "Version". In the context of version control, revision has the same meaning as commit, so we don't need to use both terms. "revision" is now consistently translated as &qu

[PATCH] l10n: de.po: translate "reset" as "neu setzen"

2013-01-28 Thread Ralf Thielow
According to the glossary, "reset" should be translated as "neu setzen" but in a couple of messages we've translated it as "zurücksetzen". This fixes that. Signed-off-by: Ralf Thielow --- Note that the part "neu" is not used in any places because I

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

2013-01-28 Thread Ralf Thielow
2013/1/28 Philip Oakley : > From: "Ralf Thielow" > Sent: Monday, January 28, 2013 5:55 PM > >> On Mon, Jan 28, 2013 at 11:33:09AM +0100, Thomas Rast wrote: >>> >>> Ralf Thielow writes: >>> >>> > #: builtin/reset.c:275 >>>

[PATCH] l10n: de.po: translate "revision" consistently as "Revision"

2013-02-01 Thread Ralf Thielow
idea that it's not necessarily the same. After this commit, "revision" is consistently translated as "Revision". Signed-off-by: Ralf Thielow --- This replaces a patch [1] earlier sent to the list. I've also updated the glossary [2] of the German translation. [1] ht

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

2013-02-18 Thread Ralf Thielow
Translate 35 new messages came from git.pot update in 9caaf23 (l10n: Update git.pot (35 new, 14 removed messages)). Signed-off-by: Ralf Thielow --- po/de.po | 140 +++ 1 file changed, 68 insertions(+), 72 deletions(-) diff --git a/po

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

2013-02-19 Thread Ralf Thielow
Translate 35 new messages came from git.pot update in 9caaf23 (l10n: Update git.pot (35 new, 14 removed messages)). Signed-off-by: Ralf Thielow Acked-by: Thomas Rast --- Thanks Thomas and Michael for review. po/de.po | 142 +++ 1

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

2013-02-19 Thread Ralf Thielow
Translate 5 new messages came from git.pot update in 235537a (l10n: git.pot: v1.8.2 round 3 (5 new)). Signed-off-by: Ralf Thielow --- po/de.po | 20 +++- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/po/de.po b/po/de.po index ed813ef..c0e5398 100644 --- a/po

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

2013-02-19 Thread Ralf Thielow
Hi, 2013/2/19 Thomas Rast : > Ralf Thielow writes: > >> msgid "You are currently bisecting branch '%s'." >> -msgstr "Sie sind gerade beim Halbieren." >> +msgstr "Sie sind gerade beim Halbieren in Zweig '%s'." > >

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

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

2013-02-23 Thread Ralf Thielow
2013/2/23 Thomas Rast : > Ralf Thielow writes: > >> diff --git a/po/de.po b/po/de.po >> index c0e5398..58a1a46 100644 >> --- a/po/de.po >> +++ b/po/de.po >> @@ -1349,11 +1349,11 @@ msgstr " (alle Konflikte behoben: führen Sie >> \"git c

[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

[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

<    1   2   3   4