[Koha-bugs] [Bug 26547] Move context from msgid to msgctxt in pref PO files

[bugzilla-daemon at bugs.koha-community.org]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26547

David Nind <david at davidnind.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |david at davidnind.com

--- Comment #12 from David Nind <david at davidnind.com> ---
As expected, since this has been in the sign off queue for a while, the patch
doesn't apply 8-(.. 

As there have been a lot of changes to the translation process over the last
few releases, I was wondering how this fits in.


kohadev-koha at kohadevbox:koha(bz26547)$ git bz apply 26547

Bug 26547 - Move context from msgid to msgctxt in pref PO files

111697 - Bug 26547: Move context from msgid to msgctxt in pref PO files
111698 - Bug 26547: Put msgctxt into a comment as well
111699 - Bug 26547: Fix msgctxt in pref PO file for blocks without a pref name
111700 - Bug 26547: *DONT PUSH* Script for updating existing pref PO files

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 26547: Move context from msgid to msgctxt in pref PO files
Using index info to reconstruct a base tree...
M       misc/translator/LangInstaller.pm
M       misc/translator/xgettext-pref
A       t/misc/translator/xgettext-pref.t
Falling back to patching base and 3-way merge...
Auto-merging t/db_dependent/misc/translator/xgettext-pref.t
Auto-merging misc/translator/xgettext-pref
Auto-merging misc/translator/LangInstaller.pm
CONFLICT (content): Merge conflict in misc/translator/LangInstaller.pm
error: Failed to merge in the changes.
Patch failed at 0001 Bug 26547: Move context from msgid to msgctxt in pref PO
files

-- 
You are receiving this mail because:
You are watching all bug changes.