]> git.koha-community.org Git - koha.git/commit
Bug 8862 - merge.pl contains untranslatable strings
authorKyle M Hall <kyle@bywatersolutions.com>
Tue, 2 Oct 2012 12:58:40 +0000 (08:58 -0400)
committerChris Cormack <chrisc@catalyst.net.nz>
Mon, 22 Oct 2012 21:31:57 +0000 (10:31 +1300)
commit239b7bd447b7a4ffa039959cc50b719f4c24878c
tree8e8c1ad45a2c49fb59bd576cc914a0de2497470f
parente764f35dee8b1b3855c6e006b83df696c8dca702
Bug 8862 - merge.pl contains untranslatable strings

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
It works: (1) merging's still effective, and (2) two new error messages appear
in staff .po file after update it.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Conflicts:

koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
cataloguing/merge.pl
koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt