control: tags -1 + pending Hi Frans, On Donnerstag, 27. November 2014, Frans Spiesschaert wrote: > Please find attached two diffs. > One to use as a patch for the wheezy manual. > The other is meant for patching the jessie manual. only the wheezy one applied cleanly, the jessie one only partly: matrix:~/Projects/debian-edu/git/debian-edu-doc$ patch -p1 < debian-edu- jessie-manual.nl.po.diff patching file documentation/debian-edu-jessie/debian-edu-jessie-manual.nl.po Hunk #1 FAILED at 6. Hunk #12 succeeded at 918 (offset 6 lines). Hunk #13 succeeded at 1084 (offset 6 lines). Hunk #14 succeeded at 1151 (offset 15 lines). Hunk #15 succeeded at 1178 (offset 15 lines). Hunk #16 succeeded at 1204 (offset 15 lines). Hunk #17 succeeded at 1262 (offset 15 lines). Hunk #18 succeeded at 1305 with fuzz 1 (offset 19 lines). Hunk #19 succeeded at 1320 (offset 19 lines). Hunk #20 succeeded at 1676 (offset 35 lines). Hunk #21 succeeded at 1898 (offset 35 lines). Hunk #22 succeeded at 2014 (offset 35 lines). Hunk #23 succeeded at 2041 (offset 35 lines). Hunk #24 succeeded at 2054 (offset 35 lines). Hunk #25 succeeded at 2089 (offset 35 lines). Hunk #26 succeeded at 2207 (offset 35 lines). Hunk #27 succeeded at 2588 (offset 42 lines). Hunk #28 succeeded at 3318 (offset 42 lines). Hunk #29 succeeded at 3333 (offset 42 lines). Hunk #30 succeeded at 3391 (offset 42 lines). Hunk #31 succeeded at 3664 (offset 42 lines). Hunk #32 succeeded at 3687 (offset 42 lines). Hunk #33 succeeded at 3815 (offset 42 lines). Hunk #34 succeeded at 4011 (offset 42 lines). Hunk #35 succeeded at 4633 (offset 49 lines). Hunk #36 succeeded at 4731 (offset 49 lines). Hunk #37 succeeded at 5187 (offset 56 lines). Hunk #38 succeeded at 5308 (offset 56 lines). Hunk #39 succeeded at 5475 (offset 61 lines). Hunk #40 succeeded at 5916 (offset 61 lines). Hunk #41 succeeded at 6190 (offset 61 lines). Hunk #42 succeeded at 6198 (offset 61 lines). Hunk #43 succeeded at 6374 (offset 61 lines). Hunk #44 succeeded at 6397 (offset 61 lines). Hunk #45 succeeded at 6468 (offset 61 lines). Hunk #46 succeeded at 6481 (offset 61 lines). Hunk #47 succeeded at 6493 (offset 61 lines). Hunk #48 succeeded at 6511 (offset 61 lines). Hunk #49 succeeded at 6573 (offset 61 lines). Hunk #50 succeeded at 6871 (offset 61 lines). Hunk #51 succeeded at 6887 (offset 61 lines). Hunk #52 succeeded at 6916 (offset 61 lines). Hunk #53 succeeded at 8068 (offset 92 lines). Hunk #54 succeeded at 8121 (offset 92 lines). Hunk #55 succeeded at 8545 (offset 92 lines). Hunk #56 succeeded at 8564 (offset 92 lines). Hunk #57 succeeded at 8582 (offset 92 lines). Hunk #58 succeeded at 8624 (offset 92 lines). Hunk #59 succeeded at 8773 (offset 92 lines). Hunk #60 succeeded at 8786 (offset 92 lines). Hunk #61 succeeded at 8816 (offset 92 lines). Hunk #62 succeeded at 8986 (offset 92 lines). Hunk #63 succeeded at 9004 (offset 92 lines). Hunk #64 succeeded at 9043 (offset 92 lines). Hunk #65 succeeded at 9094 (offset 92 lines). Hunk #66 succeeded at 9859 (offset 92 lines). Hunk #67 succeeded at 9878 (offset 92 lines). Hunk #68 succeeded at 9895 (offset 92 lines). Hunk #69 succeeded at 10233 (offset 92 lines). Hunk #70 succeeded at 10253 (offset 92 lines). Hunk #71 succeeded at 10268 (offset 92 lines). Hunk #72 succeeded at 10283 (offset 92 lines). Hunk #73 succeeded at 10886 (offset 92 lines). Hunk #74 succeeded at 11247 (offset 92 lines). Hunk #75 succeeded at 11417 (offset 92 lines). Hunk #76 succeeded at 11548 (offset 92 lines). Hunk #77 succeeded at 11928 (offset 92 lines). Hunk #78 succeeded at 12109 (offset 92 lines). Hunk #79 succeeded at 12302 (offset 92 lines). Hunk #80 succeeded at 12464 (offset 92 lines). Hunk #81 succeeded at 12594 (offset 92 lines). 1 out of 81 hunks FAILED -- saving rejects to file documentation/debian-edu- jessie/debian-edu-jessie-manual.nl.po.rej $ git diff|diffstat debian/changelog | 7 documentation/debian-edu-jessie/debian-edu-jessie-manual.nl.po | 367 +++++----- documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nl.po | 272 +++---- 3 files changed, 346 insertions(+), 300 deletions(-) In future I'd suggest to either: - send the full .po file to the bugreport, possible gzipped (instead of just a diff) - send a git patch with "git format-patch" via email (least prefered option, just a tiny bit better than "plain diffs") - send a git pull request from some git clone, be it alioth or github (eg see https://wiki.debian.org/Alioth/Git#Using_personal_Git_repositories) - become a debian-edu alioth project member and commit directly to debian-edu- doc.git Pick you poison^wpick :-) I'd be glad to help you get started with any of these options. > First of all I updated the fuzzy and new strings. > But I also went through the text entirely and fixed some > typos and in a few places applied some small improvements > to the translation. yay! thanks, Holger
Attachment:
signature.asc
Description: This is a digitally signed message part.