https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=29602
Zeno Tajoli <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] --- Comment #75 from Zeno Tajoli <[email protected]> --- Hi Victor, I'm sorry that there are still problem on check this patch. 1)There are problems on try it on sandboxes, see https://sandbox.bywatersolutions.com/provision_log/nicetrad 2)I try to check it 'manualy' but it needs rebase. Git log: koha@deb10:~/kohaclone$ git checkout -b qa_bug_29602 Switched to a new branch 'qa_bug_29602' koha@deb10:~/kohaclone$ git am -3 -i -u /home/koha/b29602_1 Commit Body is: -------------------------- Bug 29602: Surround strings with span tag To be nicer with translators. Update the PO files for whichever languages will show how this is useful. Signed-off-by: Victor Grousset/tuxayo <[email protected]> -------------------------- Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: y Applying: Bug 29602: Surround strings with span tag Using index info to reconstruct a base tree... M koha-tmpl/intranet-tmpl/prog/en/modules/about.tt M koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt M koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt M koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt M koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt M koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt M koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt M koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/about.tt error: Failed to merge in the changes. Patch failed at 0001 Bug 29602: Surround strings with span tag -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] https://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/
