On Tue, 2015-06-02 at 23:07 +0200, Larsen wrote:
> On Tue, 02 Jun 2015 23:05:10 +0200, Larsen <larsen007(a)web.de> wrote:
> 
> > On Tue, 02 Jun 2015 22:01:18 +0200, Michael Tremer <michael.tremer(a)ipfire.org> wrote:
> >
> >> Hi,
> >>
> >> this patch looks okay, but it won't apply. Git error:
> >>
> >> Applying: Aw: Re: [PATCH] Fix hardcoded strings in pppsetup.cgi
> >> error: patch failed: html/cgi-bin/pppsetup.cgi:793
> >> error: html/cgi-bin/pppsetup.cgi: patch does not apply
> >> error: patch failed: langs/de/cgi-bin/de.pl:1822
> >> error: langs/de/cgi-bin/de.pl: patch does not apply
> >> error: patch failed: langs/en/cgi-bin/en.pl:1852
> >> error: langs/en/cgi-bin/en.pl: patch does not apply
> >> Patch failed at 0001 Aw: Re: [PATCH] Fix hardcoded strings in pppsetup.cgi
> >>
> >> This is probably caused by copy-and-paste and replacing tabs by spaces
> >> or similar.
> >
> 
> (now again without hitting Ctrl+Enter too early... damn)
> 
> I saved the patch from your last reply and compared it to the original patch file
> that was created by TortoiseGit. There were no differences.
> 
> I also patched pppsetup.cgi in my VM with Core 90 (didn´t try for the lang files)
> and this also went fine.
> 
> There are no tabs in the patch.
> 
> I don´t know what could be wrong with it... =(

I think I found it. I do not really know where this is coming from
though.

If I remove the first space from every line of the diff that does not
start with a + or - character. Any idea how this comes?

Also merged.

-Michael