[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - l10ntools/source

[Libreoffice Gerrit user]

 l10ntools/source/po.cxx |   10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 6592cbe220e188bebf33cacce234923dca8eeaba
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Mon Oct 1 12:17:31 2018 +0200
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Nov 21 13:40:01 2018 +0100

    fix of extension description l10n
    
    Change-Id: Ica102309627fade2a064ee5516e84801affe4082
    Reviewed-on: https://gerrit.libreoffice.org/61184
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
    (cherry picked from commit 59f4115122f70004d78a85b08607b9678b8fd6ca)
    Reviewed-on: https://gerrit.libreoffice.org/63600

diff --git a/l10ntools/source/po.cxx b/l10ntools/source/po.cxx
index 51305c64badb..f1e37d53c20f 100644
--- a/l10ntools/source/po.cxx
+++ b/l10ntools/source/po.cxx
@@ -202,7 +202,15 @@ void GenPoEntry::readFromFile(std::ifstream& rIFStream)
         }
         else if (sLine.startsWith("\"") && pLastMsg)
         {
-            *pLastMsg += lcl_GenNormString(sLine);
+            OString sReference;
+            if (!m_sReferences.empty())
+            {
+                sReference = m_sReferences.front();
+            }
+            if (pLastMsg != &m_sMsgCtxt || sLine != "\"" + sReference + "\\n\"")
+            {
+                *pLastMsg += lcl_GenNormString(sLine);
+            }
         }
         else
             break;