Re: [patch] Updated brazilian portuguese (pt_BR) dbootstrap's pt.po
andrelop@ig.com.br (Andre Luis Lopes) writes:
> Could someone apply this one too ?
It doesn't apply cleanly:
patching file pt.po
Hunk #1 FAILED at 133.
Hunk #2 succeeded at 159 (offset -4 lines).
Hunk #3 succeeded at 169 (offset -4 lines).
Hunk #4 FAILED at 201.
Hunk #5 succeeded at 218 (offset -9 lines).
Hunk #6 FAILED at 1183.
Hunk #7 FAILED at 2676.
Hunk #8 FAILED at 2692.
Hunk #9 FAILED at 2712.
Hunk #10 FAILED at 2721.
Hunk #11 succeeded at 4657 (offset -37 lines).
Hunk #12 succeeded at 4669 (offset -37 lines).
Hunk #13 succeeded at 5167 (offset -37 lines).
Hunk #14 succeeded at 5206 (offset -37 lines).
Hunk #15 succeeded at 5220 (offset -37 lines).
Hunk #16 succeeded at 5234 (offset -37 lines).
Hunk #17 succeeded at 5252 (offset -37 lines).
Hunk #18 succeeded at 5266 (offset -37 lines).
Hunk #19 succeeded at 5280 (offset -37 lines).
Hunk #20 succeeded at 5301 (offset -37 lines).
7 out of 20 hunks FAILED -- saving rejects to file pt.po.rej
Can you fix that and resend please?
> * Fixed the CVS merge problem introduced by the last update (I guess).
There is no such conflict messages in CVS.
> Is that correct ?
Apparently.
> Is that obsolete message really nothing to bother with
> ?
Well, it's just useless at this point, so it's nice to save space by
removing it.
--
...Adam Di Carlo..<adam@onshore-devel.com>...<URL:http://www.onshored.com/>
Reply to: