[Libreoffice-commits] .: Branch 'feature/killsdf' - l10ntools/source

[Libreoffice Gerrit user]

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

New commits:
commit b0f07bbbc4f179d442ff96471669f02e82686657
Author: Ztamas <zolnaitamas2000g at gmail.com>
Date:   Sun Nov 18 12:07:58 2012 +0100

    Write source file into po entries' msgctxt
    
    So (msgctxt, msgid) pair is unique in one po file
    
    Change-Id: I64635dd7a6352300ed5fb6949a1b78c2a070c660

diff --git a/l10ntools/source/po.cxx b/l10ntools/source/po.cxx
index df9efe3..ce71207 100644
--- a/l10ntools/source/po.cxx
+++ b/l10ntools/source/po.cxx
@@ -255,7 +255,10 @@ void GenPoEntry::readFromFile(std::ifstream& rIFStream)
         else if (sLine.startsWith("\"") && pLastMsg &&
            (pLastMsg != &m_sMsgCtxt || sLine != "\"" + m_sReference + "\"") )
         {
-            *pLastMsg += lcl_GenNormString(sLine);
+            if ( pLastMsg != &m_sMsgCtxt || sLine != "\"" + m_sReference + "\\n\"" )
+            {
+                *pLastMsg += lcl_GenNormString(sLine);
+            }
         }
         else
             break;