3 files changed, 16 insertions, 20 deletions
diff --git a/tools/linguist/lupdate/cpp.cpp b/tools/linguist/lupdate/cpp.cpp
index fb95a95f8a..443abd0f3a 100644
--- a/tools/linguist/lupdate/cpp.cpp
+++ b/tools/linguist/lupdate/cpp.cpp
@@ -1883,22 +1883,18 @@ void CppParser::parseInternal(ConversionData &cd, QSet<QString> &inclusions)
         case Tok_trid:
             if (!tor)
                 goto case_default;
-            if (sourcetext.isEmpty()) {
-                yyTok = getToken();
-            } else {
-                if (!msgid.isEmpty())
-                    qWarning("%s:%d: //= cannot be used with qtTrId() / QT_TRID_NOOP(). Ignoring\n",
-                             qPrintable(yyFileName), yyLineNo);
-                //utf8 = false; // Maybe use //%% or something like that
-                line = yyLineNo;
-                yyTok = getToken();
-                if (match(Tok_LeftParen) && matchString(&msgid) && !msgid.isEmpty()) {
-                    bool plural = match(Tok_Comma);
-                    recordMessage(line, QString(), sourcetext, QString(), extracomment,
-                                  msgid, extra, false, plural);
-                }
-                sourcetext.clear();
+            if (!msgid.isEmpty())
+                qWarning("%s:%d: //= cannot be used with qtTrId() / QT_TRID_NOOP(). Ignoring\n",
+                         qPrintable(yyFileName), yyLineNo);
+            //utf8 = false; // Maybe use //%% or something like that
+            line = yyLineNo;
+            yyTok = getToken();
+            if (match(Tok_LeftParen) && matchString(&msgid) && !msgid.isEmpty()) {
+                bool plural = match(Tok_Comma);
+                recordMessage(line, QString(), sourcetext, QString(), extracomment,
+                              msgid, extra, false, plural);
             }
+            sourcetext.clear();
             extracomment.clear();
             msgid.clear();
             extra.clear();
diff --git a/tools/linguist/lupdate/merge.cpp b/tools/linguist/lupdate/merge.cpp
index a72143939a..fa0dd3d82b 100644
--- a/tools/linguist/lupdate/merge.cpp
+++ b/tools/linguist/lupdate/merge.cpp
@@ -341,7 +341,7 @@ Translator merge(const Translator &tor, const Translator &virginTor,
     foreach (TranslatorMessage m, tor.messages()) {
         TranslatorMessage::Type newType = TranslatorMessage::Finished;
 
-        if (m.sourceText().isEmpty()) {
+        if (m.sourceText().isEmpty() && m.id().isEmpty()) {
             // context/file comment
             TranslatorMessage mv = virginTor.find(m.context());
             if (!mv.isNull())
@@ -447,7 +447,7 @@ Translator merge(const Translator &tor, const Translator &virginTor,
       vernacular translator.
     */
     foreach (const TranslatorMessage &mv, virginTor.messages()) {
-        if (mv.sourceText().isEmpty()) {
+        if (mv.sourceText().isEmpty() && mv.id().isEmpty()) {
             if (tor.contains(mv.context()))
                 continue;
         } else {
@@ -465,7 +465,7 @@ Translator merge(const Translator &tor, const Translator &virginTor,
             outTor.append(mv);
         else
             outTor.appendSorted(mv);
-        if (!mv.sourceText().isEmpty())
+        if (!mv.sourceText().isEmpty() || !mv.id().isEmpty())
             ++neww;
     }
 
diff --git a/tools/linguist/shared/translator.cpp b/tools/linguist/shared/translator.cpp
index 77faabda51..bc27daf27f 100644
--- a/tools/linguist/shared/translator.cpp
+++ b/tools/linguist/shared/translator.cpp
@@ -337,7 +337,7 @@ TranslatorMessage Translator::find(const QString &context,
 bool Translator::contains(const QString &context) const
 {
     foreach (const TranslatorMessage &msg, m_messages)
-        if (msg.context() == context && msg.sourceText().isEmpty())
+        if (msg.context() == context && msg.sourceText().isEmpty() && msg.id().isEmpty())
             return true;
     return false;
 }
@@ -345,7 +345,7 @@ bool Translator::contains(const QString &context) const
 TranslatorMessage Translator::find(const QString &context) const
 {
     foreach (const TranslatorMessage &msg, m_messages)
-        if (msg.context() == context && msg.sourceText().isEmpty())
+        if (msg.context() == context && msg.sourceText().isEmpty() && msg.id().isEmpty())
             return msg;
     return TranslatorMessage();
 }