1 files changed, 10 insertions, 4 deletions

diff --git a/tools/linguist/shared/po.cpp b/tools/linguist/shared/po.cpp
index 4850cfd..a6795cb 100644
--- a/tools/linguist/shared/po.cpp
+++ b/tools/linguist/shared/po.cpp
@@ -359,7 +359,7 @@ bool loadPO(Translator &translator, QIODevice &dev, ConversionData &cd)
     const QChar quote = QLatin1Char('"');
     const QChar newline = QLatin1Char('\n');
     QTextStream in(&dev);
-    in.setCodec(cd.m_codecForSource.isEmpty() ? "UTF-8" : cd.m_codecForSource);
+    in.setCodec(cd.m_codecForSource.isEmpty() ? QByteArray("UTF-8") : cd.m_codecForSource);
     bool error = false;
 
     // format of a .po file entry:
@@ -396,7 +396,10 @@ bool loadPO(Translator &translator, QIODevice &dev, ConversionData &cd)
             const QString prefix = QLatin1String(isObsolete ? "#~ " : "");
             while (true) {
                 int idx = line.indexOf(QLatin1Char(' '), prefix.length());
-                item.msgStr.append(slurpEscapedString(lines, l, idx, prefix, cd));
+                QString str = slurpEscapedString(lines, l, idx, prefix, cd);
+                str.replace(QChar(Translator::TextVariantSeparator),
+                            QChar(Translator::BinaryVariantSeparator));
+                item.msgStr.append(str);
                 if (l + 1 >= lines.size() || !isTranslationLine(lines.at(l + 1)))
                     break;
                 ++l;
@@ -552,7 +555,7 @@ bool savePO(const Translator &translator, QIODevice &dev, ConversionData &cd)
 {
     bool ok = true;
     QTextStream out(&dev);
-    out.setCodec(cd.m_outputCodec.isEmpty() ? "UTF-8" : cd.m_outputCodec);
+    out.setCodec(cd.m_outputCodec.isEmpty() ? QByteArray("UTF-8") : cd.m_outputCodec);
 
     bool first = true;
     if (translator.messages().isEmpty() || !translator.messages().first().sourceText().isEmpty()) {
@@ -636,8 +639,11 @@ bool savePO(const Translator &translator, QIODevice &dev, ConversionData &cd)
             out << poEscapedString(prefix, QLatin1String("msgid_plural"), noWrap, plural);
             const QStringList &translations = msg.translations();
             for (int i = 0; i != translations.size(); ++i) {
+                QString str = translations.at(i);
+                str.replace(QChar(Translator::BinaryVariantSeparator),
+                            QChar(Translator::TextVariantSeparator));
                 out << poEscapedString(prefix, QString::fromLatin1("msgstr[%1]").arg(i), noWrap,
-                                       translations.at(i));
+                                       str);
             }
         }
         first = false;