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

[Francesco Riosa]

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


Francesco Riosa <francesco+kde at pnpitalia.it> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
  Attachment #60743|0                           |1
        is obsolete|                            |




--- Comment #10 from Francesco Riosa <francesco+kde pnpitalia it>  2011-06-07 14:54:23 ---
Created an attachment (id=60748)
 --> (http://bugs.kde.org/attachment.cgi?id=60748)
review-me.patch

(In reply to comment #5)
[snip]
> error: Your local changes to the following files would be overwritten by merge:
>         libkdcraw/dcrawsettingswidget.cpp
> Please, commit your changes or stash them before you can merge.
> Aborting
[snip]
This error mean that git is unable to automatically merge the two repositories
and manual merge is needed.

http://book.git-scm.com/5_advanced_branching_and_merging.html

explain something about conflict-resolution, would like to help more but I'm
myself unfamiliar with the matter. In fact usually when conflict happen I do
start from a fresh copy and re-apply all the patches when possible and do
manually the rest.

I've done this for you and you can see attached the patch against HEAD of
libkdcraw, it has been done in a hurry please check it double

Also a suggestion for the next time. try to limit the number of changes per
commit, for example this patch caould have been divided into:
1) add @item and change to i18nc
2) re-format lines lenght

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