[MPlayer-translations] patch to DOCS/man/zh/mplayer.1, sync to ../en/mplayer.1 r23455

Sebastian Krämer mail at kraymer.de
Tue Jun 5 15:21:33 CEST 2007


Z.T. wrote:
> On 2007-06-05 08:23:13, Sebastian wrote:
>> Please, resend as patch. Thank you.
> 
> Sorry for the inconvience. Here I send you the diff text.

JRaSH,

thanks for resending. But it seems you stripped the patch (header
missing), it doesn't apply:

> $ patch -p0 < /tmp/diff.txt 
> missing header for unified diff at line 7 of patch
> can't find file to patch at input line 7
> Perhaps you used the wrong -p or --strip option?
> The text leading up to this was:
> --------------------------
> |@@ -1,4 +1,4 @@
> |-.\" Partial sync with en/mplayer.1 r23370
> |+.\" Partial sync with en/mplayer.1 r23455
> | .\" Encoding: utf-8
> | .\" Only 1 section unfinished: "CODEC SPECIFIC ENCODING OPTIONS",
> | .\"   also see line 4560.
> --------------------------
> File to patch: mplayer.1
> patching file mplayer.1
> Hunk #1 FAILED at 12.
> Hunk #2 FAILED at 43.
> Hunk #3 FAILED at 1611.
> Hunk #4 FAILED at 2707.
> Hunk #5 FAILED at 7681.
> 5 out of 5 hunks FAILED -- saving rejects to file mplayer.1.rej

Please create a diff with "svn diff", that will work.

Sebastian



More information about the MPlayer-translations mailing list