[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - helpcontent2

[Olivier Hallot]

 helpcontent2 |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 04e67d89dfcab58fd885b4c4444cf2875dee8044
Author: Olivier Hallot <ohallot at collabora.co.uk>
Date:   Mon Nov 30 18:22:43 2015 -0200

    Updated core
    Project: help  e5e67c99e8b569eefc91112ff049a89d64affab0
    
    tdf#95968 Do not assemble help text with parts
    
    * Fix for tdf#95968 Help content is composed from strings -
    unacceptable for some languages
    * Add do-not-translate attribute to a file title.
    
    Change-Id: I4b995bf2d9bdc215bdacee8611291e1d2f5bca8b
    Reviewed-on: https://gerrit.libreoffice.org/20313
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>
    (cherry picked from commit 212af7230d3cd56185c9ff8548a2e61b78b6bd6f)
    Reviewed-on: https://gerrit.libreoffice.org/20323

diff --git a/helpcontent2 b/helpcontent2
index ee86f7c..e5e67c9 160000
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit ee86f7cfdc8087c54c592080e50d03ff2c0c9a76
+Subproject commit e5e67c99e8b569eefc91112ff049a89d64affab0