]> git.koha-community.org Git - koha.git/commit
projects / koha.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 4dda07d) | patch
Bug 8862 - merge.pl contains untranslatable strings
authorKyle M Hall <kyle@bywatersolutions.com>
Tue, 2 Oct 2012 12:58:40 +0000 (08:58 -0400)
committerLiz Rea - Catalyst <liz@catalyst.net.nz>
Thu, 15 Nov 2012 03:23:27 +0000 (16:23 +1300)
commit6b927aeb46ae0743c6823c4f5c8bd1dabbad5469
tree69c55eedaeae85cf48c6b7ec4dcdb58867375b34tree | snapshot
parent4dda07d2523f0bd1a186a9eb409e9552fd737a94commit | diff
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>
Signed-off-by: Liz Rea - Catalyst <liz@catalyst.net.nz>
cataloguing/merge.pl diff | blob | history
koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt diff | blob | history
Main Koha release repository