[Digikam-devel] [Bug 275039] [PATCH] switch to semantic internationalisation

Gilles Caulier caulier.gilles at gmail.com
Tue Jun 7 08:25:05 BST 2011


https://bugs.kde.org/show_bug.cgi?id=275039


Gilles Caulier <caulier.gilles at gmail.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |caulier.gilles at gmail.com




--- Comment #1 from Gilles Caulier <caulier gilles gmail com>  2011-06-07 09:25:02 ---
I cannot apply your patch against current git master:

[gilles at localhost libkdcraw]$ git reset --hard HEAD
HEAD is now at 780bfb0 apply patch #60673

[gilles at localhost libkdcraw]$ patch -p0 < libkdcraw_i18nc_r1.patch 
patching file libkdcraw/dcrawsettingswidget.cpp
Reversed (or previously applied) patch detected!  Assume -R? [n] R
Apply anyway? [n] y
Hunk #1 FAILED at 183.
Hunk #2 FAILED at 200.
Hunk #3 FAILED at 220.
Hunk #4 FAILED at 326.
Hunk #5 FAILED at 354.
Hunk #6 FAILED at 455.
Hunk #8 FAILED at 521.
Hunk #9 FAILED at 550.
Hunk #10 succeeded at 594 (offset 2 lines).
Hunk #11 FAILED at 600.
Hunk #12 succeeded at 658 (offset 2 lines).
Hunk #13 FAILED at 867.
Hunk #14 succeeded at 952 (offset 2 lines).
Hunk #15 succeeded at 1020 (offset 2 lines).
Hunk #16 succeeded at 1043 (offset 2 lines).
Hunk #17 succeeded at 1071 (offset 2 lines).
Hunk #18 succeeded at 1118 (offset 2 lines).
Hunk #19 succeeded at 1140 (offset 2 lines).
Hunk #20 succeeded at 1164 (offset 2 lines).
10 out of 20 hunks FAILED -- saving rejects to file
libkdcraw/dcrawsettingswidget.cpp.rej
patching file libkdcraw/rcombobox.cpp
patching file libkdcraw/rnuminput.cpp

Gilles Caulier

-- 
Configure bugmail: https://bugs.kde.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug.



More information about the Digikam-devel mailing list