diff -Nru kcodecs-5.79.0/autotests/base64benchmark.cpp kcodecs-5.80.0/autotests/base64benchmark.cpp --- kcodecs-5.79.0/autotests/base64benchmark.cpp 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/autotests/base64benchmark.cpp 2021-03-06 16:19:34.000000000 +0000 @@ -4,14 +4,14 @@ SPDX-License-Identifier: LGPL-2.0-or-later */ -#include -#include +#include "../src/kcodecsbase64.h" + #include + #include +#include #include -#include "../src/kcodecsbase64.h" - class Base64Benchmark : public QObject { Q_OBJECT diff -Nru kcodecs-5.79.0/autotests/codectest.cpp kcodecs-5.80.0/autotests/codectest.cpp --- kcodecs-5.79.0/autotests/codectest.cpp 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/autotests/codectest.cpp 2021-03-06 16:19:34.000000000 +0000 @@ -15,7 +15,10 @@ QTEST_MAIN(CodecTest) -enum Mode { Decode, Encode }; +enum Mode { + Decode, + Encode, +}; Q_DECLARE_METATYPE(Mode) void CodecTest::testCodecs_data() @@ -28,7 +31,7 @@ QDir codecBaseDir(QFINDTESTDATA("data")); const QStringList lst = codecBaseDir.entryList(QStringList(), QDir::Dirs | QDir::NoDotAndDotDot, QDir::NoSort); - for (const QString &dir : lst) { + for (const QString &dir : lst) { if (dir.toLower().startsWith(QLatin1String("codec_"))) { const QString codecName = dir.right(dir.size() - 6); QDir codecDir(codecBaseDir.path() + QLatin1String("/") + dir); @@ -52,7 +55,7 @@ const QByteArray expected = expectedFile.readAll(); const QString tag = codecName + QLatin1Char('/') + dataFileNameBase; - QTest::newRow(tag.toLatin1().constData()) << data << expected << codecName.toLatin1() << tag << mode; + QTest::newRow(tag.toLatin1().constData()) << data << expected << codecName.toLatin1() << tag << mode; dataFile.close(); expectedFile.close(); @@ -94,4 +97,3 @@ } QCOMPARE(result, expResult); } - diff -Nru kcodecs-5.79.0/autotests/kcharsetstest.cpp kcodecs-5.80.0/autotests/kcharsetstest.cpp --- kcodecs-5.79.0/autotests/kcharsetstest.cpp 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/autotests/kcharsetstest.cpp 2021-03-06 16:19:34.000000000 +0000 @@ -6,11 +6,11 @@ #include "kcharsetstest.h" -#include -#include #include +#include #include #include +#include static bool encodingNameHasADescription(const QString &encodingName, const QStringList &descriptions) { @@ -33,58 +33,160 @@ QTest::addColumn("expectedCodecFromKDE"); QTest::addColumn("expectedCodecFromQt"); - QTest::newRow("utf8") << "utf8" << "UTF-8" << "UTF-8"; - QTest::newRow("utf-8") << "utf-8" << "UTF-8" << "UTF-8"; - QTest::newRow("UTF8") << "UTF8" << "UTF-8" << "UTF-8"; - QTest::newRow("UTF-8") << "UTF-8" << "UTF-8" << "UTF-8"; - - QTest::newRow("Big5") << "Big5" << "Big5" << "Big5"; - QTest::newRow("Big5-HKSCS") << "Big5-HKSCS" << "Big5-HKSCS" << "Big5-HKSCS"; - QTest::newRow("EUC-JP") << "EUC-JP" << "EUC-JP" << "EUC-JP"; - QTest::newRow("EUC-KR") << "EUC-KR" << "EUC-KR" << "EUC-KR"; - QTest::newRow("CP 949") << "CP 949" << "CP 949" << "CP 949"; - QTest::newRow("GB18030") << "GB18030" << "GB18030" << "GB18030"; - QTest::newRow("GB2312") << "GB2312" << "GB2312" << "GB2312"; - QTest::newRow("GBK") << "GBK" << "GBK" << "GBK"; - QTest::newRow("IBM850") << "IBM850" << "IBM850" << "IBM850"; - QTest::newRow("IBM866") << "IBM866" << "IBM866" << "IBM866"; - QTest::newRow("IBM874") << "IBM874" << "IBM874" << "IBM874"; - QTest::newRow("ISO 10646-UCS-2") << "ISO 10646-UCS-2" << "ISO 10646-UCS-2" << "ISO 10646-UCS-2"; - QTest::newRow("ISO 8859-1") << "ISO 8859-1" << "ISO 8859-1" << "ISO 8859-1"; - QTest::newRow("ISO 8859-11") << "ISO 8859-11" << "ISO 8859-11" << "ISO 8859-11"; - QTest::newRow("ISO 8859-13") << "ISO 8859-13" << "ISO 8859-13" << "ISO 8859-13"; - QTest::newRow("ISO 8859-14") << "ISO 8859-14" << "ISO 8859-14" << "ISO 8859-14"; - QTest::newRow("ISO 8859-15") << "ISO 8859-15" << "ISO 8859-15" << "ISO 8859-15"; - QTest::newRow("ISO 8859-16") << "ISO 8859-16" << "ISO 8859-16" << "ISO 8859-16"; - QTest::newRow("ISO 8859-2") << "ISO 8859-2" << "ISO 8859-2" << "ISO 8859-2"; - QTest::newRow("ISO 8859-3") << "ISO 8859-3" << "ISO 8859-3" << "ISO 8859-3"; - QTest::newRow("ISO 8859-4") << "ISO 8859-4" << "ISO 8859-4" << "ISO 8859-4"; - QTest::newRow("ISO 8859-5") << "ISO 8859-5" << "ISO 8859-5" << "ISO 8859-5"; - QTest::newRow("ISO 8859-6") << "ISO 8859-6" << "ISO 8859-6" << "ISO 8859-6"; - QTest::newRow("ISO 8859-7") << "ISO 8859-7" << "ISO 8859-7" << "ISO 8859-7"; - QTest::newRow("ISO 8859-8") << "ISO 8859-8" << "ISO 8859-8" << "ISO 8859-8"; - QTest::newRow("ISO 8859-8-I") << "ISO 8859-8-I" << "ISO 8859-8-I" << "ISO 8859-8-I"; - QTest::newRow("ISO 8859-9") << "ISO 8859-9" << "ISO 8859-9" << "ISO 8859-9"; - QTest::newRow("KOI8-R") << "KOI8-R" << "KOI8-R" << "KOI8-R"; - QTest::newRow("KOI8-U") << "KOI8-U" << "KOI8-U" << "KOI8-U"; - QTest::newRow("TIS620") << "TIS620" << "TIS620" << "TIS620"; - QTest::newRow("TSCII") << "TSCII" << "TSCII" << "TSCII"; - QTest::newRow("UTF-16") << "UTF-16" << "UTF-16" << "UTF-16"; - QTest::newRow("UTF-8") << "UTF-8" << "UTF-8" << "UTF-8"; - QTest::newRow("cp 1250") << "cp 1250" << "cp 1250" << "cp 1250"; - QTest::newRow("cp 1251") << "cp 1251" << "cp 1251" << "cp 1251"; - QTest::newRow("cp 1252") << "cp 1252" << "cp 1252" << "cp 1252"; - QTest::newRow("cp 1253") << "cp 1253" << "cp 1253" << "cp 1253"; - QTest::newRow("cp 1254") << "cp 1254" << "cp 1254" << "cp 1254"; - QTest::newRow("cp 1255") << "cp 1255" << "cp 1255" << "cp 1255"; - QTest::newRow("cp 1256") << "cp 1256" << "cp 1256" << "cp 1256"; - QTest::newRow("cp 1257") << "cp 1257" << "cp 1257" << "cp 1257"; - QTest::newRow("jis7") << "jis7" << "jis7" << "jis7"; - QTest::newRow("sjis") << "sjis" << "sjis" << "sjis"; - QTest::newRow("ucs2") << "ucs2" << "ucs2" << "ucs2"; - QTest::newRow("utf7") << "utf7" << "utf7" << "utf7"; - QTest::newRow("windows-1258") << "windows-1258" << "windows-1258" << "windows-1258"; - QTest::newRow("winsami2") << "winsami2" << "winsami2" << "winsami2"; + QTest::newRow("utf8") << "utf8" + << "UTF-8" + << "UTF-8"; + QTest::newRow("utf-8") << "utf-8" + << "UTF-8" + << "UTF-8"; + QTest::newRow("UTF8") << "UTF8" + << "UTF-8" + << "UTF-8"; + QTest::newRow("UTF-8") << "UTF-8" + << "UTF-8" + << "UTF-8"; + + QTest::newRow("Big5") << "Big5" + << "Big5" + << "Big5"; + QTest::newRow("Big5-HKSCS") << "Big5-HKSCS" + << "Big5-HKSCS" + << "Big5-HKSCS"; + QTest::newRow("EUC-JP") << "EUC-JP" + << "EUC-JP" + << "EUC-JP"; + QTest::newRow("EUC-KR") << "EUC-KR" + << "EUC-KR" + << "EUC-KR"; + QTest::newRow("CP 949") << "CP 949" + << "CP 949" + << "CP 949"; + QTest::newRow("GB18030") << "GB18030" + << "GB18030" + << "GB18030"; + QTest::newRow("GB2312") << "GB2312" + << "GB2312" + << "GB2312"; + QTest::newRow("GBK") << "GBK" + << "GBK" + << "GBK"; + QTest::newRow("IBM850") << "IBM850" + << "IBM850" + << "IBM850"; + QTest::newRow("IBM866") << "IBM866" + << "IBM866" + << "IBM866"; + QTest::newRow("IBM874") << "IBM874" + << "IBM874" + << "IBM874"; + QTest::newRow("ISO 10646-UCS-2") << "ISO 10646-UCS-2" + << "ISO 10646-UCS-2" + << "ISO 10646-UCS-2"; + QTest::newRow("ISO 8859-1") << "ISO 8859-1" + << "ISO 8859-1" + << "ISO 8859-1"; + QTest::newRow("ISO 8859-11") << "ISO 8859-11" + << "ISO 8859-11" + << "ISO 8859-11"; + QTest::newRow("ISO 8859-13") << "ISO 8859-13" + << "ISO 8859-13" + << "ISO 8859-13"; + QTest::newRow("ISO 8859-14") << "ISO 8859-14" + << "ISO 8859-14" + << "ISO 8859-14"; + QTest::newRow("ISO 8859-15") << "ISO 8859-15" + << "ISO 8859-15" + << "ISO 8859-15"; + QTest::newRow("ISO 8859-16") << "ISO 8859-16" + << "ISO 8859-16" + << "ISO 8859-16"; + QTest::newRow("ISO 8859-2") << "ISO 8859-2" + << "ISO 8859-2" + << "ISO 8859-2"; + QTest::newRow("ISO 8859-3") << "ISO 8859-3" + << "ISO 8859-3" + << "ISO 8859-3"; + QTest::newRow("ISO 8859-4") << "ISO 8859-4" + << "ISO 8859-4" + << "ISO 8859-4"; + QTest::newRow("ISO 8859-5") << "ISO 8859-5" + << "ISO 8859-5" + << "ISO 8859-5"; + QTest::newRow("ISO 8859-6") << "ISO 8859-6" + << "ISO 8859-6" + << "ISO 8859-6"; + QTest::newRow("ISO 8859-7") << "ISO 8859-7" + << "ISO 8859-7" + << "ISO 8859-7"; + QTest::newRow("ISO 8859-8") << "ISO 8859-8" + << "ISO 8859-8" + << "ISO 8859-8"; + QTest::newRow("ISO 8859-8-I") << "ISO 8859-8-I" + << "ISO 8859-8-I" + << "ISO 8859-8-I"; + QTest::newRow("ISO 8859-9") << "ISO 8859-9" + << "ISO 8859-9" + << "ISO 8859-9"; + QTest::newRow("KOI8-R") << "KOI8-R" + << "KOI8-R" + << "KOI8-R"; + QTest::newRow("KOI8-U") << "KOI8-U" + << "KOI8-U" + << "KOI8-U"; + QTest::newRow("TIS620") << "TIS620" + << "TIS620" + << "TIS620"; + QTest::newRow("TSCII") << "TSCII" + << "TSCII" + << "TSCII"; + QTest::newRow("UTF-16") << "UTF-16" + << "UTF-16" + << "UTF-16"; + QTest::newRow("UTF-8") << "UTF-8" + << "UTF-8" + << "UTF-8"; + QTest::newRow("cp 1250") << "cp 1250" + << "cp 1250" + << "cp 1250"; + QTest::newRow("cp 1251") << "cp 1251" + << "cp 1251" + << "cp 1251"; + QTest::newRow("cp 1252") << "cp 1252" + << "cp 1252" + << "cp 1252"; + QTest::newRow("cp 1253") << "cp 1253" + << "cp 1253" + << "cp 1253"; + QTest::newRow("cp 1254") << "cp 1254" + << "cp 1254" + << "cp 1254"; + QTest::newRow("cp 1255") << "cp 1255" + << "cp 1255" + << "cp 1255"; + QTest::newRow("cp 1256") << "cp 1256" + << "cp 1256" + << "cp 1256"; + QTest::newRow("cp 1257") << "cp 1257" + << "cp 1257" + << "cp 1257"; + QTest::newRow("jis7") << "jis7" + << "jis7" + << "jis7"; + QTest::newRow("sjis") << "sjis" + << "sjis" + << "sjis"; + QTest::newRow("ucs2") << "ucs2" + << "ucs2" + << "ucs2"; + QTest::newRow("utf7") << "utf7" + << "utf7" + << "utf7"; + QTest::newRow("windows-1258") << "windows-1258" + << "windows-1258" + << "windows-1258"; + QTest::newRow("winsami2") << "winsami2" + << "winsami2" + << "winsami2"; } void KCharsetsTest::testCodecForName() @@ -101,12 +203,10 @@ } QVERIFY(QTextCodec::codecForName(expectedCodecFromKDE.toLocal8Bit()) != nullptr); - QCOMPARE(singleton->codecForName(codec)->name(), - QTextCodec::codecForName(expectedCodecFromKDE.toLocal8Bit())->name()); + QCOMPARE(singleton->codecForName(codec)->name(), QTextCodec::codecForName(expectedCodecFromKDE.toLocal8Bit())->name()); QVERIFY(QTextCodec::codecForName(expectedCodecFromQt.toLocal8Bit()) != nullptr); - QCOMPARE(QTextCodec::codecForName(codec.toLocal8Bit())->name(), - QTextCodec::codecForName(expectedCodecFromQt.toLocal8Bit())->name()); + QCOMPARE(QTextCodec::codecForName(codec.toLocal8Bit())->name(), QTextCodec::codecForName(expectedCodecFromQt.toLocal8Bit())->name()); } void KCharsetsTest::testFromEntity() @@ -164,7 +264,6 @@ } } - if (!ok) { qDebug() << "Error:" << encodingName << "not found"; QVERIFY(false); diff -Nru kcodecs-5.79.0/autotests/kcharsetstest.h kcodecs-5.80.0/autotests/kcharsetstest.h --- kcodecs-5.79.0/autotests/kcharsetstest.h 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/autotests/kcharsetstest.h 2021-03-06 16:19:34.000000000 +0000 @@ -9,7 +9,7 @@ #include -class KCharsetsTest: public QObject +class KCharsetsTest : public QObject { Q_OBJECT private Q_SLOTS: diff -Nru kcodecs-5.79.0/autotests/kcodecstest.cpp kcodecs-5.80.0/autotests/kcodecstest.cpp --- kcodecs-5.79.0/autotests/kcodecstest.cpp 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/autotests/kcodecstest.cpp 2021-03-06 16:19:34.000000000 +0000 @@ -19,10 +19,8 @@ // identity QCOMPARE(KCodecs::decodeRFC2047String("bla"), QLatin1String("bla")); // utf-8 - QCOMPARE(KCodecs::decodeRFC2047String("=?utf-8?q?Ingo=20Kl=C3=B6cker?= ", "utf-8"), - QString::fromUtf8("Ingo Klöcker ")); - QCOMPARE(KCodecs::decodeRFC2047String("=?utf-8?q?Ingo=20Kl=C3=B6cker?="), - QString::fromUtf8("Ingo Klöcker")); + QCOMPARE(KCodecs::decodeRFC2047String("=?utf-8?q?Ingo=20Kl=C3=B6cker?= ", "utf-8"), QString::fromUtf8("Ingo Klöcker ")); + QCOMPARE(KCodecs::decodeRFC2047String("=?utf-8?q?Ingo=20Kl=C3=B6cker?="), QString::fromUtf8("Ingo Klöcker")); // whitespaces between two encoded words /* @@ -35,18 +33,13 @@ */ // iso-8859-x - QCOMPARE(KCodecs::decodeRFC2047String("=?ISO-8859-1?Q?Andr=E9s_Ot=F3n?=", "utf-8"), - QString::fromUtf8("Andrés Otón")); - QCOMPARE(KCodecs::decodeRFC2047String("=?iso-8859-2?q?Rafa=B3_Rzepecki?=", "utf-8"), - QString::fromUtf8("Rafał Rzepecki")); - QCOMPARE(KCodecs::decodeRFC2047String("=?iso-8859-9?Q?S=2E=C7a=F0lar?= Onur", "utf-8"), - QString::fromUtf8("S.Çağlar Onur")); - QCOMPARE(KCodecs::decodeRFC2047String("Rafael =?iso-8859-15?q?Rodr=EDguez?=", "utf-8"), - QString::fromUtf8("Rafael Rodríguez")); + QCOMPARE(KCodecs::decodeRFC2047String("=?ISO-8859-1?Q?Andr=E9s_Ot=F3n?=", "utf-8"), QString::fromUtf8("Andrés Otón")); + QCOMPARE(KCodecs::decodeRFC2047String("=?iso-8859-2?q?Rafa=B3_Rzepecki?=", "utf-8"), QString::fromUtf8("Rafał Rzepecki")); + QCOMPARE(KCodecs::decodeRFC2047String("=?iso-8859-9?Q?S=2E=C7a=F0lar?= Onur", "utf-8"), QString::fromUtf8("S.Çağlar Onur")); + QCOMPARE(KCodecs::decodeRFC2047String("Rafael =?iso-8859-15?q?Rodr=EDguez?=", "utf-8"), QString::fromUtf8("Rafael Rodríguez")); // language parameter according to RFC 2231, section 5 - QCOMPARE(KCodecs::decodeRFC2047String("From: =?US-ASCII*EN?Q?Keith_Moore?= "), - QString::fromUtf8("From: Keith Moore ")); + QCOMPARE(KCodecs::decodeRFC2047String("From: =?US-ASCII*EN?Q?Keith_Moore?= "), QString::fromUtf8("From: Keith Moore ")); // broken qp endoding (using lowercase) QCOMPARE(KCodecs::decodeRFC2047String("Subject: =?iso-8859-1?Q?Belangrijk=3a=20Verhuizing=20FTP=20server?="), @@ -59,8 +52,7 @@ // illegal characters which are already encoded in the given encoding but are not ASCII (bug 206417) QCOMPARE(KCodecs::decodeRFC2047String("Subject: =?utf-8?Q?пОѿОлл,=20=D0=B4=D0=BE=D0=B1=D1=80=D1=8B=D0=B9=20=D0=B4=D0=B5=D0=BD=D1=8C?="), QString::fromUtf8("Subject: пОѿОлл, ЎПбрый ЎеМь")); - QCOMPARE(KCodecs::decodeRFC2047String("Subject: =?iso-8859-1?Q?ÖÄÜöäü?="), - QString::fromLatin1("Subject: ÖÄÜöäü")); + QCOMPARE(KCodecs::decodeRFC2047String("Subject: =?iso-8859-1?Q?ÖÄÜöäü?="), QString::fromLatin1("Subject: ÖÄÜöäü")); // Small data QCOMPARE(KCodecs::decodeRFC2047String("=?iso-8859-1?Q?c?="), QString::fromUtf8("c")); diff -Nru kcodecs-5.79.0/autotests/kcodecstest.h kcodecs-5.80.0/autotests/kcodecstest.h --- kcodecs-5.79.0/autotests/kcodecstest.h 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/autotests/kcodecstest.h 2021-03-06 16:19:34.000000000 +0000 @@ -19,4 +19,3 @@ }; #endif - diff -Nru kcodecs-5.79.0/autotests/kemailaddresstest.cpp kcodecs-5.80.0/autotests/kemailaddresstest.cpp --- kcodecs-5.79.0/autotests/kemailaddresstest.cpp 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/autotests/kemailaddresstest.cpp 2021-03-06 16:19:34.000000000 +0000 @@ -6,14 +6,14 @@ SPDX-License-Identifier: LGPL-2.0-only */ -//krazy:excludeall=contractions +// krazy:excludeall=contractions #include "kemailaddresstest.h" #include "../src/kemailaddress.h" -#include #include +#include #include @@ -46,58 +46,81 @@ QTest::newRow("Empty input") << QString() << QString() << QString() << false; QTest::newRow("Email only") << "faure@kde.org" << QString() << "faure@kde.org" << false; - QTest::newRow("Normal case") << "David Faure " << "David Faure" + QTest::newRow("Normal case") << "David Faure " + << "David Faure" << "faure@kde.org" << true; - QTest::newRow("Double-quotes 1") << "\"Faure, David\" " << "Faure, David" + QTest::newRow("Double-quotes 1") << "\"Faure, David\" " + << "Faure, David" << "faure@kde.org" << true; - QTest::newRow("Double-quotes 2") << " \"David Faure\"" << "David Faure" + QTest::newRow("Double-quotes 2") << " \"David Faure\"" + << "David Faure" << "faure@kde.org" << true; QTest::newRow("Parenthesis 1") << "faure@kde.org (David Faure)" - << "David Faure" << "faure@kde.org" << true; + << "David Faure" + << "faure@kde.org" << true; QTest::newRow("Parenthesis 2") << "(David Faure) faure@kde.org" - << "David Faure" << "faure@kde.org" << true; - QTest::newRow("Parenthesis 3") << "My Name (me) " << "My Name (me)" + << "David Faure" + << "faure@kde.org" << true; + QTest::newRow("Parenthesis 3") << "My Name (me) " + << "My Name (me)" << "me@home.net" << true; // #93513 // As per https://intevation.de/roundup/kolab/issue858 QTest::newRow("Nested parenthesis") << "faure@kde.org (David (The Man) Faure)" - << "David (The Man) Faure" << "faure@kde.org" << true; + << "David (The Man) Faure" + << "faure@kde.org" << true; QTest::newRow("Double-quotes inside parenthesis 1") << "faure@kde.org (David \"Crazy\" Faure)" - << "David \"Crazy\" Faure" - << "faure@kde.org" << true; + << "David \"Crazy\" Faure" + << "faure@kde.org" << true; QTest::newRow("Double-quotes inside parenthesis 2") << "(David \"Crazy\" Faure) faure@kde.org" - << "David \"Crazy\" Faure" - << "faure@kde.org" << true; + << "David \"Crazy\" Faure" + << "faure@kde.org" << true; QTest::newRow("Parenthesis inside double-quotes 1") << "\"Faure (David)\" " - << "Faure (David)" << "faure@kde.org" - << true; + << "Faure (David)" + << "faure@kde.org" << true; QTest::newRow("Parenthesis inside double-quotes 2") << " \"Faure (David)\"" - << "Faure (David)" << "faure@kde.org" - << true; - QTest::newRow("Space in email") << "David Faure < faure@kde.org >" << "David Faure" + << "Faure (David)" + << "faure@kde.org" << true; + QTest::newRow("Space in email") << "David Faure < faure@kde.org >" + << "David Faure" << "faure@kde.org" << true; - QTest::newRow("'@' in name 1") << "faure@kde.org (a@b)" << "a@b" << "faure@kde.org" << true; - QTest::newRow("'@' in name 2") << "\"a@b\" " << "a@b" << "faure@kde.org" << true; + QTest::newRow("'@' in name 1") << "faure@kde.org (a@b)" + << "a@b" + << "faure@kde.org" << true; + QTest::newRow("'@' in name 2") << "\"a@b\" " + << "a@b" + << "faure@kde.org" << true; // While typing, when there's no '@' yet - QTest::newRow("while typing 1") << "foo" << "foo" << QString() << false; - QTest::newRow("while typing 2") << "foo <" << "foo" << QString() << false; - QTest::newRow("while typing 3") << "foo , KHZ " - << "Faure, David" << "faure@kde.org" << true; + << "Faure, David" + << "faure@kde.org" << true; QTest::newRow("domain literals") << "Matt Douhan " - << "Matt Douhan" << "matt@[123.123.123.123]" << true; + << "Matt Douhan" + << "matt@[123.123.123.123]" << true; QTest::newRow("@ inside the comment") << "\"Matt@Douhan\" " - << "Matt@Douhan" << "matt@fruitsalad.org" << true; - QTest::newRow("No '@'") << "foo " << "foo" << "distlist" << true; + << "Matt@Douhan" + << "matt@fruitsalad.org" << true; + QTest::newRow("No '@'") << "foo " + << "foo" + << "distlist" << true; QTest::newRow("Backslash in display name") << "\"Lastname\\, Firstname\"" - " " - << "Lastname, Firstname" << "firstname@lastname.com" - << true; - QTest::newRow("# in domain") << "Matt Douhan " << "Matt Douhan" << "dm3tt@db0zdf.#rpl.deu.eu" << true; + " " + << "Lastname, Firstname" + << "firstname@lastname.com" << true; + QTest::newRow("# in domain") << "Matt Douhan " + << "Matt Douhan" + << "dm3tt@db0zdf.#rpl.deu.eu" << true; } void KEmailAddressTest::testIsValidEmailAddress() @@ -203,43 +226,35 @@ // correct error msg when a comma is inside <> QTest::newRow("29") << "Matt Douhan " << UnexpectedComma; - //several commentlevels + // several commentlevels QTest::newRow("30") << "Matt Douhan (hey(jongel)fibbel) " << AddressOk; // several comment levels and one (the outer) being unbalanced - QTest::newRow("31") << "Matt Douhan (hey(jongel)fibbel " - << UnbalancedParens; + QTest::newRow("31") << "Matt Douhan (hey(jongel)fibbel " << UnbalancedParens; // several comment levels and one (the inner) being unbalanced - QTest::newRow("32") << "Matt Douhan (hey(jongelfibbel) " - << UnbalancedParens; + QTest::newRow("32") << "Matt Douhan (hey(jongelfibbel) " << UnbalancedParens; // an error inside a double quote is no error - QTest::newRow("33") << "Matt Douhan \"(jongel\" " - << AddressOk; + QTest::newRow("33") << "Matt Douhan \"(jongel\" " << AddressOk; // inside a quoted string double quotes are only allowed in pairs as per rfc2822 - QTest::newRow("34") << "Matt Douhan \"jongel\"fibbel\" " - << UnbalancedQuote; + QTest::newRow("34") << "Matt Douhan \"jongel\"fibbel\" " << UnbalancedQuote; // a questionmark is valid in an atom QTest::newRow("35") << "Matt? " << AddressOk; // weird but OK - QTest::newRow("36") << "\"testing, \\\"testing\" " - << AddressOk; + QTest::newRow("36") << "\"testing, \\\"testing\" " << AddressOk; // escape a quote to many to see if it makes it invalid - QTest::newRow("37") << "\"testing, \\\"testing\\\" " - << UnbalancedQuote; + QTest::newRow("37") << "\"testing, \\\"testing\\\" " << UnbalancedQuote; // escape a parens and thus make a comma appear - QTest::newRow("38") << "Matt (jongel, fibbel\\) " - << UnbalancedParens; + QTest::newRow("38") << "Matt (jongel, fibbel\\) " << UnbalancedParens; // several errors inside doublequotes - QTest::newRow("39") << "Matt \"(jongel,\\\" < fibbel\\)\" " - << AddressOk; + QTest::newRow("39") << "Matt \"(jongel,\\\" < fibbel\\)\" " << AddressOk; // BUG 105705 QTest::newRow("40") << "matt-@fruitsalad.org" << AddressOk; @@ -251,8 +266,7 @@ QTest::newRow("42") << "matt_@(this is a cool host)fruitsalad.org" << AddressOk; // To quote rfc2822 the test below is aesthetically displeasing, but perfectly legal. - QTest::newRow("43") << "Pete(A wonderful \\) chap) " - << AddressOk; + QTest::newRow("43") << "Pete(A wonderful \\) chap) " << AddressOk; // quoted pair or not quoted pair QTest::newRow("44") << "\"jongel '\\\" fibbel\" " << AddressOk; @@ -280,7 +294,7 @@ QTest::newRow("64") << "~matt@fruitsalad.org" << AddressOk; QTest::newRow("65") << "matt%matt@fruitsalad.org" << AddressOk; - //bug 105405 + // bug 105405 QTest::newRow("66") << "[foobar] " << InvalidDisplayName; QTest::newRow("67") << "matt \"[foobar]\" Douhan " << AddressOk; @@ -290,7 +304,7 @@ QTest::newRow("dot at the end") << "msadmin@guug.de." << AddressOk; QTest::newRow("dot at the end with brackets") << "Martin Schulte " << AddressOk; - //TODO this should be a valid email address, but the checking for missing dots broke it. + // TODO this should be a valid email address, but the checking for missing dots broke it. // QTest::newRow( "valid email address without dots" ) << "user@localhost" << AddressOk; } @@ -308,23 +322,25 @@ QTest::addColumn("list"); QTest::addColumn("expErrorCode"); - //bug 139477 + // bug 139477 QTest::newRow("1") << "martin.schulte@guug.de, msadmin@guug.de," - " msnewsletter@guug.de" << AddressOk; + " msnewsletter@guug.de" + << AddressOk; QTest::newRow("2") << "martin.schulte@guug.de; msadmin@guug.de;" - " msnewsletter@guug.de" << AddressOk; + " msnewsletter@guug.de" + << AddressOk; QTest::newRow("3") << "martin.schulte@guug.de, msadmin@guug.de.," - " msnewsletter@guug.de" << AddressOk; + " msnewsletter@guug.de" + << AddressOk; QTest::newRow("4") << "Martin Schulte ," - " MS Admin , MS News " + " MS Admin , MS News " << AddressOk; QTest::newRow("5") << "Martin Schulte ;" - " MS Admin ; MS News " + " MS Admin ; MS News " << AddressOk; QTest::newRow("6") << "Martin Schulte ," - " MS Admin , MS News " + " MS Admin , MS News " << AddressOk; - } void KEmailAddressTest::testIsValidSimpleEmailAddress() @@ -388,8 +404,8 @@ QTest::newRow("") << "mattfruitsalad.org" << false; QTest::newRow("") << "matt@[123.123.123.123" << false; QTest::newRow("") << "matt@123.123.123.123]" << false; - QTest::newRow("") << "matt@[.123.123.123]" << false; - QTest::newRow("") << "matt@[123.123.123]" << false; + QTest::newRow("") << "matt@[.123.123.123]" << false; + QTest::newRow("") << "matt@[123.123.123]" << false; QTest::newRow("") << "\"matt@fruitsalad.org" << false; QTest::newRow("") << "matt\"@fruitsalad.org" << false; QTest::newRow("") << QString() << false; @@ -422,26 +438,26 @@ QTest::addColumn("input"); QTest::addColumn("expResult"); - QTest::newRow("1") << "matt@fruitsalad.org" << "matt@fruitsalad.org"; - QTest::newRow("2") << "Matt Douhan " << "matt@fruitsalad.org"; + QTest::newRow("1") << "matt@fruitsalad.org" + << "matt@fruitsalad.org"; + QTest::newRow("2") << "Matt Douhan " + << "matt@fruitsalad.org"; QTest::newRow("3") << "\"Matt Douhan \" " << "matt@fruitsalad.org"; QTest::newRow("4") << "\"Matt \" " << "matt@fruitsalad.org"; - QTest::newRow("5") << "Matt Douhan (jongel) " << "matt@fruitsalad.org"; QTest::newRow("7") << "\"Douhan, Matt\" " << "matt@fruitsalad.org"; QTest::newRow("8") << "\"Matt Douhan (m@tt)\" " << "matt@fruitsalad.org"; - QTest::newRow("9") << "\"Matt Douhan\" (matt " - << QString(); + QTest::newRow("9") << "\"Matt Douhan\" (matt " << QString(); QTest::newRow("10") << "Matt Douhan " << "matt@[123.123.123.123]"; - QTest::newRow("11") << "dm3tt@db0zdf.#rpl.deu.eu" << "dm3tt@db0zdf.#rpl.deu.eu"; - + QTest::newRow("11") << "dm3tt@db0zdf.#rpl.deu.eu" + << "dm3tt@db0zdf.#rpl.deu.eu"; } void KEmailAddressTest::testCheckSplitEmailAddrList() @@ -457,19 +473,13 @@ QTest::addColumn("input"); QTest::addColumn("expResult"); - QTest::newRow("") << "kloecker@kde.org (Kloecker, Ingo)" - << (QStringList() << QStringLiteral("kloecker@kde.org (Kloecker, Ingo)")); + QTest::newRow("") << "kloecker@kde.org (Kloecker, Ingo)" << (QStringList() << QStringLiteral("kloecker@kde.org (Kloecker, Ingo)")); QTest::newRow("") << "Matt Douhan , Foo Bar " - << (QStringList() - << QStringLiteral("Matt Douhan ") - << QStringLiteral("Foo Bar ")); + << (QStringList() << QStringLiteral("Matt Douhan ") << QStringLiteral("Foo Bar ")); QTest::newRow("") << "\"Matt, Douhan\" , Foo Bar " - << (QStringList() - << QStringLiteral("\"Matt, Douhan\" ") - << QStringLiteral("Foo Bar ")); + << (QStringList() << QStringLiteral("\"Matt, Douhan\" ") << QStringLiteral("Foo Bar ")); QTest::newRow("") << "\"Lastname\\, Firstname\" " - << (QStringList() - << QStringLiteral("\"Lastname\\, Firstname\" ")); + << (QStringList() << QStringLiteral("\"Lastname\\, Firstname\" ")); } void KEmailAddressTest::testNormalizeAddressesAndEncodeIDNs() @@ -485,7 +495,8 @@ QTest::addColumn("input"); QTest::addColumn("expResult"); - QTest::newRow("") << "matt@fruitsalad.org" << "matt@fruitsalad.org"; + QTest::newRow("") << "matt@fruitsalad.org" + << "matt@fruitsalad.org"; QTest::newRow("") << "Matt Douhan " << "Matt Douhan "; QTest::newRow("") << "Matt Douhan (jongel) " @@ -511,21 +522,14 @@ QTest::addColumn("input"); QTest::addColumn("expResult"); - QTest::newRow("") - << "=?us-ascii?Q?Surname=2C=20Name?= " - << "\"Surname, Name\" "; - - QTest::newRow("") - << "=?iso-8859-1?B?5Hf8b2xmLPZBbmRyZWFz?= " - << QStringLiteral("\"äwüolf,öAndreas\" "); - - QTest::newRow("") - << QStringLiteral("\"Andreas Straß\" ") - << QStringLiteral("\"Andreas Straß\" "); - - QTest::newRow("") - << QStringLiteral("\"András\" \"Manţia\" ") - << QStringLiteral("\"András\" \"Manţia\" "); + QTest::newRow("") << "=?us-ascii?Q?Surname=2C=20Name?= " + << "\"Surname, Name\" "; + + QTest::newRow("") << "=?iso-8859-1?B?5Hf8b2xmLPZBbmRyZWFz?= " << QStringLiteral("\"äwüolf,öAndreas\" "); + + QTest::newRow("") << QStringLiteral("\"Andreas Straß\" ") << QStringLiteral("\"Andreas Straß\" "); + + QTest::newRow("") << QStringLiteral("\"András\" \"Manţia\" ") << QStringLiteral("\"András\" \"Manţia\" "); } void KEmailAddressTest::testQuoteIfNecessary() @@ -542,17 +546,22 @@ QTest::addColumn("input"); QTest::addColumn("expResult"); - QTest::newRow("") << "Matt Douhan" << "Matt Douhan"; - QTest::newRow("") << "Douhan, Matt" << "\"Douhan, Matt\""; + QTest::newRow("") << "Matt Douhan" + << "Matt Douhan"; + QTest::newRow("") << "Douhan, Matt" + << "\"Douhan, Matt\""; QTest::newRow("") << "Matt \"jongel\" Douhan" << "\"Matt \\\"jongel\\\" Douhan\""; QTest::newRow("") << "Matt \\\"jongel\\\" Douhan" << "\"Matt \\\"jongel\\\" Douhan\""; QTest::newRow("") << "trailing '\\\\' should never occur \\" << "\"trailing '\\\\' should never occur \\\""; - QTest::newRow("") << "\"don't quote again\"" << "\"don't quote again\""; - QTest::newRow("") << "\"leading double quote" << "\"\\\"leading double quote\""; - QTest::newRow("") << "trailing double quote\"" << "\"trailing double quote\\\"\""; + QTest::newRow("") << "\"don't quote again\"" + << "\"don't quote again\""; + QTest::newRow("") << "\"leading double quote" + << "\"\\\"leading double quote\""; + QTest::newRow("") << "trailing double quote\"" + << "\"trailing double quote\\\"\""; #if 0 BEFORE: static QRegularExpression RESULT : KEmailAddressTest::testQuoteIfNecessary(): @@ -594,4 +603,3 @@ QTest::newRow("") << QStringLiteral("\"Alberto Simões\" -class KEncodingProberTest: public QObject +class KEncodingProberTest : public QObject { Q_OBJECT private Q_SLOTS: diff -Nru kcodecs-5.79.0/autotests/rfc2047test.cpp kcodecs-5.80.0/autotests/rfc2047test.cpp --- kcodecs-5.79.0/autotests/rfc2047test.cpp 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/autotests/rfc2047test.cpp 2021-03-06 16:19:34.000000000 +0000 @@ -22,6 +22,7 @@ QTest::addColumn("forceCharset"); QTest::addColumn("expectedResult"); + /* clang-format off */ QTest::newRow("empty") << QByteArray() << QByteArray() << QByteArray("utf-8") << false << QString(); @@ -91,6 +92,7 @@ QTest::newRow("small data") << QByteArray("=?iso-8859-1?Q?c?=") << QByteArray("ISO-8859-1") << QByteArray("utf-8") << false << QString::fromUtf8("c"); + /* clang-format on */ } void RFC2047Test::testRFC2047decode() @@ -104,8 +106,7 @@ QByteArray detectedCharset; const KCodecs::CharsetOption options = forceCharset ? KCodecs::ForceDefaultCharset : KCodecs::NoOption; - const QString result = KCodecs::decodeRFC2047String(input, &detectedCharset, - defaultCharset, options); + const QString result = KCodecs::decodeRFC2047String(input, &detectedCharset, defaultCharset, options); QCOMPARE(result, expectedResult); QCOMPARE(detectedCharset, expectedCharset); @@ -140,6 +141,7 @@ QTest::addColumn("encoding"); QTest::addColumn("expectedResult"); + /* clang-format off */ QTest::newRow("empty") << QString() << QByteArray("utf-8") << QByteArray(); @@ -153,9 +155,9 @@ QTest::newRow("utf-8 fallback") << QString::fromUtf8("æſðđŋħł") << QByteArray("latin1") << QByteArray("=?utf-8?B?w6bFv8OwxJHFi8SnxYI=?="); + /* clang-format on */ } - void RFC2047Test::testRFC2047encode() { QFETCH(QString, input); diff -Nru kcodecs-5.79.0/autotests/rfc2047test.h kcodecs-5.80.0/autotests/rfc2047test.h --- kcodecs-5.79.0/autotests/rfc2047test.h 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/autotests/rfc2047test.h 2021-03-06 16:19:34.000000000 +0000 @@ -24,4 +24,3 @@ }; #endif - diff -Nru kcodecs-5.79.0/CMakeLists.txt kcodecs-5.80.0/CMakeLists.txt --- kcodecs-5.79.0/CMakeLists.txt 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/CMakeLists.txt 2021-03-06 16:19:34.000000000 +0000 @@ -1,10 +1,10 @@ cmake_minimum_required(VERSION 3.5) -set(KF_VERSION "5.79.0") # handled by release scripts +set(KF_VERSION "5.80.0") # handled by release scripts project(KCodecs VERSION ${KF_VERSION}) include(FeatureSummary) -find_package(ECM 5.79.0 NO_MODULE) +find_package(ECM 5.80.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://commits.kde.org/extra-cmake-modules") feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) @@ -14,6 +14,7 @@ include(KDEInstallDirs) include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) include(KDECMakeSettings) +include(KDEGitCommitHooks) include(ECMQtDeclareLoggingCategory) set(REQUIRED_QT_VERSION 5.14.0) @@ -80,3 +81,5 @@ DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5} COMPONENT Devel ) feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) + +kde_configure_git_pre_commit_hook(CHECKS CLANG_FORMAT) diff -Nru kcodecs-5.79.0/debian/changelog kcodecs-5.80.0/debian/changelog --- kcodecs-5.79.0/debian/changelog 2021-02-13 12:20:08.000000000 +0000 +++ kcodecs-5.80.0/debian/changelog 2021-03-18 11:06:30.000000000 +0000 @@ -1,3 +1,9 @@ +kcodecs (5.80.0-0ubuntu1) hirsute; urgency=medium + + * New upstream release (5.80.0) + + -- José Manuel Santamaría Lema Thu, 18 Mar 2021 11:06:30 +0000 + kcodecs (5.79.0-0ubuntu1) hirsute; urgency=medium * New upstream release (5.79.0) diff -Nru kcodecs-5.79.0/debian/control kcodecs-5.80.0/debian/control --- kcodecs-5.79.0/debian/control 2021-02-13 12:20:08.000000000 +0000 +++ kcodecs-5.80.0/debian/control 2021-03-18 11:06:30.000000000 +0000 @@ -7,7 +7,7 @@ Build-Depends: cmake (>= 3.5~), debhelper-compat (= 13), doxygen, - extra-cmake-modules (>= 5.79.0~), + extra-cmake-modules (>= 5.80.0~), gperf, graphviz, libqt5sql5-sqlite:native, diff -Nru kcodecs-5.79.0/.git-blame-ignore-revs kcodecs-5.80.0/.git-blame-ignore-revs --- kcodecs-5.79.0/.git-blame-ignore-revs 1970-01-01 00:00:00.000000000 +0000 +++ kcodecs-5.80.0/.git-blame-ignore-revs 2021-03-06 16:19:34.000000000 +0000 @@ -0,0 +1,3 @@ +#clang-format +88d295069b046faa5846e320c2ed81805cdcd44c +bf6a25dad4c25070bdb292a4adbf6058acd50ad1 diff -Nru kcodecs-5.79.0/.gitignore kcodecs-5.80.0/.gitignore --- kcodecs-5.79.0/.gitignore 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/.gitignore 2021-03-06 16:19:34.000000000 +0000 @@ -21,3 +21,4 @@ *.unc-backup* .cmake/ /.clang-format +/compile_commands.json diff -Nru kcodecs-5.79.0/po/af/kcodecs5_qt.po kcodecs-5.80.0/po/af/kcodecs5_qt.po --- kcodecs-5.79.0/po/af/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/af/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -133,7 +133,7 @@ msgid "Other" msgstr "Ander" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, fuzzy, qt-format #| msgctxt "Descriptive Encoding Name" #| msgid "%1 ( %2 )" @@ -141,13 +141,13 @@ msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, fuzzy, qt-format msgctxt "KCharsets|@item" msgid "Other encoding (%1)" msgstr "Stel Enkodering" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, fuzzy, qt-format #| msgctxt "Descriptive Encoding Name" #| msgid "%1 ( %2 )" @@ -155,7 +155,7 @@ msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains more than one " @@ -163,68 +163,68 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a @.\n" "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "" -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "local part." msgstr "" -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "domain part." msgstr "" -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " "comments/brackets." msgstr "" -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 #, fuzzy #| msgid "The email address this bug report is sent to." msgctxt "QObject|" msgid "The email address you entered is valid." msgstr "Die e-pos adres hierdie fout raporteer is gestuur na." -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " "angle bracket." msgstr "" -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " "closing angle brackets." msgstr "" -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "unexpected comma." msgstr "" -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it ended unexpectedly.\n" @@ -232,14 +232,14 @@ "the last character in your email address." msgstr "" -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " "which does not end." msgstr "" -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -253,14 +253,14 @@ "character." msgstr "" -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "invalid display name." msgstr "" -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -268,12 +268,12 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 msgctxt "QObject|" msgid "" "The email address you entered is not valid.\n" @@ -281,111 +281,111 @@ "form joe@example.org." msgstr "" -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 #, fuzzy msgctxt "KEncodingProber|@item Text character set" msgid "Disabled" msgstr "Redigering geaktiveer" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 #, fuzzy #| msgid "Install" msgctxt "KEncodingProber|@item Text character set" msgid "Universal" msgstr "Installeer" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 #, fuzzy #| msgid "Unicode" msgctxt "KEncodingProber|@item Text character set" msgid "Unicode" msgstr "Unicode" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 #, fuzzy #| msgid "Cyrillic" msgctxt "KEncodingProber|@item Text character set" msgid "Cyrillic" msgstr "Kirrillies" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 #, fuzzy #| msgid "Western European" msgctxt "KEncodingProber|@item Text character set" msgid "Western European" msgstr "Westelike Europees" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 #, fuzzy #| msgid "Central European" msgctxt "KEncodingProber|@item Text character set" msgid "Central European" msgstr "Sentraal Europees" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 #, fuzzy #| msgid "Greek" msgctxt "KEncodingProber|@item Text character set" msgid "Greek" msgstr "Grieks" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 #, fuzzy #| msgid "Hebrew" msgctxt "KEncodingProber|@item Text character set" msgid "Hebrew" msgstr "Hibreüs" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 #, fuzzy #| msgid "Turkish" msgctxt "KEncodingProber|@item Text character set" msgid "Turkish" msgstr "Turks" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 #, fuzzy #| msgid "Japanese" msgctxt "KEncodingProber|@item Text character set" msgid "Japanese" msgstr "Japanees" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 #, fuzzy #| msgid "Baltic" msgctxt "KEncodingProber|@item Text character set" msgid "Baltic" msgstr "Balties" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 #, fuzzy #| msgid "Chinese Traditional" msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Traditional" msgstr "Tradisionele Sjinees" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 #, fuzzy #| msgid "Chinese Simplified" msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Simplified" msgstr "Vereenvoudigde Sjinees" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 #, fuzzy #| msgid "Korean" msgctxt "KEncodingProber|@item Text character set" msgid "Korean" msgstr "Koriaans" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 #, fuzzy #| msgid "Thai" msgctxt "KEncodingProber|@item Text character set" msgid "Thai" msgstr "Thai" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 #, fuzzy #| msgid "Arabic" msgctxt "KEncodingProber|@item Text character set" diff -Nru kcodecs-5.79.0/po/ar/kcodecs5_qt.po kcodecs-5.80.0/po/ar/kcodecs5_qt.po --- kcodecs-5.79.0/po/ar/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/ar/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -120,25 +120,25 @@ msgid "Other" msgstr "آخر" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, qt-format msgctxt "KCharsets|@item %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, qt-format msgctxt "KCharsets|@item" msgid "Other encoding (%1)" msgstr "ترميز آخر (%1)" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, qt-format msgctxt "KCharsets|@item Text encoding: %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 #, fuzzy #| msgctxt "QObject|" #| msgid "" @@ -154,7 +154,7 @@ "عنوان البريد الإلكتروني الذي أدخلته غير صالح لأنه يحتوي أكثر من علامة @ " "واحدة. لن تستطيع إنشاء رسائل صالحة إن لم تغيّره." -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 #, fuzzy #| msgctxt "QObject|" #| msgid "" @@ -168,12 +168,12 @@ "عنوان البريد الإلكتروني الذي أدخلته غير صالح لأنه لا يحتوي علامة @. لن " "تستطيع إنشاء رسائل صالحة إن لم تغيّره." -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "عليك إدخال شيئًا في حقل عنوان البريد الإلكتروني." -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -181,7 +181,7 @@ msgstr "" "عنوان البريد الإلكتروني الذي أدخلته غير صالح لأنه لا يحتوي الجزء المحلي فيه." -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -189,7 +189,7 @@ msgstr "" "عنوان البريد الإلكتروني الذي أدخلته غير صالح لأنه لا يحتوي عنوان النطاق." -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " @@ -198,12 +198,12 @@ "عنوان البريد الإلكتروني الذي أدخلته غير صالح لأنه يحتوي تعليقات/أقواس لم " "تُغلق." -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 msgctxt "QObject|" msgid "The email address you entered is valid." msgstr "عنوان البريد الإلكتروني الذي أدخلته صالح." -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " @@ -211,7 +211,7 @@ msgstr "" "عنوان البريد الإلكتروني الذي أدخلته غير صالح لأنه يحتوي قوسًا زاويًا لم يُغلق." -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " @@ -220,7 +220,7 @@ "عنوان البريد الإلكتروني الذي أدخلته غير صالح لأنه يحتوي العديد من الأقواس " "الزاويّة الغالِقة." -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " @@ -228,7 +228,7 @@ msgstr "" "عنوان البريد الإلكتروني الذي أدخلته غير صالح لأنه يحتوي فاصلة غير متوقعة." -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 #, fuzzy #| msgctxt "QObject|" #| msgid "" @@ -245,7 +245,7 @@ "يعني أنك استخدمت محرفًا من نوع الهروب مثل ’\\‘ كآخر محرف من عنوان البريد " "الإلكتروني." -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " @@ -253,7 +253,7 @@ msgstr "" "عنوان البريد الإلكتروني الذي أدخلته غير صالح لأنه يحتوي نصًا مقتبسًا لم ينتهي." -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -270,7 +270,7 @@ msgstr "" "عنوان البريد الإلكتروني الذي أدخلته غير صالح لأنه يحتوي محرفًا غير مسموح به." -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " @@ -278,7 +278,7 @@ msgstr "" "عنوان البريد الإلكتروني الذي أدخلته غير صالح لأنه يحتوي اسم عرض غير صالح." -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 #, fuzzy #| msgctxt "QObject|" #| msgid "" @@ -293,12 +293,12 @@ "عنوان البريد الإلكتروني الذي أدخلته غير صالح لأنه لا يحتوي نقطة ’.‘. لن " "تستطيع إنشاء رسائل صالحة إن لم تغيّره." -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "مشكلة عنوان البريد الإلكتروني مجهولة" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 #, fuzzy #| msgctxt "QObject|" #| msgid "" @@ -314,82 +314,82 @@ "عنوان البريد الإلكتروني الذي أدخلته غير صالح لأنه لا يبدو عنوان بريد " "إلكتروني حقيقي، بل شيئًا مثل joe@example.org." -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 msgctxt "KEncodingProber|@item Text character set" msgid "Disabled" msgstr "معطّل" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 msgctxt "KEncodingProber|@item Text character set" msgid "Universal" msgstr "عالمي" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 msgctxt "KEncodingProber|@item Text character set" msgid "Unicode" msgstr "يونيكودي" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 msgctxt "KEncodingProber|@item Text character set" msgid "Cyrillic" msgstr "سيريلي" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 msgctxt "KEncodingProber|@item Text character set" msgid "Western European" msgstr "أوروبي غربي" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 msgctxt "KEncodingProber|@item Text character set" msgid "Central European" msgstr "أوروبي أوسط" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 msgctxt "KEncodingProber|@item Text character set" msgid "Greek" msgstr "يوناني" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 msgctxt "KEncodingProber|@item Text character set" msgid "Hebrew" msgstr "عبري" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 msgctxt "KEncodingProber|@item Text character set" msgid "Turkish" msgstr "تركي" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 msgctxt "KEncodingProber|@item Text character set" msgid "Japanese" msgstr "ياباني" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 msgctxt "KEncodingProber|@item Text character set" msgid "Baltic" msgstr "بلطيقي" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Traditional" msgstr "صيني تقليدي" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Simplified" msgstr "صيني مبسّط" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 msgctxt "KEncodingProber|@item Text character set" msgid "Korean" msgstr "كوري" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 msgctxt "KEncodingProber|@item Text character set" msgid "Thai" msgstr "تايلندي" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 msgctxt "KEncodingProber|@item Text character set" msgid "Arabic" msgstr "عربي" diff -Nru kcodecs-5.79.0/po/as/kcodecs5_qt.po kcodecs-5.80.0/po/as/kcodecs5_qt.po --- kcodecs-5.79.0/po/as/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/as/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -155,7 +155,7 @@ msgid "Other" msgstr "অন্য" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, fuzzy, qt-format #| msgctxt "@item %1 character set, %2 encoding" #| msgid "%1 ( %2 )" @@ -163,7 +163,7 @@ msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, fuzzy, qt-format #| msgctxt "@item" #| msgid "Other encoding (%1)" @@ -171,7 +171,7 @@ msgid "Other encoding (%1)" msgstr "অন্য এন্‌কোডিং (%1)" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, fuzzy, qt-format #| msgctxt "@item %1 character set, %2 encoding" #| msgid "%1 ( %2 )" @@ -179,7 +179,7 @@ msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains more than one " @@ -187,68 +187,68 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a @.\n" "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "" -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "local part." msgstr "" -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "domain part." msgstr "" -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " "comments/brackets." msgstr "" -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 #, fuzzy #| msgid "The email address this bug report is sent to." msgctxt "QObject|" msgid "The email address you entered is valid." msgstr "এই বাগ প্ৰতিবেদন যি ঈ-মেইল ঠিকনাত প্ৰেৰিত হৈছে ।" -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " "angle bracket." msgstr "" -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " "closing angle brackets." msgstr "" -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "unexpected comma." msgstr "" -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it ended unexpectedly.\n" @@ -256,14 +256,14 @@ "the last character in your email address." msgstr "" -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " "which does not end." msgstr "" -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -277,14 +277,14 @@ "character." msgstr "" -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "invalid display name." msgstr "" -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -292,12 +292,12 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 msgctxt "QObject|" msgid "" "The email address you entered is not valid.\n" @@ -305,7 +305,7 @@ "form joe@example.org." msgstr "" -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Disabled" @@ -313,7 +313,7 @@ msgid "Disabled" msgstr "নিষ্ক্ৰিয় কৰক" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Universal" @@ -321,7 +321,7 @@ msgid "Universal" msgstr "সৰ্বব্যাপী" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Unicode" @@ -329,7 +329,7 @@ msgid "Unicode" msgstr "Unicode" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Cyrillic" @@ -337,7 +337,7 @@ msgid "Cyrillic" msgstr "সিৰিলিক" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Western European" @@ -345,7 +345,7 @@ msgid "Western European" msgstr "পশ্চিত ইউৰোপিয়ান" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Central European" @@ -353,7 +353,7 @@ msgid "Central European" msgstr "মধ্য ইউৰোপিয়ান" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Greek" @@ -361,7 +361,7 @@ msgid "Greek" msgstr "গ্ৰিক" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 #, fuzzy #| msgctxt "@item Spelling dictionary" #| msgid "Hebrew" @@ -369,7 +369,7 @@ msgid "Hebrew" msgstr "হিব্ৰু" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 #, fuzzy #| msgctxt "@item Spelling dictionary" #| msgid "Turkish" @@ -377,7 +377,7 @@ msgid "Turkish" msgstr "তুৰ্কি" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Japanese" @@ -385,7 +385,7 @@ msgid "Japanese" msgstr "জাপানি" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Baltic" @@ -393,7 +393,7 @@ msgid "Baltic" msgstr "বল্টিক" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Chinese Traditional" @@ -401,7 +401,7 @@ msgid "Chinese Traditional" msgstr "পাৰম্পৰিক চীনা" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Chinese Simplified" @@ -409,7 +409,7 @@ msgid "Chinese Simplified" msgstr "সৰলিকৃত চীনা" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Korean" @@ -417,7 +417,7 @@ msgid "Korean" msgstr "কোৰিয়ান" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Thai" @@ -425,7 +425,7 @@ msgid "Thai" msgstr "থাই" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Arabic" diff -Nru kcodecs-5.79.0/po/az/kcodecs5_qt.po kcodecs-5.80.0/po/az/kcodecs5_qt.po --- kcodecs-5.79.0/po/az/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/az/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -98,25 +98,25 @@ msgid "Other" msgstr "Digər" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, qt-format msgctxt "KCharsets|@item %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, qt-format msgctxt "KCharsets|@item" msgid "Other encoding (%1)" msgstr "Digər kodlaşma (%1)" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, qt-format msgctxt "KCharsets|@item Text encoding: %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains more than one " @@ -127,7 +127,7 @@ "işarəsi var.\n" "Əgər ünvanı düzgün yazmasanız elektron məktub göndərə bilməzsiniz." -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a @.\n" @@ -137,12 +137,12 @@ "edilməyib.\n" "Əgər ünvanı düzgün yazmasanız elektron məktub göndərə bilməzsiniz." -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "Ünvan sətrinə heç bir ünvan yazmamısınız" -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -151,7 +151,7 @@ "Daxil etdiyiniz e-mail ünvanı etibarlı deyil, çünki ünvanda çatışmayan " "hissələr var" -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -160,7 +160,7 @@ "Daxil etdiyiniz e-mail ünvanı etibarlı deyil, çünki domen hissəsi daxil " "edilməyib" -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " @@ -169,12 +169,12 @@ "Daxil etdiyiniz e-mail ünvanı etibarlı deyil, çünki bağlanmamış sərhlər və " "mötərizələr var." -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 msgctxt "QObject|" msgid "The email address you entered is valid." msgstr "Daxil etdiyiniz e-mail ünvanı doğrudur" -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " @@ -183,7 +183,7 @@ "Daxil etdiyiniz e-mail ünvanı doğru deyil, çunki bağlanmamış bucaq " "mötərizəsi var" -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " @@ -192,7 +192,7 @@ "Daxil etdiyiniz e-mail ünvanı doğru deyil, çünku birdən çox bağlanmış bucaq " "mötərizəsi var." -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " @@ -201,7 +201,7 @@ "Daxil etdiyiniz e-mail ünvanı doğru deyil, çunki burda lazım olmayan vergül " "işarəsi var" -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it ended unexpectedly.\n" @@ -212,7 +212,7 @@ "Bu, yəqin ki, e-poçt ünvanınızın sonunda '\\' kimi geriyə qaçış tipli simvol " "istifadə etdiyinizə görədir." -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " @@ -221,7 +221,7 @@ "Daxil etdiyiniz e-mail ünvanı doğru deyil, çunki bağlanmamış dırnaq işarəsi " "var." -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -239,7 +239,7 @@ "Daxil etdiyiniz e-mail ünvanı doğru deyil , çünki qəbuledilməz simvollardan " "istifadə olunur." -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " @@ -248,7 +248,7 @@ "Daxil etdiyiniz e-mail ünvanı doğru deyil, çunki yalnış əlaqə (kontakt) " "adından istifadə olunur." -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -259,12 +259,12 @@ "edilməyib.\n" "Əgər ünvanı dəyişməsəniz e-məktub yaza bilməyəcəksiniz." -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "E-mail ünvanınızla naməlum problem baş verdi" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 msgctxt "QObject|" msgid "" "The email address you entered is not valid.\n" @@ -274,82 +274,82 @@ "Daxil etdiyiniz e-mail ünvanı doğru deyil.\n" "Çünki, joe@example.org ünvan formatına uyğun deyil." -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 msgctxt "KEncodingProber|@item Text character set" msgid "Disabled" msgstr "Söndürüldü" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 msgctxt "KEncodingProber|@item Text character set" msgid "Universal" msgstr "Universal" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 msgctxt "KEncodingProber|@item Text character set" msgid "Unicode" msgstr "Unicode" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 msgctxt "KEncodingProber|@item Text character set" msgid "Cyrillic" msgstr "Kirill" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 msgctxt "KEncodingProber|@item Text character set" msgid "Western European" msgstr "Qərbi Avropa" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 msgctxt "KEncodingProber|@item Text character set" msgid "Central European" msgstr "Mərkəzi Avropa" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 msgctxt "KEncodingProber|@item Text character set" msgid "Greek" msgstr "Yunan" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 msgctxt "KEncodingProber|@item Text character set" msgid "Hebrew" msgstr "İvrit" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 msgctxt "KEncodingProber|@item Text character set" msgid "Turkish" msgstr "Türkcə" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 msgctxt "KEncodingProber|@item Text character set" msgid "Japanese" msgstr "Yaponca" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 msgctxt "KEncodingProber|@item Text character set" msgid "Baltic" msgstr "Baltikyanı" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Traditional" msgstr "Ənənəvi Çin" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Simplified" msgstr "Sadələşdirilmiş Çin" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 msgctxt "KEncodingProber|@item Text character set" msgid "Korean" msgstr "Koreya" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 msgctxt "KEncodingProber|@item Text character set" msgid "Thai" msgstr "Tailand" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 msgctxt "KEncodingProber|@item Text character set" msgid "Arabic" msgstr "Ərəbcə" diff -Nru kcodecs-5.79.0/po/be/kcodecs5_qt.po kcodecs-5.80.0/po/be/kcodecs5_qt.po --- kcodecs-5.79.0/po/be/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/be/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -163,7 +163,7 @@ msgid "Other" msgstr "Іншая" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, fuzzy, qt-format #| msgctxt "@item %1 character set, %2 encoding" #| msgid "%1 ( %2 )" @@ -171,7 +171,7 @@ msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, fuzzy, qt-format #| msgctxt "@item" #| msgid "Other encoding (%1)" @@ -179,7 +179,7 @@ msgid "Other encoding (%1)" msgstr "Іншы знаказбор (%1)" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, fuzzy, qt-format #| msgctxt "@item %1 character set, %2 encoding" #| msgid "%1 ( %2 )" @@ -187,7 +187,7 @@ msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains more than one " @@ -195,68 +195,68 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a @.\n" "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "" -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "local part." msgstr "" -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "domain part." msgstr "" -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " "comments/brackets." msgstr "" -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 #, fuzzy #| msgid "The email address this bug report is sent to." msgctxt "QObject|" msgid "The email address you entered is valid." msgstr "Адрас электроннай пошты, на які трэба выслаць паведамленне." -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " "angle bracket." msgstr "" -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " "closing angle brackets." msgstr "" -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "unexpected comma." msgstr "" -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it ended unexpectedly.\n" @@ -264,14 +264,14 @@ "the last character in your email address." msgstr "" -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " "which does not end." msgstr "" -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -285,14 +285,14 @@ "character." msgstr "" -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "invalid display name." msgstr "" -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -300,12 +300,12 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 msgctxt "QObject|" msgid "" "The email address you entered is not valid.\n" @@ -313,21 +313,21 @@ "form joe@example.org." msgstr "" -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 #, fuzzy #| msgid "disable XIM" msgctxt "KEncodingProber|@item Text character set" msgid "Disabled" msgstr "Неактыўная" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 #, fuzzy #| msgid "Uninstall" msgctxt "KEncodingProber|@item Text character set" msgid "Universal" msgstr "Выдаліць" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Unicode" @@ -335,7 +335,7 @@ msgid "Unicode" msgstr "Unicode" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Cyrillic" @@ -343,7 +343,7 @@ msgid "Cyrillic" msgstr "Кірыліца" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Western European" @@ -351,7 +351,7 @@ msgid "Western European" msgstr "Заходне-еўрапейскі" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Central European" @@ -359,7 +359,7 @@ msgid "Central European" msgstr "Цэнтральна-еўрапейскі" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Greek" @@ -367,7 +367,7 @@ msgid "Greek" msgstr "Грэцкая" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 #, fuzzy #| msgctxt "@item Spelling dictionary" #| msgid "Hebrew" @@ -375,7 +375,7 @@ msgid "Hebrew" msgstr "Габрэйская" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 #, fuzzy #| msgctxt "@item Spelling dictionary" #| msgid "Turkish" @@ -383,7 +383,7 @@ msgid "Turkish" msgstr "Турэцкая" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Japanese" @@ -391,7 +391,7 @@ msgid "Japanese" msgstr "Японская" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Baltic" @@ -399,7 +399,7 @@ msgid "Baltic" msgstr "Балцкая" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Chinese Traditional" @@ -407,7 +407,7 @@ msgid "Chinese Traditional" msgstr "Кітайская традыцыйная" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Chinese Simplified" @@ -415,7 +415,7 @@ msgid "Chinese Simplified" msgstr "Кітайская спрошчаная" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Korean" @@ -423,7 +423,7 @@ msgid "Korean" msgstr "Карэйская" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Thai" @@ -431,7 +431,7 @@ msgid "Thai" msgstr "Тайская" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Arabic" diff -Nru kcodecs-5.79.0/po/be@latin/kcodecs5_qt.po kcodecs-5.80.0/po/be@latin/kcodecs5_qt.po --- kcodecs-5.79.0/po/be@latin/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/be@latin/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -156,7 +156,7 @@ msgid "Other" msgstr "Inšy" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, fuzzy, qt-format #| msgctxt "@item %1 character set, %2 encoding" #| msgid "%1 ( %2 )" @@ -164,7 +164,7 @@ msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, fuzzy, qt-format #| msgctxt "@item" #| msgid "Other encoding (%1)" @@ -172,7 +172,7 @@ msgid "Other encoding (%1)" msgstr "Inšaje kadavańnie (%1)" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, fuzzy, qt-format #| msgctxt "@item %1 character set, %2 encoding" #| msgid "%1 ( %2 )" @@ -180,7 +180,7 @@ msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains more than one " @@ -188,67 +188,67 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a @.\n" "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "" -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "local part." msgstr "" -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "domain part." msgstr "" -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " "comments/brackets." msgstr "" -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 #, fuzzy msgctxt "QObject|" msgid "The email address you entered is valid." msgstr "Niasłušny sertyfikat." -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " "angle bracket." msgstr "" -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " "closing angle brackets." msgstr "" -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "unexpected comma." msgstr "" -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it ended unexpectedly.\n" @@ -256,14 +256,14 @@ "the last character in your email address." msgstr "" -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " "which does not end." msgstr "" -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -277,14 +277,14 @@ "character." msgstr "" -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "invalid display name." msgstr "" -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -292,12 +292,12 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 msgctxt "QObject|" msgid "" "The email address you entered is not valid.\n" @@ -305,7 +305,7 @@ "form joe@example.org." msgstr "" -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Disabled" @@ -313,7 +313,7 @@ msgid "Disabled" msgstr "Vyklučana" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Universal" @@ -321,7 +321,7 @@ msgid "Universal" msgstr "Universalny" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Unicode" @@ -329,7 +329,7 @@ msgid "Unicode" msgstr "Unikod" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Cyrillic" @@ -337,7 +337,7 @@ msgid "Cyrillic" msgstr "Kirylica" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Western European" @@ -345,7 +345,7 @@ msgid "Western European" msgstr "Zachodnie-eŭrapiejski" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Central European" @@ -353,7 +353,7 @@ msgid "Central European" msgstr "Centralna-eŭrapiejski" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Greek" @@ -361,7 +361,7 @@ msgid "Greek" msgstr "Hrecki" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 #, fuzzy #| msgctxt "@item Spelling dictionary" #| msgid "Hebrew" @@ -369,7 +369,7 @@ msgid "Hebrew" msgstr "Habrejski" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 #, fuzzy #| msgctxt "@item Spelling dictionary" #| msgid "Turkish" @@ -377,7 +377,7 @@ msgid "Turkish" msgstr "Turecki" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Japanese" @@ -385,7 +385,7 @@ msgid "Japanese" msgstr "Japonski" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Baltic" @@ -393,7 +393,7 @@ msgid "Baltic" msgstr "Bałtyjski" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Chinese Traditional" @@ -401,7 +401,7 @@ msgid "Chinese Traditional" msgstr "Kitajski tradycyjny" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Chinese Simplified" @@ -409,7 +409,7 @@ msgid "Chinese Simplified" msgstr "Kitajski sproščany" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Korean" @@ -417,7 +417,7 @@ msgid "Korean" msgstr "Karejski" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Thai" @@ -425,7 +425,7 @@ msgid "Thai" msgstr "Tajski" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Arabic" diff -Nru kcodecs-5.79.0/po/bg/kcodecs5_qt.po kcodecs-5.80.0/po/bg/kcodecs5_qt.po --- kcodecs-5.79.0/po/bg/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/bg/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -155,7 +155,7 @@ msgid "Other" msgstr "Друг" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, fuzzy, qt-format #| msgctxt "@item %1 character set, %2 encoding" #| msgid "%1 ( %2 )" @@ -163,7 +163,7 @@ msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, fuzzy, qt-format #| msgctxt "@item" #| msgid "Other encoding (%1)" @@ -171,7 +171,7 @@ msgid "Other encoding (%1)" msgstr "Друга кодова таблица (%1)" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, fuzzy, qt-format #| msgctxt "@item %1 character set, %2 encoding" #| msgid "%1 ( %2 )" @@ -179,7 +179,7 @@ msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains more than one " @@ -187,40 +187,40 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a @.\n" "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "" -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "local part." msgstr "" -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "domain part." msgstr "" -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " "comments/brackets." msgstr "" -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 #, fuzzy #| msgctxt "@info" #| msgid "The date you entered is invalid" @@ -228,28 +228,28 @@ msgid "The email address you entered is valid." msgstr "Въведената дата е неправилна" -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " "angle bracket." msgstr "" -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " "closing angle brackets." msgstr "" -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "unexpected comma." msgstr "" -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it ended unexpectedly.\n" @@ -257,14 +257,14 @@ "the last character in your email address." msgstr "" -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " "which does not end." msgstr "" -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -278,14 +278,14 @@ "character." msgstr "" -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "invalid display name." msgstr "" -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -293,12 +293,12 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 msgctxt "QObject|" msgid "" "The email address you entered is not valid.\n" @@ -306,7 +306,7 @@ "form joe@example.org." msgstr "" -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Disabled" @@ -314,7 +314,7 @@ msgid "Disabled" msgstr "Изкл." -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Universal" @@ -322,7 +322,7 @@ msgid "Universal" msgstr "Универсална" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Unicode" @@ -330,7 +330,7 @@ msgid "Unicode" msgstr "Уникод" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Cyrillic" @@ -338,7 +338,7 @@ msgid "Cyrillic" msgstr "Кирилица" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Western European" @@ -346,7 +346,7 @@ msgid "Western European" msgstr "Западноевропейски" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Central European" @@ -354,7 +354,7 @@ msgid "Central European" msgstr "Централноевропейски" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Greek" @@ -362,7 +362,7 @@ msgid "Greek" msgstr "Гръцки" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 #, fuzzy #| msgctxt "@item Spelling dictionary" #| msgid "Hebrew" @@ -370,7 +370,7 @@ msgid "Hebrew" msgstr "Иврит" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 #, fuzzy #| msgctxt "@item Spelling dictionary" #| msgid "Turkish" @@ -378,7 +378,7 @@ msgid "Turkish" msgstr "Турски" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Japanese" @@ -386,7 +386,7 @@ msgid "Japanese" msgstr "Японски" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Baltic" @@ -394,7 +394,7 @@ msgid "Baltic" msgstr "Балтийски" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Chinese Traditional" @@ -402,7 +402,7 @@ msgid "Chinese Traditional" msgstr "Китайски традиционен" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Chinese Simplified" @@ -410,7 +410,7 @@ msgid "Chinese Simplified" msgstr "Китайски опростен" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Korean" @@ -418,7 +418,7 @@ msgid "Korean" msgstr "Корейски" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Thai" @@ -426,7 +426,7 @@ msgid "Thai" msgstr "Тайландски" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Arabic" diff -Nru kcodecs-5.79.0/po/bn/kcodecs5_qt.po kcodecs-5.80.0/po/bn/kcodecs5_qt.po --- kcodecs-5.79.0/po/bn/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/bn/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -158,7 +158,7 @@ msgid "Other" msgstr "অন্যান্য" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, fuzzy, qt-format #| msgctxt "@item %1 character set, %2 encoding" #| msgid "%1 ( %2 )" @@ -166,7 +166,7 @@ msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, fuzzy, qt-format #| msgctxt "@item" #| msgid "Other encoding (%1)" @@ -174,7 +174,7 @@ msgid "Other encoding (%1)" msgstr "অন্যান্য এনকোডিং (%1)" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, fuzzy, qt-format #| msgctxt "@item %1 character set, %2 encoding" #| msgid "%1 ( %2 )" @@ -182,7 +182,7 @@ msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains more than one " @@ -190,67 +190,67 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a @.\n" "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "" -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "local part." msgstr "" -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "domain part." msgstr "" -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " "comments/brackets." msgstr "" -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 #, fuzzy msgctxt "QObject|" msgid "The email address you entered is valid." msgstr "সার্টিফিকেট-টি অবৈধ" -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " "angle bracket." msgstr "" -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " "closing angle brackets." msgstr "" -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "unexpected comma." msgstr "" -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it ended unexpectedly.\n" @@ -258,14 +258,14 @@ "the last character in your email address." msgstr "" -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " "which does not end." msgstr "" -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -279,14 +279,14 @@ "character." msgstr "" -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "invalid display name." msgstr "" -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -294,12 +294,12 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 msgctxt "QObject|" msgid "" "The email address you entered is not valid.\n" @@ -307,7 +307,7 @@ "form joe@example.org." msgstr "" -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Disabled" @@ -315,7 +315,7 @@ msgid "Disabled" msgstr "নিষ্ক্রিয়" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Universal" @@ -323,7 +323,7 @@ msgid "Universal" msgstr "সার্বজনীন" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Unicode" @@ -331,7 +331,7 @@ msgid "Unicode" msgstr "ইউনিকোড" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Cyrillic" @@ -339,7 +339,7 @@ msgid "Cyrillic" msgstr "কিরিলিক" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Western European" @@ -347,7 +347,7 @@ msgid "Western European" msgstr "পশ্চিম ইউরোপীয়" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Central European" @@ -355,7 +355,7 @@ msgid "Central European" msgstr "মধ্য ইউরোপীয়" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Greek" @@ -363,7 +363,7 @@ msgid "Greek" msgstr "গ্রীক" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 #, fuzzy #| msgctxt "@item Spelling dictionary" #| msgid "Hebrew" @@ -371,7 +371,7 @@ msgid "Hebrew" msgstr "হীব্রু" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 #, fuzzy #| msgctxt "@item Spelling dictionary" #| msgid "Turkish" @@ -379,7 +379,7 @@ msgid "Turkish" msgstr "তুর্কী" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Japanese" @@ -387,7 +387,7 @@ msgid "Japanese" msgstr "জাপানী" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Baltic" @@ -395,7 +395,7 @@ msgid "Baltic" msgstr "বল্টিক" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Chinese Traditional" @@ -403,7 +403,7 @@ msgid "Chinese Traditional" msgstr "প্রথাগত চৈনিক" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Chinese Simplified" @@ -411,7 +411,7 @@ msgid "Chinese Simplified" msgstr "সরলীকৃত চৈনিক" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Korean" @@ -419,7 +419,7 @@ msgid "Korean" msgstr "কোরীয়ান" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Thai" @@ -427,7 +427,7 @@ msgid "Thai" msgstr "থাই" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Arabic" diff -Nru kcodecs-5.79.0/po/bn_IN/kcodecs5_qt.po kcodecs-5.80.0/po/bn_IN/kcodecs5_qt.po --- kcodecs-5.79.0/po/bn_IN/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/bn_IN/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -157,7 +157,7 @@ msgid "Other" msgstr "অন্যান্য" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, fuzzy, qt-format #| msgctxt "@item %1 character set, %2 encoding" #| msgid "%1 ( %2 )" @@ -165,7 +165,7 @@ msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, fuzzy, qt-format #| msgctxt "@item" #| msgid "Other encoding (%1)" @@ -173,7 +173,7 @@ msgid "Other encoding (%1)" msgstr "অন্যান্য এনকোডিং (%1)" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, fuzzy, qt-format #| msgctxt "@item %1 character set, %2 encoding" #| msgid "%1 ( %2 )" @@ -181,7 +181,7 @@ msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains more than one " @@ -189,67 +189,67 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a @.\n" "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "" -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "local part." msgstr "" -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "domain part." msgstr "" -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " "comments/brackets." msgstr "" -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 #, fuzzy msgctxt "QObject|" msgid "The email address you entered is valid." msgstr "সার্টিফিকেটটি বৈধ নয়" -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " "angle bracket." msgstr "" -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " "closing angle brackets." msgstr "" -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "unexpected comma." msgstr "" -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it ended unexpectedly.\n" @@ -257,14 +257,14 @@ "the last character in your email address." msgstr "" -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " "which does not end." msgstr "" -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -278,14 +278,14 @@ "character." msgstr "" -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "invalid display name." msgstr "" -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -293,12 +293,12 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 msgctxt "QObject|" msgid "" "The email address you entered is not valid.\n" @@ -306,7 +306,7 @@ "form joe@example.org." msgstr "" -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Disabled" @@ -314,7 +314,7 @@ msgid "Disabled" msgstr "নিষ্ক্রিয় করুন" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Universal" @@ -322,7 +322,7 @@ msgid "Universal" msgstr "ইউনিভার্সাল" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Unicode" @@ -330,7 +330,7 @@ msgid "Unicode" msgstr "Unicode" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Cyrillic" @@ -338,7 +338,7 @@ msgid "Cyrillic" msgstr "সিরিলিক" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Western European" @@ -346,7 +346,7 @@ msgid "Western European" msgstr "পশ্চিত ইউরোপিয়ান" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Central European" @@ -354,7 +354,7 @@ msgid "Central European" msgstr "মধ্য ইউরোপিয়ান" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Greek" @@ -362,7 +362,7 @@ msgid "Greek" msgstr "গ্রিক" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 #, fuzzy #| msgctxt "@item Spelling dictionary" #| msgid "Hebrew" @@ -370,7 +370,7 @@ msgid "Hebrew" msgstr "হিব্রু" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 #, fuzzy #| msgctxt "@item Spelling dictionary" #| msgid "Turkish" @@ -378,7 +378,7 @@ msgid "Turkish" msgstr "তুর্কি" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Japanese" @@ -386,7 +386,7 @@ msgid "Japanese" msgstr "জাপানি" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Baltic" @@ -394,7 +394,7 @@ msgid "Baltic" msgstr "বল্টিক" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Chinese Traditional" @@ -402,7 +402,7 @@ msgid "Chinese Traditional" msgstr "পারম্পরিক চীনা" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Chinese Simplified" @@ -410,7 +410,7 @@ msgid "Chinese Simplified" msgstr "সরলিকৃত চীনা" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Korean" @@ -418,7 +418,7 @@ msgid "Korean" msgstr "কোরিয়ান" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Thai" @@ -426,7 +426,7 @@ msgid "Thai" msgstr "থাই" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Arabic" diff -Nru kcodecs-5.79.0/po/br/kcodecs5_qt.po kcodecs-5.80.0/po/br/kcodecs5_qt.po --- kcodecs-5.79.0/po/br/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/br/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -155,7 +155,7 @@ msgid "Other" msgstr "All" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, fuzzy, qt-format #| msgctxt "@item %1 character set, %2 encoding" #| msgid "%1 ( %2 )" @@ -163,7 +163,7 @@ msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, fuzzy, qt-format #| msgctxt "@item" #| msgid "Other encoding (%1)" @@ -171,7 +171,7 @@ msgid "Other encoding (%1)" msgstr "Kodadur all (%1)" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, fuzzy, qt-format #| msgctxt "@item %1 character set, %2 encoding" #| msgid "%1 ( %2 )" @@ -179,7 +179,7 @@ msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains more than one " @@ -187,66 +187,66 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a @.\n" "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "" -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "local part." msgstr "" -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "domain part." msgstr "" -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " "comments/brackets." msgstr "" -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 msgctxt "QObject|" msgid "The email address you entered is valid." msgstr "" -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " "angle bracket." msgstr "" -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " "closing angle brackets." msgstr "" -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "unexpected comma." msgstr "" -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it ended unexpectedly.\n" @@ -254,14 +254,14 @@ "the last character in your email address." msgstr "" -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " "which does not end." msgstr "" -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -275,14 +275,14 @@ "character." msgstr "" -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "invalid display name." msgstr "" -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -290,12 +290,12 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 msgctxt "QObject|" msgid "" "The email address you entered is not valid.\n" @@ -303,20 +303,20 @@ "form joe@example.org." msgstr "" -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 #, fuzzy msgctxt "KEncodingProber|@item Text character set" msgid "Disabled" msgstr "Moulañ sac'het" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 #, fuzzy #| msgid "Deinstall" msgctxt "KEncodingProber|@item Text character set" msgid "Universal" msgstr "Distaliañ" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Unicode" @@ -324,7 +324,7 @@ msgid "Unicode" msgstr "Unicode" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Cyrillic" @@ -332,7 +332,7 @@ msgid "Cyrillic" msgstr "Lizherenneg ar ruseg" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Western European" @@ -340,7 +340,7 @@ msgid "Western European" msgstr "Europa kornaoueg" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Central European" @@ -348,7 +348,7 @@ msgid "Central European" msgstr "Europa Kreiz" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Greek" @@ -356,21 +356,21 @@ msgid "Greek" msgstr "Gresianek" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 #, fuzzy #| msgid "Hebrew" msgctxt "KEncodingProber|@item Text character set" msgid "Hebrew" msgstr "Hebreeg" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 #, fuzzy #| msgid "Turkish" msgctxt "KEncodingProber|@item Text character set" msgid "Turkish" msgstr "Turkek" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Japanese" @@ -378,7 +378,7 @@ msgid "Japanese" msgstr "Japaneg" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Baltic" @@ -386,7 +386,7 @@ msgid "Baltic" msgstr "Baltik" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Chinese Traditional" @@ -394,7 +394,7 @@ msgid "Chinese Traditional" msgstr "Sinaeg da gustum" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Chinese Simplified" @@ -402,7 +402,7 @@ msgid "Chinese Simplified" msgstr "Sineg eeun" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Korean" @@ -410,7 +410,7 @@ msgid "Korean" msgstr "Koreeg" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Thai" @@ -418,7 +418,7 @@ msgid "Thai" msgstr "Tailh" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Arabic" diff -Nru kcodecs-5.79.0/po/bs/kcodecs5_qt.po kcodecs-5.80.0/po/bs/kcodecs5_qt.po --- kcodecs-5.79.0/po/bs/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/bs/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -165,7 +165,7 @@ msgid "Other" msgstr "drugi" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, fuzzy, qt-format #| msgctxt "@item %1 character set, %2 encoding" #| msgid "%1 ( %2 )" @@ -173,7 +173,7 @@ msgid "%1 ( %2 )" msgstr "%1 (%2)" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, fuzzy, qt-format #| msgctxt "@item" #| msgid "Other encoding (%1)" @@ -181,7 +181,7 @@ msgid "Other encoding (%1)" msgstr "drugo kodiranje (%1)" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, fuzzy, qt-format #| msgctxt "@item %1 character set, %2 encoding" #| msgid "%1 ( %2 )" @@ -189,7 +189,7 @@ msgid "%1 ( %2 )" msgstr "%1 (%2)" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains more than one " @@ -197,40 +197,40 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a @.\n" "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "" -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "local part." msgstr "" -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "domain part." msgstr "" -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " "comments/brackets." msgstr "" -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 #, fuzzy #| msgctxt "@info" #| msgid "The date you entered is invalid" @@ -238,28 +238,28 @@ msgid "The email address you entered is valid." msgstr "Datum koji ste unijeli je nevažeći" -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " "angle bracket." msgstr "" -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " "closing angle brackets." msgstr "" -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "unexpected comma." msgstr "" -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it ended unexpectedly.\n" @@ -267,14 +267,14 @@ "the last character in your email address." msgstr "" -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " "which does not end." msgstr "" -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -288,14 +288,14 @@ "character." msgstr "" -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "invalid display name." msgstr "" -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -303,12 +303,12 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 msgctxt "QObject|" msgid "" "The email address you entered is not valid.\n" @@ -316,7 +316,7 @@ "form joe@example.org." msgstr "" -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Disabled" @@ -324,7 +324,7 @@ msgid "Disabled" msgstr "isključeno" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Universal" @@ -332,7 +332,7 @@ msgid "Universal" msgstr "univerzalno" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Unicode" @@ -340,7 +340,7 @@ msgid "Unicode" msgstr "Unicode" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Cyrillic" @@ -348,7 +348,7 @@ msgid "Cyrillic" msgstr "ćirilični" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Western European" @@ -356,7 +356,7 @@ msgid "Western European" msgstr "zapadnoevropski" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Central European" @@ -364,7 +364,7 @@ msgid "Central European" msgstr "srednjeevropski" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Greek" @@ -372,7 +372,7 @@ msgid "Greek" msgstr "grčki" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 #, fuzzy #| msgctxt "@item Spelling dictionary" #| msgid "Hebrew" @@ -380,7 +380,7 @@ msgid "Hebrew" msgstr "hebrejski" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 #, fuzzy #| msgctxt "@item Spelling dictionary" #| msgid "Turkish" @@ -388,7 +388,7 @@ msgid "Turkish" msgstr "turski" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Japanese" @@ -396,7 +396,7 @@ msgid "Japanese" msgstr "japanski" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Baltic" @@ -404,7 +404,7 @@ msgid "Baltic" msgstr "baltički" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Chinese Traditional" @@ -412,7 +412,7 @@ msgid "Chinese Traditional" msgstr "kineski tradicionalni" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Chinese Simplified" @@ -420,7 +420,7 @@ msgid "Chinese Simplified" msgstr "kineski pojednostavljeni" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Korean" @@ -428,7 +428,7 @@ msgid "Korean" msgstr "korejski" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Thai" @@ -436,7 +436,7 @@ msgid "Thai" msgstr "tajlandski" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Arabic" diff -Nru kcodecs-5.79.0/po/ca/kcodecs5_qt.po kcodecs-5.80.0/po/ca/kcodecs5_qt.po --- kcodecs-5.79.0/po/ca/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/ca/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -111,25 +111,25 @@ msgid "Other" msgstr "Altres" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, qt-format msgctxt "KCharsets|@item %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, qt-format msgctxt "KCharsets|@item" msgid "Other encoding (%1)" msgstr "Altres codificacions (%1)" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, qt-format msgctxt "KCharsets|@item Text encoding: %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains more than one " @@ -139,7 +139,7 @@ "L'adreça de correu que heu introduït no és vàlida perquè conté més d'una @.\n" "No podreu crear missatges vàlids de correu si no canvieu l'adreça." -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a @.\n" @@ -148,12 +148,12 @@ "L'adreça de correu que heu introduït no és vàlida perquè no conté una @.\n" "No podreu crear missatges vàlids de correu si no canvieu l'adreça." -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "Heu d'introduir quelcom en el camp de l'adreça de correu." -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -162,7 +162,7 @@ "L'adreça de correu que heu introduït no és vàlida perquè no conté una part " "local." -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -171,7 +171,7 @@ "L'adreça de correu que heu introduït no és vàlida perquè no conté una part " "de domini." -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " @@ -180,12 +180,12 @@ "L'adreça de correu que heu introduït no és vàlida perquè conté comentaris o " "claudàtors sense tancar." -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 msgctxt "QObject|" msgid "The email address you entered is valid." msgstr "L'adreça de correu que heu introduït és vàlida." -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " @@ -194,7 +194,7 @@ "L'adreça de correu que heu introduït no és vàlida perquè conté un claudàtor " "sense tancar." -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " @@ -203,7 +203,7 @@ "L'adreça de correu que heu introduït no és vàlida perquè conté massa " "claudàtors de tancament." -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " @@ -212,7 +212,7 @@ "L'adreça de correu que heu introduït no és vàlida perquè conté una coma " "inesperada." -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it ended unexpectedly.\n" @@ -224,7 +224,7 @@ "Això probablement significa que heu usat un caràcter d'escapament (p. ex. " "\\) com a últim caràcter de l'adreça de correu." -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " @@ -233,7 +233,7 @@ "L'adreça de correu que heu introduït no és vàlida perquè conté text citat " "que no acaba." -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -251,7 +251,7 @@ "L'adreça de correu que heu introduït no és vàlida perquè conté un caràcter " "no vàlid." -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " @@ -260,7 +260,7 @@ "L'adreça de correu que heu introduït no és vàlida perquè conté un nom a " "mostrar no vàlid." -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -270,12 +270,12 @@ "L'adreça de correu que heu introduït no és vàlida perquè no conté un «.».\n" "No podreu crear missatges vàlids de correu si no canvieu l'adreça." -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "Problema desconegut amb l'adreça de correu" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 msgctxt "QObject|" msgid "" "The email address you entered is not valid.\n" @@ -285,82 +285,82 @@ "L'adreça de correu que heu introduït no és vàlida.\n" "Sembla que no conté una adreça real de correu, com p. ex. pep@exemple.org." -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 msgctxt "KEncodingProber|@item Text character set" msgid "Disabled" msgstr "Desactivat" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 msgctxt "KEncodingProber|@item Text character set" msgid "Universal" msgstr "Universal" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 msgctxt "KEncodingProber|@item Text character set" msgid "Unicode" msgstr "Unicode" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 msgctxt "KEncodingProber|@item Text character set" msgid "Cyrillic" msgstr "Ciríl·lic" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 msgctxt "KEncodingProber|@item Text character set" msgid "Western European" msgstr "Europeu occidental" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 msgctxt "KEncodingProber|@item Text character set" msgid "Central European" msgstr "Europeu central" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 msgctxt "KEncodingProber|@item Text character set" msgid "Greek" msgstr "Grec" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 msgctxt "KEncodingProber|@item Text character set" msgid "Hebrew" msgstr "Hebreu" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 msgctxt "KEncodingProber|@item Text character set" msgid "Turkish" msgstr "Turc" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 msgctxt "KEncodingProber|@item Text character set" msgid "Japanese" msgstr "Japonès" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 msgctxt "KEncodingProber|@item Text character set" msgid "Baltic" msgstr "Bàltic" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Traditional" msgstr "Xinès tradicional" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Simplified" msgstr "Xinès simplificat" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 msgctxt "KEncodingProber|@item Text character set" msgid "Korean" msgstr "Coreà" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 msgctxt "KEncodingProber|@item Text character set" msgid "Thai" msgstr "Tai" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 msgctxt "KEncodingProber|@item Text character set" msgid "Arabic" msgstr "Àrab" diff -Nru kcodecs-5.79.0/po/ca@valencia/kcodecs5_qt.po kcodecs-5.80.0/po/ca@valencia/kcodecs5_qt.po --- kcodecs-5.79.0/po/ca@valencia/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/ca@valencia/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -113,25 +113,25 @@ msgid "Other" msgstr "Altres" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, qt-format msgctxt "KCharsets|@item %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, qt-format msgctxt "KCharsets|@item" msgid "Other encoding (%1)" msgstr "Altres codificacions (%1)" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, qt-format msgctxt "KCharsets|@item Text encoding: %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 #, fuzzy #| msgctxt "QObject|" #| msgid "" @@ -147,7 +147,7 @@ "L'adreça de correu que heu introduït no és vàlida perquè conté més d'una @. " "No podreu crear missatges vàlids de correu si no canvieu l'adreça." -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 #, fuzzy #| msgctxt "QObject|" #| msgid "" @@ -161,12 +161,12 @@ "L'adreça de correu que heu introduït no és vàlida perquè no conté una @. No " "podreu crear missatges vàlids de correu si no canvieu l'adreça." -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "Heu d'introduir alguna cosa en el camp de l'adreça de correu." -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -175,7 +175,7 @@ "L'adreça de correu que heu introduït no és vàlida perquè no conté una part " "local." -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -184,7 +184,7 @@ "L'adreça de correu que heu introduït no és vàlida perquè no conté una part " "de domini." -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " @@ -193,12 +193,12 @@ "L'adreça de correu que heu introduït no és vàlida perquè conté comentaris o " "claudàtors sense tancar." -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 msgctxt "QObject|" msgid "The email address you entered is valid." msgstr "L'adreça de correu que heu introduït és vàlida." -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " @@ -207,7 +207,7 @@ "L'adreça de correu que heu introduït no és vàlida perquè conté un claudàtor " "sense tancar." -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " @@ -216,7 +216,7 @@ "L'adreça de correu que heu introduït no és vàlida perquè conté massa " "claudàtors de tancament." -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " @@ -225,7 +225,7 @@ "L'adreça de correu que heu introduït no és vàlida perquè conté una coma " "inesperada." -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 #, fuzzy #| msgctxt "QObject|" #| msgid "" @@ -242,7 +242,7 @@ "inesperadament, probablement significa que heu usat un caràcter d'escapament " "(p. ex. \\) com a últim caràcter de la vostra adreça de correu." -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " @@ -251,7 +251,7 @@ "L'adreça de correu que heu introduït no és vàlida perquè conté text citat " "que no acaba." -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -269,7 +269,7 @@ "L'adreça de correu que heu introduït no és vàlida perquè conté un caràcter " "no vàlid." -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " @@ -278,7 +278,7 @@ "L'adreça de correu que heu introduït no és vàlida perquè conté un nom que es " "mostrarà no vàlid." -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 #, fuzzy #| msgctxt "QObject|" #| msgid "" @@ -293,12 +293,12 @@ "L'adreça de correu que heu introduït no és vàlida perquè no conté un «.». No " "podreu crear missatges vàlids de correu si no canvieu l'adreça." -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "Problema desconegut amb l'adreça de correu" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 #, fuzzy #| msgctxt "QObject|" #| msgid "" @@ -314,82 +314,82 @@ "L'adreça de correu que heu introduït no és vàlida perquè sembla que no conté " "una adreça real de correu, com p. ex. pep@exemple.org." -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 msgctxt "KEncodingProber|@item Text character set" msgid "Disabled" msgstr "Desactivat" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 msgctxt "KEncodingProber|@item Text character set" msgid "Universal" msgstr "Universal" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 msgctxt "KEncodingProber|@item Text character set" msgid "Unicode" msgstr "Unicode" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 msgctxt "KEncodingProber|@item Text character set" msgid "Cyrillic" msgstr "Ciríl·lic" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 msgctxt "KEncodingProber|@item Text character set" msgid "Western European" msgstr "Europeu occidental" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 msgctxt "KEncodingProber|@item Text character set" msgid "Central European" msgstr "Europeu central" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 msgctxt "KEncodingProber|@item Text character set" msgid "Greek" msgstr "Grec" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 msgctxt "KEncodingProber|@item Text character set" msgid "Hebrew" msgstr "Hebreu" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 msgctxt "KEncodingProber|@item Text character set" msgid "Turkish" msgstr "Turc" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 msgctxt "KEncodingProber|@item Text character set" msgid "Japanese" msgstr "Japonés" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 msgctxt "KEncodingProber|@item Text character set" msgid "Baltic" msgstr "Bàltic" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Traditional" msgstr "Xinés tradicional" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Simplified" msgstr "Xinés simplificat" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 msgctxt "KEncodingProber|@item Text character set" msgid "Korean" msgstr "Coreà" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 msgctxt "KEncodingProber|@item Text character set" msgid "Thai" msgstr "Tai" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 msgctxt "KEncodingProber|@item Text character set" msgid "Arabic" msgstr "Àrab" diff -Nru kcodecs-5.79.0/po/crh/kcodecs5_qt.po kcodecs-5.80.0/po/crh/kcodecs5_qt.po --- kcodecs-5.79.0/po/crh/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/crh/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -155,7 +155,7 @@ msgid "Other" msgstr "Diger" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, fuzzy, qt-format #| msgctxt "@item %1 character set, %2 encoding" #| msgid "%1 ( %2 )" @@ -163,7 +163,7 @@ msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, fuzzy, qt-format #| msgctxt "@item" #| msgid "Other encoding (%1)" @@ -171,7 +171,7 @@ msgid "Other encoding (%1)" msgstr "Diger kodlandırma (%1)" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, fuzzy, qt-format #| msgctxt "@item %1 character set, %2 encoding" #| msgid "%1 ( %2 )" @@ -179,7 +179,7 @@ msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains more than one " @@ -187,68 +187,68 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a @.\n" "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "" -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "local part." msgstr "" -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "domain part." msgstr "" -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " "comments/brackets." msgstr "" -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 #, fuzzy #| msgid "The email address this bug report is sent to." msgctxt "QObject|" msgid "The email address you entered is valid." msgstr "Bu arıza maruzasınıñ yiberilecegi e-poçta adresi." -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " "angle bracket." msgstr "" -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " "closing angle brackets." msgstr "" -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "unexpected comma." msgstr "" -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it ended unexpectedly.\n" @@ -256,14 +256,14 @@ "the last character in your email address." msgstr "" -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " "which does not end." msgstr "" -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -277,14 +277,14 @@ "character." msgstr "" -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "invalid display name." msgstr "" -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -292,12 +292,12 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 msgctxt "QObject|" msgid "" "The email address you entered is not valid.\n" @@ -305,7 +305,7 @@ "form joe@example.org." msgstr "" -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Disabled" @@ -313,7 +313,7 @@ msgid "Disabled" msgstr "Ğayrı qabilleştirilgen" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Universal" @@ -321,7 +321,7 @@ msgid "Universal" msgstr "Universal" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Unicode" @@ -329,7 +329,7 @@ msgid "Unicode" msgstr "Unikod" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Cyrillic" @@ -337,7 +337,7 @@ msgid "Cyrillic" msgstr "Kiril" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Western European" @@ -345,7 +345,7 @@ msgid "Western European" msgstr "Ğarbiy Avropa" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Central European" @@ -353,7 +353,7 @@ msgid "Central European" msgstr "Merkeziy Avropa" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Greek" @@ -361,7 +361,7 @@ msgid "Greek" msgstr "Yunanca" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 #, fuzzy #| msgctxt "@item Spelling dictionary" #| msgid "Hebrew" @@ -369,7 +369,7 @@ msgid "Hebrew" msgstr "İbraniyce" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 #, fuzzy #| msgctxt "@item Spelling dictionary" #| msgid "Turkish" @@ -377,7 +377,7 @@ msgid "Turkish" msgstr "Türkçe" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Japanese" @@ -385,7 +385,7 @@ msgid "Japanese" msgstr "Yaponca" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Baltic" @@ -393,7 +393,7 @@ msgid "Baltic" msgstr "Baltıq" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Chinese Traditional" @@ -401,7 +401,7 @@ msgid "Chinese Traditional" msgstr "Çince, Ananeviy" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Chinese Simplified" @@ -409,7 +409,7 @@ msgid "Chinese Simplified" msgstr "Çince, Basitleştirilgen" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Korean" @@ -417,7 +417,7 @@ msgid "Korean" msgstr "Korece" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Thai" @@ -425,7 +425,7 @@ msgid "Thai" msgstr "Tayca" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Arabic" diff -Nru kcodecs-5.79.0/po/cs/kcodecs5_qt.po kcodecs-5.80.0/po/cs/kcodecs5_qt.po --- kcodecs-5.79.0/po/cs/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/cs/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -107,25 +107,25 @@ msgid "Other" msgstr "Jiné" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, qt-format msgctxt "KCharsets|@item %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, qt-format msgctxt "KCharsets|@item" msgid "Other encoding (%1)" msgstr "Jiné kódování (%1)" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, qt-format msgctxt "KCharsets|@item Text encoding: %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains more than one " @@ -136,7 +136,7 @@ "@.\n" "Pokud neprovede změnu, adresa nebude platná." -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a @.\n" @@ -145,26 +145,26 @@ "Zadaná adresa není platná, protože neobsahuje zavináč (@).\n" "Pokud nezadáte platnou adresu, nebudete moci odeslat zprávu." -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "Vyplňte pole poštovní adresy." -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "local part." msgstr "Zadaná poštovní adresa není platná, protože neobsahuje lokální část." -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "domain part." msgstr "Zadaná adresa není platná, protože neobsahuje doménovou část." -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " @@ -172,19 +172,19 @@ msgstr "" "Zadaná adresa není platná, protože obsahuje neuzavřený komentář/závorky." -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 msgctxt "QObject|" msgid "The email address you entered is valid." msgstr "Zadaná adresa je platná." -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " "angle bracket." msgstr "Zadaná adresa není platná, protože obsahuje neuzavřené ostré závorky." -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " @@ -192,14 +192,14 @@ msgstr "" "Zadaná adresa není platná, protože obsahuje příliš pravých ostrých závorek." -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "unexpected comma." msgstr "Zadaná adresa není platná, protože obsahuje neočekávanou čárku." -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it ended unexpectedly.\n" @@ -209,7 +209,7 @@ "Zadaná adresa není platná, protože neočekávaně končí.\n" "Pravděpodobně jste v adrese zadali na konci znak jako např. '\\'." -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " @@ -217,7 +217,7 @@ msgstr "" "Zadaná adresa není platná, protože obsahuje neukončený text v uvozovkách." -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -233,7 +233,7 @@ "character." msgstr "Zadaná adresa není platná, protože obsahuje nepovolené znaky." -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " @@ -241,7 +241,7 @@ msgstr "" "Zadaná adresa není platná, protože obsahuje neplatné zobrazované jméno." -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -251,12 +251,12 @@ "Zadaná adresa není platná, protože neobsahuje '.'.\n" "Pokud nezadáte platnou adresu, nebudete moci odeslat zprávu." -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "Neznámý problém s e-mailovou adresou" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 msgctxt "QObject|" msgid "" "The email address you entered is not valid.\n" @@ -266,82 +266,82 @@ "Zadaná adresa není platná.\n" "Neobsahuje skutečnou e-mailovou adresu, např. joe@example.org." -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 msgctxt "KEncodingProber|@item Text character set" msgid "Disabled" msgstr "Zakázáno" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 msgctxt "KEncodingProber|@item Text character set" msgid "Universal" msgstr "Univerzální" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 msgctxt "KEncodingProber|@item Text character set" msgid "Unicode" msgstr "Unicode" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 msgctxt "KEncodingProber|@item Text character set" msgid "Cyrillic" msgstr "Cyrilice" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 msgctxt "KEncodingProber|@item Text character set" msgid "Western European" msgstr "Západní Evropa" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 msgctxt "KEncodingProber|@item Text character set" msgid "Central European" msgstr "Střední Evropa" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 msgctxt "KEncodingProber|@item Text character set" msgid "Greek" msgstr "Řečtina" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 msgctxt "KEncodingProber|@item Text character set" msgid "Hebrew" msgstr "Hebrejština" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 msgctxt "KEncodingProber|@item Text character set" msgid "Turkish" msgstr "Turečtina" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 msgctxt "KEncodingProber|@item Text character set" msgid "Japanese" msgstr "Japonština" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 msgctxt "KEncodingProber|@item Text character set" msgid "Baltic" msgstr "Pobaltí" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Traditional" msgstr "Tradiční čínština" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Simplified" msgstr "Zjednodušená čínština" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 msgctxt "KEncodingProber|@item Text character set" msgid "Korean" msgstr "Korejština" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 msgctxt "KEncodingProber|@item Text character set" msgid "Thai" msgstr "Thajština" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 msgctxt "KEncodingProber|@item Text character set" msgid "Arabic" msgstr "Arabština" diff -Nru kcodecs-5.79.0/po/csb/kcodecs5_qt.po kcodecs-5.80.0/po/csb/kcodecs5_qt.po --- kcodecs-5.79.0/po/csb/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/csb/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -156,7 +156,7 @@ msgid "Other" msgstr "Jinszi" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, fuzzy, qt-format #| msgctxt "@item %1 character set, %2 encoding" #| msgid "%1 ( %2 )" @@ -164,7 +164,7 @@ msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, fuzzy, qt-format #| msgctxt "@item" #| msgid "Other encoding (%1)" @@ -172,7 +172,7 @@ msgid "Other encoding (%1)" msgstr "Jiné kòdowanié (%1)" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, fuzzy, qt-format #| msgctxt "@item %1 character set, %2 encoding" #| msgid "%1 ( %2 )" @@ -180,7 +180,7 @@ msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains more than one " @@ -188,67 +188,67 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a @.\n" "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "" -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "local part." msgstr "" -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "domain part." msgstr "" -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " "comments/brackets." msgstr "" -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 #, fuzzy msgctxt "QObject|" msgid "The email address you entered is valid." msgstr "Lëchi certifikat" -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " "angle bracket." msgstr "" -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " "closing angle brackets." msgstr "" -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "unexpected comma." msgstr "" -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it ended unexpectedly.\n" @@ -256,14 +256,14 @@ "the last character in your email address." msgstr "" -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " "which does not end." msgstr "" -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -277,14 +277,14 @@ "character." msgstr "" -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "invalid display name." msgstr "" -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -292,12 +292,12 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 msgctxt "QObject|" msgid "" "The email address you entered is not valid.\n" @@ -305,7 +305,7 @@ "form joe@example.org." msgstr "" -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Disabled" @@ -313,7 +313,7 @@ msgid "Disabled" msgstr "Wëłączë XIM" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Universal" @@ -321,7 +321,7 @@ msgid "Universal" msgstr "Ùniwersalno" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Unicode" @@ -329,7 +329,7 @@ msgid "Unicode" msgstr "Unicode" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Cyrillic" @@ -337,7 +337,7 @@ msgid "Cyrillic" msgstr "Cërilica" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Western European" @@ -345,7 +345,7 @@ msgid "Western European" msgstr "Zôpadnoeùropejsczé" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Central European" @@ -353,7 +353,7 @@ msgid "Central European" msgstr "Westrzédnoeùropejsczé" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Greek" @@ -361,7 +361,7 @@ msgid "Greek" msgstr "Grecczé" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 #, fuzzy #| msgctxt "@item Spelling dictionary" #| msgid "Hebrew" @@ -369,7 +369,7 @@ msgid "Hebrew" msgstr "Hebrajsczé" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 #, fuzzy #| msgctxt "@item Spelling dictionary" #| msgid "Turkish" @@ -377,7 +377,7 @@ msgid "Turkish" msgstr "Tërecczé" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Japanese" @@ -385,7 +385,7 @@ msgid "Japanese" msgstr "Japòńsczé" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Baltic" @@ -393,7 +393,7 @@ msgid "Baltic" msgstr "Bôłtëcczé" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Chinese Traditional" @@ -401,7 +401,7 @@ msgid "Chinese Traditional" msgstr "Chińsczé (zwëkòwi)" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Chinese Simplified" @@ -409,7 +409,7 @@ msgid "Chinese Simplified" msgstr "Chińsczé (prosti)" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Korean" @@ -417,7 +417,7 @@ msgid "Korean" msgstr "Kòrejańsczé" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Thai" @@ -425,7 +425,7 @@ msgid "Thai" msgstr "Tajsczé" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Arabic" diff -Nru kcodecs-5.79.0/po/cy/kcodecs5_qt.po kcodecs-5.80.0/po/cy/kcodecs5_qt.po --- kcodecs-5.79.0/po/cy/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/cy/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -148,7 +148,7 @@ msgid "Other" msgstr "Eraill" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, fuzzy, qt-format #| msgctxt "Descriptive Encoding Name" #| msgid "%1 ( %2 )" @@ -156,13 +156,13 @@ msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, fuzzy, qt-format msgctxt "KCharsets|@item" msgid "Other encoding (%1)" msgstr "&Gosod Amgodiad" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, fuzzy, qt-format #| msgctxt "Descriptive Encoding Name" #| msgid "%1 ( %2 )" @@ -170,7 +170,7 @@ msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains more than one " @@ -178,68 +178,68 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a @.\n" "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "" -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "local part." msgstr "" -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "domain part." msgstr "" -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " "comments/brackets." msgstr "" -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 #, fuzzy #| msgid "The email address this bug report is sent to." msgctxt "QObject|" msgid "The email address you entered is valid." msgstr "Y gyfeiriad ebost a anfonir yr adroddiad nam yma iddi." -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " "angle bracket." msgstr "" -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " "closing angle brackets." msgstr "" -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "unexpected comma." msgstr "" -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it ended unexpectedly.\n" @@ -247,14 +247,14 @@ "the last character in your email address." msgstr "" -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " "which does not end." msgstr "" -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -268,14 +268,14 @@ "character." msgstr "" -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "invalid display name." msgstr "" -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -283,12 +283,12 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 msgctxt "QObject|" msgid "" "The email address you entered is not valid.\n" @@ -296,111 +296,111 @@ "form joe@example.org." msgstr "" -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 #, fuzzy msgctxt "KEncodingProber|@item Text character set" msgid "Disabled" msgstr "Alluogir golygu" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 #, fuzzy #| msgid "Install" msgctxt "KEncodingProber|@item Text character set" msgid "Universal" msgstr "Arsefydlu" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 #, fuzzy #| msgid "Unicode" msgctxt "KEncodingProber|@item Text character set" msgid "Unicode" msgstr "Unicôd" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 #, fuzzy #| msgid "Cyrillic" msgctxt "KEncodingProber|@item Text character set" msgid "Cyrillic" msgstr "Cyrilig" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 #, fuzzy #| msgid "Western European" msgctxt "KEncodingProber|@item Text character set" msgid "Western European" msgstr "Gorllewin Ewrop" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 #, fuzzy #| msgid "Central European" msgctxt "KEncodingProber|@item Text character set" msgid "Central European" msgstr "Canol Ewrop" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 #, fuzzy #| msgid "Greek" msgctxt "KEncodingProber|@item Text character set" msgid "Greek" msgstr "Groeg" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 #, fuzzy #| msgid "Hebrew" msgctxt "KEncodingProber|@item Text character set" msgid "Hebrew" msgstr "Hebraeg" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 #, fuzzy #| msgid "Turkish" msgctxt "KEncodingProber|@item Text character set" msgid "Turkish" msgstr "Twrceg" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 #, fuzzy #| msgid "Japanese" msgctxt "KEncodingProber|@item Text character set" msgid "Japanese" msgstr "Siapaneeg" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 #, fuzzy #| msgid "Baltic" msgctxt "KEncodingProber|@item Text character set" msgid "Baltic" msgstr "Baltig" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 #, fuzzy #| msgid "Chinese Traditional" msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Traditional" msgstr "Tsieineeg Traddodiadol" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 #, fuzzy #| msgid "Chinese Simplified" msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Simplified" msgstr "Tseineeg Syml" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 #, fuzzy #| msgid "Korean" msgctxt "KEncodingProber|@item Text character set" msgid "Korean" msgstr "Coreeg" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 #, fuzzy #| msgid "Thai" msgctxt "KEncodingProber|@item Text character set" msgid "Thai" msgstr "Taieg" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 #, fuzzy #| msgid "Arabic" msgctxt "KEncodingProber|@item Text character set" diff -Nru kcodecs-5.79.0/po/da/kcodecs5_qt.po kcodecs-5.80.0/po/da/kcodecs5_qt.po --- kcodecs-5.79.0/po/da/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/da/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -105,25 +105,25 @@ msgid "Other" msgstr "Andet" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, qt-format msgctxt "KCharsets|@item %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, qt-format msgctxt "KCharsets|@item" msgid "Other encoding (%1)" msgstr "Andet tegnsæt (%1)" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, qt-format msgctxt "KCharsets|@item Text encoding: %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains more than one " @@ -134,7 +134,7 @@ "@.\n" "Du vil ikke skrive gyldige beskeder hvis du ikke ændrer adressen." -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a @.\n" @@ -143,12 +143,12 @@ "E-mailadressen du indtastede er ikke gyldig fordi den ikke indeholder et @.\n" "Du vil ikke skrive gyldige beskeder hvis du ikke ændrer adressen." -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "Du skal indtaste noget i e-mailadresse-feltet." -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -157,7 +157,7 @@ "Den e-mailadresse du indtastede er ikke gyldig fordi den ikke indeholder en " "lokaldel." -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -166,7 +166,7 @@ "Den e-mailadresse du indtastede er ikke gyldig fordi den ikke indeholder en " "domænedel." -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " @@ -175,12 +175,12 @@ "Den e-mailadresse du indtastede er ikke gyldig fordi den indeholder ulukkede " "kommentarer/klammer." -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 msgctxt "QObject|" msgid "The email address you entered is valid." msgstr "E-mailadressen du indtastede er gyldig." -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " @@ -189,7 +189,7 @@ "E-mailadressen du indtastede er ikke gyldig fordi den indeholder en ulukket " "klamme." -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " @@ -198,7 +198,7 @@ "E-mailadressen du indtastede er ikke gyldig fordi den indeholder for mange " "lukkende klammer." -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " @@ -207,7 +207,7 @@ "E-mailadressen du indtastede er ikke gyldig fordi den indeholder et uventet " "komma." -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it ended unexpectedly.\n" @@ -218,7 +218,7 @@ "Dette betyder sandsynligvis at du har brugt et undvigetegn såsom en \"\\\" " "som det sidste tegn i e-mailadressen." -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " @@ -227,7 +227,7 @@ "E-mailadressen du indtastede er ikke gyldig fordi den indeholder tekst i " "citationstegn som ikke er afsluttet." -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -246,7 +246,7 @@ "E-mailadressen du indtastede er ikke gyldig fordi den indeholder et ulovligt " "tegn." -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " @@ -255,7 +255,7 @@ "E-mailadressen du indtastede er ikke gyldig fordi den indeholder et ugyldigt " "visningsnavn." -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -266,12 +266,12 @@ "\".\n" "\". Du vil ikke skrive gyldige beskeder, medmindre du ikke ændrer adressen." -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "Ukendt problem med e-mailadressen" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 msgctxt "QObject|" msgid "" "The email address you entered is not valid.\n" @@ -283,82 +283,82 @@ "Den ikke lader til at indeholde en egentlig e-mailadresse, for eksempel " "noget i formatet jens@eksempel.org." -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 msgctxt "KEncodingProber|@item Text character set" msgid "Disabled" msgstr "Deaktiveret" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 msgctxt "KEncodingProber|@item Text character set" msgid "Universal" msgstr "Universel" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 msgctxt "KEncodingProber|@item Text character set" msgid "Unicode" msgstr "Unicode" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 msgctxt "KEncodingProber|@item Text character set" msgid "Cyrillic" msgstr "Kyrillisk" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 msgctxt "KEncodingProber|@item Text character set" msgid "Western European" msgstr "Vesteuropæisk" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 msgctxt "KEncodingProber|@item Text character set" msgid "Central European" msgstr "Centraleuropæisk" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 msgctxt "KEncodingProber|@item Text character set" msgid "Greek" msgstr "Græsk" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 msgctxt "KEncodingProber|@item Text character set" msgid "Hebrew" msgstr "Hebræisk" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 msgctxt "KEncodingProber|@item Text character set" msgid "Turkish" msgstr "Tyrkisk" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 msgctxt "KEncodingProber|@item Text character set" msgid "Japanese" msgstr "Japansk" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 msgctxt "KEncodingProber|@item Text character set" msgid "Baltic" msgstr "Baltisk" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Traditional" msgstr "Traditionel kinesisk" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Simplified" msgstr "Forenklet kinesisk" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 msgctxt "KEncodingProber|@item Text character set" msgid "Korean" msgstr "Koreansk" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 msgctxt "KEncodingProber|@item Text character set" msgid "Thai" msgstr "Thailandsk" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 msgctxt "KEncodingProber|@item Text character set" msgid "Arabic" msgstr "Arabisk" diff -Nru kcodecs-5.79.0/po/de/kcodecs5_qt.po kcodecs-5.80.0/po/de/kcodecs5_qt.po --- kcodecs-5.79.0/po/de/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/de/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -110,25 +110,25 @@ msgid "Other" msgstr "Weitere" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, qt-format msgctxt "KCharsets|@item %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, qt-format msgctxt "KCharsets|@item" msgid "Other encoding (%1)" msgstr "Andere Kodierung (%1)" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, qt-format msgctxt "KCharsets|@item Text encoding: %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains more than one " @@ -139,7 +139,7 @@ "enthält.\n" "Wenn Sie Ihre Adresse nicht ändern, erzeugen Sie fehlerhafte E-Mails." -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a @.\n" @@ -148,12 +148,12 @@ "Die von Ihnen eingegebene E-Mail-Adresse ist ungültig, da sie kein „@“ " "enthält.Wenn Sie Ihre Adresse nicht ändern, erzeugen Sie fehlerhafte E-Mails." -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "Das Adressfeld der E-Mail darf nicht leer sein." -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -162,7 +162,7 @@ "Die von Ihnen eingegebene E-Mail-Adresse ist ungültig, da sie keinen lokalen " "Teil enthält." -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -171,7 +171,7 @@ "Die von Ihnen eingegebene E-Mail-Adresse ist ungültig, da sie keinen Domain-" "Teil enthält." -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " @@ -180,12 +180,12 @@ "Die von Ihnen eingegebene E-Mail-Adresse ist ungültig, da sie nicht " "abgeschlossene Kommentare/Klammern enthält." -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 msgctxt "QObject|" msgid "The email address you entered is valid." msgstr "Die eingegebene E-Mail-Adresse ist ungültig." -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " @@ -194,7 +194,7 @@ "Die von Ihnen eingegebene E-Mail-Adresse ist ungültig, da sie eine nicht " "abgeschlossene spitze Klammer enthält." -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " @@ -203,7 +203,7 @@ "Die von Ihnen eingegebene E-Mail-Adresse ist ungültig, da sie zu viele " "schließende spitze Klammern enthält." -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " @@ -212,7 +212,7 @@ "Die von Ihnen eingegebene E-Mail-Adresse ist ungültig, da sie ein " "unerwartetes Komma enthält." -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it ended unexpectedly.\n" @@ -224,7 +224,7 @@ "Das rührt möglicherweise daher, dass Sie am Ende der E-Mail-Adresse ein " "gesondert behandeltes Zeichen wie \\ benutzt haben." -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " @@ -233,7 +233,7 @@ "Die von Ihnen eingegebene E-Mail-Adresse ist ungültig, da sie geklammerten " "Text enthält, dessen Ende nicht gefunden werden kann." -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -252,7 +252,7 @@ "Die von Ihnen eingegebene E-Mail-Adresse ist ungültig, da sie ein ungültiges " "Zeichen enthält." -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " @@ -261,7 +261,7 @@ "Die von Ihnen eingegebene E-Mail-Adresse ist ungültig, da sie einen " "ungültigen Klartextnamen enthält." -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -272,12 +272,12 @@ "enthält.\n" "Wenn Sie Ihre Adresse nicht ändern, erzeugen Sie fehlerhafte E-Mails." -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "Nicht näher bestimmbarer Fehler in der E-Mail-Adresse" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 msgctxt "QObject|" msgid "" "The email address you entered is not valid.\n" @@ -288,82 +288,82 @@ "Es handelt sich um keine echte E-Mail-Adresse in der Form wie z. B. " "joe@example.org." -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 msgctxt "KEncodingProber|@item Text character set" msgid "Disabled" msgstr "Deaktiviert" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 msgctxt "KEncodingProber|@item Text character set" msgid "Universal" msgstr "Allgemein" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 msgctxt "KEncodingProber|@item Text character set" msgid "Unicode" msgstr "Unicode" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 msgctxt "KEncodingProber|@item Text character set" msgid "Cyrillic" msgstr "Kyrillisch" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 msgctxt "KEncodingProber|@item Text character set" msgid "Western European" msgstr "Westeuropäisch" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 msgctxt "KEncodingProber|@item Text character set" msgid "Central European" msgstr "Mitteleuropäisch" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 msgctxt "KEncodingProber|@item Text character set" msgid "Greek" msgstr "Griechisch" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 msgctxt "KEncodingProber|@item Text character set" msgid "Hebrew" msgstr "Hebräisch" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 msgctxt "KEncodingProber|@item Text character set" msgid "Turkish" msgstr "Türkisch" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 msgctxt "KEncodingProber|@item Text character set" msgid "Japanese" msgstr "Japanisch" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 msgctxt "KEncodingProber|@item Text character set" msgid "Baltic" msgstr "Baltisch" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Traditional" msgstr "Chinesisch (Langzeichen)" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Simplified" msgstr "Chinesisch (Kurzzeichen)" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 msgctxt "KEncodingProber|@item Text character set" msgid "Korean" msgstr "Koreanisch" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 msgctxt "KEncodingProber|@item Text character set" msgid "Thai" msgstr "Thailändisch" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 msgctxt "KEncodingProber|@item Text character set" msgid "Arabic" msgstr "Arabisch" diff -Nru kcodecs-5.79.0/po/el/kcodecs5_qt.po kcodecs-5.80.0/po/el/kcodecs5_qt.po --- kcodecs-5.79.0/po/el/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/el/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -117,25 +117,25 @@ msgid "Other" msgstr "Άλλη" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, qt-format msgctxt "KCharsets|@item %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, qt-format msgctxt "KCharsets|@item" msgid "Other encoding (%1)" msgstr "Άλλη κωδικοποίηση (%1)" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, qt-format msgctxt "KCharsets|@item Text encoding: %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains more than one " @@ -146,7 +146,7 @@ "γιατί περιέχει πάνω από ένα @.\n" "Δε θα δημιουργείτε έγκυρα μηνύματα αν δεν αλλάξετε τη διεύθυνσή σας." -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a @.\n" @@ -156,13 +156,13 @@ "γιατί δεν περιέχει @.\n" "Δε θα δημιουργείτε έγκυρα μηνύματα αν δεν αλλάξετε τη διεύθυνσή σας." -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "" "Πρέπει να καταχωρήσετε κάτι στο πεδίο διεύθυνσης ηλεκτρονικής αλληλογραφίας." -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -171,7 +171,7 @@ "Η διεύθυνση ηλεκτρονικής αλληλογραφίας που καταχωρήσατε δεν είναι έγκυρη " "γιατί δεν περιέχει τοπική θύρα." -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -180,7 +180,7 @@ "Η διεύθυνση ηλεκτρονικής αλληλογραφίας που καταχωρήσατε δεν είναι έγκυρη " "γιατί δεν περιέχει το τμήμα τομέα (domain)." -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " @@ -189,13 +189,13 @@ "Η διεύθυνση ηλεκτρονικής αλληλογραφίας που καταχωρήσατε δεν είναι έγκυρη " "γιατί περιέχει παρενθέσεις/σχόλια που δεν κλείνουν." -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 msgctxt "QObject|" msgid "The email address you entered is valid." msgstr "" "Η διεύθυνση ηλεκτρονικής αλληλογραφίας που καταχωρήσατε δεν είναι έγκυρη." -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " @@ -204,7 +204,7 @@ "Η διεύθυνση ηλεκτρονικής αλληλογραφίας που καταχωρήσατε δεν είναι έγκυρη " "γιατί περιέχει αγκύλη που δεν κλείνει." -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " @@ -213,7 +213,7 @@ "Η διεύθυνση ηλεκτρονικής αλληλογραφίας που καταχωρήσατε δεν είναι έγκυρη " "γιατί περιέχει επιπλέον αγκύλες που κλείνουν." -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " @@ -222,7 +222,7 @@ "Η διεύθυνση ηλεκτρονικής αλληλογραφίας που καταχωρήσατε δεν είναι έγκυρη " "γιατί περιέχει μη αναμενόμενο κόμμα." -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it ended unexpectedly.\n" @@ -234,7 +234,7 @@ "Πιθανώς έχετε χρησιμοποιήσει κάποιον χαρακτήρα διαφυγής όπως το '\\' ως " "τελευταίο χαρακτήρα της ηλεκτρονικής διεύθυνσης." -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " @@ -243,7 +243,7 @@ "Η διεύθυνση ηλεκτρονικής αλληλογραφίας που καταχωρήσατε δεν είναι έγκυρη " "γιατί περιέχει κείμενο σε εισαγωγικά που δεν κλείνουν." -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -262,7 +262,7 @@ "Η διεύθυνση ηλεκτρονικής αλληλογραφίας που καταχωρήσατε δεν είναι έγκυρη " "γιατί περιέχει μη επιτρεπόμενο χαρακτήρα." -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " @@ -271,7 +271,7 @@ "Η διεύθυνση ηλεκτρονικής αλληλογραφίας που καταχωρήσατε δεν είναι έγκυρη " "γιατί περιέχει μη έγκυρο όνομα εμφάνισης." -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -282,12 +282,12 @@ "γιατί δεν περιέχει '.'.\n" "Δε θα δημιουργείτε έγκυρα μηνύματα αν δεν αλλάξετε τη διεύθυνσή σας." -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "Άγνωστο πρόβλημα με τη διεύθυνση ηλεκτρονικής αλληλογραφίας" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 msgctxt "QObject|" msgid "" "The email address you entered is not valid.\n" @@ -298,82 +298,82 @@ "Δε φαίνεται να περιέχει μια πραγματική διεύθυνση όπως π.χ. κάτι της μορφής " "joe@example.org." -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 msgctxt "KEncodingProber|@item Text character set" msgid "Disabled" msgstr "Ανενεργή" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 msgctxt "KEncodingProber|@item Text character set" msgid "Universal" msgstr "Καθολική" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 msgctxt "KEncodingProber|@item Text character set" msgid "Unicode" msgstr "Unicode" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 msgctxt "KEncodingProber|@item Text character set" msgid "Cyrillic" msgstr "Κυριλλική" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 msgctxt "KEncodingProber|@item Text character set" msgid "Western European" msgstr "Δυτικής Ευρώπης" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 msgctxt "KEncodingProber|@item Text character set" msgid "Central European" msgstr "Κεντρικής Ευρώπης" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 msgctxt "KEncodingProber|@item Text character set" msgid "Greek" msgstr "Ελληνική" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 msgctxt "KEncodingProber|@item Text character set" msgid "Hebrew" msgstr "Εβραϊκή" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 msgctxt "KEncodingProber|@item Text character set" msgid "Turkish" msgstr "Τουρκική" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 msgctxt "KEncodingProber|@item Text character set" msgid "Japanese" msgstr "Ιαπωνική" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 msgctxt "KEncodingProber|@item Text character set" msgid "Baltic" msgstr "Βαλτικής" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Traditional" msgstr "Κινέζικα παραδοσιακά" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Simplified" msgstr "Κινέζικα απλά" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 msgctxt "KEncodingProber|@item Text character set" msgid "Korean" msgstr "Κορεάτικη" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 msgctxt "KEncodingProber|@item Text character set" msgid "Thai" msgstr "Ταϊλανδική" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 msgctxt "KEncodingProber|@item Text character set" msgid "Arabic" msgstr "Αραβική" diff -Nru kcodecs-5.79.0/po/en_GB/kcodecs5_qt.po kcodecs-5.80.0/po/en_GB/kcodecs5_qt.po --- kcodecs-5.79.0/po/en_GB/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/en_GB/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -104,25 +104,25 @@ msgid "Other" msgstr "Other" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, qt-format msgctxt "KCharsets|@item %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, qt-format msgctxt "KCharsets|@item" msgid "Other encoding (%1)" msgstr "Other encoding (%1)" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, qt-format msgctxt "KCharsets|@item Text encoding: %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains more than one " @@ -133,7 +133,7 @@ "@.\n" "You will not create valid messages if you do not change your address." -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a @.\n" @@ -142,12 +142,12 @@ "The email address you entered is not valid because it does not contain a @.\n" "You will not create valid messages if you do not change your address." -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "You have to enter something in the email address field." -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -156,7 +156,7 @@ "The email address you entered is not valid because it does not contain a " "local part." -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -165,7 +165,7 @@ "The email address you entered is not valid because it does not contain a " "domain part." -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " @@ -174,12 +174,12 @@ "The email address you entered is not valid because it contains unclosed " "comments/brackets." -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 msgctxt "QObject|" msgid "The email address you entered is valid." msgstr "The email address you entered is valid." -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " @@ -188,7 +188,7 @@ "The email address you entered is not valid because it contains an unclosed " "angle bracket." -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " @@ -197,7 +197,7 @@ "The email address you entered is not valid because it contains too many " "closing angle brackets." -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " @@ -206,7 +206,7 @@ "The email address you have entered is not valid because it contains an " "unexpected comma." -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it ended unexpectedly.\n" @@ -217,7 +217,7 @@ "This probably means you have used an escaping type character like a '\\' as " "the last character in your email address." -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " @@ -226,7 +226,7 @@ "The email address you entered is not valid because it contains quoted text " "which does not end." -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -244,7 +244,7 @@ "The email address you entered is not valid because it contains an illegal " "character." -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " @@ -253,7 +253,7 @@ "The email address you have entered is not valid because it contains an " "invalid display name." -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -264,12 +264,12 @@ "'.'.\n" "You will not create valid messages if you do not change your address." -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "Unknown problem with email address" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 msgctxt "QObject|" msgid "" "The email address you entered is not valid.\n" @@ -280,82 +280,82 @@ "It does not seem to contain an actual email address, i.e. something of the " "form joe@example.org." -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 msgctxt "KEncodingProber|@item Text character set" msgid "Disabled" msgstr "Disabled" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 msgctxt "KEncodingProber|@item Text character set" msgid "Universal" msgstr "Universal" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 msgctxt "KEncodingProber|@item Text character set" msgid "Unicode" msgstr "Unicode" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 msgctxt "KEncodingProber|@item Text character set" msgid "Cyrillic" msgstr "Cyrillic" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 msgctxt "KEncodingProber|@item Text character set" msgid "Western European" msgstr "Western European" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 msgctxt "KEncodingProber|@item Text character set" msgid "Central European" msgstr "Central European" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 msgctxt "KEncodingProber|@item Text character set" msgid "Greek" msgstr "Greek" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 msgctxt "KEncodingProber|@item Text character set" msgid "Hebrew" msgstr "Hebrew" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 msgctxt "KEncodingProber|@item Text character set" msgid "Turkish" msgstr "Turkish" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 msgctxt "KEncodingProber|@item Text character set" msgid "Japanese" msgstr "Japanese" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 msgctxt "KEncodingProber|@item Text character set" msgid "Baltic" msgstr "Baltic" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Traditional" msgstr "Chinese Traditional" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Simplified" msgstr "Chinese Simplified" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 msgctxt "KEncodingProber|@item Text character set" msgid "Korean" msgstr "Korean" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 msgctxt "KEncodingProber|@item Text character set" msgid "Thai" msgstr "Thai" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 msgctxt "KEncodingProber|@item Text character set" msgid "Arabic" msgstr "Arabic" diff -Nru kcodecs-5.79.0/po/eo/kcodecs5_qt.po kcodecs-5.80.0/po/eo/kcodecs5_qt.po --- kcodecs-5.79.0/po/eo/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/eo/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -112,25 +112,25 @@ msgid "Other" msgstr "Alia" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, qt-format msgctxt "KCharsets|@item %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, qt-format msgctxt "KCharsets|@item" msgid "Other encoding (%1)" msgstr "Alia kodigo (%1)" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, qt-format msgctxt "KCharsets|@item Text encoding: %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains more than one " @@ -138,40 +138,40 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a @.\n" "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "" -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "local part." msgstr "" -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "domain part." msgstr "" -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " "comments/brackets." msgstr "" -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 #, fuzzy #| msgctxt "@info" #| msgid "The date you entered is invalid" @@ -179,28 +179,28 @@ msgid "The email address you entered is valid." msgstr "La dato, kiun vi enmetis, ne validas" -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " "angle bracket." msgstr "" -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " "closing angle brackets." msgstr "" -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "unexpected comma." msgstr "" -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it ended unexpectedly.\n" @@ -208,14 +208,14 @@ "the last character in your email address." msgstr "" -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " "which does not end." msgstr "" -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -229,14 +229,14 @@ "character." msgstr "" -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "invalid display name." msgstr "" -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -244,12 +244,12 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 msgctxt "QObject|" msgid "" "The email address you entered is not valid.\n" @@ -257,82 +257,82 @@ "form joe@example.org." msgstr "" -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 msgctxt "KEncodingProber|@item Text character set" msgid "Disabled" msgstr "Malŝaltita" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 msgctxt "KEncodingProber|@item Text character set" msgid "Universal" msgstr "Universala" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 msgctxt "KEncodingProber|@item Text character set" msgid "Unicode" msgstr "Unikodo" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 msgctxt "KEncodingProber|@item Text character set" msgid "Cyrillic" msgstr "Cirila" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 msgctxt "KEncodingProber|@item Text character set" msgid "Western European" msgstr "Okcidenteŭropa" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 msgctxt "KEncodingProber|@item Text character set" msgid "Central European" msgstr "Mezeŭropa" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 msgctxt "KEncodingProber|@item Text character set" msgid "Greek" msgstr "Greka" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 msgctxt "KEncodingProber|@item Text character set" msgid "Hebrew" msgstr "Hebrea" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 msgctxt "KEncodingProber|@item Text character set" msgid "Turkish" msgstr "Turka" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 msgctxt "KEncodingProber|@item Text character set" msgid "Japanese" msgstr "Japana" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 msgctxt "KEncodingProber|@item Text character set" msgid "Baltic" msgstr "Balta" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Traditional" msgstr "Tradicia ĉina" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Simplified" msgstr "Simpligita ĉina" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 msgctxt "KEncodingProber|@item Text character set" msgid "Korean" msgstr "Korea" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 msgctxt "KEncodingProber|@item Text character set" msgid "Thai" msgstr "Taja" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 msgctxt "KEncodingProber|@item Text character set" msgid "Arabic" msgstr "Araba" diff -Nru kcodecs-5.79.0/po/es/kcodecs5_qt.po kcodecs-5.80.0/po/es/kcodecs5_qt.po --- kcodecs-5.79.0/po/es/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/es/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -112,25 +112,25 @@ msgid "Other" msgstr "Otro" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, qt-format msgctxt "KCharsets|@item %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, qt-format msgctxt "KCharsets|@item" msgid "Other encoding (%1)" msgstr "Otra codificación (%1)" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, qt-format msgctxt "KCharsets|@item Text encoding: %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains more than one " @@ -141,7 +141,7 @@ "contiene más de una @.\n" "No podrá crear mensajes válidos si no modifica esta dirección." -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a @.\n" @@ -151,13 +151,13 @@ "contiene una @.\n" "No podrá crear mensajes válidos si no modifica esta dirección." -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "" "Debe de introducir algo en el campo de dirección de correo electrónico." -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -166,7 +166,7 @@ "La dirección de correo electrónico que ha introducido no es válida porque no " "contiene una parte local." -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -175,7 +175,7 @@ "La dirección de correo electrónico que ha introducido no es válida porque no " "contiene una parte de dominio." -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " @@ -184,12 +184,12 @@ "La dirección de correo electrónico que ha introducido no es válida porque " "contiene comentarios o paréntesis sin cerrar." -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 msgctxt "QObject|" msgid "The email address you entered is valid." msgstr "La dirección de correo electrónico que ha introducido es válida." -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " @@ -198,7 +198,7 @@ "La dirección de correo electrónico que ha introducido no es válida porque " "contiene un paréntesis angular sin cerrar." -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " @@ -207,7 +207,7 @@ "La dirección de correo electrónico que ha introducido no es válida porque " "contiene demasiados paréntesis angulares de cierre." -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " @@ -216,7 +216,7 @@ "La dirección de correo electrónico que ha introducido no es válida porque " "contiene una coma no esperada." -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it ended unexpectedly.\n" @@ -228,7 +228,7 @@ "Esto suele suceder cuando usa un carácter de escape como '\\' al final de la " "dirección de correo electrónico." -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " @@ -237,7 +237,7 @@ "La dirección de correo electrónico que ha introducido no es válida porque " "contiene texto entre comillas que no termina." -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -255,7 +255,7 @@ "La dirección de correo electrónico que ha introducido no es válida porque " "contiene un carácter no permitido." -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " @@ -264,7 +264,7 @@ "La dirección de correo electrónico que ha introducido no es válida porque " "contiene un nombre a mostrar no permitido." -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -275,12 +275,12 @@ "contiene un «.».\n" "No podrá crear mensajes válidos si no modifica esta dirección." -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "Problema desconocido con la dirección de correo electrónico" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 msgctxt "QObject|" msgid "" "The email address you entered is not valid.\n" @@ -291,82 +291,82 @@ " Parece que no contiene una dirección de correo real, como fulano@ejemplo." "org." -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 msgctxt "KEncodingProber|@item Text character set" msgid "Disabled" msgstr "Desactivado" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 msgctxt "KEncodingProber|@item Text character set" msgid "Universal" msgstr "Universal" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 msgctxt "KEncodingProber|@item Text character set" msgid "Unicode" msgstr "Unicode" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 msgctxt "KEncodingProber|@item Text character set" msgid "Cyrillic" msgstr "Cirílico" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 msgctxt "KEncodingProber|@item Text character set" msgid "Western European" msgstr "Europeo occidental" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 msgctxt "KEncodingProber|@item Text character set" msgid "Central European" msgstr "Centroeuropeo" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 msgctxt "KEncodingProber|@item Text character set" msgid "Greek" msgstr "Griego" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 msgctxt "KEncodingProber|@item Text character set" msgid "Hebrew" msgstr "Hebreo" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 msgctxt "KEncodingProber|@item Text character set" msgid "Turkish" msgstr "Turco" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 msgctxt "KEncodingProber|@item Text character set" msgid "Japanese" msgstr "Japonés" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 msgctxt "KEncodingProber|@item Text character set" msgid "Baltic" msgstr "Báltico" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Traditional" msgstr "Chino tradicional" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Simplified" msgstr "Chino simplificado" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 msgctxt "KEncodingProber|@item Text character set" msgid "Korean" msgstr "Coreano" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 msgctxt "KEncodingProber|@item Text character set" msgid "Thai" msgstr "Tailandés" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 msgctxt "KEncodingProber|@item Text character set" msgid "Arabic" msgstr "Árabe" diff -Nru kcodecs-5.79.0/po/et/kcodecs5_qt.po kcodecs-5.80.0/po/et/kcodecs5_qt.po --- kcodecs-5.79.0/po/et/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/et/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -107,25 +107,25 @@ msgid "Other" msgstr "Muu" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, qt-format msgctxt "KCharsets|@item %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, qt-format msgctxt "KCharsets|@item" msgid "Other encoding (%1)" msgstr "Muu kodeering (%1)" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, qt-format msgctxt "KCharsets|@item Text encoding: %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains more than one " @@ -135,7 +135,7 @@ "Sisestatud e-posti aadress ei sobi, sest selles on üle ühe @-märgi.\n" "Sa ei saa kirju saata, kui sa ei muuda aadressi." -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a @.\n" @@ -144,12 +144,12 @@ "Sisestatud e-posti aadress ei sobi, sest selles pole ühtegi @-märki.\n" "Sa ei saa kirju saata, kui sa ei muuda aadressi." -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "E-posti aadressi väljale tuleb ikka midagi kirjutada." -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -158,7 +158,7 @@ "Sisestatud e-posti aadress ei sobi, sest selles ei leidu serverile viitavat " "osa." -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -167,7 +167,7 @@ "Sisestatud e-posti aadress ei sobi, sest selles ei leidu domeenile viitavat " "osa." -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " @@ -176,12 +176,12 @@ "Sisestatud e-posti aadress ei sobi, sest selles on lõpetamata kommentaare/" "sulge." -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 msgctxt "QObject|" msgid "The email address you entered is valid." msgstr "Sisestatud e-posti aadress on täiesti sobilik." -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " @@ -189,7 +189,7 @@ msgstr "" "Sisestatud e-posti aadress ei sobi, sest selles on lõpetamata nurksulg." -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " @@ -198,14 +198,14 @@ "Sisestatud e-posti aadress ei sobi, sest selles on liiga palju lõpetavaid " "nurksulge." -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "unexpected comma." msgstr "Sisestatud e-posti aadress ei sobi, sest selles on ootamatu koma." -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it ended unexpectedly.\n" @@ -216,14 +216,14 @@ "See tähendab arvatavasti, et oled kasutanud aadressi viimase märgina näiteks " "paomärki ('\\')." -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " "which does not end." msgstr "Sisestatud e-posti aadress ei sobi, sest sisaldab lõpetamata tsitaati." -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -239,7 +239,7 @@ "character." msgstr "Sisestatud e-posti aadress ei sobi, sest selles on lubamatu sümbol." -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " @@ -247,7 +247,7 @@ msgstr "" "Sisestatud e-posti aadress ei sobi, sest selles on lubamatu näidatav nimi." -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -257,12 +257,12 @@ "Sisestatud e-posti aadress ei sobi, sest selles pole ühtegi punkti.\n" "Sa ei saa kirju saata, kui sa ei muuda aadressi." -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "Tundmatu probleem e-posti aadressiga" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 msgctxt "QObject|" msgid "" "The email address you entered is not valid.\n" @@ -273,82 +273,82 @@ "See ei paista sisaldavat tegelikku e-posti aadressi, s.t. midagi, mis oleks " "kujul jaan@kuskil.ee." -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 msgctxt "KEncodingProber|@item Text character set" msgid "Disabled" msgstr "Keelatud" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 msgctxt "KEncodingProber|@item Text character set" msgid "Universal" msgstr "Universaalne" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 msgctxt "KEncodingProber|@item Text character set" msgid "Unicode" msgstr "Unicode" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 msgctxt "KEncodingProber|@item Text character set" msgid "Cyrillic" msgstr "Kirillitsa" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 msgctxt "KEncodingProber|@item Text character set" msgid "Western European" msgstr "Lääne-Euroopa" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 msgctxt "KEncodingProber|@item Text character set" msgid "Central European" msgstr "Kesk-Euroopa" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 msgctxt "KEncodingProber|@item Text character set" msgid "Greek" msgstr "Kreeka" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 msgctxt "KEncodingProber|@item Text character set" msgid "Hebrew" msgstr "Heebrea" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 msgctxt "KEncodingProber|@item Text character set" msgid "Turkish" msgstr "Türgi" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 msgctxt "KEncodingProber|@item Text character set" msgid "Japanese" msgstr "Jaapani" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 msgctxt "KEncodingProber|@item Text character set" msgid "Baltic" msgstr "Balti" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Traditional" msgstr "Hiina (traditsiooniline)" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Simplified" msgstr "Hiina (lihtsustatud)" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 msgctxt "KEncodingProber|@item Text character set" msgid "Korean" msgstr "Korea" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 msgctxt "KEncodingProber|@item Text character set" msgid "Thai" msgstr "Tai" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 msgctxt "KEncodingProber|@item Text character set" msgid "Arabic" msgstr "Araabia" diff -Nru kcodecs-5.79.0/po/eu/kcodecs5_qt.po kcodecs-5.80.0/po/eu/kcodecs5_qt.po --- kcodecs-5.79.0/po/eu/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/eu/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -111,25 +111,25 @@ msgid "Other" msgstr "Bestelakoak" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, qt-format msgctxt "KCharsets|@item %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, qt-format msgctxt "KCharsets|@item" msgid "Other encoding (%1)" msgstr "Beste kodeketa batzuk (%1)" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, qt-format msgctxt "KCharsets|@item Text encoding: %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains more than one " @@ -140,7 +140,7 @@ "daukalako.\n" "Ez dituzu mezu erabilgarriak sortuko zure helbidea aldatzen ez baduzu." -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a @.\n" @@ -149,12 +149,12 @@ "Sartu duzun e-posta helbidea ez da erabilgarria @ falta zaiolako.\n" "Ez dituzu mezu erabilgarriak sortuko zure helbidea aldatzen ez baduzu." -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "Zerbait sartu behar duzu e-posta helbide eremuan." -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -162,7 +162,7 @@ msgstr "" "Sartu duzun e-posta helbidea ez da baliagarria lokal zatia falta zaiolako." -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -170,7 +170,7 @@ msgstr "" "Sartu duzun e-posta helbidea ez da erabilgarria domeinu zatia falta zaiolako." -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " @@ -179,12 +179,12 @@ "Sartu duzun e-posta helbidea ez da erabilgarria itxi gabeko iruzkinak/" "kortxeteak dituelako." -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 msgctxt "QObject|" msgid "The email address you entered is valid." msgstr "Sartu duzun e-posta helbidea erabilgarria da" -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " @@ -193,7 +193,7 @@ "Sartu duzun e-posta helbidea ez da erabilgarria itxi gabeko parentesi " "angeluduna daukalako." -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " @@ -202,7 +202,7 @@ "Sartu duzun e-posta helbidea ez da erabilgarria ixteko parentesi angeluar " "gehiegi dituelako." -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " @@ -210,7 +210,7 @@ msgstr "" "Sartu duzun e-posta helbidea ez da erabilgarria ustekabeko koma bat duelako." -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it ended unexpectedly.\n" @@ -221,7 +221,7 @@ "Honen arrazoia izan daiteke ihes karaktere bat erabili izana, «\\» " "esaterako, zure e-posta helbideko azken karaktere gisa." -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " @@ -230,7 +230,7 @@ "Sartu duzun e-posta helbidea baliogabea da itxi gabeko iruzkin testua " "daukalako." -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -248,7 +248,7 @@ "Sartu duzun e-posta helbidea ez da erabilgarria legez kanpoko karaktere bat " "erabiltzen duelako." -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " @@ -257,7 +257,7 @@ "Sartu duzun e-posta helbidea ez da erabilgarria erakusteko izen baliogabe " "bat duelako." -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -267,12 +267,12 @@ "Sartu duzun e-posta helbidea ez da erabilgarria «.» bat falta duelako.\n" "Ezingo dituzu mezu erabilgarriak sortu zure helbidea aldatzen ez baduzu." -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "Arazo ezezaguna e-posta helbidearekin" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 msgctxt "QObject|" msgid "" "The email address you entered is not valid.\n" @@ -282,82 +282,82 @@ "Sartu duzun e-posta helbidea ez da erabilgarria.\n" "Ez dirudi benetako e-posta bat denik, ez da jone@adibidea.eus modukoa." -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 msgctxt "KEncodingProber|@item Text character set" msgid "Disabled" msgstr "Desgaituta" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 msgctxt "KEncodingProber|@item Text character set" msgid "Universal" msgstr "Unibertsala" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 msgctxt "KEncodingProber|@item Text character set" msgid "Unicode" msgstr "Unicode" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 msgctxt "KEncodingProber|@item Text character set" msgid "Cyrillic" msgstr "Zirilikoa" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 msgctxt "KEncodingProber|@item Text character set" msgid "Western European" msgstr "Europako Mendebaldekoa" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 msgctxt "KEncodingProber|@item Text character set" msgid "Central European" msgstr "Europako Erdialdekoa" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 msgctxt "KEncodingProber|@item Text character set" msgid "Greek" msgstr "Grekoa" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 msgctxt "KEncodingProber|@item Text character set" msgid "Hebrew" msgstr "Hebreera" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 msgctxt "KEncodingProber|@item Text character set" msgid "Turkish" msgstr "Turkiera" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 msgctxt "KEncodingProber|@item Text character set" msgid "Japanese" msgstr "Japoniera" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 msgctxt "KEncodingProber|@item Text character set" msgid "Baltic" msgstr "Baltikoa" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Traditional" msgstr "Txinera tradizionala" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Simplified" msgstr "Txinera erraztua" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 msgctxt "KEncodingProber|@item Text character set" msgid "Korean" msgstr "Koreera" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 msgctxt "KEncodingProber|@item Text character set" msgid "Thai" msgstr "Thailandiera" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 msgctxt "KEncodingProber|@item Text character set" msgid "Arabic" msgstr "Arabiera" diff -Nru kcodecs-5.79.0/po/fa/kcodecs5_qt.po kcodecs-5.80.0/po/fa/kcodecs5_qt.po --- kcodecs-5.79.0/po/fa/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/fa/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -159,7 +159,7 @@ msgstr "غیره" # %1 ( %2 ) -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, fuzzy, qt-format #| msgctxt "@item %1 character set, %2 encoding" #| msgid "%1 ( %2 )" @@ -167,7 +167,7 @@ msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, fuzzy, qt-format #| msgctxt "@item" #| msgid "Other encoding (%1)" @@ -176,7 +176,7 @@ msgstr "کدبندی دیگر )%1(" # %1 ( %2 ) -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, fuzzy, qt-format #| msgctxt "@item %1 character set, %2 encoding" #| msgid "%1 ( %2 )" @@ -184,7 +184,7 @@ msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains more than one " @@ -192,67 +192,67 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a @.\n" "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "" -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "local part." msgstr "" -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "domain part." msgstr "" -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " "comments/brackets." msgstr "" -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 #, fuzzy msgctxt "QObject|" msgid "The email address you entered is valid." msgstr "گواهی‌نامه معتبر نیست" -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " "angle bracket." msgstr "" -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " "closing angle brackets." msgstr "" -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "unexpected comma." msgstr "" -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it ended unexpectedly.\n" @@ -260,14 +260,14 @@ "the last character in your email address." msgstr "" -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " "which does not end." msgstr "" -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -281,14 +281,14 @@ "character." msgstr "" -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "invalid display name." msgstr "" -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -296,12 +296,12 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 msgctxt "QObject|" msgid "" "The email address you entered is not valid.\n" @@ -309,7 +309,7 @@ "form joe@example.org." msgstr "" -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Disabled" @@ -318,7 +318,7 @@ msgstr "غیرفعال شده" # Uninstall -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Universal" @@ -326,7 +326,7 @@ msgid "Universal" msgstr "فراگیر" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Unicode" @@ -334,7 +334,7 @@ msgid "Unicode" msgstr "یونی‌کد" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Cyrillic" @@ -342,7 +342,7 @@ msgid "Cyrillic" msgstr "سریلی" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Western European" @@ -350,7 +350,7 @@ msgid "Western European" msgstr "اروپای غربی" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Central European" @@ -358,7 +358,7 @@ msgid "Central European" msgstr "اروپای مرکزی" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Greek" @@ -366,7 +366,7 @@ msgid "Greek" msgstr "یونانی" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 #, fuzzy #| msgctxt "@item Spelling dictionary" #| msgid "Hebrew" @@ -374,7 +374,7 @@ msgid "Hebrew" msgstr "عبری" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 #, fuzzy #| msgctxt "@item Spelling dictionary" #| msgid "Turkish" @@ -382,7 +382,7 @@ msgid "Turkish" msgstr "ترکی" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Japanese" @@ -390,7 +390,7 @@ msgid "Japanese" msgstr "ژاپنی" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Baltic" @@ -398,7 +398,7 @@ msgid "Baltic" msgstr "بالتیک" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Chinese Traditional" @@ -406,7 +406,7 @@ msgid "Chinese Traditional" msgstr "چینی سنتی" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Chinese Simplified" @@ -414,7 +414,7 @@ msgid "Chinese Simplified" msgstr "چینی ساده‌شده" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Korean" @@ -422,7 +422,7 @@ msgid "Korean" msgstr "کره‌ای" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Thai" @@ -430,7 +430,7 @@ msgid "Thai" msgstr "تایلندی" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Arabic" diff -Nru kcodecs-5.79.0/po/fi/kcodecs5_qt.po kcodecs-5.80.0/po/fi/kcodecs5_qt.po --- kcodecs-5.79.0/po/fi/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/fi/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -123,25 +123,25 @@ msgid "Other" msgstr "Muu" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, qt-format msgctxt "KCharsets|@item %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, qt-format msgctxt "KCharsets|@item" msgid "Other encoding (%1)" msgstr "Muu merkistökoodaus (%1)" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, qt-format msgctxt "KCharsets|@item Text encoding: %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains more than one " @@ -151,7 +151,7 @@ "Antamasi sähköpostiosoite ei kelpaa, sillä se sisältää useita @-merkkejä.\n" "Kelvollisia viestejä ei voi kirjoittaa, ellei osoitetta muuteta." -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a @.\n" @@ -160,12 +160,12 @@ "Antamasi sähköpostiosoite ei kelpaa, koska se ei sisällä @-merkkiä.\n" "Et voi kirjoittaa viestejä, ellei osoitetta muuteta." -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "Täytä sähköpostiosoite sille varattuun kenttään." -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -174,7 +174,7 @@ "Antamasi sähköpostiosoite ei ole kelvollinen, sillä se ei sisällä " "paikallista osaa (ennen @-merkkiä)." -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -183,7 +183,7 @@ "Antamasi sähköpostiosoite ei ole kelvollinen, sillä se ei sisällä " "verkkoalueen nimeä (@-merkin jälkeen)." -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " @@ -192,12 +192,12 @@ "Antamasi sähköpostiosoite ei ole kelvollinen, sillä siinä on pariton määrä " "sulkuja." -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 msgctxt "QObject|" msgid "The email address you entered is valid." msgstr "Antamasi sähköpostiosoite on kelvollinen." -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " @@ -206,7 +206,7 @@ "Antamasi sähköpostiosoite ei ole kelvollinen, sillä siitä puuttuu sulkeva " "hakasulje." -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " @@ -215,7 +215,7 @@ "Antamasi sähköpostiosoite ei ole kelvollinen, sillä siinä on liikaa " "hakasulkeita." -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " @@ -223,7 +223,7 @@ msgstr "" "Antamasi sähköpostiosoite ei ole kelvollinen, sillä se sisältää pilkun." -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it ended unexpectedly.\n" @@ -234,7 +234,7 @@ "Tämä johtuu todennäköisesti siitä, että olet käyttänyt osoitteessa " "lopetusmerkkiä (esimerkiksi ”\\”)." -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " @@ -243,7 +243,7 @@ "Antamasi sähköpostiosoite ei ole kelvollinen, sillä se sisältää " "päättymättömän lainauksen." -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -261,7 +261,7 @@ "Antamasi sähköpostiosoite ei ole kelvollinen, sillä se sisältää virheellisen " "merkin." -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " @@ -270,7 +270,7 @@ "Antamasi sähköpostiosoite ei ole kelvollinen, sillä sen sisältämä näyttönimi " "ei ole kelvollinen." -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -280,12 +280,12 @@ "Antamasi sähköpostiosoite ei kelpaa, koska se ei sisällä pistettä.\n" "Kelvollisia viestejä ei voi kirjoittaa, ellei osoitetta muuteta." -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "Tuntematon sähköpostiosoiteongelma." -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 msgctxt "QObject|" msgid "" "The email address you entered is not valid.\n" @@ -296,82 +296,82 @@ "Se ei vaikuta sisältävän varsinaista sähköpostiosoitetta (esim. " "matti@esimerkki.fi)." -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 msgctxt "KEncodingProber|@item Text character set" msgid "Disabled" msgstr "Ei käytössä" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 msgctxt "KEncodingProber|@item Text character set" msgid "Universal" msgstr "Yleinen" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 msgctxt "KEncodingProber|@item Text character set" msgid "Unicode" msgstr "Unicode" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 msgctxt "KEncodingProber|@item Text character set" msgid "Cyrillic" msgstr "Kyrillinen" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 msgctxt "KEncodingProber|@item Text character set" msgid "Western European" msgstr "Länsieurooppalainen" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 msgctxt "KEncodingProber|@item Text character set" msgid "Central European" msgstr "Keskieurooppalainen" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 msgctxt "KEncodingProber|@item Text character set" msgid "Greek" msgstr "Kreikkalainen" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 msgctxt "KEncodingProber|@item Text character set" msgid "Hebrew" msgstr "Heprealainen" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 msgctxt "KEncodingProber|@item Text character set" msgid "Turkish" msgstr "Turkkilainen" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 msgctxt "KEncodingProber|@item Text character set" msgid "Japanese" msgstr "Japanilainen" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 msgctxt "KEncodingProber|@item Text character set" msgid "Baltic" msgstr "Baltialainen" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Traditional" msgstr "Kiina (perinteinen)" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Simplified" msgstr "Kiina (yksinkertaistettu)" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 msgctxt "KEncodingProber|@item Text character set" msgid "Korean" msgstr "Korealainen" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 msgctxt "KEncodingProber|@item Text character set" msgid "Thai" msgstr "Thai" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 msgctxt "KEncodingProber|@item Text character set" msgid "Arabic" msgstr "Arabialainen" diff -Nru kcodecs-5.79.0/po/fr/kcodecs5_qt.po kcodecs-5.80.0/po/fr/kcodecs5_qt.po --- kcodecs-5.79.0/po/fr/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/fr/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -25,7 +25,7 @@ "POT-Creation-Date: 2014-03-23 01:50+0000\n" "PO-Revision-Date: 2021-01-11 12:52+0100\n" "Last-Translator: Xavier Besnard \n" -"Language-Team: FR\n" +"Language-Team: French \n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -122,25 +122,25 @@ msgid "Other" msgstr "Autre" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, qt-format msgctxt "KCharsets|@item %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, qt-format msgctxt "KCharsets|@item" msgid "Other encoding (%1)" msgstr "Autre encodage (%1)" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, qt-format msgctxt "KCharsets|@item Text encoding: %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains more than one " @@ -152,7 +152,7 @@ "Vous ne pourrez pas créer de messages valables tant que vous n'aurez pas " "modifié pas votre adresse." -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a @.\n" @@ -163,14 +163,14 @@ "Vous ne pourrez pas créer de messages valables tant que vous n'aurez pas " "modifié pas votre adresse." -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "" "Vous devez saisir quelque chose dans le champ « Adresse de courrier " "électronique »." -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -179,7 +179,7 @@ "L'adresse de courrier électronique que vous avez saisie n'est pas valable " "car elle ne contient aucune partie locale." -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -188,7 +188,7 @@ "L'adresse de courrier électronique que vous avez saisie n'est pas valable " "car elle ne contient aucun nom de domaine." -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " @@ -197,12 +197,12 @@ "L'adresse de courrier électronique que vous avez saisie n'est pas valable " "car elle contient des parenthèses / crochets non fermés." -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 msgctxt "QObject|" msgid "The email address you entered is valid." msgstr "L'adresse de courrier électronique que vous avez saisie est valable." -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " @@ -211,7 +211,7 @@ "L'adresse de courrier électronique que vous avez saisie n'est pas valable " "car elle contient des chevrons non fermés." -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " @@ -220,7 +220,7 @@ "L'adresse de courrier électronique que vous avez saisie n'est pas valable " "car elle contient trop de chevrons fermants." -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " @@ -229,7 +229,7 @@ "L'adresse de courrier électronique que vous avez saisie n'est pas valable " "car elle contient une virgule inattendue." -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it ended unexpectedly.\n" @@ -242,7 +242,7 @@ "« Échappement » comme « \\ » comme dernier caractère dans votre adresse de " "courriel." -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " @@ -251,7 +251,7 @@ "L'adresse de courrier électronique que vous avez saisie n'est pas valable " "car elle contient des marques de citation (' ou \") non fermées." -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -270,7 +270,7 @@ "L'adresse de courrier électronique que vous avez saisie n'est pas valable " "car elle contient un caractère interdit." -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " @@ -279,7 +279,7 @@ "L'adresse de courrier électronique que vous avez saisie n'est pas valable " "car elle contient un nom incorrect à afficher." -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -290,12 +290,12 @@ "car elle ne contient aucun point (caractère « . »). Vous ne pourrez pas " "créer de messages valables tant que vous n'aurez pas modifié votre adresse." -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "Problème inconnu avec l'adresse de courrier électronique" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 msgctxt "QObject|" msgid "" "The email address you entered is not valid.\n" @@ -306,82 +306,82 @@ "En effet, elle ne semble pas correspondre une véritable adresse, c'est-à-" "dire quelque chose du type « jean@exemple.org »." -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 msgctxt "KEncodingProber|@item Text character set" msgid "Disabled" msgstr "Désactivé" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 msgctxt "KEncodingProber|@item Text character set" msgid "Universal" msgstr "Universel" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 msgctxt "KEncodingProber|@item Text character set" msgid "Unicode" msgstr "Unicode" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 msgctxt "KEncodingProber|@item Text character set" msgid "Cyrillic" msgstr "Cyrillique" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 msgctxt "KEncodingProber|@item Text character set" msgid "Western European" msgstr "Européen de l'ouest" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 msgctxt "KEncodingProber|@item Text character set" msgid "Central European" msgstr "Européen central" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 msgctxt "KEncodingProber|@item Text character set" msgid "Greek" msgstr "Grec" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 msgctxt "KEncodingProber|@item Text character set" msgid "Hebrew" msgstr "Hébreu" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 msgctxt "KEncodingProber|@item Text character set" msgid "Turkish" msgstr "Turc" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 msgctxt "KEncodingProber|@item Text character set" msgid "Japanese" msgstr "Japonais" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 msgctxt "KEncodingProber|@item Text character set" msgid "Baltic" msgstr "Balte" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Traditional" msgstr "Chinois traditionnel" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Simplified" msgstr "Chinois simplifié" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 msgctxt "KEncodingProber|@item Text character set" msgid "Korean" msgstr "Coréen" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 msgctxt "KEncodingProber|@item Text character set" msgid "Thai" msgstr "Thaïlandais" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 msgctxt "KEncodingProber|@item Text character set" msgid "Arabic" msgstr "Arabe" diff -Nru kcodecs-5.79.0/po/fy/kcodecs5_qt.po kcodecs-5.80.0/po/fy/kcodecs5_qt.po --- kcodecs-5.79.0/po/fy/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/fy/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -163,7 +163,7 @@ msgid "Other" msgstr "Oare" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, fuzzy, qt-format #| msgctxt "@item %1 character set, %2 encoding" #| msgid "%1 ( %2 )" @@ -171,7 +171,7 @@ msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, fuzzy, qt-format #| msgctxt "@item" #| msgid "Other encoding (%1)" @@ -179,7 +179,7 @@ msgid "Other encoding (%1)" msgstr "Oare kodearring (%1)" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, fuzzy, qt-format #| msgctxt "@item %1 character set, %2 encoding" #| msgid "%1 ( %2 )" @@ -187,7 +187,7 @@ msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains more than one " @@ -195,67 +195,67 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a @.\n" "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "" -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "local part." msgstr "" -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "domain part." msgstr "" -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " "comments/brackets." msgstr "" -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 #, fuzzy msgctxt "QObject|" msgid "The email address you entered is valid." msgstr "It sertifikaat is net jildich." -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " "angle bracket." msgstr "" -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " "closing angle brackets." msgstr "" -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "unexpected comma." msgstr "" -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it ended unexpectedly.\n" @@ -263,14 +263,14 @@ "the last character in your email address." msgstr "" -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " "which does not end." msgstr "" -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -284,14 +284,14 @@ "character." msgstr "" -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "invalid display name." msgstr "" -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -299,12 +299,12 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 msgctxt "QObject|" msgid "" "The email address you entered is not valid.\n" @@ -312,7 +312,7 @@ "form joe@example.org." msgstr "" -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Disabled" @@ -320,7 +320,7 @@ msgid "Disabled" msgstr "Utskeakele" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Universal" @@ -328,7 +328,7 @@ msgid "Universal" msgstr "Universeel" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Unicode" @@ -336,7 +336,7 @@ msgid "Unicode" msgstr "Unikoade" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Cyrillic" @@ -344,7 +344,7 @@ msgid "Cyrillic" msgstr "Cyrillysk" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Western European" @@ -352,7 +352,7 @@ msgid "Western European" msgstr "West-Europeesk" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Central European" @@ -360,7 +360,7 @@ msgid "Central European" msgstr "Sintraal Europeesk" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Greek" @@ -368,7 +368,7 @@ msgid "Greek" msgstr "Gryks" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 #, fuzzy #| msgctxt "@item Spelling dictionary" #| msgid "Hebrew" @@ -376,7 +376,7 @@ msgid "Hebrew" msgstr "Hebrieusk" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 #, fuzzy #| msgctxt "@item Spelling dictionary" #| msgid "Turkish" @@ -384,7 +384,7 @@ msgid "Turkish" msgstr "Turksk" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Japanese" @@ -392,7 +392,7 @@ msgid "Japanese" msgstr "Japansk" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Baltic" @@ -400,7 +400,7 @@ msgid "Baltic" msgstr "Baltysk" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Chinese Traditional" @@ -408,7 +408,7 @@ msgid "Chinese Traditional" msgstr "Tradisjoneel Sineesk" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Chinese Simplified" @@ -416,7 +416,7 @@ msgid "Chinese Simplified" msgstr "Ferienfâldige Sineesk" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Korean" @@ -424,7 +424,7 @@ msgid "Korean" msgstr "Koreaansk" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Thai" @@ -432,7 +432,7 @@ msgid "Thai" msgstr "Taïsk" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Arabic" diff -Nru kcodecs-5.79.0/po/ga/kcodecs5_qt.po kcodecs-5.80.0/po/ga/kcodecs5_qt.po --- kcodecs-5.79.0/po/ga/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/ga/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -157,7 +157,7 @@ msgid "Other" msgstr "Eile" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, fuzzy, qt-format #| msgctxt "@item %1 character set, %2 encoding" #| msgid "%1 ( %2 )" @@ -165,7 +165,7 @@ msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, fuzzy, qt-format #| msgctxt "@item" #| msgid "Other encoding (%1)" @@ -173,7 +173,7 @@ msgid "Other encoding (%1)" msgstr "Ionchódú eile (%1)" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, fuzzy, qt-format #| msgctxt "@item %1 character set, %2 encoding" #| msgid "%1 ( %2 )" @@ -181,7 +181,7 @@ msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains more than one " @@ -189,40 +189,40 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a @.\n" "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "" -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "local part." msgstr "" -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "domain part." msgstr "" -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " "comments/brackets." msgstr "" -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 #, fuzzy #| msgctxt "@info" #| msgid "The date you entered is invalid" @@ -230,28 +230,28 @@ msgid "The email address you entered is valid." msgstr "Chuir tú dáta neamhbhailí isteach" -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " "angle bracket." msgstr "" -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " "closing angle brackets." msgstr "" -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "unexpected comma." msgstr "" -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it ended unexpectedly.\n" @@ -259,14 +259,14 @@ "the last character in your email address." msgstr "" -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " "which does not end." msgstr "" -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -280,14 +280,14 @@ "character." msgstr "" -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "invalid display name." msgstr "" -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -295,12 +295,12 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 msgctxt "QObject|" msgid "" "The email address you entered is not valid.\n" @@ -308,7 +308,7 @@ "form joe@example.org." msgstr "" -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Disabled" @@ -316,7 +316,7 @@ msgid "Disabled" msgstr "Díchumasaithe" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Universal" @@ -324,7 +324,7 @@ msgid "Universal" msgstr "Uilíoch" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Unicode" @@ -332,7 +332,7 @@ msgid "Unicode" msgstr "Unicode" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Cyrillic" @@ -340,7 +340,7 @@ msgid "Cyrillic" msgstr "Coireallach" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Western European" @@ -348,7 +348,7 @@ msgid "Western European" msgstr "Iarthar na hEorpa" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Central European" @@ -356,7 +356,7 @@ msgid "Central European" msgstr "Lár na hEorpa" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Greek" @@ -364,7 +364,7 @@ msgid "Greek" msgstr "Gréagach" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 #, fuzzy #| msgctxt "@item Spelling dictionary" #| msgid "Hebrew" @@ -372,7 +372,7 @@ msgid "Hebrew" msgstr "Eabhrais" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 #, fuzzy #| msgctxt "@item Spelling dictionary" #| msgid "Turkish" @@ -380,7 +380,7 @@ msgid "Turkish" msgstr "Tuircis" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Japanese" @@ -388,7 +388,7 @@ msgid "Japanese" msgstr "Seapánach" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Baltic" @@ -396,7 +396,7 @@ msgid "Baltic" msgstr "Baltach" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Chinese Traditional" @@ -404,7 +404,7 @@ msgid "Chinese Traditional" msgstr "Sínis Thraidisiúnta" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Chinese Simplified" @@ -412,7 +412,7 @@ msgid "Chinese Simplified" msgstr "Sínis Shimplithe" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Korean" @@ -420,7 +420,7 @@ msgid "Korean" msgstr "Cóiréach" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Thai" @@ -428,7 +428,7 @@ msgid "Thai" msgstr "Téalannach" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Arabic" diff -Nru kcodecs-5.79.0/po/gd/kcodecs5_qt.po kcodecs-5.80.0/po/gd/kcodecs5_qt.po --- kcodecs-5.79.0/po/gd/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/gd/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -100,25 +100,25 @@ msgid "Other" msgstr "Eile" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, qt-format msgctxt "KCharsets|@item %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, qt-format msgctxt "KCharsets|@item" msgid "Other encoding (%1)" msgstr "Còdachadh eile (%1)" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, qt-format msgctxt "KCharsets|@item Text encoding: %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 #, fuzzy #| msgctxt "QObject|" #| msgid "" @@ -135,7 +135,7 @@ "'na bhroinn. Cha chruthaich thu teachdaireachdan dligheach mur atharraich " "thu an seòladh agad." -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 #, fuzzy #| msgctxt "QObject|" #| msgid "" @@ -150,13 +150,13 @@ "eil @ 'na bhroinn. Cha chruthaich thu teachdaireachdan dligheach mur " "atharraich thu an seòladh agad." -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "" "Feumaidh tu rudeigin a chur a-steach ann an raon an t-seòlaidh puist-d." -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -165,7 +165,7 @@ "Chan eil an seòladh puist-d a chuir thu a-steach dligheach air sgàth 's nach " "eil pàirt ionadail 'na bhroinn." -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -174,7 +174,7 @@ "Chan eil an seòladh puist-d a chuir thu a-steach dligheach air sgàth 's nach " "eil pàirt àrainne 'na bhroinn." -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " @@ -183,12 +183,12 @@ "Chan eil an seòladh puist-d a chuir thu a-steach dligheach air sgàth 's gu " "bheil beachdan/camagan 'na bhroinn nach deach a dhùnadh." -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 msgctxt "QObject|" msgid "The email address you entered is valid." msgstr "Tha an seòladh puist-d a chuir thu a-steach dligheach." -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " @@ -197,7 +197,7 @@ "Chan eil an seòladh puist-d a chuir thu a-steach dligheach air sgàth 's gu " "bheil camag bhiorach 'na bhroinn nach deach a dhùnadh." -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " @@ -206,7 +206,7 @@ "Chan eil an seòladh puist-d a chuir thu a-steach dligheach air sgàth 's gu " "bheil cus chamagan biorach dùnaidh 'na bhroinn." -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " @@ -215,7 +215,7 @@ "Chan eil an seòladh puist-d a chuir thu a-steach dligheach air sgàth 's gu " "bheil cromag 'na bhroinn air nach eil dùil." -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 #, fuzzy #| msgctxt "QObject|" #| msgid "" @@ -233,7 +233,7 @@ "caractar teichidh mar \"\\\" 'na charactar mu dheireadh san t-seòladh puist-" "d agad." -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " @@ -242,7 +242,7 @@ "Chan eil an seòladh puist-d a chuir thu a-steach dligheach air sgàth 's gu " "bheil teacsa le comharran-iomraidh 'na bhroinn nach dig gu crìoch." -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -261,7 +261,7 @@ "Chan eil an seòladh puist-d a chuir thu a-steach dligheach air sgàth 's gu " "bheil caractar mì-dhligheach 'na bhroinn." -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " @@ -270,7 +270,7 @@ "Chan eil an seòladh puist-d a chuir thu a-steach dligheach air sgàth 's gu " "bheil ainm taisbeanaidh mì-dhligheach 'na bhroinn." -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 #, fuzzy #| msgctxt "QObject|" #| msgid "" @@ -286,12 +286,12 @@ "eil \".\" 'na bhroinn. Cha chruthaich thu teachdaireachdan dligheach mur " "atharraich thu an seòladh agad." -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "Duilgheadas nach aithne dhuinn le seòladh puist-d" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 #, fuzzy #| msgctxt "QObject|" #| msgid "" @@ -308,82 +308,82 @@ "eil coltas seòlaidh puist-d air, can rudeigin dhen chruth iain@ball-" "eisimpleir.org." -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 msgctxt "KEncodingProber|@item Text character set" msgid "Disabled" msgstr "À comas" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 msgctxt "KEncodingProber|@item Text character set" msgid "Universal" msgstr "Uile-choitcheann" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 msgctxt "KEncodingProber|@item Text character set" msgid "Unicode" msgstr "Unicode" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 msgctxt "KEncodingProber|@item Text character set" msgid "Cyrillic" msgstr "Cirilis" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 msgctxt "KEncodingProber|@item Text character set" msgid "Western European" msgstr "Siarach" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 msgctxt "KEncodingProber|@item Text character set" msgid "Central European" msgstr "Meadhan-Eòrpach" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 msgctxt "KEncodingProber|@item Text character set" msgid "Greek" msgstr "Greugais" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 msgctxt "KEncodingProber|@item Text character set" msgid "Hebrew" msgstr "Eabhra" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 msgctxt "KEncodingProber|@item Text character set" msgid "Turkish" msgstr "Turcais" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 msgctxt "KEncodingProber|@item Text character set" msgid "Japanese" msgstr "Seapanais" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 msgctxt "KEncodingProber|@item Text character set" msgid "Baltic" msgstr "Baltach" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Traditional" msgstr "Sìnis thradaiseanta" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Simplified" msgstr "Sìnis shimplichte" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 msgctxt "KEncodingProber|@item Text character set" msgid "Korean" msgstr "Coireanais" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 msgctxt "KEncodingProber|@item Text character set" msgid "Thai" msgstr "Tàidh" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 msgctxt "KEncodingProber|@item Text character set" msgid "Arabic" msgstr "Arabais" diff -Nru kcodecs-5.79.0/po/gl/kcodecs5_qt.po kcodecs-5.80.0/po/gl/kcodecs5_qt.po --- kcodecs-5.79.0/po/gl/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/gl/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -111,25 +111,25 @@ msgid "Other" msgstr "Outro" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, qt-format msgctxt "KCharsets|@item %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, qt-format msgctxt "KCharsets|@item" msgid "Other encoding (%1)" msgstr "Outra codificación (%1)" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, qt-format msgctxt "KCharsets|@item Text encoding: %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 #, fuzzy #| msgctxt "QObject|" #| msgid "" @@ -145,7 +145,7 @@ "O enderezo de correo electrónico que inseriu non é correcto porque contén " "máis dun @. Non creará mensaxes correctas se non cambia o enderezo." -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 #, fuzzy #| msgctxt "QObject|" #| msgid "" @@ -159,12 +159,12 @@ "O enderezo de correo electrónico que inseriu non é correcto porque non " "contén ningún @. Non creará mensaxes correctas se non cambia o enderezo." -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "Debe inserir algo no campo do enderezo de correo." -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -173,7 +173,7 @@ "O enderezo de correo electrónico que inseriu non é correcto porque non " "contén unha parte local." -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -182,7 +182,7 @@ "O enderezo de correo electrónico que inseriu non é correcto porque non " "contén unha parte de dominio." -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " @@ -191,12 +191,12 @@ "O enderezo de correo electrónico que inseriu non é correcto porque contén " "comentarios/corchetes non pechados." -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 msgctxt "QObject|" msgid "The email address you entered is valid." msgstr "O enderezo de correo electrónico que inseriu é correcto." -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " @@ -205,7 +205,7 @@ "O enderezo de correo electrónico que inseriu non é correcto porque contén un " "paréntese angular non pechado." -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " @@ -214,7 +214,7 @@ "O enderezo de correo electrónico que inseriu non é correcto porque contén un " "demasiados parénteses angulares de peche." -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " @@ -223,7 +223,7 @@ "O enderezo de correo electrónico que inseriu non é correcto porque contén " "unha coma inesperada." -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 #, fuzzy #| msgctxt "QObject|" #| msgid "" @@ -240,7 +240,7 @@ "de xeito inesperado. Isto probabelmente significa que usou un carácter de " "escape como un «\\» como último carácter no enderezo de correo." -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " @@ -249,7 +249,7 @@ "O enderezo de correo electrónico que inseriu non é correcto porque contén " "texto entre aspas que non terminan." -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -268,7 +268,7 @@ "O enderezo de correo electrónico que inseriu non é correcto porque contén un " "carácter inaceptábel." -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " @@ -277,7 +277,7 @@ "O enderezo de correo electrónico que inseriu non é correcto porque contén un " "nome para mostrar incorrecto." -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 #, fuzzy #| msgctxt "QObject|" #| msgid "" @@ -292,12 +292,12 @@ "O enderezo de correo electrónico que inseriu non é correcto porque non " "contén ningún punto. Non creará mensaxes correctas se non cambia o enderezo." -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "Erro descoñecido no enderezo de correo" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 #, fuzzy #| msgctxt "QObject|" #| msgid "" @@ -314,82 +314,82 @@ "parece conter un enderezo de correo real, é dicir, algo do estilo " "marce@trasno.gal." -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 msgctxt "KEncodingProber|@item Text character set" msgid "Disabled" msgstr "Desactivado" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 msgctxt "KEncodingProber|@item Text character set" msgid "Universal" msgstr "Universal" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 msgctxt "KEncodingProber|@item Text character set" msgid "Unicode" msgstr "Unicode" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 msgctxt "KEncodingProber|@item Text character set" msgid "Cyrillic" msgstr "Cirílico" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 msgctxt "KEncodingProber|@item Text character set" msgid "Western European" msgstr "Europeo occidental" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 msgctxt "KEncodingProber|@item Text character set" msgid "Central European" msgstr "Centroeuropeo" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 msgctxt "KEncodingProber|@item Text character set" msgid "Greek" msgstr "Grego" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 msgctxt "KEncodingProber|@item Text character set" msgid "Hebrew" msgstr "Hebreo" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 msgctxt "KEncodingProber|@item Text character set" msgid "Turkish" msgstr "Turco" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 msgctxt "KEncodingProber|@item Text character set" msgid "Japanese" msgstr "Xaponés" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 msgctxt "KEncodingProber|@item Text character set" msgid "Baltic" msgstr "Báltico" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Traditional" msgstr "Chinés tradicional" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Simplified" msgstr "Chinés simplificado" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 msgctxt "KEncodingProber|@item Text character set" msgid "Korean" msgstr "Coreano" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 msgctxt "KEncodingProber|@item Text character set" msgid "Thai" msgstr "Tailandés" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 msgctxt "KEncodingProber|@item Text character set" msgid "Arabic" msgstr "Árabe" diff -Nru kcodecs-5.79.0/po/gu/kcodecs5_qt.po kcodecs-5.80.0/po/gu/kcodecs5_qt.po --- kcodecs-5.79.0/po/gu/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/gu/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -155,7 +155,7 @@ msgid "Other" msgstr "બીજું" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, fuzzy, qt-format #| msgctxt "@item %1 character set, %2 encoding" #| msgid "%1 ( %2 )" @@ -163,7 +163,7 @@ msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, fuzzy, qt-format #| msgctxt "@item" #| msgid "Other encoding (%1)" @@ -171,7 +171,7 @@ msgid "Other encoding (%1)" msgstr "બીજા એનકોડિંગ (%1)" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, fuzzy, qt-format #| msgctxt "@item %1 character set, %2 encoding" #| msgid "%1 ( %2 )" @@ -179,7 +179,7 @@ msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains more than one " @@ -187,67 +187,67 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a @.\n" "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "" -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "local part." msgstr "" -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "domain part." msgstr "" -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " "comments/brackets." msgstr "" -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 #, fuzzy msgctxt "QObject|" msgid "The email address you entered is valid." msgstr "પ્રમાણપત્ર અયોગ્ય છે" -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " "angle bracket." msgstr "" -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " "closing angle brackets." msgstr "" -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "unexpected comma." msgstr "" -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it ended unexpectedly.\n" @@ -255,14 +255,14 @@ "the last character in your email address." msgstr "" -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " "which does not end." msgstr "" -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -276,14 +276,14 @@ "character." msgstr "" -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "invalid display name." msgstr "" -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -291,12 +291,12 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 msgctxt "QObject|" msgid "" "The email address you entered is not valid.\n" @@ -304,7 +304,7 @@ "form joe@example.org." msgstr "" -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Disabled" @@ -312,7 +312,7 @@ msgid "Disabled" msgstr "અસક્રિય કરેલ" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Universal" @@ -320,7 +320,7 @@ msgid "Universal" msgstr "વૈશ્વીક" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Unicode" @@ -328,7 +328,7 @@ msgid "Unicode" msgstr "યુનિકોડ" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Cyrillic" @@ -336,7 +336,7 @@ msgid "Cyrillic" msgstr "સીરિલીક" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Western European" @@ -344,7 +344,7 @@ msgid "Western European" msgstr "પશ્ચિમ યુરોપિયન" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Central European" @@ -352,7 +352,7 @@ msgid "Central European" msgstr "મધ્ય યુરોપિયન" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Greek" @@ -360,7 +360,7 @@ msgid "Greek" msgstr "ગ્રીક" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 #, fuzzy #| msgctxt "@item Spelling dictionary" #| msgid "Hebrew" @@ -368,7 +368,7 @@ msgid "Hebrew" msgstr "હીબ્રુ" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 #, fuzzy #| msgctxt "@item Spelling dictionary" #| msgid "Turkish" @@ -376,7 +376,7 @@ msgid "Turkish" msgstr "તુર્કિઝ" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Japanese" @@ -384,7 +384,7 @@ msgid "Japanese" msgstr "જાપાનીઝ" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Baltic" @@ -392,7 +392,7 @@ msgid "Baltic" msgstr "બાલ્ટિક" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Chinese Traditional" @@ -400,7 +400,7 @@ msgid "Chinese Traditional" msgstr "ચાઇનિઝ પરંપરાગત" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Chinese Simplified" @@ -408,7 +408,7 @@ msgid "Chinese Simplified" msgstr "ચાઇનિઝ સરળ" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Korean" @@ -416,7 +416,7 @@ msgid "Korean" msgstr "કોરીયન" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Thai" @@ -424,7 +424,7 @@ msgid "Thai" msgstr "થાઈ" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Arabic" diff -Nru kcodecs-5.79.0/po/ha/kcodecs5_qt.po kcodecs-5.80.0/po/ha/kcodecs5_qt.po --- kcodecs-5.79.0/po/ha/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/ha/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -104,25 +104,25 @@ msgid "Other" msgstr "" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, qt-format msgctxt "KCharsets|@item %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, qt-format msgctxt "KCharsets|@item" msgid "Other encoding (%1)" msgstr "" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, qt-format msgctxt "KCharsets|@item Text encoding: %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains more than one " @@ -130,66 +130,66 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a @.\n" "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "" -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "local part." msgstr "" -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "domain part." msgstr "" -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " "comments/brackets." msgstr "" -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 msgctxt "QObject|" msgid "The email address you entered is valid." msgstr "" -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " "angle bracket." msgstr "" -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " "closing angle brackets." msgstr "" -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "unexpected comma." msgstr "" -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it ended unexpectedly.\n" @@ -197,14 +197,14 @@ "the last character in your email address." msgstr "" -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " "which does not end." msgstr "" -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -218,14 +218,14 @@ "character." msgstr "" -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "invalid display name." msgstr "" -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -233,12 +233,12 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 msgctxt "QObject|" msgid "" "The email address you entered is not valid.\n" @@ -246,82 +246,82 @@ "form joe@example.org." msgstr "" -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 msgctxt "KEncodingProber|@item Text character set" msgid "Disabled" msgstr "" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 msgctxt "KEncodingProber|@item Text character set" msgid "Universal" msgstr "" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 msgctxt "KEncodingProber|@item Text character set" msgid "Unicode" msgstr "" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 msgctxt "KEncodingProber|@item Text character set" msgid "Cyrillic" msgstr "" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 msgctxt "KEncodingProber|@item Text character set" msgid "Western European" msgstr "" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 msgctxt "KEncodingProber|@item Text character set" msgid "Central European" msgstr "" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 msgctxt "KEncodingProber|@item Text character set" msgid "Greek" msgstr "" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 msgctxt "KEncodingProber|@item Text character set" msgid "Hebrew" msgstr "" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 msgctxt "KEncodingProber|@item Text character set" msgid "Turkish" msgstr "" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 msgctxt "KEncodingProber|@item Text character set" msgid "Japanese" msgstr "" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 msgctxt "KEncodingProber|@item Text character set" msgid "Baltic" msgstr "" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Traditional" msgstr "" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Simplified" msgstr "" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 msgctxt "KEncodingProber|@item Text character set" msgid "Korean" msgstr "" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 msgctxt "KEncodingProber|@item Text character set" msgid "Thai" msgstr "" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 msgctxt "KEncodingProber|@item Text character set" msgid "Arabic" msgstr "" diff -Nru kcodecs-5.79.0/po/he/kcodecs5_qt.po kcodecs-5.80.0/po/he/kcodecs5_qt.po --- kcodecs-5.79.0/po/he/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/he/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -132,25 +132,25 @@ msgid "Other" msgstr "אחר" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, fuzzy, qt-format msgctxt "KCharsets|@item %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 (%2)" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, fuzzy, qt-format msgctxt "KCharsets|@item" msgid "Other encoding (%1)" msgstr "קידוד אחר (%1)" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, fuzzy, qt-format msgctxt "KCharsets|@item Text encoding: %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 (%2)" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains more than one " @@ -158,67 +158,67 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a @.\n" "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "" -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "local part." msgstr "" -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "domain part." msgstr "" -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " "comments/brackets." msgstr "" -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 #, fuzzy msgctxt "QObject|" msgid "The email address you entered is valid." msgstr "התאריך שהכנסת אינו תקין" -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " "angle bracket." msgstr "" -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " "closing angle brackets." msgstr "" -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "unexpected comma." msgstr "" -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it ended unexpectedly.\n" @@ -226,14 +226,14 @@ "the last character in your email address." msgstr "" -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " "which does not end." msgstr "" -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -247,14 +247,14 @@ "character." msgstr "" -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "invalid display name." msgstr "" -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -262,12 +262,12 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 msgctxt "QObject|" msgid "" "The email address you entered is not valid.\n" @@ -275,97 +275,97 @@ "form joe@example.org." msgstr "" -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 #, fuzzy msgctxt "KEncodingProber|@item Text character set" msgid "Disabled" msgstr "מבוטל" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 #, fuzzy msgctxt "KEncodingProber|@item Text character set" msgid "Universal" msgstr "אוניברסלי" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 #, fuzzy msgctxt "KEncodingProber|@item Text character set" msgid "Unicode" msgstr "יוניקוד" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 #, fuzzy msgctxt "KEncodingProber|@item Text character set" msgid "Cyrillic" msgstr "קירילי" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 #, fuzzy msgctxt "KEncodingProber|@item Text character set" msgid "Western European" msgstr "מערב אירופי" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 #, fuzzy msgctxt "KEncodingProber|@item Text character set" msgid "Central European" msgstr "מרכז אירופי" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 #, fuzzy msgctxt "KEncodingProber|@item Text character set" msgid "Greek" msgstr "יווני" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 #, fuzzy msgctxt "KEncodingProber|@item Text character set" msgid "Hebrew" msgstr "עברית" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 #, fuzzy msgctxt "KEncodingProber|@item Text character set" msgid "Turkish" msgstr "טורקית" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 #, fuzzy msgctxt "KEncodingProber|@item Text character set" msgid "Japanese" msgstr "יפני" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 #, fuzzy msgctxt "KEncodingProber|@item Text character set" msgid "Baltic" msgstr "בלטי" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 #, fuzzy msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Traditional" msgstr "סיני מסורתי" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 #, fuzzy msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Simplified" msgstr "סיני מפושט" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 #, fuzzy msgctxt "KEncodingProber|@item Text character set" msgid "Korean" msgstr "קוריאני" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 #, fuzzy msgctxt "KEncodingProber|@item Text character set" msgid "Thai" msgstr "תאילנדי" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 #, fuzzy msgctxt "KEncodingProber|@item Text character set" msgid "Arabic" diff -Nru kcodecs-5.79.0/po/hi/kcodecs5_qt.po kcodecs-5.80.0/po/hi/kcodecs5_qt.po --- kcodecs-5.79.0/po/hi/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/hi/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -157,7 +157,7 @@ msgid "Other" msgstr "अन्य" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, fuzzy, qt-format #| msgctxt "@item %1 character set, %2 encoding" #| msgid "%1 ( %2 )" @@ -165,7 +165,7 @@ msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, fuzzy, qt-format #| msgctxt "@item" #| msgid "Other encoding (%1)" @@ -173,7 +173,7 @@ msgid "Other encoding (%1)" msgstr "अन्य एनकोडिंग (%1)" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, fuzzy, qt-format #| msgctxt "@item %1 character set, %2 encoding" #| msgid "%1 ( %2 )" @@ -181,7 +181,7 @@ msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains more than one " @@ -189,40 +189,40 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a @.\n" "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "" -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "local part." msgstr "" -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "domain part." msgstr "" -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " "comments/brackets." msgstr "" -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 #, fuzzy #| msgctxt "@info" #| msgid "The date you entered is invalid" @@ -230,28 +230,28 @@ msgid "The email address you entered is valid." msgstr "जो तारीख़ आपने भरा है वह अवैध है" -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " "angle bracket." msgstr "" -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " "closing angle brackets." msgstr "" -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "unexpected comma." msgstr "" -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it ended unexpectedly.\n" @@ -259,14 +259,14 @@ "the last character in your email address." msgstr "" -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " "which does not end." msgstr "" -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -280,14 +280,14 @@ "character." msgstr "" -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "invalid display name." msgstr "" -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -295,12 +295,12 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 msgctxt "QObject|" msgid "" "The email address you entered is not valid.\n" @@ -308,7 +308,7 @@ "form joe@example.org." msgstr "" -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Disabled" @@ -316,7 +316,7 @@ msgid "Disabled" msgstr "अक्षम करें" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Universal" @@ -324,7 +324,7 @@ msgid "Universal" msgstr "सर्वव्यापी" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Unicode" @@ -332,7 +332,7 @@ msgid "Unicode" msgstr "युनिकोड" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Cyrillic" @@ -340,7 +340,7 @@ msgid "Cyrillic" msgstr "साइरिलिक" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Western European" @@ -348,7 +348,7 @@ msgid "Western European" msgstr "पश्चिमी यूरोपीय" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Central European" @@ -356,7 +356,7 @@ msgid "Central European" msgstr "मध्य यूरोपीय" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Greek" @@ -364,7 +364,7 @@ msgid "Greek" msgstr "यूनानी" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 #, fuzzy #| msgctxt "@item Spelling dictionary" #| msgid "Hebrew" @@ -372,7 +372,7 @@ msgid "Hebrew" msgstr "हिब्रू" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 #, fuzzy #| msgctxt "@item Spelling dictionary" #| msgid "Turkish" @@ -380,7 +380,7 @@ msgid "Turkish" msgstr "तुर्की" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Japanese" @@ -388,7 +388,7 @@ msgid "Japanese" msgstr "जापानी" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Baltic" @@ -396,7 +396,7 @@ msgid "Baltic" msgstr "बाल्टिक" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Chinese Traditional" @@ -404,7 +404,7 @@ msgid "Chinese Traditional" msgstr "चीनी (परम्परिक)" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Chinese Simplified" @@ -412,7 +412,7 @@ msgid "Chinese Simplified" msgstr "चीनी (सरल)" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Korean" @@ -420,7 +420,7 @@ msgid "Korean" msgstr "कोरियाई" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Thai" @@ -428,7 +428,7 @@ msgid "Thai" msgstr "थाई" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Arabic" diff -Nru kcodecs-5.79.0/po/hne/kcodecs5_qt.po kcodecs-5.80.0/po/hne/kcodecs5_qt.po --- kcodecs-5.79.0/po/hne/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/hne/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -156,7 +156,7 @@ msgid "Other" msgstr "अउ दुसर" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, fuzzy, qt-format #| msgctxt "@item %1 character set, %2 encoding" #| msgid "%1 ( %2 )" @@ -164,7 +164,7 @@ msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, fuzzy, qt-format #| msgctxt "@item" #| msgid "Other encoding (%1)" @@ -172,7 +172,7 @@ msgid "Other encoding (%1)" msgstr "अऊ दूसर एनकोडिंग (%1)" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, fuzzy, qt-format #| msgctxt "@item %1 character set, %2 encoding" #| msgid "%1 ( %2 )" @@ -180,7 +180,7 @@ msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains more than one " @@ -188,68 +188,68 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a @.\n" "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "" -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "local part." msgstr "" -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "domain part." msgstr "" -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " "comments/brackets." msgstr "" -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 #, fuzzy #| msgid "The email address this bug report is sent to." msgctxt "QObject|" msgid "The email address you entered is valid." msgstr "ये बग रिपोट ल भेजे बर ईमेल पता." -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " "angle bracket." msgstr "" -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " "closing angle brackets." msgstr "" -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "unexpected comma." msgstr "" -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it ended unexpectedly.\n" @@ -257,14 +257,14 @@ "the last character in your email address." msgstr "" -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " "which does not end." msgstr "" -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -278,14 +278,14 @@ "character." msgstr "" -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "invalid display name." msgstr "" -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -293,12 +293,12 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 msgctxt "QObject|" msgid "" "The email address you entered is not valid.\n" @@ -306,7 +306,7 @@ "form joe@example.org." msgstr "" -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Disabled" @@ -314,7 +314,7 @@ msgid "Disabled" msgstr "अक्छम" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Universal" @@ -322,7 +322,7 @@ msgid "Universal" msgstr "यूनिवर्सल" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Unicode" @@ -330,7 +330,7 @@ msgid "Unicode" msgstr "युनिकोड" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Cyrillic" @@ -338,7 +338,7 @@ msgid "Cyrillic" msgstr "साइरिलिक" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Western European" @@ -346,7 +346,7 @@ msgid "Western European" msgstr "पस्चिमी यूरोपीय" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Central European" @@ -354,7 +354,7 @@ msgid "Central European" msgstr "मध्य यूरोपीय" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Greek" @@ -362,7 +362,7 @@ msgid "Greek" msgstr "यूनानी" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 #, fuzzy #| msgctxt "@item Spelling dictionary" #| msgid "Hebrew" @@ -370,7 +370,7 @@ msgid "Hebrew" msgstr "हिब्रू" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 #, fuzzy #| msgctxt "@item Spelling dictionary" #| msgid "Turkish" @@ -378,7 +378,7 @@ msgid "Turkish" msgstr "तुर्की" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Japanese" @@ -386,7 +386,7 @@ msgid "Japanese" msgstr "जापानी" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Baltic" @@ -394,7 +394,7 @@ msgid "Baltic" msgstr "बाल्टिक" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Chinese Traditional" @@ -402,7 +402,7 @@ msgid "Chinese Traditional" msgstr "चीनी (परम्परिक)" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Chinese Simplified" @@ -410,7 +410,7 @@ msgid "Chinese Simplified" msgstr "चीनी (सरल)" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Korean" @@ -418,7 +418,7 @@ msgid "Korean" msgstr "कोरियाई" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Thai" @@ -426,7 +426,7 @@ msgid "Thai" msgstr "थाई" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Arabic" diff -Nru kcodecs-5.79.0/po/hr/kcodecs5_qt.po kcodecs-5.80.0/po/hr/kcodecs5_qt.po --- kcodecs-5.79.0/po/hr/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/hr/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -166,7 +166,7 @@ msgid "Other" msgstr "Ostalo" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, fuzzy, qt-format #| msgctxt "@item %1 character set, %2 encoding" #| msgid "%1 ( %2 )" @@ -174,7 +174,7 @@ msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, fuzzy, qt-format #| msgctxt "@item" #| msgid "Other encoding (%1)" @@ -182,7 +182,7 @@ msgid "Other encoding (%1)" msgstr "Drugo kodiranje (%1)" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, fuzzy, qt-format #| msgctxt "@item %1 character set, %2 encoding" #| msgid "%1 ( %2 )" @@ -190,7 +190,7 @@ msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains more than one " @@ -198,40 +198,40 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a @.\n" "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "" -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "local part." msgstr "" -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "domain part." msgstr "" -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " "comments/brackets." msgstr "" -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 #, fuzzy #| msgctxt "@info" #| msgid "The date you entered is invalid" @@ -239,28 +239,28 @@ msgid "The email address you entered is valid." msgstr "Datum koji ste unijeli nije ispravan" -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " "angle bracket." msgstr "" -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " "closing angle brackets." msgstr "" -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "unexpected comma." msgstr "" -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it ended unexpectedly.\n" @@ -268,14 +268,14 @@ "the last character in your email address." msgstr "" -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " "which does not end." msgstr "" -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -289,14 +289,14 @@ "character." msgstr "" -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "invalid display name." msgstr "" -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -304,12 +304,12 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 msgctxt "QObject|" msgid "" "The email address you entered is not valid.\n" @@ -317,7 +317,7 @@ "form joe@example.org." msgstr "" -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Disabled" @@ -325,7 +325,7 @@ msgid "Disabled" msgstr "Onemogućeno" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Universal" @@ -333,7 +333,7 @@ msgid "Universal" msgstr "Univerzalno" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Unicode" @@ -341,7 +341,7 @@ msgid "Unicode" msgstr "Unicode" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Cyrillic" @@ -349,7 +349,7 @@ msgid "Cyrillic" msgstr "Ćirilica" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Western European" @@ -357,7 +357,7 @@ msgid "Western European" msgstr "Zapadno europski" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Central European" @@ -365,7 +365,7 @@ msgid "Central European" msgstr "Srednjeeuropski" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Greek" @@ -373,7 +373,7 @@ msgid "Greek" msgstr "Grčki" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 #, fuzzy #| msgctxt "@item Spelling dictionary" #| msgid "Hebrew" @@ -381,7 +381,7 @@ msgid "Hebrew" msgstr "Hebrejski" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 #, fuzzy #| msgctxt "@item Spelling dictionary" #| msgid "Turkish" @@ -389,7 +389,7 @@ msgid "Turkish" msgstr "Turski" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Japanese" @@ -397,7 +397,7 @@ msgid "Japanese" msgstr "Japanski" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Baltic" @@ -405,7 +405,7 @@ msgid "Baltic" msgstr "Baltički" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Chinese Traditional" @@ -413,7 +413,7 @@ msgid "Chinese Traditional" msgstr "Kineski tradicionalan" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Chinese Simplified" @@ -421,7 +421,7 @@ msgid "Chinese Simplified" msgstr "Kineski pojednostavljen" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Korean" @@ -429,7 +429,7 @@ msgid "Korean" msgstr "Korejski" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Thai" @@ -437,7 +437,7 @@ msgid "Thai" msgstr "Thai" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Arabic" diff -Nru kcodecs-5.79.0/po/hsb/kcodecs5_qt.po kcodecs-5.80.0/po/hsb/kcodecs5_qt.po --- kcodecs-5.79.0/po/hsb/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/hsb/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -159,7 +159,7 @@ msgid "Other" msgstr "Druhe" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, fuzzy, qt-format #| msgctxt "@item %1 character set, %2 encoding" #| msgid "%1 ( %2 )" @@ -167,7 +167,7 @@ msgid "%1 ( %2 )" msgstr "%1 (%2)" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, fuzzy, qt-format #| msgctxt "@item" #| msgid "Other encoding (%1)" @@ -175,7 +175,7 @@ msgid "Other encoding (%1)" msgstr "druhe kodowanje (%1)" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, fuzzy, qt-format #| msgctxt "@item %1 character set, %2 encoding" #| msgid "%1 ( %2 )" @@ -183,7 +183,7 @@ msgid "%1 ( %2 )" msgstr "%1 (%2)" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains more than one " @@ -191,68 +191,68 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a @.\n" "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "" -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "local part." msgstr "" -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "domain part." msgstr "" -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " "comments/brackets." msgstr "" -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 #, fuzzy #| msgid "The email address this bug report is sent to." msgctxt "QObject|" msgid "The email address you entered is valid." msgstr "Emailowa adresa, na kotruž ma so tuta rozprawa wo zmylku pósłać." -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " "angle bracket." msgstr "" -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " "closing angle brackets." msgstr "" -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "unexpected comma." msgstr "" -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it ended unexpectedly.\n" @@ -260,14 +260,14 @@ "the last character in your email address." msgstr "" -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " "which does not end." msgstr "" -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -281,14 +281,14 @@ "character." msgstr "" -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "invalid display name." msgstr "" -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -296,12 +296,12 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 msgctxt "QObject|" msgid "" "The email address you entered is not valid.\n" @@ -309,7 +309,7 @@ "form joe@example.org." msgstr "" -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Disabled" @@ -317,7 +317,7 @@ msgid "Disabled" msgstr "njesteji k dispoziciji" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Universal" @@ -325,7 +325,7 @@ msgid "Universal" msgstr "uniwersalnje" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Unicode" @@ -333,7 +333,7 @@ msgid "Unicode" msgstr "Unicode" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Cyrillic" @@ -341,7 +341,7 @@ msgid "Cyrillic" msgstr "Kyriliske" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Western European" @@ -349,7 +349,7 @@ msgid "Western European" msgstr "Zapadnoeuropske" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Central European" @@ -357,7 +357,7 @@ msgid "Central European" msgstr "Centralnoeuropske" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Greek" @@ -365,7 +365,7 @@ msgid "Greek" msgstr "Grjekske" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 #, fuzzy #| msgctxt "@item Spelling dictionary" #| msgid "Hebrew" @@ -373,7 +373,7 @@ msgid "Hebrew" msgstr "Hebrejske" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 #, fuzzy #| msgctxt "@item Spelling dictionary" #| msgid "Turkish" @@ -381,7 +381,7 @@ msgid "Turkish" msgstr "Turkowske" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Japanese" @@ -389,7 +389,7 @@ msgid "Japanese" msgstr "Japanske" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Baltic" @@ -397,7 +397,7 @@ msgid "Baltic" msgstr "Baltiske" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Chinese Traditional" @@ -405,7 +405,7 @@ msgid "Chinese Traditional" msgstr "Chinske tradicionalne" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Chinese Simplified" @@ -413,7 +413,7 @@ msgid "Chinese Simplified" msgstr "Chinske zjednorjene" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Korean" @@ -421,7 +421,7 @@ msgid "Korean" msgstr "Koreanske" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Thai" @@ -429,7 +429,7 @@ msgid "Thai" msgstr "Tailandske" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Arabic" diff -Nru kcodecs-5.79.0/po/hu/kcodecs5_qt.po kcodecs-5.80.0/po/hu/kcodecs5_qt.po --- kcodecs-5.79.0/po/hu/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/hu/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -103,25 +103,25 @@ msgid "Other" msgstr "Egyéb" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, qt-format msgctxt "KCharsets|@item %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, qt-format msgctxt "KCharsets|@item" msgid "Other encoding (%1)" msgstr "Egyéb kódolás (%1)" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, qt-format msgctxt "KCharsets|@item Text encoding: %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains more than one " @@ -131,7 +131,7 @@ "A megadott e-mail cím érvénytelen, mivel egynél több @ karaktert tartalmaz.\n" "Nem írhat érvényes üzeneteket, ha nem változtatja meg a címét." -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a @.\n" @@ -140,19 +140,19 @@ "A megadott e-mail cím érvénytelen, mert nem tartalmaz @ karaktert.\n" "Nem írhat érvényes üzeneteket, ha nem változtatja meg a címét." -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "Írjon be valamit az e-mail címmezőjébe." -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "local part." msgstr "A megadott e-mail cím érvénytelen, mert nem tartalmaz helyi részt." -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -160,7 +160,7 @@ msgstr "" "A megadott e-mail cím érvénytelen, mivel nem tartalmaz tartomány részt." -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " @@ -168,12 +168,12 @@ msgstr "" "Az e-mail cím érvénytelen, mivel lezáratlan kommentet/zárójelet tartalmaz." -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 msgctxt "QObject|" msgid "The email address you entered is valid." msgstr "A megadott e-mail cím érvényes." -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " @@ -182,7 +182,7 @@ "A megadott e-mail cím érvénytelen, mivel lezáratlan kúpos zárójelet " "tartalmaz." -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " @@ -191,14 +191,14 @@ "A megadott e-mail cím érvénytelen, mivel túl sok záró kúpos zárójelet " "tartalmaz." -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "unexpected comma." msgstr "A megadott e-mail cím érvénytelen, mivel váratlan vesszőt tartalmaz." -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it ended unexpectedly.\n" @@ -209,7 +209,7 @@ "Ennek oka valószínűleg az, hogy egy escape karaktert, például '\\' használt " "az e-mail cím utolsó karaktereként." -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " @@ -218,7 +218,7 @@ "A megadott e-mail cím érvénytelen, mivel olyan idézett szöveget tartalmaz, " "aminek nincs vége." -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -235,7 +235,7 @@ msgstr "" "A megadott e-mail cím érvénytelen, mivel érvénytelen karaktert tartalmaz." -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " @@ -244,7 +244,7 @@ "A megadott e-mail cím érvénytelen, mivel érvénytelen megjelenítendő nevet " "tartalmaz." -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -254,12 +254,12 @@ "A megadott e-mail cím érvénytelen, mert nem tartalmaz '.' karaktert.\n" "Nem írhat érvényes üzeneteket, ha nem változtatja meg a címét." -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "Ismeretlen hiba az e-mail címmel" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 msgctxt "QObject|" msgid "" "The email address you entered is not valid.\n" @@ -269,82 +269,82 @@ "A megadott e-mail cím érvénytelen.\n" "Nem tűnik valódi e-mail címnek (például kovacsjanos@tesztzrt.hu)." -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 msgctxt "KEncodingProber|@item Text character set" msgid "Disabled" msgstr "Kikapcsolva" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 msgctxt "KEncodingProber|@item Text character set" msgid "Universal" msgstr "Univerzális" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 msgctxt "KEncodingProber|@item Text character set" msgid "Unicode" msgstr "Unicode" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 msgctxt "KEncodingProber|@item Text character set" msgid "Cyrillic" msgstr "Cirill" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 msgctxt "KEncodingProber|@item Text character set" msgid "Western European" msgstr "Nyugat-európai" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 msgctxt "KEncodingProber|@item Text character set" msgid "Central European" msgstr "Közép-európai" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 msgctxt "KEncodingProber|@item Text character set" msgid "Greek" msgstr "Görög" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 msgctxt "KEncodingProber|@item Text character set" msgid "Hebrew" msgstr "Héber" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 msgctxt "KEncodingProber|@item Text character set" msgid "Turkish" msgstr "Török" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 msgctxt "KEncodingProber|@item Text character set" msgid "Japanese" msgstr "Japán" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 msgctxt "KEncodingProber|@item Text character set" msgid "Baltic" msgstr "Balti" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Traditional" msgstr "Kínai, hagyományos" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Simplified" msgstr "Kínai, egyszerűsített" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 msgctxt "KEncodingProber|@item Text character set" msgid "Korean" msgstr "Koreai" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 msgctxt "KEncodingProber|@item Text character set" msgid "Thai" msgstr "Thai" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 msgctxt "KEncodingProber|@item Text character set" msgid "Arabic" msgstr "Arab" diff -Nru kcodecs-5.79.0/po/hy/kcodecs5_qt.po kcodecs-5.80.0/po/hy/kcodecs5_qt.po --- kcodecs-5.79.0/po/hy/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/hy/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -159,7 +159,7 @@ msgid "Other" msgstr "Այլ" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, fuzzy, qt-format #| msgctxt "@item %1 character set, %2 encoding" #| msgid "%1 ( %2 )" @@ -167,7 +167,7 @@ msgid "%1 ( %2 )" msgstr "%1 (%2)" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, fuzzy, qt-format #| msgctxt "@item" #| msgid "Other encoding (%1)" @@ -175,7 +175,7 @@ msgid "Other encoding (%1)" msgstr "Այլ կոդավորում (%1)" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, fuzzy, qt-format #| msgctxt "@item %1 character set, %2 encoding" #| msgid "%1 ( %2 )" @@ -183,7 +183,7 @@ msgid "%1 ( %2 )" msgstr "%1 (%2)" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains more than one " @@ -191,40 +191,40 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a @.\n" "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "" -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "local part." msgstr "" -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "domain part." msgstr "" -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " "comments/brackets." msgstr "" -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 #, fuzzy #| msgctxt "@info" #| msgid "The date you entered is invalid" @@ -232,28 +232,28 @@ msgid "The email address you entered is valid." msgstr "Մուտքագրված է անթույլատրելի ամսաթիվ" -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " "angle bracket." msgstr "" -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " "closing angle brackets." msgstr "" -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "unexpected comma." msgstr "" -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it ended unexpectedly.\n" @@ -261,14 +261,14 @@ "the last character in your email address." msgstr "" -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " "which does not end." msgstr "" -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -282,14 +282,14 @@ "character." msgstr "" -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "invalid display name." msgstr "" -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -297,12 +297,12 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 msgctxt "QObject|" msgid "" "The email address you entered is not valid.\n" @@ -310,7 +310,7 @@ "form joe@example.org." msgstr "" -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Disabled" @@ -318,7 +318,7 @@ msgid "Disabled" msgstr "Անջատված" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Universal" @@ -326,7 +326,7 @@ msgid "Universal" msgstr "Ունիվերսալ" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Unicode" @@ -334,7 +334,7 @@ msgid "Unicode" msgstr "Յունիկոդ" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Cyrillic" @@ -342,7 +342,7 @@ msgid "Cyrillic" msgstr "Կիրիլիցա" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Western European" @@ -350,7 +350,7 @@ msgid "Western European" msgstr "Արևմտյան Եվրոպա" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Central European" @@ -358,7 +358,7 @@ msgid "Central European" msgstr "Կենտրոնական Եվրոպա" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Greek" @@ -366,7 +366,7 @@ msgid "Greek" msgstr "Հունական" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 #, fuzzy #| msgctxt "@item Spelling dictionary" #| msgid "Hebrew" @@ -374,7 +374,7 @@ msgid "Hebrew" msgstr "Հրեա" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 #, fuzzy #| msgctxt "@item Spelling dictionary" #| msgid "Turkish" @@ -382,7 +382,7 @@ msgid "Turkish" msgstr "Թուրքերեն" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Japanese" @@ -390,7 +390,7 @@ msgid "Japanese" msgstr "Ճապոնական" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Baltic" @@ -399,7 +399,7 @@ msgstr "Բալթյան" # Здесь речь идёт не о локали, а о наборе символов. В случае локали перевод "Китайский (Тайвань)", т.к. локаль zh_TW. -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Chinese Traditional" @@ -407,7 +407,7 @@ msgid "Chinese Traditional" msgstr "Չինական" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Chinese Simplified" @@ -415,7 +415,7 @@ msgid "Chinese Simplified" msgstr "Չինական (Հեշտացված)" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Korean" @@ -423,7 +423,7 @@ msgid "Korean" msgstr "Կորեական" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Thai" @@ -431,7 +431,7 @@ msgid "Thai" msgstr "Թայերեն" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Arabic" diff -Nru kcodecs-5.79.0/po/ia/kcodecs5_qt.po kcodecs-5.80.0/po/ia/kcodecs5_qt.po --- kcodecs-5.79.0/po/ia/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/ia/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -103,25 +103,25 @@ msgid "Other" msgstr "Altere" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, qt-format msgctxt "KCharsets|@item %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 (%2)" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, qt-format msgctxt "KCharsets|@item" msgid "Other encoding (%1)" msgstr "Altere codificationes (%1)" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, qt-format msgctxt "KCharsets|@item Text encoding: %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 (%2)" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains more than one " @@ -132,7 +132,7 @@ "que un @. \n" "Tu non creara messages valide si tu non modifica tu adresse." -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a @.\n" @@ -142,12 +142,12 @@ "un @.\n" "Tu non creara valide messages si tu non modifica tu adresse." -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "Tu ha insertate qualcosa in le campo de adresse de e-posta." -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -156,7 +156,7 @@ "Le adresse de e-posta que tu ha insertate non es valide proque il non " "contine un parte de local." -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -165,7 +165,7 @@ "Le adresse de e-posta que tu ha insertate non es valide proque il non " "contine un parte de dominio." -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " @@ -174,12 +174,12 @@ "Le adresse de e-posta que tu ha insertate non es valide proque il contine " "commentos/parentheses non claudite. " -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 msgctxt "QObject|" msgid "The email address you entered is valid." msgstr "Le adresse de e-posta que tu ha insertate es valide." -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " @@ -188,7 +188,7 @@ "Le adresse de e-posta que tu ha insertate non es valide proque il contine " "parenthese angular non claudite " -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " @@ -197,7 +197,7 @@ "Le adresse de e-posta que tu ha insertate non es valide proque il contine " "nimie parentheses angular claudite. " -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " @@ -206,7 +206,7 @@ "Le adresse de e-posta que tu ha insertate non es valide proque il contine un " "comma non attendite." -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it ended unexpectedly.\n" @@ -218,7 +218,7 @@ "Isto probabilemente significa que tu ha usate un typo de character de " "escappar tal como '\\' como le ultime character in tu adresse de e-posta. " -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " @@ -227,7 +227,7 @@ "Le adresse de e-posta que tu ha insertate non es valide proque il contine " "texto citate que non termina." -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -246,7 +246,7 @@ "Le adresse de e-posta que tu ha insertate non es valide proque il contine un " "character invalide." -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " @@ -255,7 +255,7 @@ "Le adresse de e-posta que tu ha insertate non es valide proque il contine un " "invalide nomine de monstrar." -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -266,12 +266,12 @@ "un '.'.\n" "Tu non creara valide messages si tu non modifica tu adresse." -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "Problema incognite con le adresse de e-posta" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 msgctxt "QObject|" msgid "" "The email address you entered is not valid.\n" @@ -282,82 +282,82 @@ "Il non sembla continer un ver adresse de e-posta; i.e. alcun cosa de forma " "como joe@exemplo.org." -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 msgctxt "KEncodingProber|@item Text character set" msgid "Disabled" msgstr "Dishabilitate" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 msgctxt "KEncodingProber|@item Text character set" msgid "Universal" msgstr "Universal" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 msgctxt "KEncodingProber|@item Text character set" msgid "Unicode" msgstr "Unicode" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 msgctxt "KEncodingProber|@item Text character set" msgid "Cyrillic" msgstr "Cyrillic" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 msgctxt "KEncodingProber|@item Text character set" msgid "Western European" msgstr "Europee Occidental" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 msgctxt "KEncodingProber|@item Text character set" msgid "Central European" msgstr "Europee Central" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 msgctxt "KEncodingProber|@item Text character set" msgid "Greek" msgstr "Greco" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 msgctxt "KEncodingProber|@item Text character set" msgid "Hebrew" msgstr "Hebreo" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 msgctxt "KEncodingProber|@item Text character set" msgid "Turkish" msgstr "Turc" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 msgctxt "KEncodingProber|@item Text character set" msgid "Japanese" msgstr "Japonese " -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 msgctxt "KEncodingProber|@item Text character set" msgid "Baltic" msgstr "Baltic" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Traditional" msgstr "Chinese Traditional" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Simplified" msgstr "Chinese Simplificate" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 msgctxt "KEncodingProber|@item Text character set" msgid "Korean" msgstr "Coreano " -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 msgctxt "KEncodingProber|@item Text character set" msgid "Thai" msgstr "Thai" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 msgctxt "KEncodingProber|@item Text character set" msgid "Arabic" msgstr "Arabe" diff -Nru kcodecs-5.79.0/po/id/kcodecs5_qt.po kcodecs-5.80.0/po/id/kcodecs5_qt.po --- kcodecs-5.79.0/po/id/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/id/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -104,25 +104,25 @@ msgid "Other" msgstr "Lainnya" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, qt-format msgctxt "KCharsets|@item %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, qt-format msgctxt "KCharsets|@item" msgid "Other encoding (%1)" msgstr "Penyandian lain (%1)" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, qt-format msgctxt "KCharsets|@item Text encoding: %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 #, fuzzy #| msgctxt "QObject|" #| msgid "" @@ -139,7 +139,7 @@ "Kamu tidak akan menciptakan pesan yang absah jika kamu tidak mengubah " "alamatmu." -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 #, fuzzy #| msgctxt "QObject|" #| msgid "" @@ -153,12 +153,12 @@ "Alamat email yang kamu masukkan tidak absah karena tidak berisi @. Kamu " "tidak akan menciptakan pesan yang absah jika kamu tidak mengubah alamatmu." -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "Kamu harus memasukkan sesuatu di kolom alamat email." -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -167,7 +167,7 @@ "Alamat email yang kamu masukkan tidak absah karena tidak berisi sebuah " "bagian lokal." -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -176,7 +176,7 @@ "Alamat email yang kamu masukkan tidak absah karena tidak berisi sebuah " "bagian domain." -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " @@ -185,12 +185,12 @@ "Alamat email yang kamu masukkan tidak absah karena berisi komentar/kurung " "yang tidak ditutup." -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 msgctxt "QObject|" msgid "The email address you entered is valid." msgstr "Alamat email yang kamu masukkan tidak absah." -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " @@ -199,7 +199,7 @@ "Alamat email yang kamu masukkan tidak absah karena berisi sebuah tanda " "kurung sudut yang tidak ditutup." -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " @@ -208,7 +208,7 @@ "Alamat email yang kamu masukkan tidak absah karena berisi terlalu banyak " "tanda kurung sudut tutup." -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " @@ -217,7 +217,7 @@ "Alamat email yang kamu masukkan tidak absah karena berisi sebuah tanda koma " "tidak terduga." -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 #, fuzzy #| msgctxt "QObject|" #| msgid "" @@ -234,7 +234,7 @@ "Ini mungkin berarti kamu telah menggunakan karakter tipe escape seperti '\\' " "sebagai karakter terakhir di alamat email-mu." -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " @@ -243,7 +243,7 @@ "Alamat email yang kamu masukkan tidak absah karena berisi kutipan teks yang " "tidak berakhir." -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -262,7 +262,7 @@ "Alamat email yang kamu masukkan tidak absah karena berisi sebuah karakter " "ilegal." -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " @@ -271,7 +271,7 @@ "Alamat email yang kamu masukkan tidak absah karena berisi sebuah nama " "tampilan tidak absah." -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 #, fuzzy #| msgctxt "QObject|" #| msgid "" @@ -286,12 +286,12 @@ "Alamat email yang kamu masukkan tidak absah karena tidak berisi sebuah tanda " "'.'. Kamu tidak akan menciptakan pesan jika kamu tidak mengubah alamatmu." -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "Masalah tak diketahui dengan alamat email" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 #, fuzzy #| msgctxt "QObject|" #| msgid "" @@ -308,82 +308,82 @@ "sebuah alamat email yang sebenarnya, misalkan sesuatu yang berbentuk " "budi@contoh.org." -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 msgctxt "KEncodingProber|@item Text character set" msgid "Disabled" msgstr "Dinonfungsikan" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 msgctxt "KEncodingProber|@item Text character set" msgid "Universal" msgstr "Universal" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 msgctxt "KEncodingProber|@item Text character set" msgid "Unicode" msgstr "Unicode" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 msgctxt "KEncodingProber|@item Text character set" msgid "Cyrillic" msgstr "Cyrillic" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 msgctxt "KEncodingProber|@item Text character set" msgid "Western European" msgstr "Eropa Barat" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 msgctxt "KEncodingProber|@item Text character set" msgid "Central European" msgstr "Eropa Tengah" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 msgctxt "KEncodingProber|@item Text character set" msgid "Greek" msgstr "Yunani" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 msgctxt "KEncodingProber|@item Text character set" msgid "Hebrew" msgstr "Ibrani" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 msgctxt "KEncodingProber|@item Text character set" msgid "Turkish" msgstr "Turki" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 msgctxt "KEncodingProber|@item Text character set" msgid "Japanese" msgstr "Jepang" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 msgctxt "KEncodingProber|@item Text character set" msgid "Baltic" msgstr "Baltik" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Traditional" msgstr "Cina Tradisional" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Simplified" msgstr "Cina Disederhanakan" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 msgctxt "KEncodingProber|@item Text character set" msgid "Korean" msgstr "Korea" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 msgctxt "KEncodingProber|@item Text character set" msgid "Thai" msgstr "Thai" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 msgctxt "KEncodingProber|@item Text character set" msgid "Arabic" msgstr "Arab" diff -Nru kcodecs-5.79.0/po/is/kcodecs5_qt.po kcodecs-5.80.0/po/is/kcodecs5_qt.po --- kcodecs-5.79.0/po/is/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/is/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -159,7 +159,7 @@ msgid "Other" msgstr "Annað" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, fuzzy, qt-format #| msgctxt "@item %1 character set, %2 encoding" #| msgid "%1 ( %2 )" @@ -167,7 +167,7 @@ msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, fuzzy, qt-format #| msgctxt "@item" #| msgid "Other encoding (%1)" @@ -175,7 +175,7 @@ msgid "Other encoding (%1)" msgstr "Önnur kóðun (%1)" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, fuzzy, qt-format #| msgctxt "@item %1 character set, %2 encoding" #| msgid "%1 ( %2 )" @@ -183,7 +183,7 @@ msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains more than one " @@ -191,40 +191,40 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a @.\n" "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "" -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "local part." msgstr "" -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "domain part." msgstr "" -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " "comments/brackets." msgstr "" -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 #, fuzzy #| msgctxt "@info" #| msgid "The date you entered is invalid" @@ -232,28 +232,28 @@ msgid "The email address you entered is valid." msgstr "Dagsetningin sem þú slóst inn er ógild" -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " "angle bracket." msgstr "" -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " "closing angle brackets." msgstr "" -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "unexpected comma." msgstr "" -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it ended unexpectedly.\n" @@ -261,14 +261,14 @@ "the last character in your email address." msgstr "" -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " "which does not end." msgstr "" -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -282,14 +282,14 @@ "character." msgstr "" -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "invalid display name." msgstr "" -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -297,12 +297,12 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 msgctxt "QObject|" msgid "" "The email address you entered is not valid.\n" @@ -310,7 +310,7 @@ "form joe@example.org." msgstr "" -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Disabled" @@ -318,7 +318,7 @@ msgid "Disabled" msgstr "Óvirkt" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Universal" @@ -326,7 +326,7 @@ msgid "Universal" msgstr "Alheims" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Unicode" @@ -334,7 +334,7 @@ msgid "Unicode" msgstr "Unicode" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Cyrillic" @@ -342,7 +342,7 @@ msgid "Cyrillic" msgstr "Kýrílskt" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Western European" @@ -350,7 +350,7 @@ msgid "Western European" msgstr "Vesturevrópskt" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Central European" @@ -358,7 +358,7 @@ msgid "Central European" msgstr "Mið-evrópskt" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Greek" @@ -366,7 +366,7 @@ msgid "Greek" msgstr "Grískt" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 #, fuzzy #| msgctxt "@item Spelling dictionary" #| msgid "Hebrew" @@ -374,7 +374,7 @@ msgid "Hebrew" msgstr "Hebreskt" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 #, fuzzy #| msgctxt "@item Spelling dictionary" #| msgid "Turkish" @@ -382,7 +382,7 @@ msgid "Turkish" msgstr "Tyrknenskt" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Japanese" @@ -390,7 +390,7 @@ msgid "Japanese" msgstr "Japanskt" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Baltic" @@ -398,7 +398,7 @@ msgid "Baltic" msgstr "Baltneskt" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Chinese Traditional" @@ -406,7 +406,7 @@ msgid "Chinese Traditional" msgstr "Hefðbundin kínverska" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Chinese Simplified" @@ -414,7 +414,7 @@ msgid "Chinese Simplified" msgstr "Einfölduð kínverska" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Korean" @@ -422,7 +422,7 @@ msgid "Korean" msgstr "Kóreskt" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Thai" @@ -430,7 +430,7 @@ msgid "Thai" msgstr "Tælenskt" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Arabic" diff -Nru kcodecs-5.79.0/po/it/kcodecs5_qt.po kcodecs-5.80.0/po/it/kcodecs5_qt.po --- kcodecs-5.79.0/po/it/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/it/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -112,25 +112,25 @@ msgid "Other" msgstr "Altro" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, qt-format msgctxt "KCharsets|@item %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, qt-format msgctxt "KCharsets|@item" msgid "Other encoding (%1)" msgstr "Altra codifica (%1)" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, qt-format msgctxt "KCharsets|@item Text encoding: %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains more than one " @@ -141,7 +141,7 @@ "carattere @.\n" "Non potrai creare messaggi validi se non cambi l'indirizzo." -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a @.\n" @@ -151,12 +151,12 @@ "carattere @.\n" "Non potrai creare messaggi validi se non cambi l'indirizzo." -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "Devi scrivere qualcosa nel campo dell'indirizzo di posta." -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -165,7 +165,7 @@ "L'indirizzo di posta che hai inserito non è valido perché non contiene una " "parte locale." -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -174,7 +174,7 @@ "L'indirizzo di posta che hai inserito non è valido perché non contiene una " "parte del dominio." -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " @@ -183,12 +183,12 @@ "L'indirizzo di posta che hai inserito non è valido perché contiene commenti " "o parentesi non chiuse." -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 msgctxt "QObject|" msgid "The email address you entered is valid." msgstr "L'indirizzo di posta che hai inserito è valido." -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " @@ -197,7 +197,7 @@ "L'indirizzo di posta che hai inserito non è valido perché contiene una " "parentesi uncinata non chiusa." -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " @@ -206,7 +206,7 @@ "L'indirizzo di posta che hai inserito non è valido perché contiene troppe " "parentesi uncinate di chiusura." -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " @@ -215,7 +215,7 @@ "L'indirizzo di posta che hai inserito non è valido perché contiene una " "virgola inattesa." -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it ended unexpectedly.\n" @@ -226,7 +226,7 @@ "modo inatteso. Probabilmente vuol dire che hai usato un carattere di escape " "come «\\» come ultimo carattere dell'indirizzo." -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " @@ -235,7 +235,7 @@ "L'indirizzo di posta che hai inserito non è valido perché contiene del testo " "virgolettato che non si conclude." -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -254,7 +254,7 @@ "L'indirizzo di posta che hai inserito non è valido perché contiene un " "carattere illegale." -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " @@ -263,7 +263,7 @@ "L'indirizzo di posta che hai inserito non è valido perché contiene un nome " "visualizzabile non valido." -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -274,12 +274,12 @@ "carattere «.».\n" "Non potrai creare messaggi validi se non cambi l'indirizzo." -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "Problema sconosciuto con l'indirizzo di posta" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 msgctxt "QObject|" msgid "" "The email address you entered is not valid.\n" @@ -290,82 +290,82 @@ "Non sembra contenere un indirizzo vero e proprio, cioè qualcosa nella forma " "pippo@esempio.org." -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 msgctxt "KEncodingProber|@item Text character set" msgid "Disabled" msgstr "Disabilitato" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 msgctxt "KEncodingProber|@item Text character set" msgid "Universal" msgstr "Universale" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 msgctxt "KEncodingProber|@item Text character set" msgid "Unicode" msgstr "Unicode" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 msgctxt "KEncodingProber|@item Text character set" msgid "Cyrillic" msgstr "Cirillico" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 msgctxt "KEncodingProber|@item Text character set" msgid "Western European" msgstr "Europeo occidentale" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 msgctxt "KEncodingProber|@item Text character set" msgid "Central European" msgstr "Europeo centrale" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 msgctxt "KEncodingProber|@item Text character set" msgid "Greek" msgstr "Greco" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 msgctxt "KEncodingProber|@item Text character set" msgid "Hebrew" msgstr "Ebraico" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 msgctxt "KEncodingProber|@item Text character set" msgid "Turkish" msgstr "Turco" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 msgctxt "KEncodingProber|@item Text character set" msgid "Japanese" msgstr "Giapponese" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 msgctxt "KEncodingProber|@item Text character set" msgid "Baltic" msgstr "Baltico" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Traditional" msgstr "Cinese tradizionale" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Simplified" msgstr "Cinese semplificato" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 msgctxt "KEncodingProber|@item Text character set" msgid "Korean" msgstr "Coreano" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 msgctxt "KEncodingProber|@item Text character set" msgid "Thai" msgstr "Tailandese" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 msgctxt "KEncodingProber|@item Text character set" msgid "Arabic" msgstr "Arabo" diff -Nru kcodecs-5.79.0/po/ja/kcodecs5_qt.po kcodecs-5.80.0/po/ja/kcodecs5_qt.po --- kcodecs-5.79.0/po/ja/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/ja/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -112,7 +112,7 @@ msgid "Other" msgstr "その他" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, fuzzy, qt-format #| msgctxt "@item %1 character set, %2 encoding" #| msgid "%1 ( %2 )" @@ -120,7 +120,7 @@ msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, fuzzy, qt-format #| msgctxt "@item" #| msgid "Other encoding (%1)" @@ -128,7 +128,7 @@ msgid "Other encoding (%1)" msgstr "その他のエンコーディング (%1)" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, fuzzy, qt-format #| msgctxt "@item %1 character set, %2 encoding" #| msgid "%1 ( %2 )" @@ -136,7 +136,7 @@ msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 #, fuzzy #| msgctxt "QObject|" #| msgid "" @@ -152,7 +152,7 @@ "入力されたメールアドレスには @ が 2 つ以上含まれているため、有効ではありませ" "ん。有効なメッセージを作成するには、アドレスを訂正してください。" -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 #, fuzzy #| msgctxt "QObject|" #| msgid "" @@ -166,12 +166,12 @@ "入力されたメールアドレスには @ が含まれていないため、有効ではありません。有効" "なメッセージを作成するには、アドレスを訂正してください。" -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "メールアドレス欄が空になっています。入力してください。" -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -180,7 +180,7 @@ "入力されたメールアドレスにはローカルの部分 (@ の前) が含まれていないため、有" "効ではありません。" -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -189,7 +189,7 @@ "入力されたメールアドレスにはドメイン (@ の後) が含まれていないため、有効では" "ありません。" -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " @@ -198,12 +198,12 @@ "入力されたメールアドレスには閉じられていないコメント/括弧が含まれているため、" "有効ではありません。" -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 msgctxt "QObject|" msgid "The email address you entered is valid." msgstr "入力されたメールアドレスは有効です。" -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " @@ -212,7 +212,7 @@ "入力されたメールアドレスには閉じられていない山括弧が含まれているため、有効で" "はありません。" -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " @@ -220,7 +220,7 @@ msgstr "" "右山括弧の数が多すぎるため、入力されたメールアドレスは有効ではありません。" -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " @@ -229,7 +229,7 @@ "入力されたメールアドレスには予想外のコンマが含まれているため、有効ではありま" "せん。" -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 #, fuzzy #| msgctxt "QObject|" #| msgid "" @@ -246,7 +246,7 @@ "メールアドレスの最後の文字に \\ のようなエスケープ文字が使われているためで" "す。" -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " @@ -255,7 +255,7 @@ "入力されたメールアドレスには終端のない引用テキストが含まれているため、有効で" "はありません。" -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -273,7 +273,7 @@ "入力されたメールアドレスには不正な文字が含まれているため、有効ではありませ" "ん。" -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " @@ -282,7 +282,7 @@ "入力されたメールアドレスには無効な表示名が含まれているため、有効ではありませ" "ん。" -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 #, fuzzy #| msgctxt "QObject|" #| msgid "" @@ -297,12 +297,12 @@ "入力されたメールアドレスには @ が含まれていないため、有効ではありません。有効" "なメッセージを作成するには、アドレスを訂正してください。" -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "メールアドレスに関する未知の問題" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 #, fuzzy #| msgctxt "QObject|" #| msgid "" @@ -318,7 +318,7 @@ "入力されたメールアドレスには joe@example.org のような形式の実際のメールアドレ" "スが含まれていないようなので、有効ではありません。" -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Disabled" @@ -326,7 +326,7 @@ msgid "Disabled" msgstr "無効" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Universal" @@ -334,7 +334,7 @@ msgid "Universal" msgstr "ユニバーサル" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Unicode" @@ -342,7 +342,7 @@ msgid "Unicode" msgstr "Unicode" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Cyrillic" @@ -350,7 +350,7 @@ msgid "Cyrillic" msgstr "キリル文字" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Western European" @@ -358,7 +358,7 @@ msgid "Western European" msgstr "西ヨーロッパ諸語" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Central European" @@ -366,7 +366,7 @@ msgid "Central European" msgstr "中央ヨーロッパ諸語" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Greek" @@ -374,7 +374,7 @@ msgid "Greek" msgstr "ギリシャ語" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 #, fuzzy #| msgctxt "@item Spelling dictionary" #| msgid "Hebrew" @@ -382,7 +382,7 @@ msgid "Hebrew" msgstr "ヘブライ語" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 #, fuzzy #| msgctxt "@item Spelling dictionary" #| msgid "Turkish" @@ -390,7 +390,7 @@ msgid "Turkish" msgstr "トルコ語" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Japanese" @@ -398,7 +398,7 @@ msgid "Japanese" msgstr "日本語" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Baltic" @@ -406,7 +406,7 @@ msgid "Baltic" msgstr "バルト諸語" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Chinese Traditional" @@ -414,7 +414,7 @@ msgid "Chinese Traditional" msgstr "中国語繁体字" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Chinese Simplified" @@ -422,7 +422,7 @@ msgid "Chinese Simplified" msgstr "中国語簡体字" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Korean" @@ -430,7 +430,7 @@ msgid "Korean" msgstr "韓国語・朝鮮語" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Thai" @@ -438,7 +438,7 @@ msgid "Thai" msgstr "タイ語" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Arabic" diff -Nru kcodecs-5.79.0/po/ka/kcodecs5_qt.po kcodecs-5.80.0/po/ka/kcodecs5_qt.po --- kcodecs-5.79.0/po/ka/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/ka/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -136,7 +136,7 @@ msgid "Other" msgstr "სხვა" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, fuzzy, qt-format #| msgctxt "Descriptive Encoding Name" #| msgid "%1 ( %2 )" @@ -144,13 +144,13 @@ msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, fuzzy, qt-format msgctxt "KCharsets|@item" msgid "Other encoding (%1)" msgstr "&კოდირება..." -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, fuzzy, qt-format #| msgctxt "Descriptive Encoding Name" #| msgid "%1 ( %2 )" @@ -158,7 +158,7 @@ msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains more than one " @@ -166,68 +166,68 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a @.\n" "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "" -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "local part." msgstr "" -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "domain part." msgstr "" -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " "comments/brackets." msgstr "" -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 #, fuzzy #| msgid "The email address this bug report is sent to." msgctxt "QObject|" msgid "The email address you entered is valid." msgstr "შეცდომის პატაკის გასაგზავნი ელფოსტის მისამართი." -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " "angle bracket." msgstr "" -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " "closing angle brackets." msgstr "" -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "unexpected comma." msgstr "" -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it ended unexpectedly.\n" @@ -235,14 +235,14 @@ "the last character in your email address." msgstr "" -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " "which does not end." msgstr "" -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -256,14 +256,14 @@ "character." msgstr "" -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "invalid display name." msgstr "" -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -271,12 +271,12 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 msgctxt "QObject|" msgid "" "The email address you entered is not valid.\n" @@ -284,112 +284,112 @@ "form joe@example.org." msgstr "" -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 #, fuzzy #| msgid "disable XIM" msgctxt "KEncodingProber|@item Text character set" msgid "Disabled" msgstr "XIM-ის ამორთვა" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 #, fuzzy #| msgid "Install" msgctxt "KEncodingProber|@item Text character set" msgid "Universal" msgstr "ჩადგმა" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 #, fuzzy #| msgid "Unicode" msgctxt "KEncodingProber|@item Text character set" msgid "Unicode" msgstr "უნიკოდი" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 #, fuzzy #| msgid "Cyrillic" msgctxt "KEncodingProber|@item Text character set" msgid "Cyrillic" msgstr "კირილიცა" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 #, fuzzy #| msgid "Western European" msgctxt "KEncodingProber|@item Text character set" msgid "Western European" msgstr "დასავლეთ ევროპა" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 #, fuzzy #| msgid "Central European" msgctxt "KEncodingProber|@item Text character set" msgid "Central European" msgstr "ცენტრალური ევროპა" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 #, fuzzy #| msgid "Greek" msgctxt "KEncodingProber|@item Text character set" msgid "Greek" msgstr "ბერძნული" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 #, fuzzy #| msgid "Hebrew" msgctxt "KEncodingProber|@item Text character set" msgid "Hebrew" msgstr "ივრითი" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 #, fuzzy #| msgid "Turkish" msgctxt "KEncodingProber|@item Text character set" msgid "Turkish" msgstr "თურქული" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 #, fuzzy #| msgid "Japanese" msgctxt "KEncodingProber|@item Text character set" msgid "Japanese" msgstr "იაპონური" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 #, fuzzy #| msgid "Baltic" msgctxt "KEncodingProber|@item Text character set" msgid "Baltic" msgstr "ბალტიური" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 #, fuzzy #| msgid "Chinese Traditional" msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Traditional" msgstr "ჩინური ტრადიციული" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 #, fuzzy #| msgid "Chinese Simplified" msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Simplified" msgstr "ჩინური გამარტივებული" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 #, fuzzy #| msgid "Korean" msgctxt "KEncodingProber|@item Text character set" msgid "Korean" msgstr "კორეული" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 #, fuzzy #| msgid "Thai" msgctxt "KEncodingProber|@item Text character set" msgid "Thai" msgstr "ტაი" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 #, fuzzy #| msgid "Arabic" msgctxt "KEncodingProber|@item Text character set" diff -Nru kcodecs-5.79.0/po/kk/kcodecs5_qt.po kcodecs-5.80.0/po/kk/kcodecs5_qt.po --- kcodecs-5.79.0/po/kk/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/kk/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -155,7 +155,7 @@ msgid "Other" msgstr "Басқа" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, fuzzy, qt-format #| msgctxt "@item %1 character set, %2 encoding" #| msgid "%1 ( %2 )" @@ -163,7 +163,7 @@ msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, fuzzy, qt-format #| msgctxt "@item" #| msgid "Other encoding (%1)" @@ -171,7 +171,7 @@ msgid "Other encoding (%1)" msgstr "Басқа кодтама (%1)" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, fuzzy, qt-format #| msgctxt "@item %1 character set, %2 encoding" #| msgid "%1 ( %2 )" @@ -179,7 +179,7 @@ msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains more than one " @@ -187,40 +187,40 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a @.\n" "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "" -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "local part." msgstr "" -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "domain part." msgstr "" -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " "comments/brackets." msgstr "" -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 #, fuzzy #| msgctxt "@info" #| msgid "The date you entered is invalid" @@ -228,28 +228,28 @@ msgid "The email address you entered is valid." msgstr "Келтірілген күн дұрыс емес" -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " "angle bracket." msgstr "" -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " "closing angle brackets." msgstr "" -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "unexpected comma." msgstr "" -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it ended unexpectedly.\n" @@ -257,14 +257,14 @@ "the last character in your email address." msgstr "" -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " "which does not end." msgstr "" -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -278,14 +278,14 @@ "character." msgstr "" -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "invalid display name." msgstr "" -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -293,12 +293,12 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 msgctxt "QObject|" msgid "" "The email address you entered is not valid.\n" @@ -306,7 +306,7 @@ "form joe@example.org." msgstr "" -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Disabled" @@ -314,7 +314,7 @@ msgid "Disabled" msgstr "Рұқсат етілмеген" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Universal" @@ -322,7 +322,7 @@ msgid "Universal" msgstr "Universal" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Unicode" @@ -330,7 +330,7 @@ msgid "Unicode" msgstr "Юникод" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Cyrillic" @@ -338,7 +338,7 @@ msgid "Cyrillic" msgstr "Кирилл жазуы" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Western European" @@ -346,7 +346,7 @@ msgid "Western European" msgstr "Батыс Еуропалық" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Central European" @@ -354,7 +354,7 @@ msgid "Central European" msgstr "Орта Еуропалық" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Greek" @@ -362,7 +362,7 @@ msgid "Greek" msgstr "Грек" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 #, fuzzy #| msgctxt "@item Spelling dictionary" #| msgid "Hebrew" @@ -370,7 +370,7 @@ msgid "Hebrew" msgstr "Иврит" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 #, fuzzy #| msgctxt "@item Spelling dictionary" #| msgid "Turkish" @@ -378,7 +378,7 @@ msgid "Turkish" msgstr "Түрік" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Japanese" @@ -386,7 +386,7 @@ msgid "Japanese" msgstr "Жапон" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Baltic" @@ -394,7 +394,7 @@ msgid "Baltic" msgstr "Балтық" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Chinese Traditional" @@ -402,7 +402,7 @@ msgid "Chinese Traditional" msgstr "Дәстүрлі қытай" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Chinese Simplified" @@ -410,7 +410,7 @@ msgid "Chinese Simplified" msgstr "Жеңілдеткен қытай" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Korean" @@ -418,7 +418,7 @@ msgid "Korean" msgstr "Корей" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Thai" @@ -426,7 +426,7 @@ msgid "Thai" msgstr "Тай" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Arabic" diff -Nru kcodecs-5.79.0/po/km/kcodecs5_qt.po kcodecs-5.80.0/po/km/kcodecs5_qt.po --- kcodecs-5.79.0/po/km/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/km/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -153,7 +153,7 @@ msgid "Other" msgstr "ផ្សេង​ទៀត" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, fuzzy, qt-format #| msgctxt "@item %1 character set, %2 encoding" #| msgid "%1 ( %2 )" @@ -161,7 +161,7 @@ msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, fuzzy, qt-format #| msgctxt "@item" #| msgid "Other encoding (%1)" @@ -169,7 +169,7 @@ msgid "Other encoding (%1)" msgstr "កា​រអ៊ិនកូដ​ផ្សេងៗ (%1)" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, fuzzy, qt-format #| msgctxt "@item %1 character set, %2 encoding" #| msgid "%1 ( %2 )" @@ -177,7 +177,7 @@ msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains more than one " @@ -185,40 +185,40 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a @.\n" "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "" -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "local part." msgstr "" -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "domain part." msgstr "" -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " "comments/brackets." msgstr "" -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 #, fuzzy #| msgctxt "@info" #| msgid "The date you entered is invalid" @@ -226,28 +226,28 @@ msgid "The email address you entered is valid." msgstr "កាលបរិច្ឆេទ​ដែល​អ្នក​បាន​បញ្ចូល​មិន​ត្រឹមត្រូវ​ទេ" -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " "angle bracket." msgstr "" -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " "closing angle brackets." msgstr "" -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "unexpected comma." msgstr "" -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it ended unexpectedly.\n" @@ -255,14 +255,14 @@ "the last character in your email address." msgstr "" -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " "which does not end." msgstr "" -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -276,14 +276,14 @@ "character." msgstr "" -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "invalid display name." msgstr "" -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -291,12 +291,12 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 msgctxt "QObject|" msgid "" "The email address you entered is not valid.\n" @@ -304,7 +304,7 @@ "form joe@example.org." msgstr "" -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Disabled" @@ -312,7 +312,7 @@ msgid "Disabled" msgstr "បានបិទ" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Universal" @@ -320,7 +320,7 @@ msgid "Universal" msgstr "សកល" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Unicode" @@ -328,7 +328,7 @@ msgid "Unicode" msgstr "យូនីកូដ" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Cyrillic" @@ -336,7 +336,7 @@ msgid "Cyrillic" msgstr "ស៊ីរីលីក" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Western European" @@ -344,7 +344,7 @@ msgid "Western European" msgstr "អឺរ៉ុប​ខាង​លិច" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Central European" @@ -352,7 +352,7 @@ msgid "Central European" msgstr "អឺរ៉ុប​កណ្ដាល" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Greek" @@ -360,7 +360,7 @@ msgid "Greek" msgstr "ក្រិក" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 #, fuzzy #| msgctxt "@item Spelling dictionary" #| msgid "Hebrew" @@ -368,7 +368,7 @@ msgid "Hebrew" msgstr "ហេប្រ៊ូ" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 #, fuzzy #| msgctxt "@item Spelling dictionary" #| msgid "Turkish" @@ -376,7 +376,7 @@ msgid "Turkish" msgstr "ទួរគី" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Japanese" @@ -384,7 +384,7 @@ msgid "Japanese" msgstr "ជប៉ុន" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Baltic" @@ -392,7 +392,7 @@ msgid "Baltic" msgstr "បាល់ទិក" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Chinese Traditional" @@ -400,7 +400,7 @@ msgid "Chinese Traditional" msgstr "ចិន​បុរាណ" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Chinese Simplified" @@ -408,7 +408,7 @@ msgid "Chinese Simplified" msgstr "ចិន​សាមញ្ញ" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Korean" @@ -416,7 +416,7 @@ msgid "Korean" msgstr "កូរ៉េ" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Thai" @@ -424,7 +424,7 @@ msgid "Thai" msgstr "​ថៃ" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Arabic" diff -Nru kcodecs-5.79.0/po/kn/kcodecs5_qt.po kcodecs-5.80.0/po/kn/kcodecs5_qt.po --- kcodecs-5.79.0/po/kn/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/kn/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -157,7 +157,7 @@ msgid "Other" msgstr "ಇತರೆ" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, fuzzy, qt-format #| msgctxt "@item %1 character set, %2 encoding" #| msgid "%1 ( %2 )" @@ -165,7 +165,7 @@ msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, fuzzy, qt-format #| msgctxt "@item" #| msgid "Other encoding (%1)" @@ -173,7 +173,7 @@ msgid "Other encoding (%1)" msgstr "ಬೇರೆ ಸಾಂಕೇತೀಕರಣ (encoding) (%1)" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, fuzzy, qt-format #| msgctxt "@item %1 character set, %2 encoding" #| msgid "%1 ( %2 )" @@ -181,7 +181,7 @@ msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains more than one " @@ -189,67 +189,67 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a @.\n" "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "" -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "local part." msgstr "" -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "domain part." msgstr "" -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " "comments/brackets." msgstr "" -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 #, fuzzy msgctxt "QObject|" msgid "The email address you entered is valid." msgstr "ಪ್ರಮಾಣಪತ್ರ ಆಮಾನ್ಯವಾದುದಾಗಿದೆ" -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " "angle bracket." msgstr "" -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " "closing angle brackets." msgstr "" -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "unexpected comma." msgstr "" -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it ended unexpectedly.\n" @@ -257,14 +257,14 @@ "the last character in your email address." msgstr "" -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " "which does not end." msgstr "" -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -278,14 +278,14 @@ "character." msgstr "" -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "invalid display name." msgstr "" -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -293,12 +293,12 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 msgctxt "QObject|" msgid "" "The email address you entered is not valid.\n" @@ -306,7 +306,7 @@ "form joe@example.org." msgstr "" -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Disabled" @@ -314,7 +314,7 @@ msgid "Disabled" msgstr "ನಿಷ್ಕ್ರಿಯಗೊಂಡಿದೆ" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Universal" @@ -322,7 +322,7 @@ msgid "Universal" msgstr "ಜಾಗತಿಕ" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Unicode" @@ -330,7 +330,7 @@ msgid "Unicode" msgstr "ಯೂನಿಕೋಡ್" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Cyrillic" @@ -338,7 +338,7 @@ msgid "Cyrillic" msgstr "ಸಿರಿಲಿಕ್" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Western European" @@ -346,7 +346,7 @@ msgid "Western European" msgstr "ಪಾಶ್ಚಾತ್ಯ ಯೂರೋಪಿಯನ್" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Central European" @@ -354,7 +354,7 @@ msgid "Central European" msgstr "ಮಧ್ಯ ಯುರೋಪಿಯನ್" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Greek" @@ -362,7 +362,7 @@ msgid "Greek" msgstr "ಗ್ರೀಕ್" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 #, fuzzy #| msgctxt "@item Spelling dictionary" #| msgid "Hebrew" @@ -370,7 +370,7 @@ msgid "Hebrew" msgstr "ಹೀಬ್ರೂ" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 #, fuzzy #| msgctxt "@item Spelling dictionary" #| msgid "Turkish" @@ -378,7 +378,7 @@ msgid "Turkish" msgstr "ತುರ್ಕಿಶ್" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Japanese" @@ -386,7 +386,7 @@ msgid "Japanese" msgstr "ಜಪಾನೀ" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Baltic" @@ -394,7 +394,7 @@ msgid "Baltic" msgstr "ಬಾಲ್ಟಿಕ್" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Chinese Traditional" @@ -402,7 +402,7 @@ msgid "Chinese Traditional" msgstr "ಸಾಂಪ್ರದಾಯಿಕ ಚೀನೀ" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Chinese Simplified" @@ -410,7 +410,7 @@ msgid "Chinese Simplified" msgstr "ಸರಳ ಚೀನೀ" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Korean" @@ -418,7 +418,7 @@ msgid "Korean" msgstr "ಕೊರಿಯನ್" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Thai" @@ -426,7 +426,7 @@ msgid "Thai" msgstr "ಥಾಯ್" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Arabic" diff -Nru kcodecs-5.79.0/po/ko/kcodecs5_qt.po kcodecs-5.80.0/po/ko/kcodecs5_qt.po --- kcodecs-5.79.0/po/ko/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/ko/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -104,25 +104,25 @@ msgid "Other" msgstr "기타" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, qt-format msgctxt "KCharsets|@item %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, qt-format msgctxt "KCharsets|@item" msgid "Other encoding (%1)" msgstr "기타 인코딩 (%1)" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, qt-format msgctxt "KCharsets|@item Text encoding: %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains more than one " @@ -132,7 +132,7 @@ "입력한 이메일 주소에 @ 기호가 두 개 이상 들어가 있어서 올바르지 않습니다.\n" "주소를 변경하지 않으면 메시지를 작성할 수 없습니다." -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a @.\n" @@ -141,26 +141,26 @@ "입력한 이메일 주소에 @ 기호가 들어가 있지 않아서 올바르지 않습니다.\n" "주소를 변경하지 않으면 메시지를 작성할 수 없습니다." -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "이메일 주소 항목에 내용을 입력해야 합니다." -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "local part." msgstr "입력한 이메일 주소에 로컬 부분이 들어 있지 않아서 올바르지 않습니다." -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "domain part." msgstr "입력한 이메일 주소에 도메인 부분이 들어 있지 않아서 올바르지 않습니다." -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " @@ -169,12 +169,12 @@ "입력한 이메일 주소에 닫히지 않은 설명이나 괄호가 들어 있어서 올바르지 않습니" "다." -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 msgctxt "QObject|" msgid "The email address you entered is valid." msgstr "입력한 이메일 주소가 올바릅니다." -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " @@ -182,7 +182,7 @@ msgstr "" "입력한 이메일 주소에 닫히지 않은 부등호가 들어 있어서 올바르지 않습니다." -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " @@ -190,7 +190,7 @@ msgstr "" "입력한 이메일 주소에 너무 많은 닫는 부등호가 들어 있어서 올바르지 않습니다." -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " @@ -198,7 +198,7 @@ msgstr "" "입력한 이메일 주소에 예상하지 못한 곳에 쉼표가 들어 있어서 올바르지 않습니다." -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it ended unexpectedly.\n" @@ -209,7 +209,7 @@ "입력한 이메일 주소에 마지막 글자로 '\\'와 같은 이스케이프 문자열을 사용했을 " "수도 있습니다." -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " @@ -217,7 +217,7 @@ msgstr "" "입력한 이메일 주소에 닫히지 않은 따옴표가 들어 있어서 올바르지 않습니다." -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -234,7 +234,7 @@ msgstr "" "입력한 이메일 주소에 사용할 수 없는 문자가 들어 있어서 올바르지 않습니다." -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " @@ -242,7 +242,7 @@ msgstr "" "입력한 이메일 주소에 올바르지 않은 표시 이름이 들어 있어서 올바르지 않습니다." -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -252,12 +252,12 @@ "입력한 이메일 주소에 마침표('.')가 들어 있지 않아서 올바르지 않습니다.\n" "주소를 변경하지 않으면 메시지를 작성할 수 없습니다." -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "이메일 주소의 알 수 없는 문제" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 msgctxt "QObject|" msgid "" "The email address you entered is not valid.\n" @@ -268,82 +268,82 @@ "입력한 이메일 주소에 실제 이메일 주소가 들어 있지 않는 것 같습니다. 예를 들" "어 joe@example.org 형태입니다." -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 msgctxt "KEncodingProber|@item Text character set" msgid "Disabled" msgstr "사용 안 함" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 msgctxt "KEncodingProber|@item Text character set" msgid "Universal" msgstr "다중" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 msgctxt "KEncodingProber|@item Text character set" msgid "Unicode" msgstr "유니코드" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 msgctxt "KEncodingProber|@item Text character set" msgid "Cyrillic" msgstr "키릴 문자" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 msgctxt "KEncodingProber|@item Text character set" msgid "Western European" msgstr "서부 유럽 문자" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 msgctxt "KEncodingProber|@item Text character set" msgid "Central European" msgstr "중부 유럽 문자" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 msgctxt "KEncodingProber|@item Text character set" msgid "Greek" msgstr "그리스 문자" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 msgctxt "KEncodingProber|@item Text character set" msgid "Hebrew" msgstr "히브리 문자" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 msgctxt "KEncodingProber|@item Text character set" msgid "Turkish" msgstr "터키 문자" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 msgctxt "KEncodingProber|@item Text character set" msgid "Japanese" msgstr "가나" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 msgctxt "KEncodingProber|@item Text character set" msgid "Baltic" msgstr "발트 문자" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Traditional" msgstr "중국어 번체" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Simplified" msgstr "중국어 간체" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 msgctxt "KEncodingProber|@item Text character set" msgid "Korean" msgstr "한글" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 msgctxt "KEncodingProber|@item Text character set" msgid "Thai" msgstr "태국 문자" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 msgctxt "KEncodingProber|@item Text character set" msgid "Arabic" msgstr "아랍 문자" diff -Nru kcodecs-5.79.0/po/ku/kcodecs5_qt.po kcodecs-5.80.0/po/ku/kcodecs5_qt.po --- kcodecs-5.79.0/po/ku/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/ku/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -163,7 +163,7 @@ msgid "Other" msgstr "Yên Din" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, fuzzy, qt-format #| msgctxt "@item %1 character set, %2 encoding" #| msgid "%1 ( %2 )" @@ -171,7 +171,7 @@ msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, fuzzy, qt-format #| msgctxt "@item" #| msgid "Other encoding (%1)" @@ -179,7 +179,7 @@ msgid "Other encoding (%1)" msgstr "Kodkirineke din (%1)" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, fuzzy, qt-format #| msgctxt "@item %1 character set, %2 encoding" #| msgid "%1 ( %2 )" @@ -187,7 +187,7 @@ msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains more than one " @@ -195,67 +195,67 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a @.\n" "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "" -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "local part." msgstr "" -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "domain part." msgstr "" -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " "comments/brackets." msgstr "" -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 #, fuzzy msgctxt "QObject|" msgid "The email address you entered is valid." msgstr "Bawername nederbasdar e" -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " "angle bracket." msgstr "" -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " "closing angle brackets." msgstr "" -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "unexpected comma." msgstr "" -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it ended unexpectedly.\n" @@ -263,14 +263,14 @@ "the last character in your email address." msgstr "" -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " "which does not end." msgstr "" -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -284,14 +284,14 @@ "character." msgstr "" -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "invalid display name." msgstr "" -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -299,12 +299,12 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 msgctxt "QObject|" msgid "" "The email address you entered is not valid.\n" @@ -312,7 +312,7 @@ "form joe@example.org." msgstr "" -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Disabled" @@ -320,7 +320,7 @@ msgid "Disabled" msgstr "Bêbandorkirî" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Universal" @@ -328,7 +328,7 @@ msgid "Universal" msgstr "Gerdûnî" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Unicode" @@ -336,7 +336,7 @@ msgid "Unicode" msgstr "Unîcode" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Cyrillic" @@ -344,7 +344,7 @@ msgid "Cyrillic" msgstr "Kîrîlî" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Western European" @@ -352,7 +352,7 @@ msgid "Western European" msgstr "Ewropayî Rojava" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Central European" @@ -360,7 +360,7 @@ msgid "Central European" msgstr "Ewropayî Navîn" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Greek" @@ -368,7 +368,7 @@ msgid "Greek" msgstr "Yewnanî" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 #, fuzzy #| msgctxt "@item Spelling dictionary" #| msgid "Hebrew" @@ -376,7 +376,7 @@ msgid "Hebrew" msgstr "Îbranî" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 #, fuzzy #| msgctxt "@item Spelling dictionary" #| msgid "Turkish" @@ -384,7 +384,7 @@ msgid "Turkish" msgstr "Tirkî" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Japanese" @@ -392,7 +392,7 @@ msgid "Japanese" msgstr "Japonî" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Baltic" @@ -400,7 +400,7 @@ msgid "Baltic" msgstr "Baltîkî" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Chinese Traditional" @@ -408,7 +408,7 @@ msgid "Chinese Traditional" msgstr "Çîniya Kevneşopî" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Chinese Simplified" @@ -416,7 +416,7 @@ msgid "Chinese Simplified" msgstr "Çîniya Hêsankirî" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Korean" @@ -424,7 +424,7 @@ msgid "Korean" msgstr "Koreyî" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Thai" @@ -432,7 +432,7 @@ msgid "Thai" msgstr "Tayî" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Arabic" diff -Nru kcodecs-5.79.0/po/lb/kcodecs5_qt.po kcodecs-5.80.0/po/lb/kcodecs5_qt.po --- kcodecs-5.79.0/po/lb/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/lb/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -136,7 +136,7 @@ msgid "Other" msgstr "Aner" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, fuzzy, qt-format #| msgctxt "Descriptive Encoding Name" #| msgid "%1 ( %2 )" @@ -144,13 +144,13 @@ msgid "%1 ( %2 )" msgstr "%1 (%2)" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, fuzzy, qt-format msgctxt "KCharsets|@item" msgid "Other encoding (%1)" msgstr "&Verschlësselung festléen" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, fuzzy, qt-format #| msgctxt "Descriptive Encoding Name" #| msgid "%1 ( %2 )" @@ -158,7 +158,7 @@ msgid "%1 ( %2 )" msgstr "%1 (%2)" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains more than one " @@ -166,68 +166,68 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a @.\n" "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "" -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "local part." msgstr "" -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "domain part." msgstr "" -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " "comments/brackets." msgstr "" -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 #, fuzzy #| msgid "The email address this bug report is sent to." msgctxt "QObject|" msgid "The email address you entered is valid." msgstr "D'E-Mail-Adress, wou de Käfer gemellt gëtt." -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " "angle bracket." msgstr "" -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " "closing angle brackets." msgstr "" -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "unexpected comma." msgstr "" -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it ended unexpectedly.\n" @@ -235,14 +235,14 @@ "the last character in your email address." msgstr "" -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " "which does not end." msgstr "" -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -256,14 +256,14 @@ "character." msgstr "" -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "invalid display name." msgstr "" -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -271,12 +271,12 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 msgctxt "QObject|" msgid "" "The email address you entered is not valid.\n" @@ -284,111 +284,111 @@ "form joe@example.org." msgstr "" -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 #, fuzzy msgctxt "KEncodingProber|@item Text character set" msgid "Disabled" msgstr "Veränneren aktivéiert" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 #, fuzzy #| msgid "Install" msgctxt "KEncodingProber|@item Text character set" msgid "Universal" msgstr "Installéieren" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 #, fuzzy #| msgid "Unicode" msgctxt "KEncodingProber|@item Text character set" msgid "Unicode" msgstr "Unicode" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 #, fuzzy #| msgid "Cyrillic" msgctxt "KEncodingProber|@item Text character set" msgid "Cyrillic" msgstr "Kyrillësch" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 #, fuzzy #| msgid "Western European" msgctxt "KEncodingProber|@item Text character set" msgid "Western European" msgstr "Westeuropäësch" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 #, fuzzy #| msgid "Central European" msgctxt "KEncodingProber|@item Text character set" msgid "Central European" msgstr "Mëtteleuropäësch" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 #, fuzzy #| msgid "Greek" msgctxt "KEncodingProber|@item Text character set" msgid "Greek" msgstr "Griichësch" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 #, fuzzy #| msgid "Hebrew" msgctxt "KEncodingProber|@item Text character set" msgid "Hebrew" msgstr "Hebräësch" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 #, fuzzy #| msgid "Turkish" msgctxt "KEncodingProber|@item Text character set" msgid "Turkish" msgstr "Türkësch" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 #, fuzzy #| msgid "Japanese" msgctxt "KEncodingProber|@item Text character set" msgid "Japanese" msgstr "Japanësch" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 #, fuzzy #| msgid "Baltic" msgctxt "KEncodingProber|@item Text character set" msgid "Baltic" msgstr "Baltësch" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 #, fuzzy #| msgid "Chinese Traditional" msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Traditional" msgstr "Chinesësch traditionell" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 #, fuzzy #| msgid "Chinese Simplified" msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Simplified" msgstr "Chinesësch einfach" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 #, fuzzy #| msgid "Korean" msgctxt "KEncodingProber|@item Text character set" msgid "Korean" msgstr "Koreanësch" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 #, fuzzy #| msgid "Thai" msgctxt "KEncodingProber|@item Text character set" msgid "Thai" msgstr "Thailännësch" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 #, fuzzy #| msgid "Arabic" msgctxt "KEncodingProber|@item Text character set" diff -Nru kcodecs-5.79.0/po/lt/kcodecs5_qt.po kcodecs-5.80.0/po/lt/kcodecs5_qt.po --- kcodecs-5.79.0/po/lt/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/lt/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -109,25 +109,25 @@ msgid "Other" msgstr "Kita" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, qt-format msgctxt "KCharsets|@item %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, qt-format msgctxt "KCharsets|@item" msgid "Other encoding (%1)" msgstr "Kita koduotė (%1)" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, qt-format msgctxt "KCharsets|@item Text encoding: %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 #, fuzzy #| msgctxt "QObject|" #| msgid "" @@ -144,7 +144,7 @@ "vienas @ simbolis. Jei nepakeisite adreso, negalėsite išsiųsti tinkamų " "laiškų." -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 #, fuzzy #| msgctxt "QObject|" #| msgid "" @@ -158,12 +158,12 @@ "El. pašto adresas, kurį įrašėte, yra neteisingas, nes jame nėra @ simbolio. " "Jei nepakeisite adreso, negalėsite išsiųsti tinkamų laiškų." -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "Turite kažką įrašyti el. pašto adreso lauke." -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -171,7 +171,7 @@ msgstr "" "El. pašto adresas, kurį įrašėte, yra neteisingas, nes neturi vietinės dalies." -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -179,7 +179,7 @@ msgstr "" "El. pašto adresas, kurį įrašėte, yra neteisingas, nes neturi srities dalies." -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " @@ -188,12 +188,12 @@ "El. pašto adresas, kurį įrašėte, yra neteisingas, nes jame yra neuždarytų " "komentarų/skliaustelių." -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 msgctxt "QObject|" msgid "The email address you entered is valid." msgstr "Įrašytas el. pašto adresas yra teisingas." -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " @@ -202,7 +202,7 @@ "El. pašto adresas, kurį įrašėte, yra neteisingas, nes turi neuždarytą " "kampinį skliaustą." -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " @@ -211,7 +211,7 @@ "El. pašto adresas, kurį įrašėte, yra neteisingas, nes turi per daug kampinių " "skliaustų." -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " @@ -219,7 +219,7 @@ msgstr "" "El. pašto adresas, kurį įrašėte, yra neteisingas, nes jame yra kablelis." -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 #, fuzzy #| msgctxt "QObject|" #| msgid "" @@ -236,7 +236,7 @@ "baigiasi; tai greičiausiai reiškia, kad panaudojote atšaukimo ženklą, pvz., " "„\\“ kaip paskutinį ženklą el. pašto adrese." -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " @@ -245,7 +245,7 @@ "El. pašto adresas, kurį įrašėte, yra neteisingas, nes turi atvertą ir " "neužvertą cituojamą tekstą." -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -263,7 +263,7 @@ "El. pašto adresas, kurį įrašėte, yra neteisingas, nes jame yra netinkamų " "ženklų." -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " @@ -272,7 +272,7 @@ "El. pašto adresas, kurį įrašėte, yra neteisingas, nes turi netinkamą " "pavadinimą." -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 #, fuzzy #| msgctxt "QObject|" #| msgid "" @@ -287,12 +287,12 @@ "El. pašto adresas, kurį įrašėte, yra neteisingas, nes jame nėra simbolio " "'.'. Jei nepakeisite savo adreso, negalėsite išsiųsti tinkamų laiškų." -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "Nežinoma problema su el. pašto adresu" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 #, fuzzy #| msgctxt "QObject|" #| msgid "" @@ -308,82 +308,82 @@ "El. pašto adresas, kurį įrašėte, yra neteisingas, nes neturi faktinio el. " "pašto adreso, t.y. kažko panašaus į jonas@example.org." -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 msgctxt "KEncodingProber|@item Text character set" msgid "Disabled" msgstr "Išjungtas" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 msgctxt "KEncodingProber|@item Text character set" msgid "Universal" msgstr "Universalus" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 msgctxt "KEncodingProber|@item Text character set" msgid "Unicode" msgstr "Unikodas" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 msgctxt "KEncodingProber|@item Text character set" msgid "Cyrillic" msgstr "Kirilica" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 msgctxt "KEncodingProber|@item Text character set" msgid "Western European" msgstr "Vakarų Europos" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 msgctxt "KEncodingProber|@item Text character set" msgid "Central European" msgstr "Centrinės Europos" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 msgctxt "KEncodingProber|@item Text character set" msgid "Greek" msgstr "Graikų" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 msgctxt "KEncodingProber|@item Text character set" msgid "Hebrew" msgstr "Hebrajų" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 msgctxt "KEncodingProber|@item Text character set" msgid "Turkish" msgstr "Turkų" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 msgctxt "KEncodingProber|@item Text character set" msgid "Japanese" msgstr "Japonų" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 msgctxt "KEncodingProber|@item Text character set" msgid "Baltic" msgstr "Baltų" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Traditional" msgstr "Kinų tradicinė" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Simplified" msgstr "Kinų supaprastinta" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 msgctxt "KEncodingProber|@item Text character set" msgid "Korean" msgstr "Korėjiečių" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 msgctxt "KEncodingProber|@item Text character set" msgid "Thai" msgstr "Tajų" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 msgctxt "KEncodingProber|@item Text character set" msgid "Arabic" msgstr "Arabų" diff -Nru kcodecs-5.79.0/po/lv/kcodecs5_qt.po kcodecs-5.80.0/po/lv/kcodecs5_qt.po --- kcodecs-5.79.0/po/lv/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/lv/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -162,7 +162,7 @@ msgid "Other" msgstr "Cits" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, fuzzy, qt-format #| msgctxt "@item %1 character set, %2 encoding" #| msgid "%1 ( %2 )" @@ -170,7 +170,7 @@ msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, fuzzy, qt-format #| msgctxt "@item" #| msgid "Other encoding (%1)" @@ -178,7 +178,7 @@ msgid "Other encoding (%1)" msgstr "Cits kodējums (%1)" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, fuzzy, qt-format #| msgctxt "@item %1 character set, %2 encoding" #| msgid "%1 ( %2 )" @@ -186,7 +186,7 @@ msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains more than one " @@ -194,40 +194,40 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a @.\n" "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "" -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "local part." msgstr "" -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "domain part." msgstr "" -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " "comments/brackets." msgstr "" -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 #, fuzzy #| msgctxt "@info" #| msgid "The date you entered is invalid" @@ -235,28 +235,28 @@ msgid "The email address you entered is valid." msgstr "Ievadītais datums nav derīgs" -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " "angle bracket." msgstr "" -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " "closing angle brackets." msgstr "" -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "unexpected comma." msgstr "" -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it ended unexpectedly.\n" @@ -264,14 +264,14 @@ "the last character in your email address." msgstr "" -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " "which does not end." msgstr "" -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -285,14 +285,14 @@ "character." msgstr "" -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "invalid display name." msgstr "" -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -300,12 +300,12 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 msgctxt "QObject|" msgid "" "The email address you entered is not valid.\n" @@ -313,7 +313,7 @@ "form joe@example.org." msgstr "" -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Disabled" @@ -321,7 +321,7 @@ msgid "Disabled" msgstr "Izslēgts" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Universal" @@ -329,7 +329,7 @@ msgid "Universal" msgstr "Universāls" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Unicode" @@ -337,7 +337,7 @@ msgid "Unicode" msgstr "Unikods" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Cyrillic" @@ -345,7 +345,7 @@ msgid "Cyrillic" msgstr "Kirilica" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Western European" @@ -353,7 +353,7 @@ msgid "Western European" msgstr "Rietumeiropas" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Central European" @@ -361,7 +361,7 @@ msgid "Central European" msgstr "Centrāleiropas" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Greek" @@ -369,7 +369,7 @@ msgid "Greek" msgstr "Grieķu" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 #, fuzzy #| msgctxt "@item Spelling dictionary" #| msgid "Hebrew" @@ -377,7 +377,7 @@ msgid "Hebrew" msgstr "Ebreju" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 #, fuzzy #| msgctxt "@item Spelling dictionary" #| msgid "Turkish" @@ -385,7 +385,7 @@ msgid "Turkish" msgstr "Turku" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Japanese" @@ -393,7 +393,7 @@ msgid "Japanese" msgstr "Japāņu" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Baltic" @@ -401,7 +401,7 @@ msgid "Baltic" msgstr "Baltu" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Chinese Traditional" @@ -409,7 +409,7 @@ msgid "Chinese Traditional" msgstr "Tradicionālais ķīniešu" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Chinese Simplified" @@ -417,7 +417,7 @@ msgid "Chinese Simplified" msgstr "Vienkāršotais ķīniešu" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Korean" @@ -425,7 +425,7 @@ msgid "Korean" msgstr "Korejiešu" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Thai" @@ -433,7 +433,7 @@ msgid "Thai" msgstr "Taizemes" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Arabic" diff -Nru kcodecs-5.79.0/po/mai/kcodecs5_qt.po kcodecs-5.80.0/po/mai/kcodecs5_qt.po --- kcodecs-5.79.0/po/mai/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/mai/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -157,7 +157,7 @@ msgid "Other" msgstr "आन" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, fuzzy, qt-format #| msgctxt "@item %1 character set, %2 encoding" #| msgid "%1 ( %2 )" @@ -165,7 +165,7 @@ msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, fuzzy, qt-format #| msgctxt "@item" #| msgid "Other encoding (%1)" @@ -173,7 +173,7 @@ msgid "Other encoding (%1)" msgstr "आन एनकोडिंग (%1)" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, fuzzy, qt-format #| msgctxt "@item %1 character set, %2 encoding" #| msgid "%1 ( %2 )" @@ -181,7 +181,7 @@ msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains more than one " @@ -189,68 +189,68 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a @.\n" "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "" -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "local part." msgstr "" -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "domain part." msgstr "" -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " "comments/brackets." msgstr "" -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 #, fuzzy #| msgid "The email address this bug report is sent to." msgctxt "QObject|" msgid "The email address you entered is valid." msgstr "ई बग रिपोट केँ भेजबा क' लेल इमेल पता." -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " "angle bracket." msgstr "" -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " "closing angle brackets." msgstr "" -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "unexpected comma." msgstr "" -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it ended unexpectedly.\n" @@ -258,14 +258,14 @@ "the last character in your email address." msgstr "" -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " "which does not end." msgstr "" -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -279,14 +279,14 @@ "character." msgstr "" -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "invalid display name." msgstr "" -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -294,12 +294,12 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 msgctxt "QObject|" msgid "" "The email address you entered is not valid.\n" @@ -307,7 +307,7 @@ "form joe@example.org." msgstr "" -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Disabled" @@ -315,7 +315,7 @@ msgid "Disabled" msgstr "अक्षम" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Universal" @@ -323,7 +323,7 @@ msgid "Universal" msgstr "सार्वभौमिक" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Unicode" @@ -331,7 +331,7 @@ msgid "Unicode" msgstr "यूनिकोड" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Cyrillic" @@ -339,7 +339,7 @@ msgid "Cyrillic" msgstr "साइरिलिक" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Western European" @@ -347,7 +347,7 @@ msgid "Western European" msgstr "पश्चिमी यूरोपीय" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Central European" @@ -355,7 +355,7 @@ msgid "Central European" msgstr "बिचला यूरोपीय" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Greek" @@ -363,7 +363,7 @@ msgid "Greek" msgstr "ग्रीक" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 #, fuzzy #| msgctxt "@item Spelling dictionary" #| msgid "Hebrew" @@ -371,7 +371,7 @@ msgid "Hebrew" msgstr "हिब्रू" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 #, fuzzy #| msgctxt "@item Spelling dictionary" #| msgid "Turkish" @@ -379,7 +379,7 @@ msgid "Turkish" msgstr "तुर्की" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Japanese" @@ -387,7 +387,7 @@ msgid "Japanese" msgstr "जापानी" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Baltic" @@ -395,7 +395,7 @@ msgid "Baltic" msgstr "बाल्टिक" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Chinese Traditional" @@ -403,7 +403,7 @@ msgid "Chinese Traditional" msgstr "चीनी पारम्परिक" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Chinese Simplified" @@ -411,7 +411,7 @@ msgid "Chinese Simplified" msgstr "चीनी (सरल)" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Korean" @@ -419,7 +419,7 @@ msgid "Korean" msgstr "कोरियाइ" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Thai" @@ -427,7 +427,7 @@ msgid "Thai" msgstr "थाइ" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Arabic" diff -Nru kcodecs-5.79.0/po/mk/kcodecs5_qt.po kcodecs-5.80.0/po/mk/kcodecs5_qt.po --- kcodecs-5.79.0/po/mk/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/mk/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -166,7 +166,7 @@ msgid "Other" msgstr "Друго" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, fuzzy, qt-format #| msgctxt "@item %1 character set, %2 encoding" #| msgid "%1 ( %2 )" @@ -174,7 +174,7 @@ msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, fuzzy, qt-format #| msgctxt "@item" #| msgid "Other encoding (%1)" @@ -182,7 +182,7 @@ msgid "Other encoding (%1)" msgstr "Друго кодирање (%1)" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, fuzzy, qt-format #| msgctxt "@item %1 character set, %2 encoding" #| msgid "%1 ( %2 )" @@ -190,7 +190,7 @@ msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains more than one " @@ -198,67 +198,67 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a @.\n" "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "" -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "local part." msgstr "" -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "domain part." msgstr "" -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " "comments/brackets." msgstr "" -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 #, fuzzy msgctxt "QObject|" msgid "The email address you entered is valid." msgstr "Сертификатот не е валиден" -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " "angle bracket." msgstr "" -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " "closing angle brackets." msgstr "" -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "unexpected comma." msgstr "" -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it ended unexpectedly.\n" @@ -266,14 +266,14 @@ "the last character in your email address." msgstr "" -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " "which does not end." msgstr "" -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -287,14 +287,14 @@ "character." msgstr "" -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "invalid display name." msgstr "" -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -302,12 +302,12 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 msgctxt "QObject|" msgid "" "The email address you entered is not valid.\n" @@ -315,7 +315,7 @@ "form joe@example.org." msgstr "" -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Disabled" @@ -323,7 +323,7 @@ msgid "Disabled" msgstr "Оневозможено" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Universal" @@ -331,7 +331,7 @@ msgid "Universal" msgstr "Универзално" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Unicode" @@ -339,7 +339,7 @@ msgid "Unicode" msgstr "Уникод" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Cyrillic" @@ -347,7 +347,7 @@ msgid "Cyrillic" msgstr "Кириличен" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Western European" @@ -355,7 +355,7 @@ msgid "Western European" msgstr "Западноевропски" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Central European" @@ -363,7 +363,7 @@ msgid "Central European" msgstr "Централноевропски" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Greek" @@ -371,7 +371,7 @@ msgid "Greek" msgstr "Грчки" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 #, fuzzy #| msgctxt "@item Spelling dictionary" #| msgid "Hebrew" @@ -379,7 +379,7 @@ msgid "Hebrew" msgstr "Еврејски" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 #, fuzzy #| msgctxt "@item Spelling dictionary" #| msgid "Turkish" @@ -387,7 +387,7 @@ msgid "Turkish" msgstr "Турски" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Japanese" @@ -395,7 +395,7 @@ msgid "Japanese" msgstr "Јапонски" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Baltic" @@ -403,7 +403,7 @@ msgid "Baltic" msgstr "Балтички" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Chinese Traditional" @@ -411,7 +411,7 @@ msgid "Chinese Traditional" msgstr "Традиционален кинески" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Chinese Simplified" @@ -419,7 +419,7 @@ msgid "Chinese Simplified" msgstr "Поедноставен кинески" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Korean" @@ -427,7 +427,7 @@ msgid "Korean" msgstr "Корејски" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Thai" @@ -435,7 +435,7 @@ msgid "Thai" msgstr "Тајландски" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Arabic" diff -Nru kcodecs-5.79.0/po/ml/kcodecs5_qt.po kcodecs-5.80.0/po/ml/kcodecs5_qt.po --- kcodecs-5.79.0/po/ml/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/ml/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -124,25 +124,25 @@ msgid "Other" msgstr "മറ്റുള്ളവ" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, fuzzy, qt-format msgctxt "KCharsets|@item %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, fuzzy, qt-format msgctxt "KCharsets|@item" msgid "Other encoding (%1)" msgstr "മറ്റുള്ള എന്‍കോഡിങ്ങ് (%1)" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, fuzzy, qt-format msgctxt "KCharsets|@item Text encoding: %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains more than one " @@ -150,67 +150,67 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a @.\n" "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "" -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "local part." msgstr "" -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "domain part." msgstr "" -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " "comments/brackets." msgstr "" -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 #, fuzzy msgctxt "QObject|" msgid "The email address you entered is valid." msgstr "ഈ സാക്ഷ്യപത്രം അസാധുവാണു്" -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " "angle bracket." msgstr "" -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " "closing angle brackets." msgstr "" -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "unexpected comma." msgstr "" -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it ended unexpectedly.\n" @@ -218,14 +218,14 @@ "the last character in your email address." msgstr "" -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " "which does not end." msgstr "" -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -239,14 +239,14 @@ "character." msgstr "" -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "invalid display name." msgstr "" -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -254,12 +254,12 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 msgctxt "QObject|" msgid "" "The email address you entered is not valid.\n" @@ -267,97 +267,97 @@ "form joe@example.org." msgstr "" -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 #, fuzzy msgctxt "KEncodingProber|@item Text character set" msgid "Disabled" msgstr "പ്രവര്‍ത്തന രഹിതമാക്കിയിരിയ്ക്കുന്നു" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 #, fuzzy msgctxt "KEncodingProber|@item Text character set" msgid "Universal" msgstr "സാര്‍വ്വജനികം" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 #, fuzzy msgctxt "KEncodingProber|@item Text character set" msgid "Unicode" msgstr "യൂണികോഡ്" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 #, fuzzy msgctxt "KEncodingProber|@item Text character set" msgid "Cyrillic" msgstr "സിറിലിക്" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 #, fuzzy msgctxt "KEncodingProber|@item Text character set" msgid "Western European" msgstr "പടിഞ്ഞാറന്‍ യൂറോപ്യന്‍" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 #, fuzzy msgctxt "KEncodingProber|@item Text character set" msgid "Central European" msgstr "മദ്ധ്യ യൂറോപ്യന്‍" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 #, fuzzy msgctxt "KEncodingProber|@item Text character set" msgid "Greek" msgstr "ഗ്രീക്ക്" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 #, fuzzy msgctxt "KEncodingProber|@item Text character set" msgid "Hebrew" msgstr "ഹീബ്രു" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 #, fuzzy msgctxt "KEncodingProber|@item Text character set" msgid "Turkish" msgstr "തുര്‍ക്കിഷ്" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 #, fuzzy msgctxt "KEncodingProber|@item Text character set" msgid "Japanese" msgstr "ജാപനീസ്" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 #, fuzzy msgctxt "KEncodingProber|@item Text character set" msgid "Baltic" msgstr "ബാള്‍ട്ടിക്" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 #, fuzzy msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Traditional" msgstr "പരമ്പരാഗത ചൈനീസ്" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 #, fuzzy msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Simplified" msgstr "ലളിതമാക്കിയ ചൈനീസ്" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 #, fuzzy msgctxt "KEncodingProber|@item Text character set" msgid "Korean" msgstr "കൊറിയന്‍" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 #, fuzzy msgctxt "KEncodingProber|@item Text character set" msgid "Thai" msgstr "ഥായി" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 #, fuzzy msgctxt "KEncodingProber|@item Text character set" msgid "Arabic" diff -Nru kcodecs-5.79.0/po/mr/kcodecs5_qt.po kcodecs-5.80.0/po/mr/kcodecs5_qt.po --- kcodecs-5.79.0/po/mr/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/mr/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -156,25 +156,25 @@ msgid "Other" msgstr "इतर" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, qt-format msgctxt "KCharsets|@item %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, qt-format msgctxt "KCharsets|@item" msgid "Other encoding (%1)" msgstr "इतर एन्कोडिंग (%1)" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, qt-format msgctxt "KCharsets|@item Text encoding: %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains more than one " @@ -182,40 +182,40 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a @.\n" "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "" -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "local part." msgstr "" -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "domain part." msgstr "" -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " "comments/brackets." msgstr "" -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 #, fuzzy #| msgctxt "@info" #| msgid "The date you entered is invalid" @@ -223,28 +223,28 @@ msgid "The email address you entered is valid." msgstr "तुम्ही दिलेला दिनांक चुकीचा आहे" -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " "angle bracket." msgstr "" -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " "closing angle brackets." msgstr "" -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "unexpected comma." msgstr "" -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it ended unexpectedly.\n" @@ -252,14 +252,14 @@ "the last character in your email address." msgstr "" -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " "which does not end." msgstr "" -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -273,14 +273,14 @@ "character." msgstr "" -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "invalid display name." msgstr "" -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -288,12 +288,12 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 msgctxt "QObject|" msgid "" "The email address you entered is not valid.\n" @@ -301,82 +301,82 @@ "form joe@example.org." msgstr "" -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 msgctxt "KEncodingProber|@item Text character set" msgid "Disabled" msgstr "अकार्यान्वित" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 msgctxt "KEncodingProber|@item Text character set" msgid "Universal" msgstr "जागतिक" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 msgctxt "KEncodingProber|@item Text character set" msgid "Unicode" msgstr "युनिकोड" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 msgctxt "KEncodingProber|@item Text character set" msgid "Cyrillic" msgstr "सिरीलिक" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 msgctxt "KEncodingProber|@item Text character set" msgid "Western European" msgstr "पश्चिमी युरोपियन" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 msgctxt "KEncodingProber|@item Text character set" msgid "Central European" msgstr "मध्य युरोपिअन" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 msgctxt "KEncodingProber|@item Text character set" msgid "Greek" msgstr "ग्रीक" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 msgctxt "KEncodingProber|@item Text character set" msgid "Hebrew" msgstr "हिब्रू" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 msgctxt "KEncodingProber|@item Text character set" msgid "Turkish" msgstr "तुर्किश" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 msgctxt "KEncodingProber|@item Text character set" msgid "Japanese" msgstr "जपानी" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 msgctxt "KEncodingProber|@item Text character set" msgid "Baltic" msgstr "बाल्टिक" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Traditional" msgstr "पारंपारिक चिनी" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Simplified" msgstr "विश्लेषीत चिनी" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 msgctxt "KEncodingProber|@item Text character set" msgid "Korean" msgstr "कोरियन" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 msgctxt "KEncodingProber|@item Text character set" msgid "Thai" msgstr "थाई" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 msgctxt "KEncodingProber|@item Text character set" msgid "Arabic" msgstr "अरेबिक" diff -Nru kcodecs-5.79.0/po/ms/kcodecs5_qt.po kcodecs-5.80.0/po/ms/kcodecs5_qt.po --- kcodecs-5.79.0/po/ms/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/ms/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -158,7 +158,7 @@ msgid "Other" msgstr "Lain-lain" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, fuzzy, qt-format #| msgctxt "@item %1 character set, %2 encoding" #| msgid "%1 ( %2 )" @@ -166,7 +166,7 @@ msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, fuzzy, qt-format #| msgctxt "@item" #| msgid "Other encoding (%1)" @@ -174,7 +174,7 @@ msgid "Other encoding (%1)" msgstr "Penenkodan lain (%1)" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, fuzzy, qt-format #| msgctxt "@item %1 character set, %2 encoding" #| msgid "%1 ( %2 )" @@ -182,7 +182,7 @@ msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains more than one " @@ -190,67 +190,67 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a @.\n" "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "" -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "local part." msgstr "" -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "domain part." msgstr "" -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " "comments/brackets." msgstr "" -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 #, fuzzy msgctxt "QObject|" msgid "The email address you entered is valid." msgstr "tarikh" -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " "angle bracket." msgstr "" -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " "closing angle brackets." msgstr "" -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "unexpected comma." msgstr "" -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it ended unexpectedly.\n" @@ -258,14 +258,14 @@ "the last character in your email address." msgstr "" -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " "which does not end." msgstr "" -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -279,14 +279,14 @@ "character." msgstr "" -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "invalid display name." msgstr "" -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -294,12 +294,12 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 msgctxt "QObject|" msgid "" "The email address you entered is not valid.\n" @@ -307,7 +307,7 @@ "form joe@example.org." msgstr "" -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Disabled" @@ -315,7 +315,7 @@ msgid "Disabled" msgstr "Dimatikan" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Universal" @@ -323,7 +323,7 @@ msgid "Universal" msgstr "Universal" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Unicode" @@ -331,7 +331,7 @@ msgid "Unicode" msgstr "Unicode" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Cyrillic" @@ -339,7 +339,7 @@ msgid "Cyrillic" msgstr "Cyrillic" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Western European" @@ -347,7 +347,7 @@ msgid "Western European" msgstr "Eropah Barat" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Central European" @@ -355,7 +355,7 @@ msgid "Central European" msgstr "Eropah Tengah" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Greek" @@ -363,7 +363,7 @@ msgid "Greek" msgstr "Greek" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 #, fuzzy #| msgctxt "@item Spelling dictionary" #| msgid "Hebrew" @@ -371,7 +371,7 @@ msgid "Hebrew" msgstr "Hebrew" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 #, fuzzy #| msgctxt "@item Spelling dictionary" #| msgid "Turkish" @@ -379,7 +379,7 @@ msgid "Turkish" msgstr "Turki" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Japanese" @@ -387,7 +387,7 @@ msgid "Japanese" msgstr "Jepun" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Baltic" @@ -395,7 +395,7 @@ msgid "Baltic" msgstr "Baltik" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Chinese Traditional" @@ -403,7 +403,7 @@ msgid "Chinese Traditional" msgstr "Cina Tradisi" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Chinese Simplified" @@ -411,7 +411,7 @@ msgid "Chinese Simplified" msgstr "Cina Mudah" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Korean" @@ -419,7 +419,7 @@ msgid "Korean" msgstr "Korea" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Thai" @@ -427,7 +427,7 @@ msgid "Thai" msgstr "Thai" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Arabic" diff -Nru kcodecs-5.79.0/po/nb/kcodecs5_qt.po kcodecs-5.80.0/po/nb/kcodecs5_qt.po --- kcodecs-5.79.0/po/nb/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/nb/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -111,25 +111,25 @@ msgid "Other" msgstr "Andre" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, qt-format msgctxt "KCharsets|@item %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, qt-format msgctxt "KCharsets|@item" msgid "Other encoding (%1)" msgstr "Annen koding (%1)" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, qt-format msgctxt "KCharsets|@item Text encoding: %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains more than one " @@ -137,19 +137,19 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a @.\n" "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "Du må skrive noe i feltet for e-postadresse." -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -158,7 +158,7 @@ "E-postadressen du oppga er ikke gyldig fordi den ikke inneholder en lokal " "del." -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -167,7 +167,7 @@ "E-postadressen du oppga er ikke gyldig fordi den ikke inneholder en " "domenedel." -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " @@ -176,12 +176,12 @@ "E-postadressen du oppga er ikke gyldig fordi den inneholder kommentarer/" "parenteser som ikke er lukket." -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 msgctxt "QObject|" msgid "The email address you entered is valid." msgstr "E-postadressen du oppga er gyldig." -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " @@ -190,7 +190,7 @@ "E-postadressen du oppga er ikke gyldig fordi den inneholder en " "vinkelparentes som ikke er lukket." -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " @@ -199,7 +199,7 @@ "E-postadressen du oppga er ikke gyldig fordi den inneholder for mange " "lukkende vinkelparenteser." -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " @@ -207,7 +207,7 @@ msgstr "" "E-postadressen du oppga er ikke gyldig fordi den inneholder et uventet komma." -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it ended unexpectedly.\n" @@ -215,7 +215,7 @@ "the last character in your email address." msgstr "" -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " @@ -224,7 +224,7 @@ "E-postadressen du oppga er ikke gyldig fordi den inneholder sitert tekst som " "ikke slutter." -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -241,7 +241,7 @@ msgstr "" "E-postadressen du oppga er ikke gyldig fordi den inneholder et ugyldig tegn." -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " @@ -250,7 +250,7 @@ "E-postadressen du oppga er ikke gyldig fordi den inneholder et ugyldig " "skjermnavn." -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -258,12 +258,12 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "Ukjent problem med e-postadressen" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 msgctxt "QObject|" msgid "" "The email address you entered is not valid.\n" @@ -271,82 +271,82 @@ "form joe@example.org." msgstr "" -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 msgctxt "KEncodingProber|@item Text character set" msgid "Disabled" msgstr "Slått av" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 msgctxt "KEncodingProber|@item Text character set" msgid "Universal" msgstr "Universal" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 msgctxt "KEncodingProber|@item Text character set" msgid "Unicode" msgstr "Unicode" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 msgctxt "KEncodingProber|@item Text character set" msgid "Cyrillic" msgstr "Kyrillisk" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 msgctxt "KEncodingProber|@item Text character set" msgid "Western European" msgstr "Vesteuropeisk" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 msgctxt "KEncodingProber|@item Text character set" msgid "Central European" msgstr "Sentraleuropeisk" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 msgctxt "KEncodingProber|@item Text character set" msgid "Greek" msgstr "Gresk" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 msgctxt "KEncodingProber|@item Text character set" msgid "Hebrew" msgstr "Hebraisk" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 msgctxt "KEncodingProber|@item Text character set" msgid "Turkish" msgstr "Tyrkisk" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 msgctxt "KEncodingProber|@item Text character set" msgid "Japanese" msgstr "Japansk" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 msgctxt "KEncodingProber|@item Text character set" msgid "Baltic" msgstr "Baltisk" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Traditional" msgstr "Tradisjonelt kinesisk" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Simplified" msgstr "Forenklet kinesisk" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 msgctxt "KEncodingProber|@item Text character set" msgid "Korean" msgstr "Koreansk" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 msgctxt "KEncodingProber|@item Text character set" msgid "Thai" msgstr "Thailandsk" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 msgctxt "KEncodingProber|@item Text character set" msgid "Arabic" msgstr "Arabisk" diff -Nru kcodecs-5.79.0/po/nds/kcodecs5_qt.po kcodecs-5.80.0/po/nds/kcodecs5_qt.po --- kcodecs-5.79.0/po/nds/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/nds/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -156,25 +156,25 @@ msgid "Other" msgstr "Annerswat" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, qt-format msgctxt "KCharsets|@item %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, qt-format msgctxt "KCharsets|@item" msgid "Other encoding (%1)" msgstr "Anner Koderen (%1)" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, qt-format msgctxt "KCharsets|@item Text encoding: %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains more than one " @@ -182,40 +182,40 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a @.\n" "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "" -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "local part." msgstr "" -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "domain part." msgstr "" -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " "comments/brackets." msgstr "" -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 #, fuzzy #| msgctxt "@info" #| msgid "The date you entered is invalid" @@ -223,28 +223,28 @@ msgid "The email address you entered is valid." msgstr "Du hest en leeg Datum ingeven." -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " "angle bracket." msgstr "" -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " "closing angle brackets." msgstr "" -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "unexpected comma." msgstr "" -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it ended unexpectedly.\n" @@ -252,14 +252,14 @@ "the last character in your email address." msgstr "" -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " "which does not end." msgstr "" -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -273,14 +273,14 @@ "character." msgstr "" -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "invalid display name." msgstr "" -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -288,12 +288,12 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 msgctxt "QObject|" msgid "" "The email address you entered is not valid.\n" @@ -301,82 +301,82 @@ "form joe@example.org." msgstr "" -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 msgctxt "KEncodingProber|@item Text character set" msgid "Disabled" msgstr "Utmaakt" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 msgctxt "KEncodingProber|@item Text character set" msgid "Universal" msgstr "Allmeen" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 msgctxt "KEncodingProber|@item Text character set" msgid "Unicode" msgstr "Unikode" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 msgctxt "KEncodingProber|@item Text character set" msgid "Cyrillic" msgstr "Kyrillsch" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 msgctxt "KEncodingProber|@item Text character set" msgid "Western European" msgstr "Westeuropääsch" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 msgctxt "KEncodingProber|@item Text character set" msgid "Central European" msgstr "Zentraaleuropääsch" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 msgctxt "KEncodingProber|@item Text character set" msgid "Greek" msgstr "Greeksch" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 msgctxt "KEncodingProber|@item Text character set" msgid "Hebrew" msgstr "Hebrääsch" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 msgctxt "KEncodingProber|@item Text character set" msgid "Turkish" msgstr "Törksch" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 msgctxt "KEncodingProber|@item Text character set" msgid "Japanese" msgstr "Japaansch" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 msgctxt "KEncodingProber|@item Text character set" msgid "Baltic" msgstr "Baltsch" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Traditional" msgstr "Traditschonell Chineesch" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Simplified" msgstr "Vereenfacht Chineesch" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 msgctxt "KEncodingProber|@item Text character set" msgid "Korean" msgstr "Koreaansch" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 msgctxt "KEncodingProber|@item Text character set" msgid "Thai" msgstr "Thailannsch" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 msgctxt "KEncodingProber|@item Text character set" msgid "Arabic" msgstr "Araabsch" diff -Nru kcodecs-5.79.0/po/ne/kcodecs5_qt.po kcodecs-5.80.0/po/ne/kcodecs5_qt.po --- kcodecs-5.79.0/po/ne/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/ne/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -159,7 +159,7 @@ msgid "Other" msgstr "अन्य" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, fuzzy, qt-format #| msgctxt "@item %1 character set, %2 encoding" #| msgid "%1 ( %2 )" @@ -167,7 +167,7 @@ msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, fuzzy, qt-format #| msgctxt "@item" #| msgid "Other encoding (%1)" @@ -175,7 +175,7 @@ msgid "Other encoding (%1)" msgstr "अन्य सङ्केतन (%1)" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, fuzzy, qt-format #| msgctxt "@item %1 character set, %2 encoding" #| msgid "%1 ( %2 )" @@ -183,7 +183,7 @@ msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains more than one " @@ -191,68 +191,68 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a @.\n" "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "" -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "local part." msgstr "" -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "domain part." msgstr "" -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " "comments/brackets." msgstr "" -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 #, fuzzy #| msgid "The email address this bug report is sent to." msgctxt "QObject|" msgid "The email address you entered is valid." msgstr "बग प्रतिवेदन पठाइने इमेल ठेगाना ।" -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " "angle bracket." msgstr "" -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " "closing angle brackets." msgstr "" -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "unexpected comma." msgstr "" -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it ended unexpectedly.\n" @@ -260,14 +260,14 @@ "the last character in your email address." msgstr "" -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " "which does not end." msgstr "" -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -281,14 +281,14 @@ "character." msgstr "" -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "invalid display name." msgstr "" -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -296,12 +296,12 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 msgctxt "QObject|" msgid "" "The email address you entered is not valid.\n" @@ -309,21 +309,21 @@ "form joe@example.org." msgstr "" -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 #, fuzzy #| msgid "disable XIM" msgctxt "KEncodingProber|@item Text character set" msgid "Disabled" msgstr "XIM अक्षम पार्नुहोस्" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 #, fuzzy #| msgid "Uninstall" msgctxt "KEncodingProber|@item Text character set" msgid "Universal" msgstr "विस्थापन गर्नुहोस्" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Unicode" @@ -331,7 +331,7 @@ msgid "Unicode" msgstr "युनिकोड" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Cyrillic" @@ -339,7 +339,7 @@ msgid "Cyrillic" msgstr "सिरिलिक" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Western European" @@ -347,7 +347,7 @@ msgid "Western European" msgstr "पश्चिम युरोपेली" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Central European" @@ -355,7 +355,7 @@ msgid "Central European" msgstr "मध्य युरोपेली" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Greek" @@ -363,7 +363,7 @@ msgid "Greek" msgstr "ग्रिक" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 #, fuzzy #| msgctxt "@item Spelling dictionary" #| msgid "Hebrew" @@ -371,7 +371,7 @@ msgid "Hebrew" msgstr "हिब्रु" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 #, fuzzy #| msgctxt "@item Spelling dictionary" #| msgid "Turkish" @@ -379,7 +379,7 @@ msgid "Turkish" msgstr "टर्किश" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Japanese" @@ -387,7 +387,7 @@ msgid "Japanese" msgstr "जापानी" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Baltic" @@ -395,7 +395,7 @@ msgid "Baltic" msgstr "बाल्टिक" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Chinese Traditional" @@ -403,7 +403,7 @@ msgid "Chinese Traditional" msgstr "परम्परागत चिनियाँ" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Chinese Simplified" @@ -411,7 +411,7 @@ msgid "Chinese Simplified" msgstr "सरलीकृत चिनियाँ" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Korean" @@ -419,7 +419,7 @@ msgid "Korean" msgstr "कोरियाली" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Thai" @@ -427,7 +427,7 @@ msgid "Thai" msgstr "थाइ" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Arabic" diff -Nru kcodecs-5.79.0/po/nl/kcodecs5_qt.po kcodecs-5.80.0/po/nl/kcodecs5_qt.po --- kcodecs-5.79.0/po/nl/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/nl/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -117,25 +117,25 @@ msgid "Other" msgstr "Overig" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, qt-format msgctxt "KCharsets|@item %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, qt-format msgctxt "KCharsets|@item" msgid "Other encoding (%1)" msgstr "Andere codering (%1)" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, qt-format msgctxt "KCharsets|@item Text encoding: %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains more than one " @@ -145,7 +145,7 @@ "Het ingevoerde e-mailadres is ongeldig omdat het meer dan één @ bevat.\n" "U kunt geen geldige berichten aanmaken wanneer u dit adres niet wijzigt." -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a @.\n" @@ -154,12 +154,12 @@ "Het ingevoerde e-mailadres is ongeldig omdat het geen @ bevat.\n" "U kunt geen geldige berichten aanmaken wanneer u dit adres niet wijzigt." -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "U dient iets in het e-mailadresveld in te vullen." -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -168,7 +168,7 @@ "Het e-mailadres dat u hebt ingevoerd is ongeldig omdat het lokale gedeelte " "ontbreekt." -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -177,7 +177,7 @@ "Het e-mailadres dat u hebt ingevoerd is ongeldig omdat het domeingedeelte " "ontbreekt." -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " @@ -186,26 +186,26 @@ "Het e-mailadres dat u hebt ingevuld is ongeldig omdat sommige haakjes of " "opmerkingen niet gesloten zijn." -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 msgctxt "QObject|" msgid "The email address you entered is valid." msgstr "Het e-mailadres dat u hebt ingevuld is geldig." -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " "angle bracket." msgstr "Het e-mailadres is ongeldig omdat het haakje niet gesloten zijn." -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " "closing angle brackets." msgstr "Het e-mailadres is ongeldig omdat er te veel sluithaakjes zijn." -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " @@ -213,7 +213,7 @@ msgstr "" "Het ingevoerde e-mailadres is ongeldig omdat het een onverwachte komma bevat." -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it ended unexpectedly.\n" @@ -225,7 +225,7 @@ "Dit houdt vermoedelijk in dat u een escape-teken, zoals '\\', als laatste in " "het adres hebt geplaatst." -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " @@ -234,7 +234,7 @@ "Het e-mailadres dat u hebt ingevoerd is ongeldig omdat het aangehaalde tekst " "bevat dat niet wordt afgesloten." -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -252,7 +252,7 @@ "Het e-mailadres dat u hebt ingevoerd hebt bevat lettertekens die niet " "toegestaan zijn." -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " @@ -261,7 +261,7 @@ "Het ingevoerde e-mailadres is ongeldig omdat het een ongeldige 'weer te " "geven naam' bevat." -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -271,12 +271,12 @@ "Het ingevoerde e-mailadres is ongeldig omdat het geen '.' bevat.\n" "U kunt geen geldige berichten aanmaken wanneer u dit adres niet wijzigt." -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "Onbekend probleem met e-mailadres" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 msgctxt "QObject|" msgid "" "The email address you entered is not valid.\n" @@ -287,82 +287,82 @@ "Het lijkt geen adresgedeelte te bevatten, bijvoorbeeld iets in de vorm " "jan@voorbeeld.nl." -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 msgctxt "KEncodingProber|@item Text character set" msgid "Disabled" msgstr "Uitgeschakeld" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 msgctxt "KEncodingProber|@item Text character set" msgid "Universal" msgstr "Universeel" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 msgctxt "KEncodingProber|@item Text character set" msgid "Unicode" msgstr "Unicode" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 msgctxt "KEncodingProber|@item Text character set" msgid "Cyrillic" msgstr "Cyrillisch" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 msgctxt "KEncodingProber|@item Text character set" msgid "Western European" msgstr "West-Europees" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 msgctxt "KEncodingProber|@item Text character set" msgid "Central European" msgstr "Centraal-Europees" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 msgctxt "KEncodingProber|@item Text character set" msgid "Greek" msgstr "Grieks" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 msgctxt "KEncodingProber|@item Text character set" msgid "Hebrew" msgstr "Hebreeuws" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 msgctxt "KEncodingProber|@item Text character set" msgid "Turkish" msgstr "Turks" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 msgctxt "KEncodingProber|@item Text character set" msgid "Japanese" msgstr "Japans" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 msgctxt "KEncodingProber|@item Text character set" msgid "Baltic" msgstr "Baltisch" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Traditional" msgstr "Traditioneel Chinees" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Simplified" msgstr "Vereenvoudigd Chinees" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 msgctxt "KEncodingProber|@item Text character set" msgid "Korean" msgstr "Koreaans" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 msgctxt "KEncodingProber|@item Text character set" msgid "Thai" msgstr "Thai" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 msgctxt "KEncodingProber|@item Text character set" msgid "Arabic" msgstr "Arabisch" diff -Nru kcodecs-5.79.0/po/nn/kcodecs5_qt.po kcodecs-5.80.0/po/nn/kcodecs5_qt.po --- kcodecs-5.79.0/po/nn/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/nn/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -108,25 +108,25 @@ msgid "Other" msgstr "Anna" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, qt-format msgctxt "KCharsets|@item %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 (%2)" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, qt-format msgctxt "KCharsets|@item" msgid "Other encoding (%1)" msgstr "Anna teiknkoding (%1)" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, qt-format msgctxt "KCharsets|@item Text encoding: %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 (%2)" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains more than one " @@ -137,7 +137,7 @@ "krøllalfa (@).\n" "Du vil ikkje kunna senda gyldig e-post dersom du ikkje endrar adressa." -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a @.\n" @@ -147,12 +147,12 @@ "krøllalfa (@).\n" "Du vil ikkje kunna senda gyldig e-post dersom du ikkje endrar adressa." -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "Du må skriva noko i e-postadressefeltet." -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -161,7 +161,7 @@ "E-postadressa du oppgav er ikkje gyldig, då ho ikkje inneheld nokon lokal " "del (teksten før @)." -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -170,7 +170,7 @@ "E-postadressa du oppgav er ikkje gyldig, då ho ikkje inneheld noko domene " "(teksten etter @)." -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " @@ -179,12 +179,12 @@ "E-postadressa du oppgav er ikkje gyldig, då ho inneheld kommentarar/" "parentesar som ikkje er lukka." -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 msgctxt "QObject|" msgid "The email address you entered is valid." msgstr "E-postadressa du oppgav er gyldig." -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " @@ -193,7 +193,7 @@ "E-postadressa du oppgav er ikkje gyldig, då ho inneheld ein vinkelparentes " "som ikkje er lukka." -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " @@ -202,7 +202,7 @@ "E-postadressa du oppgav er ikkje gyldig, då ho inneheld for mange lukkande " "vinkelparentesar." -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " @@ -210,7 +210,7 @@ msgstr "" "E-postadressa du oppgav er ikkje gyldig, då ho inneheld eit uventa komma." -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it ended unexpectedly.\n" @@ -221,7 +221,7 @@ "Dette kjem truleg av at du har brukt eit verneteikn som \\ heilt sist i " "adressa." -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " @@ -230,7 +230,7 @@ "E-postadressa du oppgav er ikkje gyldig, då ho inneheld sitert tekst som " "ikkje sluttar." -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -247,7 +247,7 @@ msgstr "" "E-postadressa du oppgav er ikkje gyldig, då ho inneheld eit ugyldig teikn." -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " @@ -256,7 +256,7 @@ "E-postadressa du oppgav er ikkje gyldig, då ho inneheld eit ugyldig " "visingsnamn." -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -266,12 +266,12 @@ "E-postadressa du oppgav er ikkje gyldig, då ho ikkje inneheld noko punktum.\n" "Du vil ikkje kunna senda gyldig e-post dersom du ikkje endrar adressa." -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "Ukjend problem med e-postadressa" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 msgctxt "QObject|" msgid "" "The email address you entered is not valid.\n" @@ -281,82 +281,82 @@ "E-postadressa du oppgav er ikkje gyldig.\n" "Ho har ikkje form som ei ekte e-postadresse, eksempelvis kari@eksempel.no." -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 msgctxt "KEncodingProber|@item Text character set" msgid "Disabled" msgstr "Av" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 msgctxt "KEncodingProber|@item Text character set" msgid "Universal" msgstr "Universell" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 msgctxt "KEncodingProber|@item Text character set" msgid "Unicode" msgstr "Unicode" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 msgctxt "KEncodingProber|@item Text character set" msgid "Cyrillic" msgstr "Kyrillisk" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 msgctxt "KEncodingProber|@item Text character set" msgid "Western European" msgstr "Vesteuropeisk" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 msgctxt "KEncodingProber|@item Text character set" msgid "Central European" msgstr "Sentraleuropeisk" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 msgctxt "KEncodingProber|@item Text character set" msgid "Greek" msgstr "Gresk" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 msgctxt "KEncodingProber|@item Text character set" msgid "Hebrew" msgstr "Hebraisk" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 msgctxt "KEncodingProber|@item Text character set" msgid "Turkish" msgstr "Tyrkisk" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 msgctxt "KEncodingProber|@item Text character set" msgid "Japanese" msgstr "Japansk" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 msgctxt "KEncodingProber|@item Text character set" msgid "Baltic" msgstr "Baltisk" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Traditional" msgstr "Kinesisk – tradisjonell" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Simplified" msgstr "Kinesisk – forenkla" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 msgctxt "KEncodingProber|@item Text character set" msgid "Korean" msgstr "Koreansk" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 msgctxt "KEncodingProber|@item Text character set" msgid "Thai" msgstr "Thai" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 msgctxt "KEncodingProber|@item Text character set" msgid "Arabic" msgstr "Arabisk" diff -Nru kcodecs-5.79.0/po/oc/kcodecs5_qt.po kcodecs-5.80.0/po/oc/kcodecs5_qt.po --- kcodecs-5.79.0/po/oc/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/oc/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -152,7 +152,7 @@ msgid "Other" msgstr "Autre" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, fuzzy, qt-format #| msgctxt "@item %1 character set, %2 encoding" #| msgid "%1 ( %2 )" @@ -160,13 +160,13 @@ msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, qt-format msgctxt "KCharsets|@item" msgid "Other encoding (%1)" msgstr "" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, fuzzy, qt-format #| msgctxt "@item %1 character set, %2 encoding" #| msgid "%1 ( %2 )" @@ -174,7 +174,7 @@ msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains more than one " @@ -182,68 +182,68 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a @.\n" "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "" -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "local part." msgstr "" -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "domain part." msgstr "" -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " "comments/brackets." msgstr "" -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 #, fuzzy #| msgid "The email address this bug report is sent to." msgctxt "QObject|" msgid "The email address you entered is valid." msgstr "L'adreça electronica a laquala aqueste rapòrt de bòg serà mandat." -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " "angle bracket." msgstr "" -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " "closing angle brackets." msgstr "" -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "unexpected comma." msgstr "" -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it ended unexpectedly.\n" @@ -251,14 +251,14 @@ "the last character in your email address." msgstr "" -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " "which does not end." msgstr "" -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -272,14 +272,14 @@ "character." msgstr "" -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "invalid display name." msgstr "" -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -287,12 +287,12 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 msgctxt "QObject|" msgid "" "The email address you entered is not valid.\n" @@ -300,21 +300,21 @@ "form joe@example.org." msgstr "" -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 #, fuzzy #| msgid "disable XIM" msgctxt "KEncodingProber|@item Text character set" msgid "Disabled" msgstr "desactivar XIM" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 #, fuzzy #| msgid "Uninstall" msgctxt "KEncodingProber|@item Text character set" msgid "Universal" msgstr "Desinstallar" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Unicode" @@ -322,7 +322,7 @@ msgid "Unicode" msgstr "Unicode" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Cyrillic" @@ -330,7 +330,7 @@ msgid "Cyrillic" msgstr "Cirillic" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Western European" @@ -338,7 +338,7 @@ msgid "Western European" msgstr "Europèu de l'oèst" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Central European" @@ -346,7 +346,7 @@ msgid "Central European" msgstr "European central" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Greek" @@ -354,7 +354,7 @@ msgid "Greek" msgstr "Grèc" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 #, fuzzy #| msgctxt "@item Spelling dictionary" #| msgid "Hebrew" @@ -362,7 +362,7 @@ msgid "Hebrew" msgstr "Ebrèu" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 #, fuzzy #| msgctxt "@item Spelling dictionary" #| msgid "Turkish" @@ -370,7 +370,7 @@ msgid "Turkish" msgstr "Turc" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Japanese" @@ -378,7 +378,7 @@ msgid "Japanese" msgstr "Japonés" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Baltic" @@ -386,7 +386,7 @@ msgid "Baltic" msgstr "Baltic" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Chinese Traditional" @@ -394,7 +394,7 @@ msgid "Chinese Traditional" msgstr "Chinés tradicional" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Chinese Simplified" @@ -402,7 +402,7 @@ msgid "Chinese Simplified" msgstr "Chinés simplificat" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Korean" @@ -410,7 +410,7 @@ msgid "Korean" msgstr "Corean" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Thai" @@ -418,7 +418,7 @@ msgid "Thai" msgstr "Tailandés" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Arabic" diff -Nru kcodecs-5.79.0/po/or/kcodecs5_qt.po kcodecs-5.80.0/po/or/kcodecs5_qt.po --- kcodecs-5.79.0/po/or/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/or/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -156,7 +156,7 @@ msgid "Other" msgstr "ଅନ୍ଯାନ୍ଯ" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, fuzzy, qt-format #| msgctxt "@item %1 character set, %2 encoding" #| msgid "%1 ( %2 )" @@ -164,7 +164,7 @@ msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, fuzzy, qt-format #| msgctxt "@item" #| msgid "Other encoding (%1)" @@ -172,7 +172,7 @@ msgid "Other encoding (%1)" msgstr "ଅନ୍ୟାନ୍ୟ ସାଙ୍କେତିକରଣ (%1)" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, fuzzy, qt-format #| msgctxt "@item %1 character set, %2 encoding" #| msgid "%1 ( %2 )" @@ -180,7 +180,7 @@ msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains more than one " @@ -188,68 +188,68 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a @.\n" "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "" -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "local part." msgstr "" -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "domain part." msgstr "" -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " "comments/brackets." msgstr "" -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 #, fuzzy #| msgid "The email address this bug report is sent to." msgctxt "QObject|" msgid "The email address you entered is valid." msgstr "ଏହି ତ୍ରୁଟି ବିବରଣୀ ପଠାଇଥିବା ଇମେଲ ଠିକଣା।" -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " "angle bracket." msgstr "" -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " "closing angle brackets." msgstr "" -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "unexpected comma." msgstr "" -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it ended unexpectedly.\n" @@ -257,14 +257,14 @@ "the last character in your email address." msgstr "" -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " "which does not end." msgstr "" -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -278,14 +278,14 @@ "character." msgstr "" -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "invalid display name." msgstr "" -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -293,12 +293,12 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 msgctxt "QObject|" msgid "" "The email address you entered is not valid.\n" @@ -306,7 +306,7 @@ "form joe@example.org." msgstr "" -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Disabled" @@ -314,7 +314,7 @@ msgid "Disabled" msgstr "ନିଷ୍କ୍ରିୟ ଅଛି" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Universal" @@ -322,7 +322,7 @@ msgid "Universal" msgstr "ଜାଗତିକ" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Unicode" @@ -330,7 +330,7 @@ msgid "Unicode" msgstr "ୟୁନିକୋଡ" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Cyrillic" @@ -338,7 +338,7 @@ msgid "Cyrillic" msgstr "ସିରୀଲିକ" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Western European" @@ -346,7 +346,7 @@ msgid "Western European" msgstr "ପଶ୍ଚିମ ୟୁରୋପୀୟ" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Central European" @@ -354,7 +354,7 @@ msgid "Central European" msgstr "କେନ୍ଦ୍ର ୟୁରୋପୀୟ" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Greek" @@ -362,7 +362,7 @@ msgid "Greek" msgstr "ଗ୍ରୀକ" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 #, fuzzy #| msgctxt "@item Spelling dictionary" #| msgid "Hebrew" @@ -370,7 +370,7 @@ msgid "Hebrew" msgstr "ହବ୍ର୍ୟୁ" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 #, fuzzy #| msgctxt "@item Spelling dictionary" #| msgid "Turkish" @@ -378,7 +378,7 @@ msgid "Turkish" msgstr "ତୁର୍କିଶ" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Japanese" @@ -386,7 +386,7 @@ msgid "Japanese" msgstr "ଜାପାନୀ" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Baltic" @@ -394,7 +394,7 @@ msgid "Baltic" msgstr "ବାଲଟିକ" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Chinese Traditional" @@ -402,7 +402,7 @@ msgid "Chinese Traditional" msgstr "Chinese Traditional" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Chinese Simplified" @@ -410,7 +410,7 @@ msgid "Chinese Simplified" msgstr "Chinese Simplified" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Korean" @@ -418,7 +418,7 @@ msgid "Korean" msgstr "କୋରିୟାନ" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Thai" @@ -426,7 +426,7 @@ msgid "Thai" msgstr "ଥାଈ" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Arabic" diff -Nru kcodecs-5.79.0/po/pa/kcodecs5_qt.po kcodecs-5.80.0/po/pa/kcodecs5_qt.po --- kcodecs-5.79.0/po/pa/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/pa/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -110,25 +110,25 @@ msgid "Other" msgstr "ਹੋਰ" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, qt-format msgctxt "KCharsets|@item %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, qt-format msgctxt "KCharsets|@item" msgid "Other encoding (%1)" msgstr "ਹੋਰ ਇੰਕੋਡਿੰਗ (%1)" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, qt-format msgctxt "KCharsets|@item Text encoding: %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains more than one " @@ -136,40 +136,40 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a @.\n" "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "" -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "local part." msgstr "" -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "domain part." msgstr "" -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " "comments/brackets." msgstr "" -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 #, fuzzy #| msgctxt "@info" #| msgid "The date you entered is invalid" @@ -177,28 +177,28 @@ msgid "The email address you entered is valid." msgstr "ਤੁਹਾਡੇ ਵਲੋਂ ਦਿੱਤੀ ਮਿਤੀ ਗਲਤ ਹੈ" -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " "angle bracket." msgstr "" -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " "closing angle brackets." msgstr "" -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "unexpected comma." msgstr "" -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it ended unexpectedly.\n" @@ -206,14 +206,14 @@ "the last character in your email address." msgstr "" -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " "which does not end." msgstr "" -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -227,14 +227,14 @@ "character." msgstr "" -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "invalid display name." msgstr "" -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -242,12 +242,12 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "ਈਮੇਲ ਐਡਰੈੱਸ ਨਾਲ ਅਣਜਾਣੀ ਸਮੱਸਿਆ" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 msgctxt "QObject|" msgid "" "The email address you entered is not valid.\n" @@ -255,82 +255,82 @@ "form joe@example.org." msgstr "" -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 msgctxt "KEncodingProber|@item Text character set" msgid "Disabled" msgstr "ਬੰਦ ਹੈ" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 msgctxt "KEncodingProber|@item Text character set" msgid "Universal" msgstr "ਯੂਨੀਵਰਸਲ" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 msgctxt "KEncodingProber|@item Text character set" msgid "Unicode" msgstr "ਯੂਨੀਕੋਡ" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 msgctxt "KEncodingProber|@item Text character set" msgid "Cyrillic" msgstr "ਸਿਰਲਿਕ" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 msgctxt "KEncodingProber|@item Text character set" msgid "Western European" msgstr "ਦੱਖਣੀ ਯੂਰਪ" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 msgctxt "KEncodingProber|@item Text character set" msgid "Central European" msgstr "ਕੇਂਦਰੀ ਯੂਰਪ" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 msgctxt "KEncodingProber|@item Text character set" msgid "Greek" msgstr "ਗਰੀਕ" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 msgctxt "KEncodingProber|@item Text character set" msgid "Hebrew" msgstr "ਹਿਬਰੀ" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 msgctxt "KEncodingProber|@item Text character set" msgid "Turkish" msgstr "ਤੁਰਕ" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 msgctxt "KEncodingProber|@item Text character set" msgid "Japanese" msgstr "ਜਪਾਨੀ" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 msgctxt "KEncodingProber|@item Text character set" msgid "Baltic" msgstr "ਬਾਲਟਿਕ" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Traditional" msgstr "ਚੀਨੀ ਮੂਲ" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Simplified" msgstr "ਚੀਨੀ ਸਧਾਰਨ" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 msgctxt "KEncodingProber|@item Text character set" msgid "Korean" msgstr "ਕੋਰੀਆਈ" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 msgctxt "KEncodingProber|@item Text character set" msgid "Thai" msgstr "ਥਾਈ" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 msgctxt "KEncodingProber|@item Text character set" msgid "Arabic" msgstr "ਅਰਬੀ" diff -Nru kcodecs-5.79.0/po/pl/kcodecs5_qt.po kcodecs-5.80.0/po/pl/kcodecs5_qt.po --- kcodecs-5.79.0/po/pl/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/pl/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -114,25 +114,25 @@ msgid "Other" msgstr "Inne" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, qt-format msgctxt "KCharsets|@item %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, qt-format msgctxt "KCharsets|@item" msgid "Other encoding (%1)" msgstr "Inne kodowanie (%1)" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, qt-format msgctxt "KCharsets|@item Text encoding: %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains more than one " @@ -143,7 +143,7 @@ "@.\n" "Nie utworzysz prawidłowych wiadomości, jeśli nie zmienisz swojego adresu." -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a @.\n" @@ -152,12 +152,12 @@ "Podany adres pocztowy jest nieprawidłowy, ponieważ nie zawiera @.\n" "Nie utworzysz prawidłowych wiadomości, jeśli nie zmienisz swojego adresu." -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "Musisz coś podać w polu adresu pocztowego." -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -166,7 +166,7 @@ "Podany adres pocztowy jest nieprawidłowy, ponieważ nie zawiera części " "lokalnej." -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -174,7 +174,7 @@ msgstr "" "Podany adres pocztowy jest nieprawidłowy, ponieważ nie zawiera części domeny." -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " @@ -183,12 +183,12 @@ "Podany adres pocztowy jest nieprawidłowy, ponieważ zawiera niesparowane " "znaki komentarza/nawiasy." -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 msgctxt "QObject|" msgid "The email address you entered is valid." msgstr "Podany adres pocztowy jest prawidłowy." -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " @@ -197,7 +197,7 @@ "Podany adres pocztowy jest nieprawidłowy, ponieważ zawiera niesparowany znak " "nawiasu trójkątnego." -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " @@ -206,7 +206,7 @@ "Podany adres pocztowy jest nieprawidłowy, ponieważ zawiera zbyt wiele " "zamykających znaków nawiasów trójkątnych." -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " @@ -215,7 +215,7 @@ "Podany adres pocztowy jest nieprawidłowy, ponieważ zawiera nieoczekiwany " "przecinek." -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it ended unexpectedly.\n" @@ -227,7 +227,7 @@ "Prawdopodobnie oznacza to, że użyto znaku komentarza np. '\\' jako " "ostatniego znaku w twoim adresie." -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " @@ -236,7 +236,7 @@ "Podany adres pocztowy jest nieprawidłowy, ponieważ zawiera niedokończony " "tekst w cudzysłowach." -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -254,7 +254,7 @@ "Podany adres pocztowy jest nieprawidłowy, ponieważ zawiera nieprawidłowy " "znak." -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " @@ -263,7 +263,7 @@ "Podany adres pocztowy jest nieprawidłowy, ponieważ zawiera nieprawidłową " "nazwę wyświetlaną." -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -273,12 +273,12 @@ "Podany adres pocztowy jest nieprawidłowy, ponieważ nie zawiera '.'.\n" "Nie utworzysz prawidłowych wiadomości, jeśli nie zmienisz swojego adresu." -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "Nieznany problem z adresem pocztowym" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 msgctxt "QObject|" msgid "" "The email address you entered is not valid.\n" @@ -289,82 +289,82 @@ "Wygląda jakby nie zawierał poprawnego adresu, czyli czegoś podobnego do " "jan@przykladowy.org." -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 msgctxt "KEncodingProber|@item Text character set" msgid "Disabled" msgstr "Wyłączone" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 msgctxt "KEncodingProber|@item Text character set" msgid "Universal" msgstr "Uniwersalne" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 msgctxt "KEncodingProber|@item Text character set" msgid "Unicode" msgstr "Unikod" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 msgctxt "KEncodingProber|@item Text character set" msgid "Cyrillic" msgstr "Cyrylica" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 msgctxt "KEncodingProber|@item Text character set" msgid "Western European" msgstr "Zachodnioeuropejskie" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 msgctxt "KEncodingProber|@item Text character set" msgid "Central European" msgstr "Środkowoeuropejskie" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 msgctxt "KEncodingProber|@item Text character set" msgid "Greek" msgstr "Greckie" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 msgctxt "KEncodingProber|@item Text character set" msgid "Hebrew" msgstr "Hebrajskie" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 msgctxt "KEncodingProber|@item Text character set" msgid "Turkish" msgstr "Tureckie" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 msgctxt "KEncodingProber|@item Text character set" msgid "Japanese" msgstr "Japońskie" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 msgctxt "KEncodingProber|@item Text character set" msgid "Baltic" msgstr "Bałtyckie" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Traditional" msgstr "Chińskie tradycyjne" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Simplified" msgstr "Chińskie uproszczone" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 msgctxt "KEncodingProber|@item Text character set" msgid "Korean" msgstr "Koreańskie" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 msgctxt "KEncodingProber|@item Text character set" msgid "Thai" msgstr "Tajskie" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 msgctxt "KEncodingProber|@item Text character set" msgid "Arabic" msgstr "Arabskie" diff -Nru kcodecs-5.79.0/po/ps/kcodecs5_qt.po kcodecs-5.80.0/po/ps/kcodecs5_qt.po --- kcodecs-5.79.0/po/ps/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/ps/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -156,7 +156,7 @@ msgid "Other" msgstr "بل" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, fuzzy, qt-format #| msgctxt "@item %1 character set, %2 encoding" #| msgid "%1 ( %2 )" @@ -164,7 +164,7 @@ msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, fuzzy, qt-format #| msgctxt "@item" #| msgid "Other encoding (%1)" @@ -172,7 +172,7 @@ msgid "Other encoding (%1)" msgstr "(%1) بله کوډييزونه" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, fuzzy, qt-format #| msgctxt "@item %1 character set, %2 encoding" #| msgid "%1 ( %2 )" @@ -180,7 +180,7 @@ msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains more than one " @@ -188,68 +188,68 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a @.\n" "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "" -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "local part." msgstr "" -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "domain part." msgstr "" -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " "comments/brackets." msgstr "" -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 #, fuzzy #| msgid "The email address this bug report is sent to." msgctxt "QObject|" msgid "The email address you entered is valid." msgstr ".هغه برېښليک پته چې دا کړاو راپور ورته لېږل کيږي" -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " "angle bracket." msgstr "" -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " "closing angle brackets." msgstr "" -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "unexpected comma." msgstr "" -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it ended unexpectedly.\n" @@ -257,14 +257,14 @@ "the last character in your email address." msgstr "" -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " "which does not end." msgstr "" -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -278,14 +278,14 @@ "character." msgstr "" -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "invalid display name." msgstr "" -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -293,12 +293,12 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 msgctxt "QObject|" msgid "" "The email address you entered is not valid.\n" @@ -306,7 +306,7 @@ "form joe@example.org." msgstr "" -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Disabled" @@ -314,7 +314,7 @@ msgid "Disabled" msgstr "ناتوانول شوی" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Universal" @@ -322,7 +322,7 @@ msgid "Universal" msgstr "نړېوال" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Unicode" @@ -330,7 +330,7 @@ msgid "Unicode" msgstr "يونيکوډ" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Cyrillic" @@ -338,7 +338,7 @@ msgid "Cyrillic" msgstr "سېرېلېک" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Western European" @@ -346,7 +346,7 @@ msgid "Western European" msgstr "لوېديځ اروپايي" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Central European" @@ -354,7 +354,7 @@ msgid "Central European" msgstr "منځنی اروپايي" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Greek" @@ -362,7 +362,7 @@ msgid "Greek" msgstr "ګريک" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 #, fuzzy #| msgctxt "@item Spelling dictionary" #| msgid "Hebrew" @@ -370,7 +370,7 @@ msgid "Hebrew" msgstr "هېبرو" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 #, fuzzy #| msgctxt "@item Spelling dictionary" #| msgid "Turkish" @@ -378,7 +378,7 @@ msgid "Turkish" msgstr "ترکي" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Japanese" @@ -386,7 +386,7 @@ msgid "Japanese" msgstr "جاپاني" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Baltic" @@ -394,7 +394,7 @@ msgid "Baltic" msgstr "بالټيک" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Chinese Traditional" @@ -402,7 +402,7 @@ msgid "Chinese Traditional" msgstr "چينايي هڅوبي" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Chinese Simplified" @@ -410,7 +410,7 @@ msgid "Chinese Simplified" msgstr "چينايي ساده" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Korean" @@ -418,7 +418,7 @@ msgid "Korean" msgstr "کوريايي" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Thai" @@ -426,7 +426,7 @@ msgid "Thai" msgstr "ټهايي" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Arabic" diff -Nru kcodecs-5.79.0/po/pt/kcodecs5_qt.po kcodecs-5.80.0/po/pt/kcodecs5_qt.po --- kcodecs-5.79.0/po/pt/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/pt/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -192,25 +192,25 @@ msgid "Other" msgstr "Outro" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, qt-format msgctxt "KCharsets|@item %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, qt-format msgctxt "KCharsets|@item" msgid "Other encoding (%1)" msgstr "Outra codificação (%1)" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, qt-format msgctxt "KCharsets|@item Text encoding: %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains more than one " @@ -221,7 +221,7 @@ "'@'.\n" "Não poderá criar mensagens válidas, caso não altere o seu endereço." -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a @.\n" @@ -231,12 +231,12 @@ "'@'.\n" "Não poderá criar mensagens válidas, caso não altere o seu endereço." -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "Tem de introduzir algo no campo do endereço de e-mail." -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -245,7 +245,7 @@ "O endereço de e-mail que introduziu não é válido, porque não contém uma " "parte local." -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -254,7 +254,7 @@ "O endereço de e-mail que introduziu não é válido, porque não contém uma " "parte de domínio." -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " @@ -263,12 +263,12 @@ "O endereço de e-mail que introduziu não é válido, porque contém comentários/" "parêntesis não fechados." -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 msgctxt "QObject|" msgid "The email address you entered is valid." msgstr "O endereço de e-mail que introduziu é válido." -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " @@ -277,7 +277,7 @@ "O endereço de e-mail que introduziu não é válido, porque não contém uma " "parte local." -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " @@ -286,7 +286,7 @@ "O endereço de e-mail que introduziu não é válido, porque contém demasiados " "parêntesis de fecho." -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " @@ -295,7 +295,7 @@ "O endereço de e-mail que introduziu não é válido, porque contém uma vírgula " "inesperada." -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it ended unexpectedly.\n" @@ -307,7 +307,7 @@ "Isto provavelmente significa que usou um carácter de escape, como um '\\' " "como último carácter no seu endereço de e-mail." -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " @@ -316,7 +316,7 @@ "O endereço de e-mail que introduziu não é válido, porque contém texto entre " "aspas que não terminam." -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -334,7 +334,7 @@ "O endereço de e-mail que introduziu não é válido, porque contém um carácter " "inválido." -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " @@ -343,7 +343,7 @@ "O endereço de e-mail que introduziu não é válido, porque contém um nome " "visível inválido." -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -353,12 +353,12 @@ "O endereço de e-mail que introduziu não é válido, porque não contém um '.'.\n" "Não conseguirá criar mensagens válidas enquanto não mudar o seu endereço." -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "Problema desconhecido com o endereço de e-mail" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 msgctxt "QObject|" msgid "" "The email address you entered is not valid.\n" @@ -368,82 +368,82 @@ "O endereço de e-mail que introduziu não é válido.\n" "Não parece ter um endereço de e-mail real, i.e., algo do tipo ze@exemplo.org." -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 msgctxt "KEncodingProber|@item Text character set" msgid "Disabled" msgstr "Desactivado" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 msgctxt "KEncodingProber|@item Text character set" msgid "Universal" msgstr "Universal" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 msgctxt "KEncodingProber|@item Text character set" msgid "Unicode" msgstr "Unicode" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 msgctxt "KEncodingProber|@item Text character set" msgid "Cyrillic" msgstr "Cirílico" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 msgctxt "KEncodingProber|@item Text character set" msgid "Western European" msgstr "Europeu Ocidental" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 msgctxt "KEncodingProber|@item Text character set" msgid "Central European" msgstr "Europeu Central" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 msgctxt "KEncodingProber|@item Text character set" msgid "Greek" msgstr "Grego" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 msgctxt "KEncodingProber|@item Text character set" msgid "Hebrew" msgstr "Hebreu" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 msgctxt "KEncodingProber|@item Text character set" msgid "Turkish" msgstr "Turco" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 msgctxt "KEncodingProber|@item Text character set" msgid "Japanese" msgstr "Japonês" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 msgctxt "KEncodingProber|@item Text character set" msgid "Baltic" msgstr "Báltico" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Traditional" msgstr "Chinês Tradicional" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Simplified" msgstr "Chinês Simplificado" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 msgctxt "KEncodingProber|@item Text character set" msgid "Korean" msgstr "Coreano" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 msgctxt "KEncodingProber|@item Text character set" msgid "Thai" msgstr "Tailandês" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 msgctxt "KEncodingProber|@item Text character set" msgid "Arabic" msgstr "Árabe" diff -Nru kcodecs-5.79.0/po/pt_BR/kcodecs5_qt.po kcodecs-5.80.0/po/pt_BR/kcodecs5_qt.po --- kcodecs-5.79.0/po/pt_BR/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/pt_BR/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -114,25 +114,25 @@ msgid "Other" msgstr "Outro" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, qt-format msgctxt "KCharsets|@item %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, qt-format msgctxt "KCharsets|@item" msgid "Other encoding (%1)" msgstr "Outra codificação (%1)" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, qt-format msgctxt "KCharsets|@item Text encoding: %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains more than one " @@ -142,7 +142,7 @@ "O endereço de e-mail informado não é válido porque contém mais de uma @.\n" "Você não vai criar mensagens válidas se não alterá-lo." -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a @.\n" @@ -151,12 +151,12 @@ "O endereço de e-mail informado não é válido porque não contém uma @.\n" "Você não vai criar mensagens válidas se não alterá-lo." -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "Você deve informar algo no campo do endereço de e-mail." -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -165,7 +165,7 @@ "O endereço de e-mail informado não é válido porque não contém uma parte " "local." -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -174,7 +174,7 @@ "O endereço de e-mail informado não é válido porque não contém uma parte de " "domínio." -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " @@ -183,12 +183,12 @@ "O endereço de e-mail informado não é válido porque contém comentários/" "colchetes não fechados." -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 msgctxt "QObject|" msgid "The email address you entered is valid." msgstr "O endereço de e-mail informado é válido." -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " @@ -197,7 +197,7 @@ "O endereço de e-mail informado não é válido porque contém um sinal de menor " "não-fechado." -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " @@ -206,7 +206,7 @@ "O endereço de e-mail informado não é válido porque contém vários sinais de " "maior fechados." -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " @@ -215,7 +215,7 @@ "O endereço de e-mail informado não é válido porque contém uma vírgula " "inesperada." -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it ended unexpectedly.\n" @@ -226,7 +226,7 @@ "Isto provavelmente significa que você usou um caractere de escape como uma " "'\\' como último caractere no seu endereço de e-mail." -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " @@ -235,7 +235,7 @@ "O endereço de e-mail informado não é válido porque contém texto entre aspas " "sem um término." -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -253,7 +253,7 @@ "O endereço de e-mail informado não é válido porque contém um caractere " "ilegal." -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " @@ -262,7 +262,7 @@ "O endereço de e-mail informado não é válido porque contém um nome de " "exibição inválido." -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -272,12 +272,12 @@ "O endereço de e-mail informado não é válido porque não contém um '.'.\n" "Você não vai criar mensagens válidas se não alterá-lo." -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "Problema desconhecido com o endereço de e-mail" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 msgctxt "QObject|" msgid "" "The email address you entered is not valid.\n" @@ -288,82 +288,82 @@ "Ele não parece conter um endereço de e-mail real, por exemplo, algo no " "formato joao@exemplo.org." -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 msgctxt "KEncodingProber|@item Text character set" msgid "Disabled" msgstr "Desativado" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 msgctxt "KEncodingProber|@item Text character set" msgid "Universal" msgstr "Universal" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 msgctxt "KEncodingProber|@item Text character set" msgid "Unicode" msgstr "Unicode" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 msgctxt "KEncodingProber|@item Text character set" msgid "Cyrillic" msgstr "Cirílico" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 msgctxt "KEncodingProber|@item Text character set" msgid "Western European" msgstr "Oeste Europeu" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 msgctxt "KEncodingProber|@item Text character set" msgid "Central European" msgstr "Europa Central" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 msgctxt "KEncodingProber|@item Text character set" msgid "Greek" msgstr "Grego" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 msgctxt "KEncodingProber|@item Text character set" msgid "Hebrew" msgstr "Hebraico" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 msgctxt "KEncodingProber|@item Text character set" msgid "Turkish" msgstr "Turco" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 msgctxt "KEncodingProber|@item Text character set" msgid "Japanese" msgstr "Japonês" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 msgctxt "KEncodingProber|@item Text character set" msgid "Baltic" msgstr "Báltico" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Traditional" msgstr "Chinês tradicional" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Simplified" msgstr "Chinês simplificado" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 msgctxt "KEncodingProber|@item Text character set" msgid "Korean" msgstr "Coreano" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 msgctxt "KEncodingProber|@item Text character set" msgid "Thai" msgstr "Tailandês" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 msgctxt "KEncodingProber|@item Text character set" msgid "Arabic" msgstr "Árabe" diff -Nru kcodecs-5.79.0/po/ro/kcodecs5_qt.po kcodecs-5.80.0/po/ro/kcodecs5_qt.po --- kcodecs-5.79.0/po/ro/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/ro/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -105,25 +105,25 @@ msgid "Other" msgstr "Altul" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, qt-format msgctxt "KCharsets|@item %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, qt-format msgctxt "KCharsets|@item" msgid "Other encoding (%1)" msgstr "Altă codare (%1)" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, qt-format msgctxt "KCharsets|@item Text encoding: %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains more than one " @@ -133,7 +133,7 @@ "Adresa de e-mail introdusă nu e validă pentru că conține mai mult de un @.\n" "Nu veți crea mesaje valide dacă nu vă schimbați adresa." -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a @.\n" @@ -142,12 +142,12 @@ "Adresa de e-mail introdusă nu e validă pentru că nu conține un @.\n" "Nu veți crea mesaje valide dacă nu vă schimbați adresa." -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "Trebuie să introduceți ceva în câmpul cu adresă de e-mail." -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -156,7 +156,7 @@ "Adresa de e-mail introdusă nu e validă pentru că nu conține componenta " "locală." -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -165,7 +165,7 @@ "Adresa de e-mail introdusă nu e validă pentru că nu conține componenta de " "domeniu." -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " @@ -174,12 +174,12 @@ "Adresa de e-mail introdusă nu e validă pentru că conține comentarii/" "paranteze neînchise." -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 msgctxt "QObject|" msgid "The email address you entered is valid." msgstr "Adresa de e-mail introdusă e validă." -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " @@ -188,7 +188,7 @@ "Adresa de e-mail introdusă nu e validă pentru că conține o paranteză " "unghiulară neînchisă." -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " @@ -197,7 +197,7 @@ "Adresa de e-mail introdusă nu e validă pentru că conține prea multe " "paranteze unghiulare de închidere." -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " @@ -206,7 +206,7 @@ "Adresa de e-mail introdusă nu e validă pentru că conține o virgulă " "neașteptată." -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it ended unexpectedly.\n" @@ -217,7 +217,7 @@ "Aceasta probabil înseamnă că ați folosit un caracter de eludare ca „\\” " "drept ultimul caracter în adresa de e-mail." -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " @@ -226,7 +226,7 @@ "Adresa de e-mail introdusă nu e validă pentru că conține text citat care nu " "se termină." -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -244,7 +244,7 @@ "Adresa de e-mail introdusă nu e validă pentru că conține un caracter " "nepermis." -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " @@ -253,7 +253,7 @@ "Adresa de e-mail introdusă nu e validă pentru că conține un nume afișat " "nevalid." -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -263,12 +263,12 @@ "Adresa de e-mail introdusă nu e validă pentru că nu conține un „.”.\n" "Nu veți crea mesaje valide dacă nu vă schimbați adresa." -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "Problemă necunoscută cu adresa de poștă electronică" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 msgctxt "QObject|" msgid "" "The email address you entered is not valid.\n" @@ -279,82 +279,82 @@ "Nu pare să conțină o adresă de e-mail reală, de ex. ceva de forma " "ion@example.org." -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 msgctxt "KEncodingProber|@item Text character set" msgid "Disabled" msgstr "Dezactivat" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 msgctxt "KEncodingProber|@item Text character set" msgid "Universal" msgstr "Universal" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 msgctxt "KEncodingProber|@item Text character set" msgid "Unicode" msgstr "Unicod" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 msgctxt "KEncodingProber|@item Text character set" msgid "Cyrillic" msgstr "Chirilic" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 msgctxt "KEncodingProber|@item Text character set" msgid "Western European" msgstr "European de vest" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 msgctxt "KEncodingProber|@item Text character set" msgid "Central European" msgstr "European central" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 msgctxt "KEncodingProber|@item Text character set" msgid "Greek" msgstr "Grec" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 msgctxt "KEncodingProber|@item Text character set" msgid "Hebrew" msgstr "Ebraic" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 msgctxt "KEncodingProber|@item Text character set" msgid "Turkish" msgstr "Turc" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 msgctxt "KEncodingProber|@item Text character set" msgid "Japanese" msgstr "Japonez" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 msgctxt "KEncodingProber|@item Text character set" msgid "Baltic" msgstr "Baltic" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Traditional" msgstr "Chineză tradițională" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Simplified" msgstr "Chineză simplificată" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 msgctxt "KEncodingProber|@item Text character set" msgid "Korean" msgstr "Coreean" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 msgctxt "KEncodingProber|@item Text character set" msgid "Thai" msgstr "Tailandez" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 msgctxt "KEncodingProber|@item Text character set" msgid "Arabic" msgstr "Arab" diff -Nru kcodecs-5.79.0/po/ru/kcodecs5_qt.po kcodecs-5.80.0/po/ru/kcodecs5_qt.po --- kcodecs-5.79.0/po/ru/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/ru/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -121,25 +121,25 @@ msgid "Other" msgstr "Другие" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, qt-format msgctxt "KCharsets|@item %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 (%2)" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, qt-format msgctxt "KCharsets|@item" msgid "Other encoding (%1)" msgstr "Другая кодировка (%1)" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, qt-format msgctxt "KCharsets|@item Text encoding: %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 (%2)" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains more than one " @@ -151,7 +151,7 @@ " Будет невозможно создавать правильные письма, пока вы не исправите этот " "адрес." -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a @.\n" @@ -162,12 +162,12 @@ "Будет невозможно создавать правильные письма, пока вы не исправите этот " "адрес." -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "Необходимо ввести адрес электронной почты." -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -176,7 +176,7 @@ "Введённый вами адрес электронной почты некорректен, потому что не содержит " "имени почтового ящика." -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -185,7 +185,7 @@ "Введённый вами адрес электронной почты некорректен, потому что не содержит " "доменного имени сервера." -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " @@ -194,12 +194,12 @@ "Введённый вами адрес электронной почты некорректен, потому что содержит " "незакрытые комментарии или скобки." -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 msgctxt "QObject|" msgid "The email address you entered is valid." msgstr "Введён корректный адрес электронной почты." -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " @@ -208,7 +208,7 @@ "Введённый вами адрес электронной почты некорректен, потому что содержит " "незакрытую угловую скобку." -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " @@ -217,7 +217,7 @@ "Введённый вами адрес электронной почты некорректен, потому что содержит " "слишком много закрывающих угловых скобок." -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " @@ -226,7 +226,7 @@ "Введённый вами адрес электронной почты некорректен, потому что содержит " "запятую там, где её не должно быть." -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it ended unexpectedly.\n" @@ -238,7 +238,7 @@ "Это может означать, что последним символом адреса является экранирующий " "символ обратной косой черты «\\»." -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " @@ -247,7 +247,7 @@ "Введённый вами адрес электронной почты некорректен, потому что содержит " "незакрытые кавычки." -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -265,7 +265,7 @@ "Введённый вами адрес электронной почты некорректен, потому что содержит " "недопустимый символ." -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " @@ -274,7 +274,7 @@ "Введённый вами адрес электронной почты некорректен, потому что содержит " "недопустимое имя контакта." -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -286,12 +286,12 @@ "Будет невозможно создавать правильные письма, пока вы не исправите этот " "адрес." -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "Неизвестная ошибка во введённом адресе электронной почты." -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 msgctxt "QObject|" msgid "" "The email address you entered is not valid.\n" @@ -301,83 +301,83 @@ "Введённый вами адрес электронной почты некорректен, потому что не содержит " "собственно адреса в формате joe@example.org." -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 msgctxt "KEncodingProber|@item Text character set" msgid "Disabled" msgstr "Отключена" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 msgctxt "KEncodingProber|@item Text character set" msgid "Universal" msgstr "Универсальная" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 msgctxt "KEncodingProber|@item Text character set" msgid "Unicode" msgstr "Юникод" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 msgctxt "KEncodingProber|@item Text character set" msgid "Cyrillic" msgstr "Кириллица" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 msgctxt "KEncodingProber|@item Text character set" msgid "Western European" msgstr "Западная Европа" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 msgctxt "KEncodingProber|@item Text character set" msgid "Central European" msgstr "Центральная Европа" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 msgctxt "KEncodingProber|@item Text character set" msgid "Greek" msgstr "Греческое письмо" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 msgctxt "KEncodingProber|@item Text character set" msgid "Hebrew" msgstr "Иврит" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 msgctxt "KEncodingProber|@item Text character set" msgid "Turkish" msgstr "Турецкое письмо" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 msgctxt "KEncodingProber|@item Text character set" msgid "Japanese" msgstr "Японское письмо" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 msgctxt "KEncodingProber|@item Text character set" msgid "Baltic" msgstr "Прибалтийское письмо" # Здесь речь идёт не о локали, а о наборе символов. В случае локали перевод "Китайский (Тайвань)", т.к. локаль zh_TW. -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Traditional" msgstr "Китайское письмо (традиционное)" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Simplified" msgstr "Китайское письмо (упрощённое)" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 msgctxt "KEncodingProber|@item Text character set" msgid "Korean" msgstr "Корейское письмо" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 msgctxt "KEncodingProber|@item Text character set" msgid "Thai" msgstr "Тайское письмо" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 msgctxt "KEncodingProber|@item Text character set" msgid "Arabic" msgstr "Арабское письмо" diff -Nru kcodecs-5.79.0/po/se/kcodecs5_qt.po kcodecs-5.80.0/po/se/kcodecs5_qt.po --- kcodecs-5.79.0/po/se/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/se/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -105,25 +105,25 @@ msgid "Other" msgstr "" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, fuzzy, qt-format msgctxt "KCharsets|@item %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, fuzzy, qt-format msgctxt "KCharsets|@item" msgid "Other encoding (%1)" msgstr "Eará koden (%1)" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, fuzzy, qt-format msgctxt "KCharsets|@item Text encoding: %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains more than one " @@ -131,66 +131,66 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a @.\n" "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "" -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "local part." msgstr "" -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "domain part." msgstr "" -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " "comments/brackets." msgstr "" -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 msgctxt "QObject|" msgid "The email address you entered is valid." msgstr "" -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " "angle bracket." msgstr "" -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " "closing angle brackets." msgstr "" -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "unexpected comma." msgstr "" -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it ended unexpectedly.\n" @@ -198,14 +198,14 @@ "the last character in your email address." msgstr "" -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " "which does not end." msgstr "" -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -219,14 +219,14 @@ "character." msgstr "" -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "invalid display name." msgstr "" -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -234,12 +234,12 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 msgctxt "QObject|" msgid "" "The email address you entered is not valid.\n" @@ -247,97 +247,97 @@ "form joe@example.org." msgstr "" -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 #, fuzzy msgctxt "KEncodingProber|@item Text character set" msgid "Disabled" msgstr "Ale geavat XIM" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 #, fuzzy msgctxt "KEncodingProber|@item Text character set" msgid "Universal" msgstr "Oppalaš" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 #, fuzzy msgctxt "KEncodingProber|@item Text character set" msgid "Unicode" msgstr "Unicode" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 #, fuzzy msgctxt "KEncodingProber|@item Text character set" msgid "Cyrillic" msgstr "Kyrillalaš" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 #, fuzzy msgctxt "KEncodingProber|@item Text character set" msgid "Western European" msgstr "Oarjeeurohpalaš" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 #, fuzzy msgctxt "KEncodingProber|@item Text character set" msgid "Central European" msgstr "Gaskaeurohpalaš" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 #, fuzzy msgctxt "KEncodingProber|@item Text character set" msgid "Greek" msgstr "Greikalaš" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 #, fuzzy msgctxt "KEncodingProber|@item Text character set" msgid "Hebrew" msgstr "Hebrealaš" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 #, fuzzy msgctxt "KEncodingProber|@item Text character set" msgid "Turkish" msgstr "Turkalaš" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 #, fuzzy msgctxt "KEncodingProber|@item Text character set" msgid "Japanese" msgstr "Japánalaš" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 #, fuzzy msgctxt "KEncodingProber|@item Text character set" msgid "Baltic" msgstr "Báltalaš" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 #, fuzzy msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Traditional" msgstr "Árbevirolaš kiinnálašgiella" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 #, fuzzy msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Simplified" msgstr "Álkidahtton kiinnálašgiella" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 #, fuzzy msgctxt "KEncodingProber|@item Text character set" msgid "Korean" msgstr "Korealaš" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 #, fuzzy msgctxt "KEncodingProber|@item Text character set" msgid "Thai" msgstr "Thailándalaš" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 #, fuzzy msgctxt "KEncodingProber|@item Text character set" msgid "Arabic" diff -Nru kcodecs-5.79.0/po/si/kcodecs5_qt.po kcodecs-5.80.0/po/si/kcodecs5_qt.po --- kcodecs-5.79.0/po/si/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/si/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -153,7 +153,7 @@ msgid "Other" msgstr "වෙනත්" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, fuzzy, qt-format #| msgctxt "@item %1 character set, %2 encoding" #| msgid "%1 ( %2 )" @@ -161,7 +161,7 @@ msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, fuzzy, qt-format #| msgctxt "@item" #| msgid "Other encoding (%1)" @@ -169,7 +169,7 @@ msgid "Other encoding (%1)" msgstr "වෙනත් සංකේතාංකනයක් (%1)" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, fuzzy, qt-format #| msgctxt "@item %1 character set, %2 encoding" #| msgid "%1 ( %2 )" @@ -177,7 +177,7 @@ msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains more than one " @@ -185,40 +185,40 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a @.\n" "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "" -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "local part." msgstr "" -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "domain part." msgstr "" -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " "comments/brackets." msgstr "" -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 #, fuzzy #| msgctxt "@info" #| msgid "The date you entered is invalid" @@ -226,28 +226,28 @@ msgid "The email address you entered is valid." msgstr "ඔබ ඇතුළත් කළ දිනය වලංගු නොවේ" -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " "angle bracket." msgstr "" -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " "closing angle brackets." msgstr "" -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "unexpected comma." msgstr "" -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it ended unexpectedly.\n" @@ -255,14 +255,14 @@ "the last character in your email address." msgstr "" -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " "which does not end." msgstr "" -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -276,14 +276,14 @@ "character." msgstr "" -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "invalid display name." msgstr "" -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -291,12 +291,12 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 msgctxt "QObject|" msgid "" "The email address you entered is not valid.\n" @@ -304,7 +304,7 @@ "form joe@example.org." msgstr "" -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Disabled" @@ -312,7 +312,7 @@ msgid "Disabled" msgstr "අක්‍රීයයි" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Universal" @@ -320,7 +320,7 @@ msgid "Universal" msgstr "විශ්ව" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Unicode" @@ -328,7 +328,7 @@ msgid "Unicode" msgstr "යුනිකේත" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Cyrillic" @@ -336,7 +336,7 @@ msgid "Cyrillic" msgstr "සයිරිලීක" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Western European" @@ -344,7 +344,7 @@ msgid "Western European" msgstr "බටහිර යුරෝපීය" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Central European" @@ -352,7 +352,7 @@ msgid "Central European" msgstr "මධ්‍යම යුරෝපීය" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Greek" @@ -360,7 +360,7 @@ msgid "Greek" msgstr "ග්‍රීක" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 #, fuzzy #| msgctxt "@item Spelling dictionary" #| msgid "Hebrew" @@ -368,7 +368,7 @@ msgid "Hebrew" msgstr "හෙබ්රුව්" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 #, fuzzy #| msgctxt "@item Spelling dictionary" #| msgid "Turkish" @@ -376,7 +376,7 @@ msgid "Turkish" msgstr "තුර්කි" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Japanese" @@ -384,7 +384,7 @@ msgid "Japanese" msgstr "ජපන්" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Baltic" @@ -392,7 +392,7 @@ msgid "Baltic" msgstr "බොල්ටික්" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Chinese Traditional" @@ -400,7 +400,7 @@ msgid "Chinese Traditional" msgstr "සම්ප්‍රදායික චීන" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Chinese Simplified" @@ -408,7 +408,7 @@ msgid "Chinese Simplified" msgstr "සරලවු චීන" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Korean" @@ -416,7 +416,7 @@ msgid "Korean" msgstr "කොරියානු" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Thai" @@ -424,7 +424,7 @@ msgid "Thai" msgstr "තායී" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Arabic" diff -Nru kcodecs-5.79.0/po/sk/kcodecs5_qt.po kcodecs-5.80.0/po/sk/kcodecs5_qt.po --- kcodecs-5.79.0/po/sk/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/sk/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -108,25 +108,25 @@ msgid "Other" msgstr "Iné" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, qt-format msgctxt "KCharsets|@item %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, qt-format msgctxt "KCharsets|@item" msgid "Other encoding (%1)" msgstr "Iné kódovanie (%1)" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, qt-format msgctxt "KCharsets|@item Text encoding: %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 #, fuzzy #| msgctxt "QObject|" #| msgid "" @@ -142,7 +142,7 @@ "Emailová adresa ktorú ste vložili nie je platná pretože obsahuje viac ako " "jeden @. Nebudete môcť písať platné správy ak si nezmeníte adresu." -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 #, fuzzy #| msgctxt "QObject|" #| msgid "" @@ -156,12 +156,12 @@ "Emailová adresa ktorú ste vložili nie je platná pretože neobsahuje @. " "Nebudete môcť písať platné správy ak si nezmeníte adresu." -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "Vložili ste niečo do poľa pre emailovú adresu." -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -170,7 +170,7 @@ "Emailová adresa ktorú ste vložili nie je platná pretože neobsahuje lokálnu " "časť." -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -179,7 +179,7 @@ "Emailová adresa ktorú ste vložili nie je platná pretože neobsahuje doménovú " "časť." -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " @@ -188,12 +188,12 @@ "Emailová adresa ktorú ste vložili nie je platná pretože obsahuje neuzavreté " "komentáre/zátvorky." -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 msgctxt "QObject|" msgid "The email address you entered is valid." msgstr "Emailová adresa ktorú ste vložili je platná." -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " @@ -202,7 +202,7 @@ "Emailová adresa ktorú ste vložili nie je platná pretože obsahuje neuzavreté " "hranaté zátvorky." -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " @@ -211,7 +211,7 @@ "Emailová adresa ktorú ste vložili nie je platná pretože obsahuje priveľa " "hrataných zátvoriek." -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " @@ -220,7 +220,7 @@ "Emailová adresa ktorú ste vložili nie je platná pretože obsahuje neočakávanú " "bodku." -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 #, fuzzy #| msgctxt "QObject|" #| msgid "" @@ -237,7 +237,7 @@ "neočakávane, čo môže znamenať že ste použili escape sekvenciu ako napríklad " "'\\' ako posledný znak vašej emailovej adresy." -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " @@ -246,7 +246,7 @@ "Emailová adresa ktorú ste vložili nie je platná pretože obsahuje text v " "zátvorkách, ktorý nekončí. " -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -264,7 +264,7 @@ "Emailová adres ktorú ste vložili nie je platná pretože obsahuje neprípustný " "znak." -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " @@ -273,7 +273,7 @@ "Emailová adresa ktorú ste vložili nie je platná pretože obsahuje neplatné " "zobrazované meno." -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 #, fuzzy #| msgctxt "QObject|" #| msgid "" @@ -288,12 +288,12 @@ "Emailová adresa, ktorú ste vložili, nie je platná, pretože neobsahuje '.'. " "Nebudete môcť písať platné správy, ak si nezmeníte adresu." -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "Neznámy problém s emailovou adresou." -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 #, fuzzy #| msgctxt "QObject|" #| msgid "" @@ -309,82 +309,82 @@ "Emailová adresa ktorú ste vložili nie je platná pretože sa zdá že neobsahuje " "platnú emailovú adresu, napríklad vo forme joe@priklad.org." -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 msgctxt "KEncodingProber|@item Text character set" msgid "Disabled" msgstr "Zakázané" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 msgctxt "KEncodingProber|@item Text character set" msgid "Universal" msgstr "Univerzálne" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 msgctxt "KEncodingProber|@item Text character set" msgid "Unicode" msgstr "Unicode" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 msgctxt "KEncodingProber|@item Text character set" msgid "Cyrillic" msgstr "Cyrilika" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 msgctxt "KEncodingProber|@item Text character set" msgid "Western European" msgstr "Západoeurópske" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 msgctxt "KEncodingProber|@item Text character set" msgid "Central European" msgstr "Stredoeurópske" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 msgctxt "KEncodingProber|@item Text character set" msgid "Greek" msgstr "Grécke" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 msgctxt "KEncodingProber|@item Text character set" msgid "Hebrew" msgstr "Hebrejské" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 msgctxt "KEncodingProber|@item Text character set" msgid "Turkish" msgstr "Turecké" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 msgctxt "KEncodingProber|@item Text character set" msgid "Japanese" msgstr "Japonské" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 msgctxt "KEncodingProber|@item Text character set" msgid "Baltic" msgstr "Pobaltské" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Traditional" msgstr "Čínske tradičné" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Simplified" msgstr "Čínske zjednodušené" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 msgctxt "KEncodingProber|@item Text character set" msgid "Korean" msgstr "Kórejské" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 msgctxt "KEncodingProber|@item Text character set" msgid "Thai" msgstr "Thajské" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 msgctxt "KEncodingProber|@item Text character set" msgid "Arabic" msgstr "Arabské" diff -Nru kcodecs-5.79.0/po/sl/kcodecs5_qt.po kcodecs-5.80.0/po/sl/kcodecs5_qt.po --- kcodecs-5.79.0/po/sl/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/sl/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -115,25 +115,25 @@ msgid "Other" msgstr "Drugi" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, qt-format msgctxt "KCharsets|@item %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, qt-format msgctxt "KCharsets|@item" msgid "Other encoding (%1)" msgstr "Drugo kodiranje (%1)" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, qt-format msgctxt "KCharsets|@item Text encoding: %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains more than one " @@ -143,7 +143,7 @@ "E-poštni naslov, ki ste ga vnesli, ni veljaven, ker vsebuje več kot en @.\n" "Če ne spremenite naslova, ne boste mogli ustvariti veljavnih sporočil." -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a @.\n" @@ -152,12 +152,12 @@ "E-poštni naslov, ki ste ga vnesli, ni veljaven, ker vsebuje več kot en @.\n" "Če ne spremenite naslova, ne boste mogli ustvariti veljavnih sporočil." -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "Polje za e-poštni naslov morate izpolniti." -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -166,7 +166,7 @@ "E-poštni naslov, ki ste ga vnesli, ni veljaven, ker ne vsebuje krajevnega " "dela." -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -175,7 +175,7 @@ "E-poštni naslov, ki ste ga vnesli, ni veljaven, ker ne vsebuje domenskega " "dela." -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " @@ -184,12 +184,12 @@ "E-poštni naslov, ki ste ga vnesli, ni veljaven, ker vsebuje nezaprte opombe/" "oklepaje." -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 msgctxt "QObject|" msgid "The email address you entered is valid." msgstr "E-poštni naslov, ki ste ga vnesli, je veljaven." -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " @@ -198,7 +198,7 @@ "E-poštni naslov, ki ste ga vnesli, ni veljaven, ker vsebuje nezaprt lomljeni " "oklepaj." -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " @@ -207,7 +207,7 @@ "E-poštni naslov, ki ste ga vnesli, ni veljaven, ker vsebuje preveč lomljenih " "zaklepajev." -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " @@ -216,7 +216,7 @@ "E-poštni naslov, ki ste ga vnesli, ni veljaven, ker vsebuje nepričakovano " "vejico." -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it ended unexpectedly.\n" @@ -227,7 +227,7 @@ "To verjetno pomeni, da ste za zadnji znak svojega e-poštnega naslova " "uporabili ubežni znak, kot je na primer '\\'." -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " @@ -236,7 +236,7 @@ "E-poštni naslov, ki ste ga vnesli, ni veljaven, ker vsebuje navedeno " "besedilo, ki se ne konča." -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -253,7 +253,7 @@ msgstr "" "E-poštni naslov, ki ste ga vnesli, ni veljaven, ker vsebuje nedovoljen znak." -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " @@ -262,7 +262,7 @@ "E-poštni naslov, ki ste ga vnesli, ni veljaven, ker vsebuje neveljavno ime " "za prikaz." -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -272,12 +272,12 @@ "E-poštni naslov, ki ste ga vnesli, ni veljaven, ker ne vsebuje '.'.\n" "Če ne spremenite naslova, ne boste mogli ustvariti veljavnih sporočil." -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "Neznana težava z e-poštnim naslovom" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 msgctxt "QObject|" msgid "" "The email address you entered is not valid.\n" @@ -288,82 +288,82 @@ "Videti je, da ne vsebuje dejanskega e-poštnega naslova, to je nekaj v obliki " "janez@karnekje.org." -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 msgctxt "KEncodingProber|@item Text character set" msgid "Disabled" msgstr "Onemogočeno" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 msgctxt "KEncodingProber|@item Text character set" msgid "Universal" msgstr "Univerzalni" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 msgctxt "KEncodingProber|@item Text character set" msgid "Unicode" msgstr "Unicode" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 msgctxt "KEncodingProber|@item Text character set" msgid "Cyrillic" msgstr "Cirilica" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 msgctxt "KEncodingProber|@item Text character set" msgid "Western European" msgstr "Zahodnoevropski" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 msgctxt "KEncodingProber|@item Text character set" msgid "Central European" msgstr "Srednjeevropski" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 msgctxt "KEncodingProber|@item Text character set" msgid "Greek" msgstr "Grški" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 msgctxt "KEncodingProber|@item Text character set" msgid "Hebrew" msgstr "Hebrejski" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 msgctxt "KEncodingProber|@item Text character set" msgid "Turkish" msgstr "Turški" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 msgctxt "KEncodingProber|@item Text character set" msgid "Japanese" msgstr "Japonski" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 msgctxt "KEncodingProber|@item Text character set" msgid "Baltic" msgstr "Baltski" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Traditional" msgstr "Tradicionalni kitajski" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Simplified" msgstr "Poenostavljeni kitajski" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 msgctxt "KEncodingProber|@item Text character set" msgid "Korean" msgstr "Korejski" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 msgctxt "KEncodingProber|@item Text character set" msgid "Thai" msgstr "Tajski" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 msgctxt "KEncodingProber|@item Text character set" msgid "Arabic" msgstr "Arabski" diff -Nru kcodecs-5.79.0/po/sq/kcodecs5_qt.po kcodecs-5.80.0/po/sq/kcodecs5_qt.po --- kcodecs-5.79.0/po/sq/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/sq/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -152,7 +152,7 @@ msgid "Other" msgstr "Tjetër" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, fuzzy, qt-format #| msgctxt "@item %1 character set, %2 encoding" #| msgid "%1 ( %2 )" @@ -160,7 +160,7 @@ msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, fuzzy, qt-format #| msgctxt "@item" #| msgid "Other encoding (%1)" @@ -168,7 +168,7 @@ msgid "Other encoding (%1)" msgstr "Kodim tjetër (%1)" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, fuzzy, qt-format #| msgctxt "@item %1 character set, %2 encoding" #| msgid "%1 ( %2 )" @@ -176,7 +176,7 @@ msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains more than one " @@ -184,67 +184,67 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a @.\n" "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "" -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "local part." msgstr "" -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "domain part." msgstr "" -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " "comments/brackets." msgstr "" -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 #, fuzzy msgctxt "QObject|" msgid "The email address you entered is valid." msgstr "Shtegu i specifikuar i socket është i pavlefshëm" -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " "angle bracket." msgstr "" -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " "closing angle brackets." msgstr "" -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "unexpected comma." msgstr "" -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it ended unexpectedly.\n" @@ -252,14 +252,14 @@ "the last character in your email address." msgstr "" -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " "which does not end." msgstr "" -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -273,14 +273,14 @@ "character." msgstr "" -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "invalid display name." msgstr "" -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -288,12 +288,12 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 msgctxt "QObject|" msgid "" "The email address you entered is not valid.\n" @@ -301,14 +301,14 @@ "form joe@example.org." msgstr "" -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 #, fuzzy #| msgid "Disabled" msgctxt "KEncodingProber|@item Text character set" msgid "Disabled" msgstr "Çaktivizuar" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Universal" @@ -316,7 +316,7 @@ msgid "Universal" msgstr "Universal" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Unicode" @@ -324,7 +324,7 @@ msgid "Unicode" msgstr "Unikod" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Cyrillic" @@ -332,7 +332,7 @@ msgid "Cyrillic" msgstr "Cirilike" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Western European" @@ -340,7 +340,7 @@ msgid "Western European" msgstr "Europiane Perëndimore" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Central European" @@ -348,7 +348,7 @@ msgid "Central European" msgstr "Europiane Qendrore" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Greek" @@ -356,7 +356,7 @@ msgid "Greek" msgstr "Greke" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 #, fuzzy #| msgctxt "@item Spelling dictionary" #| msgid "Hebrew" @@ -364,7 +364,7 @@ msgid "Hebrew" msgstr "Hebraik" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 #, fuzzy #| msgctxt "@item Spelling dictionary" #| msgid "Turkish" @@ -372,7 +372,7 @@ msgid "Turkish" msgstr "Turqisht" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Japanese" @@ -380,7 +380,7 @@ msgid "Japanese" msgstr "Japoneze" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Baltic" @@ -388,7 +388,7 @@ msgid "Baltic" msgstr "Balltike" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Chinese Traditional" @@ -396,7 +396,7 @@ msgid "Chinese Traditional" msgstr "Kineze Tradicionale" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Chinese Simplified" @@ -404,7 +404,7 @@ msgid "Chinese Simplified" msgstr "Kineze e Thjeshtëzuar" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Korean" @@ -412,7 +412,7 @@ msgid "Korean" msgstr "Koreane" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Thai" @@ -420,7 +420,7 @@ msgid "Thai" msgstr "Tailandeze" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Arabic" diff -Nru kcodecs-5.79.0/po/sv/kcodecs5_qt.po kcodecs-5.80.0/po/sv/kcodecs5_qt.po --- kcodecs-5.79.0/po/sv/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/sv/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -98,25 +98,25 @@ msgid "Other" msgstr "Övriga" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, qt-format msgctxt "KCharsets|@item %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, qt-format msgctxt "KCharsets|@item" msgid "Other encoding (%1)" msgstr "Annan kodning (%1)" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, qt-format msgctxt "KCharsets|@item Text encoding: %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains more than one " @@ -127,7 +127,7 @@ "ett @.\n" "Du kommer inte att skapa giltiga brev om du inte ändrar din adress." -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a @.\n" @@ -137,12 +137,12 @@ "något @.\n" "Du kommer inte att skapa giltiga brev om du inte ändrar din adress." -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "Du måste skriva in någonting i fältet för e-postadress." -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -151,7 +151,7 @@ "E-postadressen som du angav är inte giltig, eftersom den inte innehåller än " "lokal del." -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -160,7 +160,7 @@ "E-postadressen som du angav är inte giltig, eftersom den inte innehåller än " "domändel." -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " @@ -169,12 +169,12 @@ "E-postadressen som du angav är inte giltig, eftersom den innehåller " "kommentarer eller parenteser utan avslutning." -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 msgctxt "QObject|" msgid "The email address you entered is valid." msgstr "E-postadressen som du angav är giltig." -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " @@ -183,7 +183,7 @@ "E-postadressen som du angav är inte giltig, eftersom den innehåller en " "vinkelparentes utan avslutning." -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " @@ -192,7 +192,7 @@ "E-postadressen som du angav är inte giltig, eftersom den innehåller för " "många avslutande vinkelparenteser." -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " @@ -201,7 +201,7 @@ "E-postadressen som du angav är inte giltig, eftersom den innehåller ett " "oväntat kommatecken." -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it ended unexpectedly.\n" @@ -213,7 +213,7 @@ "Det betyder troligen att du har använt teckenkombinationen '\\' som som " "sista tecken i e-postadressen." -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " @@ -222,7 +222,7 @@ "E-postadressen som du angav är inte giltig, eftersom den innehåller citerad " "text utan avslutning." -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -240,7 +240,7 @@ "E-postadressen som du angav är inte giltig, eftersom den innehåller ett " "ogiltigt tecken." -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " @@ -249,7 +249,7 @@ "E-postadressen som du angav är inte giltig, eftersom den innehåller ett " "felaktigt namn att visa." -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -260,12 +260,12 @@ "något '.'.\n" "Du kommer inte att skapa giltiga brev om du inte ändrar din adress." -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "Okänt problem med e-postadress." -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 msgctxt "QObject|" msgid "" "The email address you entered is not valid.\n" @@ -276,82 +276,82 @@ "Den verkar inte innehålla en verklig e-postadress, dvs. någonting på formen " "anna@exempel.se." -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 msgctxt "KEncodingProber|@item Text character set" msgid "Disabled" msgstr "Inaktiverad" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 msgctxt "KEncodingProber|@item Text character set" msgid "Universal" msgstr "Universell" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 msgctxt "KEncodingProber|@item Text character set" msgid "Unicode" msgstr "Unicode" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 msgctxt "KEncodingProber|@item Text character set" msgid "Cyrillic" msgstr "Kyrillisk" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 msgctxt "KEncodingProber|@item Text character set" msgid "Western European" msgstr "Västeuropeisk" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 msgctxt "KEncodingProber|@item Text character set" msgid "Central European" msgstr "Centraleuropeisk" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 msgctxt "KEncodingProber|@item Text character set" msgid "Greek" msgstr "Grekisk" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 msgctxt "KEncodingProber|@item Text character set" msgid "Hebrew" msgstr "Hebreisk" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 msgctxt "KEncodingProber|@item Text character set" msgid "Turkish" msgstr "Turkisk" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 msgctxt "KEncodingProber|@item Text character set" msgid "Japanese" msgstr "Japansk" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 msgctxt "KEncodingProber|@item Text character set" msgid "Baltic" msgstr "Baltisk" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Traditional" msgstr "Traditionell kinesisk" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Simplified" msgstr "Förenklad kinesisk" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 msgctxt "KEncodingProber|@item Text character set" msgid "Korean" msgstr "Koreansk" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 msgctxt "KEncodingProber|@item Text character set" msgid "Thai" msgstr "Thailändsk" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 msgctxt "KEncodingProber|@item Text character set" msgid "Arabic" msgstr "Arabisk" diff -Nru kcodecs-5.79.0/po/ta/kcodecs5_qt.po kcodecs-5.80.0/po/ta/kcodecs5_qt.po --- kcodecs-5.79.0/po/ta/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/ta/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -156,7 +156,7 @@ msgid "Other" msgstr "மற்றவை" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, fuzzy, qt-format #| msgctxt "@item %1 character set, %2 encoding" #| msgid "%1 ( %2 )" @@ -164,7 +164,7 @@ msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, fuzzy, qt-format #| msgctxt "@item" #| msgid "Other encoding (%1)" @@ -172,7 +172,7 @@ msgid "Other encoding (%1)" msgstr "ஏனைய எழுத்துருவாக்கம் (%1)" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, fuzzy, qt-format #| msgctxt "@item %1 character set, %2 encoding" #| msgid "%1 ( %2 )" @@ -180,7 +180,7 @@ msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains more than one " @@ -188,40 +188,40 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a @.\n" "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "" -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "local part." msgstr "" -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "domain part." msgstr "" -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " "comments/brackets." msgstr "" -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 #, fuzzy #| msgctxt "@info" #| msgid "The date you entered is invalid" @@ -229,28 +229,28 @@ msgid "The email address you entered is valid." msgstr "நீங்கள் இட்ட தேதி சரியானதல்ல" -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " "angle bracket." msgstr "" -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " "closing angle brackets." msgstr "" -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "unexpected comma." msgstr "" -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it ended unexpectedly.\n" @@ -258,14 +258,14 @@ "the last character in your email address." msgstr "" -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " "which does not end." msgstr "" -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -279,14 +279,14 @@ "character." msgstr "" -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "invalid display name." msgstr "" -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -294,12 +294,12 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 msgctxt "QObject|" msgid "" "The email address you entered is not valid.\n" @@ -307,7 +307,7 @@ "form joe@example.org." msgstr "" -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Disabled" @@ -315,7 +315,7 @@ msgid "Disabled" msgstr "முடக்கப்பட்டுள்ளது" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Universal" @@ -323,7 +323,7 @@ msgid "Universal" msgstr "பொதுவான" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Unicode" @@ -331,7 +331,7 @@ msgid "Unicode" msgstr "யுனிகோடு" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Cyrillic" @@ -339,7 +339,7 @@ msgid "Cyrillic" msgstr "சைரிலிக்" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Western European" @@ -347,7 +347,7 @@ msgid "Western European" msgstr "மேற்கு ஐரோப்பிய" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Central European" @@ -355,7 +355,7 @@ msgid "Central European" msgstr "மத்திய ஐரோப்பிய" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Greek" @@ -363,7 +363,7 @@ msgid "Greek" msgstr "கிரேக்கம்" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 #, fuzzy #| msgctxt "@item Spelling dictionary" #| msgid "Hebrew" @@ -371,7 +371,7 @@ msgid "Hebrew" msgstr "எபிரேயம்" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 #, fuzzy #| msgctxt "@item Spelling dictionary" #| msgid "Turkish" @@ -379,7 +379,7 @@ msgid "Turkish" msgstr "துருக்கியம்" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Japanese" @@ -387,7 +387,7 @@ msgid "Japanese" msgstr "ஜப்பானிய" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Baltic" @@ -395,7 +395,7 @@ msgid "Baltic" msgstr "பால்டிக்" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Chinese Traditional" @@ -403,7 +403,7 @@ msgid "Chinese Traditional" msgstr "பாரம்பரிய சீனம்" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Chinese Simplified" @@ -411,7 +411,7 @@ msgid "Chinese Simplified" msgstr "இலகு சீனம்" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Korean" @@ -419,7 +419,7 @@ msgid "Korean" msgstr "கொரிய" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Thai" @@ -427,7 +427,7 @@ msgid "Thai" msgstr "தாய்" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Arabic" diff -Nru kcodecs-5.79.0/po/te/kcodecs5_qt.po kcodecs-5.80.0/po/te/kcodecs5_qt.po --- kcodecs-5.79.0/po/te/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/te/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -161,7 +161,7 @@ msgid "Other" msgstr "ఇతర" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, fuzzy, qt-format #| msgctxt "@item %1 character set, %2 encoding" #| msgid "%1 ( %2 )" @@ -169,7 +169,7 @@ msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, fuzzy, qt-format #| msgctxt "@item" #| msgid "Other encoding (%1)" @@ -177,7 +177,7 @@ msgid "Other encoding (%1)" msgstr "ఇతర సంకేతీకరణం (%1)" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, fuzzy, qt-format #| msgctxt "@item %1 character set, %2 encoding" #| msgid "%1 ( %2 )" @@ -185,7 +185,7 @@ msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains more than one " @@ -193,40 +193,40 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a @.\n" "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "" -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "local part." msgstr "" -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "domain part." msgstr "" -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " "comments/brackets." msgstr "" -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 #, fuzzy #| msgctxt "@info" #| msgid "The date you entered is invalid" @@ -234,28 +234,28 @@ msgid "The email address you entered is valid." msgstr "మీరు ఇచ్చిన తేది సరి అయినది కాదు" -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " "angle bracket." msgstr "" -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " "closing angle brackets." msgstr "" -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "unexpected comma." msgstr "" -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it ended unexpectedly.\n" @@ -263,14 +263,14 @@ "the last character in your email address." msgstr "" -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " "which does not end." msgstr "" -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -284,14 +284,14 @@ "character." msgstr "" -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "invalid display name." msgstr "" -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -299,12 +299,12 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 msgctxt "QObject|" msgid "" "The email address you entered is not valid.\n" @@ -312,7 +312,7 @@ "form joe@example.org." msgstr "" -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Disabled" @@ -320,7 +320,7 @@ msgid "Disabled" msgstr "అచేతనమైన" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Universal" @@ -328,7 +328,7 @@ msgid "Universal" msgstr "సముదాయమైన" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Unicode" @@ -336,7 +336,7 @@ msgid "Unicode" msgstr "యూనికోడ్" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Cyrillic" @@ -344,7 +344,7 @@ msgid "Cyrillic" msgstr "సిరిల్లిక్" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Western European" @@ -352,7 +352,7 @@ msgid "Western European" msgstr "పడమటి ఐరోపా" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Central European" @@ -360,7 +360,7 @@ msgid "Central European" msgstr "మధ్య ఐరోపా" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Greek" @@ -368,7 +368,7 @@ msgid "Greek" msgstr "గ్రీకు" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 #, fuzzy #| msgctxt "@item Spelling dictionary" #| msgid "Hebrew" @@ -376,7 +376,7 @@ msgid "Hebrew" msgstr "హిబ్రూ" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 #, fuzzy #| msgctxt "@item Spelling dictionary" #| msgid "Turkish" @@ -384,7 +384,7 @@ msgid "Turkish" msgstr "టర్కిష్" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Japanese" @@ -392,7 +392,7 @@ msgid "Japanese" msgstr "జాపనీస్" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Baltic" @@ -400,7 +400,7 @@ msgid "Baltic" msgstr "బాల్టిక్" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Chinese Traditional" @@ -408,7 +408,7 @@ msgid "Chinese Traditional" msgstr "సాంప్రదాయక చైనీస్" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Chinese Simplified" @@ -416,7 +416,7 @@ msgid "Chinese Simplified" msgstr "సరళమైన చైనీస్" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Korean" @@ -424,7 +424,7 @@ msgid "Korean" msgstr "కొరియన్" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Thai" @@ -432,7 +432,7 @@ msgid "Thai" msgstr "థాయ్" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Arabic" diff -Nru kcodecs-5.79.0/po/tg/kcodecs5_qt.po kcodecs-5.80.0/po/tg/kcodecs5_qt.po --- kcodecs-5.79.0/po/tg/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/tg/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -107,25 +107,25 @@ msgid "Other" msgstr "Дигар" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, qt-format msgctxt "KCharsets|@item %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, qt-format msgctxt "KCharsets|@item" msgid "Other encoding (%1)" msgstr "Рамзгузории дигар (%1)" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, qt-format msgctxt "KCharsets|@item Text encoding: %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 #, fuzzy #| msgctxt "QObject|" #| msgid "" @@ -142,7 +142,7 @@ "зиёда аз як аломати @ дар бар мегирад. Паёмҳои дуруст эҷод карда намешаванд, " "агар шумо нишонии худро иваз накунед." -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 #, fuzzy #| msgctxt "QObject|" #| msgid "" @@ -157,13 +157,13 @@ "аломати @ дар бар намегирад. Паёмҳои дуруст эҷод карда намешаванд, агар шумо " "нишонии худро иваз накунед." -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "" "Шумо бояд ақаллан як нишонии почтаи электрониро ба ин майдон ворид намоед." -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -172,7 +172,7 @@ "Нишонии почтаи электроние, ки шумо ворид кардед нодуруст аст, зеро ки он " "қисмати маҳаллиро дар бар намегирад." -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -181,7 +181,7 @@ "Нишонии почтаи электроние, ки шумо ворид кардед нодуруст аст, зеро ки он " "қисмати доменро дар бар намегирад." -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " @@ -190,12 +190,12 @@ "Нишонии почтаи электроние, ки шумо ворид кардед нодуруст аст, зеро ки он " "шарҳҳо/қавсҳои анҷомро дар бар мегирад." -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 msgctxt "QObject|" msgid "The email address you entered is valid." msgstr "Нишонии почтаи электроние, ки шумо ворид кардед нодуруст аст." -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " @@ -204,7 +204,7 @@ "Нишонии почтаи электроние, ки шумо ворид кардед нодуруст аст, зеро ки он " "қавсҳои қунҷиро дар бар мегирад." -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " @@ -213,7 +213,7 @@ "Нишонии почтаи электроние, ки шумо ворид кардед нодуруст аст, зеро ки он аз " "ҳад зиёд қавсҳои кунҷии анҷомро дар бар мегирад." -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " @@ -222,7 +222,7 @@ "Нишонии почтаи электроние, ки шумо ворид кардед нодуруст аст, зеро ки он " "вергули ногаҳонро дар бар мегирад." -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 #, fuzzy #| msgctxt "QObject|" #| msgid "" @@ -240,7 +240,7 @@ "монанди '\\' ба ҷои аломати охирин дар нишонии почтаи электронии худ " "гузоштед." -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " @@ -249,7 +249,7 @@ "Нишонии почтаи электроние, ки шумо ворид кардед нодуруст аст, зеро ки он " "матни бепоёнро дар бар мегирад." -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -268,7 +268,7 @@ "Нишонии почтаи электроние, ки шумо ворид кардед нодуруст аст, зеро ки он " "дорои аломати ғайриоддӣ мебошад." -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " @@ -277,7 +277,7 @@ "Нишонии почтаи электроние, ки шумо ворид кардед нодуруст аст, зеро ки он " "дорои номи намоишии нодуруст мебошад." -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 #, fuzzy #| msgctxt "QObject|" #| msgid "" @@ -293,12 +293,12 @@ "дорои аломати '.' намебошад. Паёмҳои дуруст эҷод карда намешаванд, агар шумо " "нишонии худро иваз накунед." -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "Мушкилии номаълум бо нишонии почтаи электронӣ" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 #, fuzzy #| msgctxt "QObject|" #| msgid "" @@ -315,82 +315,82 @@ "нишонии почтаи электронии ҳақиқӣ монанд нест, масалан ношонӣ бояд дар шакли " "noma@example.tj навишта шавад." -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 msgctxt "KEncodingProber|@item Text character set" msgid "Disabled" msgstr "Ғайрифаъол" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 msgctxt "KEncodingProber|@item Text character set" msgid "Universal" msgstr "Ҳаматарафа" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 msgctxt "KEncodingProber|@item Text character set" msgid "Unicode" msgstr "Юникод" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 msgctxt "KEncodingProber|@item Text character set" msgid "Cyrillic" msgstr "Кирилликӣ" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 msgctxt "KEncodingProber|@item Text character set" msgid "Western European" msgstr "Аврупоии ғарбӣ" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 msgctxt "KEncodingProber|@item Text character set" msgid "Central European" msgstr "Аврупоии марказӣ" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 msgctxt "KEncodingProber|@item Text character set" msgid "Greek" msgstr "Юнонӣ" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 msgctxt "KEncodingProber|@item Text character set" msgid "Hebrew" msgstr "Яҳудӣ" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 msgctxt "KEncodingProber|@item Text character set" msgid "Turkish" msgstr "Туркӣ" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 msgctxt "KEncodingProber|@item Text character set" msgid "Japanese" msgstr "Ҷопонӣ" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 msgctxt "KEncodingProber|@item Text character set" msgid "Baltic" msgstr "Балтикӣ" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Traditional" msgstr "Хитоии анъанавӣ" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Simplified" msgstr "Хитоии оддӣ" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 msgctxt "KEncodingProber|@item Text character set" msgid "Korean" msgstr "Кореягӣ" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 msgctxt "KEncodingProber|@item Text character set" msgid "Thai" msgstr "Тайландӣ" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 msgctxt "KEncodingProber|@item Text character set" msgid "Arabic" msgstr "Арабӣ" diff -Nru kcodecs-5.79.0/po/th/kcodecs5_qt.po kcodecs-5.80.0/po/th/kcodecs5_qt.po --- kcodecs-5.79.0/po/th/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/th/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -158,7 +158,7 @@ msgid "Other" msgstr "อื่น ๆ" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, fuzzy, qt-format #| msgctxt "@item %1 character set, %2 encoding" #| msgid "%1 ( %2 )" @@ -166,7 +166,7 @@ msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, fuzzy, qt-format #| msgctxt "@item" #| msgid "Other encoding (%1)" @@ -174,7 +174,7 @@ msgid "Other encoding (%1)" msgstr "รหัสภาษาอื่น ๆ (%1)" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, fuzzy, qt-format #| msgctxt "@item %1 character set, %2 encoding" #| msgid "%1 ( %2 )" @@ -182,7 +182,7 @@ msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains more than one " @@ -190,67 +190,67 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a @.\n" "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "" -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "local part." msgstr "" -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "domain part." msgstr "" -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " "comments/brackets." msgstr "" -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 #, fuzzy msgctxt "QObject|" msgid "The email address you entered is valid." msgstr "ใบรับรองใช้งานไม่ได้" -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " "angle bracket." msgstr "" -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " "closing angle brackets." msgstr "" -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "unexpected comma." msgstr "" -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it ended unexpectedly.\n" @@ -258,14 +258,14 @@ "the last character in your email address." msgstr "" -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " "which does not end." msgstr "" -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -279,14 +279,14 @@ "character." msgstr "" -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "invalid display name." msgstr "" -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -294,12 +294,12 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 msgctxt "QObject|" msgid "" "The email address you entered is not valid.\n" @@ -307,7 +307,7 @@ "form joe@example.org." msgstr "" -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Disabled" @@ -315,7 +315,7 @@ msgid "Disabled" msgstr "ถูกปิดการใช้งาน" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Universal" @@ -323,7 +323,7 @@ msgid "Universal" msgstr "สากล" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Unicode" @@ -331,7 +331,7 @@ msgid "Unicode" msgstr "ยูนิโค้ด" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Cyrillic" @@ -339,7 +339,7 @@ msgid "Cyrillic" msgstr "ไซริลิค" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Western European" @@ -347,7 +347,7 @@ msgid "Western European" msgstr "ยุโรปตะวันตก" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Central European" @@ -355,7 +355,7 @@ msgid "Central European" msgstr "ยุโรปตอนกลาง" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Greek" @@ -363,7 +363,7 @@ msgid "Greek" msgstr "กรีก" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 #, fuzzy #| msgctxt "@item Spelling dictionary" #| msgid "Hebrew" @@ -371,7 +371,7 @@ msgid "Hebrew" msgstr "ฮิบรู" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 #, fuzzy #| msgctxt "@item Spelling dictionary" #| msgid "Turkish" @@ -379,7 +379,7 @@ msgid "Turkish" msgstr "ตุรกี" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Japanese" @@ -387,7 +387,7 @@ msgid "Japanese" msgstr "ญี่ปุ่น" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Baltic" @@ -395,7 +395,7 @@ msgid "Baltic" msgstr "บอลติก" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Chinese Traditional" @@ -403,7 +403,7 @@ msgid "Chinese Traditional" msgstr "จีนดั้งเดิม" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Chinese Simplified" @@ -411,7 +411,7 @@ msgid "Chinese Simplified" msgstr "จีนประยุกต์" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Korean" @@ -419,7 +419,7 @@ msgid "Korean" msgstr "เกาหลี" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Thai" @@ -427,7 +427,7 @@ msgid "Thai" msgstr "ไทย" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Arabic" diff -Nru kcodecs-5.79.0/po/tr/kcodecs5_qt.po kcodecs-5.80.0/po/tr/kcodecs5_qt.po --- kcodecs-5.79.0/po/tr/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/tr/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -118,25 +118,25 @@ msgid "Other" msgstr "Diğer" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, qt-format msgctxt "KCharsets|@item %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, qt-format msgctxt "KCharsets|@item" msgid "Other encoding (%1)" msgstr "Diğer kodlama (%1)" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, qt-format msgctxt "KCharsets|@item Text encoding: %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 #, fuzzy #| msgctxt "QObject|" #| msgid "" @@ -152,7 +152,7 @@ "Girdiğiniz e-posta adresi birden fazla @ içerdiği için geçerli değil. Eğer " "adresinizi değiştirmezseniz geçerli iletiler oluşturamazsınız." -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 #, fuzzy #| msgctxt "QObject|" #| msgid "" @@ -166,12 +166,12 @@ "Girdiğiniz e-posta adresi @ karakteri içermediği için geçerli değil. Eğer " "adresinizi değiştirmezseniz geçerli ileti oluşturamazsınız." -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "E-posta adresi alanına bir şeyler girmek zorundasınız." -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -179,7 +179,7 @@ msgstr "" "Girdiğiniz e-posta adresi yerel bir bölüm içermediği için geçerli değil." -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -187,7 +187,7 @@ msgstr "" "Girdiğiniz e-posta adresi bir alan adı bölümü içermediği için geçerli değil." -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " @@ -196,12 +196,12 @@ "Girdiğiniz e-posta adresi kapatılmamış parantez ya da açıklama içerdiği için " "geçerli değil." -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 msgctxt "QObject|" msgid "The email address you entered is valid." msgstr "Girdiğiniz e-posta adresi geçerli." -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " @@ -210,7 +210,7 @@ "Girdiğiniz e-posta adresi kapatılmamış köşeli parantez içerdiği için geçerli " "değil." -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " @@ -219,7 +219,7 @@ "Girdiğiniz e-posta adresi çok fazla kapanan köşeli parantez içerdiği için " "geçerli değil." -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " @@ -227,7 +227,7 @@ msgstr "" "Girdiğiniz e-posta adresi beklenmeyen virgül içerdiği için geçerli değil." -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 #, fuzzy #| msgctxt "QObject|" #| msgid "" @@ -244,7 +244,7 @@ "Bu, e-posta adresinizin son karakteri olarak '\\' gibi bir kaçış karakteri " "kullandığınız anlamına gelir." -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " @@ -253,7 +253,7 @@ "Girdiğiniz e-posta adresi bitirilmemiş olan bir alıntılanmış metin içerdiği " "için geçerli değil." -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -270,7 +270,7 @@ msgstr "" "Girdiğiniz e-posta adresi uygunsuz bir karakter içerdiği için geçerli değil." -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " @@ -279,7 +279,7 @@ "Girdiğiniz e-posta adresi geçersiz bir görünen isim içerdiği için geçerli " "değil." -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 #, fuzzy #| msgctxt "QObject|" #| msgid "" @@ -294,12 +294,12 @@ "Girdiğiniz e-posta adresi '.' karakteri içermediği için geçerli değil. Eğer " "adresinizi değiştirmezseniz geçerli ileti oluşturamazsınız." -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "E-posta adresi ile ilgili bilinmeyen hata" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 #, fuzzy #| msgctxt "QObject|" #| msgid "" @@ -315,82 +315,82 @@ "Girdiğiniz e-posta adresi güncel bir e-posta adresi gibi görünmediği için " "geçerli değil, örneğin şöyle kaan@deneme.org." -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 msgctxt "KEncodingProber|@item Text character set" msgid "Disabled" msgstr "Devre Dışı" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 msgctxt "KEncodingProber|@item Text character set" msgid "Universal" msgstr "Evrensel" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 msgctxt "KEncodingProber|@item Text character set" msgid "Unicode" msgstr "Unicode" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 msgctxt "KEncodingProber|@item Text character set" msgid "Cyrillic" msgstr "Kiril Alfabesi" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 msgctxt "KEncodingProber|@item Text character set" msgid "Western European" msgstr "Batı Avrupa" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 msgctxt "KEncodingProber|@item Text character set" msgid "Central European" msgstr "Orta Avrupa" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 msgctxt "KEncodingProber|@item Text character set" msgid "Greek" msgstr "Yunanca" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 msgctxt "KEncodingProber|@item Text character set" msgid "Hebrew" msgstr "İbranice" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 msgctxt "KEncodingProber|@item Text character set" msgid "Turkish" msgstr "Türkçe" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 msgctxt "KEncodingProber|@item Text character set" msgid "Japanese" msgstr "Japonca" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 msgctxt "KEncodingProber|@item Text character set" msgid "Baltic" msgstr "Baltık" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Traditional" msgstr "Geleneksel Çince" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Simplified" msgstr "Basitleştirilmiş Çince" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 msgctxt "KEncodingProber|@item Text character set" msgid "Korean" msgstr "Korece" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 msgctxt "KEncodingProber|@item Text character set" msgid "Thai" msgstr "Tay Dili" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 msgctxt "KEncodingProber|@item Text character set" msgid "Arabic" msgstr "Arapça" diff -Nru kcodecs-5.79.0/po/tt/kcodecs5_qt.po kcodecs-5.80.0/po/tt/kcodecs5_qt.po --- kcodecs-5.79.0/po/tt/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/tt/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -154,7 +154,7 @@ msgid "Other" msgstr "Башкалар" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, fuzzy, qt-format #| msgctxt "@item %1 character set, %2 encoding" #| msgid "%1 ( %2 )" @@ -162,7 +162,7 @@ msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, fuzzy, qt-format #| msgctxt "@item" #| msgid "Other encoding (%1)" @@ -170,7 +170,7 @@ msgid "Other encoding (%1)" msgstr "Башка кодлашу (%1)" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, fuzzy, qt-format #| msgctxt "@item %1 character set, %2 encoding" #| msgid "%1 ( %2 )" @@ -178,7 +178,7 @@ msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains more than one " @@ -186,40 +186,40 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a @.\n" "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "" -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "local part." msgstr "" -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "domain part." msgstr "" -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " "comments/brackets." msgstr "" -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 #, fuzzy #| msgctxt "@info" #| msgid "The date you entered is invalid" @@ -227,28 +227,28 @@ msgid "The email address you entered is valid." msgstr "Хаталы вакыт кертелгән" -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " "angle bracket." msgstr "" -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " "closing angle brackets." msgstr "" -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "unexpected comma." msgstr "" -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it ended unexpectedly.\n" @@ -256,14 +256,14 @@ "the last character in your email address." msgstr "" -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " "which does not end." msgstr "" -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -277,14 +277,14 @@ "character." msgstr "" -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "invalid display name." msgstr "" -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -292,12 +292,12 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 msgctxt "QObject|" msgid "" "The email address you entered is not valid.\n" @@ -305,7 +305,7 @@ "form joe@example.org." msgstr "" -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Disabled" @@ -313,7 +313,7 @@ msgid "Disabled" msgstr "Сүндерелгән" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Universal" @@ -321,7 +321,7 @@ msgid "Universal" msgstr "Универсаль" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Unicode" @@ -329,7 +329,7 @@ msgid "Unicode" msgstr "Юникод" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Cyrillic" @@ -337,7 +337,7 @@ msgid "Cyrillic" msgstr "Кирилл" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Western European" @@ -345,7 +345,7 @@ msgid "Western European" msgstr "Көнбатыш Аурупа" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Central European" @@ -353,7 +353,7 @@ msgid "Central European" msgstr "Үзәк Аурупа" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Greek" @@ -361,7 +361,7 @@ msgid "Greek" msgstr "Грек" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 #, fuzzy #| msgctxt "@item Spelling dictionary" #| msgid "Hebrew" @@ -369,7 +369,7 @@ msgid "Hebrew" msgstr "Иврит" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 #, fuzzy #| msgctxt "@item Spelling dictionary" #| msgid "Turkish" @@ -377,7 +377,7 @@ msgid "Turkish" msgstr "Төрек" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Japanese" @@ -385,7 +385,7 @@ msgid "Japanese" msgstr "Япон" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Baltic" @@ -393,7 +393,7 @@ msgid "Baltic" msgstr "Балтик" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Chinese Traditional" @@ -401,7 +401,7 @@ msgid "Chinese Traditional" msgstr "Кытай (гадәти)" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Chinese Simplified" @@ -409,7 +409,7 @@ msgid "Chinese Simplified" msgstr "Кытай (җиңел)" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Korean" @@ -417,7 +417,7 @@ msgid "Korean" msgstr "Корея" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Thai" @@ -425,7 +425,7 @@ msgid "Thai" msgstr "Тай" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Arabic" diff -Nru kcodecs-5.79.0/po/ug/kcodecs5_qt.po kcodecs-5.80.0/po/ug/kcodecs5_qt.po --- kcodecs-5.79.0/po/ug/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/ug/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -155,7 +155,7 @@ msgid "Other" msgstr "باشقا" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, fuzzy, qt-format #| msgctxt "@item %1 character set, %2 encoding" #| msgid "%1 ( %2 )" @@ -163,7 +163,7 @@ msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, fuzzy, qt-format #| msgctxt "@item" #| msgid "Other encoding (%1)" @@ -171,7 +171,7 @@ msgid "Other encoding (%1)" msgstr "باشقا كودلاش (%1)" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, fuzzy, qt-format #| msgctxt "@item %1 character set, %2 encoding" #| msgid "%1 ( %2 )" @@ -179,7 +179,7 @@ msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains more than one " @@ -187,40 +187,40 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a @.\n" "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "" -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "local part." msgstr "" -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "domain part." msgstr "" -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " "comments/brackets." msgstr "" -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 #, fuzzy #| msgctxt "@info" #| msgid "The date you entered is invalid" @@ -228,28 +228,28 @@ msgid "The email address you entered is valid." msgstr "كىرگۈزگەن چېسلا ئىناۋەتسىز" -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " "angle bracket." msgstr "" -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " "closing angle brackets." msgstr "" -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "unexpected comma." msgstr "" -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it ended unexpectedly.\n" @@ -257,14 +257,14 @@ "the last character in your email address." msgstr "" -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " "which does not end." msgstr "" -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -278,14 +278,14 @@ "character." msgstr "" -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "invalid display name." msgstr "" -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -293,12 +293,12 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 msgctxt "QObject|" msgid "" "The email address you entered is not valid.\n" @@ -306,7 +306,7 @@ "form joe@example.org." msgstr "" -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Disabled" @@ -314,7 +314,7 @@ msgid "Disabled" msgstr "ئىناۋەتسىز قىلىنغان" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Universal" @@ -322,7 +322,7 @@ msgid "Universal" msgstr "ھەممىباب" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Unicode" @@ -330,7 +330,7 @@ msgid "Unicode" msgstr "يۇنىكود" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Cyrillic" @@ -338,7 +338,7 @@ msgid "Cyrillic" msgstr "سلاۋيانچە" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Western European" @@ -346,7 +346,7 @@ msgid "Western European" msgstr "غەربىي ياۋروپا" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Central European" @@ -354,7 +354,7 @@ msgid "Central European" msgstr "ئوتتۇرا ياۋروپا" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Greek" @@ -362,7 +362,7 @@ msgid "Greek" msgstr "گىرېكچە" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 #, fuzzy #| msgctxt "@item Spelling dictionary" #| msgid "Hebrew" @@ -370,7 +370,7 @@ msgid "Hebrew" msgstr "ئىبرانىچە" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 #, fuzzy #| msgctxt "@item Spelling dictionary" #| msgid "Turkish" @@ -378,7 +378,7 @@ msgid "Turkish" msgstr "تۈركچە" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Japanese" @@ -386,7 +386,7 @@ msgid "Japanese" msgstr "ياپونچە" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Baltic" @@ -394,7 +394,7 @@ msgid "Baltic" msgstr "بالتىق" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Chinese Traditional" @@ -402,7 +402,7 @@ msgid "Chinese Traditional" msgstr "مۇرەككەپ خەنزۇچە" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Chinese Simplified" @@ -410,7 +410,7 @@ msgid "Chinese Simplified" msgstr "ئاددىي خەنزۇچە" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Korean" @@ -418,7 +418,7 @@ msgid "Korean" msgstr "كورېيەچە" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Thai" @@ -426,7 +426,7 @@ msgid "Thai" msgstr "تايلاندچە" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Arabic" diff -Nru kcodecs-5.79.0/po/uk/kcodecs5_qt.po kcodecs-5.80.0/po/uk/kcodecs5_qt.po --- kcodecs-5.79.0/po/uk/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/uk/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -110,25 +110,25 @@ msgid "Other" msgstr "Інше" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, qt-format msgctxt "KCharsets|@item %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 (%2)" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, qt-format msgctxt "KCharsets|@item" msgid "Other encoding (%1)" msgstr "Інше кодування (%1)" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, qt-format msgctxt "KCharsets|@item Text encoding: %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains more than one " @@ -139,7 +139,7 @@ "ніж один символ @.\n" "Ви не зможете створювати повідомлення, якщо ви не зміните вашу адресу." -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a @.\n" @@ -148,12 +148,12 @@ "Введено некоректну адресу електронної пошти, оскільки вона не містить @.\n" "Ви не зможете створювати повідомлення, якщо ви не зміните вашу адресу." -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "Потрібно щось ввести в поле адреси ел. пошти." -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -162,7 +162,7 @@ "Введено некоректну адресу електронної пошти, оскільки вона не містить " "локальну частину." -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -171,7 +171,7 @@ "Введено некоректну адресу електронної пошти, оскільки вона не містить назви " "домену." -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " @@ -180,12 +180,12 @@ "Введено некоректну адресу електронної пошти, оскільки вона містить незакриті " "коментарі/квадратні дужки." -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 msgctxt "QObject|" msgid "The email address you entered is valid." msgstr "Ви ввели чинну адресу ел. пошти." -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " @@ -194,7 +194,7 @@ "Введено некоректну адресу електронної пошти, оскільки вона містить незакриту " "кутову дужку." -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " @@ -203,7 +203,7 @@ "Введено некоректну адресу електронної пошти, оскільки вона містить забагато " "закритих кутових дужок." -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " @@ -211,7 +211,7 @@ msgstr "" "Введено некоректну адресу електронної пошти, оскільки вона містить кому." -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it ended unexpectedly.\n" @@ -222,7 +222,7 @@ "Ймовірно, ви використали символ «\\» як останній символ вашої адреси " "електронної пошти." -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " @@ -231,7 +231,7 @@ "Введено некоректну адресу електронної пошти, оскільки вона містить текст, " "який не має кінцевих лапок." -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -249,7 +249,7 @@ "Введено некоректну адресу електронної пошти, оскільки вона містить " "некоректний символ." -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " @@ -258,7 +258,7 @@ "Введено некоректну адресу електронної пошти, оскільки вона містить " "некоректне екранне ім'я." -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -268,12 +268,12 @@ "Введено некоректну адресу електронної пошти, оскільки вона не містить «.».\n" "Ви не зможете створювати повідомлення, якщо ви не зміните вашу адресу." -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "Невідома проблема з адресою ел. пошти" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 msgctxt "QObject|" msgid "" "The email address you entered is not valid.\n" @@ -284,82 +284,82 @@ "Вона не містить самої адреси, тобто не є в формі fr.ivan@ukrainian-orthodox." "org." -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 msgctxt "KEncodingProber|@item Text character set" msgid "Disabled" msgstr "Вимкнено" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 msgctxt "KEncodingProber|@item Text character set" msgid "Universal" msgstr "універсальне" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 msgctxt "KEncodingProber|@item Text character set" msgid "Unicode" msgstr "Unicode" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 msgctxt "KEncodingProber|@item Text character set" msgid "Cyrillic" msgstr "кирилиця" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 msgctxt "KEncodingProber|@item Text character set" msgid "Western European" msgstr "західноєвропейське" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 msgctxt "KEncodingProber|@item Text character set" msgid "Central European" msgstr "центральноєвропейське" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 msgctxt "KEncodingProber|@item Text character set" msgid "Greek" msgstr "грецьке" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 msgctxt "KEncodingProber|@item Text character set" msgid "Hebrew" msgstr "іврит" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 msgctxt "KEncodingProber|@item Text character set" msgid "Turkish" msgstr "Турецький" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 msgctxt "KEncodingProber|@item Text character set" msgid "Japanese" msgstr "японське" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 msgctxt "KEncodingProber|@item Text character set" msgid "Baltic" msgstr "балтійське" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Traditional" msgstr "китайське (традиційне)" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Simplified" msgstr "китайське (спрощене)" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 msgctxt "KEncodingProber|@item Text character set" msgid "Korean" msgstr "корейське" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 msgctxt "KEncodingProber|@item Text character set" msgid "Thai" msgstr "тайське" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 msgctxt "KEncodingProber|@item Text character set" msgid "Arabic" msgstr "арабське" diff -Nru kcodecs-5.79.0/po/uz/kcodecs5_qt.po kcodecs-5.80.0/po/uz/kcodecs5_qt.po --- kcodecs-5.79.0/po/uz/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/uz/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -154,25 +154,25 @@ msgid "Other" msgstr "Boshqa" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, fuzzy, qt-format msgctxt "KCharsets|@item %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, fuzzy, qt-format msgctxt "KCharsets|@item" msgid "Other encoding (%1)" msgstr "&Kodlash usulini tanlash" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, fuzzy, qt-format msgctxt "KCharsets|@item Text encoding: %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains more than one " @@ -180,68 +180,68 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a @.\n" "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "" -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "local part." msgstr "" -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "domain part." msgstr "" -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " "comments/brackets." msgstr "" -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 #, fuzzy #| msgid "The email address this bug report is sent to." msgctxt "QObject|" msgid "The email address you entered is valid." msgstr "Xato haqida xabar quyidagi manzilga joʻnatiladi." -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " "angle bracket." msgstr "" -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " "closing angle brackets." msgstr "" -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "unexpected comma." msgstr "" -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it ended unexpectedly.\n" @@ -249,14 +249,14 @@ "the last character in your email address." msgstr "" -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " "which does not end." msgstr "" -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -270,14 +270,14 @@ "character." msgstr "" -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "invalid display name." msgstr "" -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -285,12 +285,12 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 msgctxt "QObject|" msgid "" "The email address you entered is not valid.\n" @@ -298,19 +298,19 @@ "form joe@example.org." msgstr "" -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 #, fuzzy msgctxt "KEncodingProber|@item Text character set" msgid "Disabled" msgstr "Tahrirlash mumkin" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 #, fuzzy msgctxt "KEncodingProber|@item Text character set" msgid "Universal" msgstr "Oʻrnatish" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Unicode" @@ -318,7 +318,7 @@ msgid "Unicode" msgstr "Yunikod" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Cyrillic" @@ -326,7 +326,7 @@ msgid "Cyrillic" msgstr "Kirilcha" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Western European" @@ -334,7 +334,7 @@ msgid "Western European" msgstr "Janubiy Yevropacha" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Central European" @@ -342,7 +342,7 @@ msgid "Central European" msgstr "Markaziy Yevropacha" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Greek" @@ -350,19 +350,19 @@ msgid "Greek" msgstr "Yunoncha" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 #, fuzzy msgctxt "KEncodingProber|@item Text character set" msgid "Hebrew" msgstr "Yahudiycha" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 #, fuzzy msgctxt "KEncodingProber|@item Text character set" msgid "Turkish" msgstr "Turkcha" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Japanese" @@ -370,7 +370,7 @@ msgid "Japanese" msgstr "Yaponcha" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Baltic" @@ -378,7 +378,7 @@ msgid "Baltic" msgstr "Boltiqcha" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Chinese Traditional" @@ -386,7 +386,7 @@ msgid "Chinese Traditional" msgstr "Anʼanaviy Xitoycha" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Chinese Simplified" @@ -394,7 +394,7 @@ msgid "Chinese Simplified" msgstr "Soddalashtirilgan Xitoycha" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Korean" @@ -402,7 +402,7 @@ msgid "Korean" msgstr "Koreyscha" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Thai" @@ -410,7 +410,7 @@ msgid "Thai" msgstr "Taycha" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Arabic" diff -Nru kcodecs-5.79.0/po/uz@cyrillic/kcodecs5_qt.po kcodecs-5.80.0/po/uz@cyrillic/kcodecs5_qt.po --- kcodecs-5.79.0/po/uz@cyrillic/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/uz@cyrillic/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -154,7 +154,7 @@ msgid "Other" msgstr "Бошқа" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, fuzzy, qt-format #| msgctxt "@item %1 character set, %2 encoding" #| msgid "%1 ( %2 )" @@ -162,13 +162,13 @@ msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, fuzzy, qt-format msgctxt "KCharsets|@item" msgid "Other encoding (%1)" msgstr "&Кодлаш усулини танлаш" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, fuzzy, qt-format #| msgctxt "@item %1 character set, %2 encoding" #| msgid "%1 ( %2 )" @@ -176,7 +176,7 @@ msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains more than one " @@ -184,68 +184,68 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a @.\n" "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "" -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "local part." msgstr "" -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "domain part." msgstr "" -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " "comments/brackets." msgstr "" -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 #, fuzzy #| msgid "The email address this bug report is sent to." msgctxt "QObject|" msgid "The email address you entered is valid." msgstr "Хато ҳақида хабар қуйидаги манзилга жўнатилади." -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " "angle bracket." msgstr "" -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " "closing angle brackets." msgstr "" -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "unexpected comma." msgstr "" -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it ended unexpectedly.\n" @@ -253,14 +253,14 @@ "the last character in your email address." msgstr "" -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " "which does not end." msgstr "" -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -274,14 +274,14 @@ "character." msgstr "" -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "invalid display name." msgstr "" -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -289,12 +289,12 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 msgctxt "QObject|" msgid "" "The email address you entered is not valid.\n" @@ -302,19 +302,19 @@ "form joe@example.org." msgstr "" -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 #, fuzzy msgctxt "KEncodingProber|@item Text character set" msgid "Disabled" msgstr "Таҳрирлаш мумкин" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 #, fuzzy msgctxt "KEncodingProber|@item Text character set" msgid "Universal" msgstr "Ўрнатиш" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Unicode" @@ -322,7 +322,7 @@ msgid "Unicode" msgstr "Юникод" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Cyrillic" @@ -330,7 +330,7 @@ msgid "Cyrillic" msgstr "Кирилча" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Western European" @@ -338,7 +338,7 @@ msgid "Western European" msgstr "Жанубий Европача" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Central European" @@ -346,7 +346,7 @@ msgid "Central European" msgstr "Марказий Европача" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Greek" @@ -354,7 +354,7 @@ msgid "Greek" msgstr "Юнонча" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 #, fuzzy #| msgctxt "@item Spelling dictionary" #| msgid "Hebrew" @@ -362,7 +362,7 @@ msgid "Hebrew" msgstr "Яҳудийча" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 #, fuzzy #| msgctxt "@item Spelling dictionary" #| msgid "Turkish" @@ -370,7 +370,7 @@ msgid "Turkish" msgstr "Туркча" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Japanese" @@ -378,7 +378,7 @@ msgid "Japanese" msgstr "Японча" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Baltic" @@ -386,7 +386,7 @@ msgid "Baltic" msgstr "Болтиқча" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Chinese Traditional" @@ -394,7 +394,7 @@ msgid "Chinese Traditional" msgstr "Анъанавий Хитойча" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Chinese Simplified" @@ -402,7 +402,7 @@ msgid "Chinese Simplified" msgstr "Соддалаштирилган Хитойча" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Korean" @@ -410,7 +410,7 @@ msgid "Korean" msgstr "Корейсча" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Thai" @@ -418,7 +418,7 @@ msgid "Thai" msgstr "Тайча" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Arabic" diff -Nru kcodecs-5.79.0/po/vi/kcodecs5_qt.po kcodecs-5.80.0/po/vi/kcodecs5_qt.po --- kcodecs-5.79.0/po/vi/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/vi/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -156,7 +156,7 @@ msgid "Other" msgstr "Khác" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, fuzzy, qt-format #| msgctxt "@item %1 character set, %2 encoding" #| msgid "%1 ( %2 )" @@ -164,7 +164,7 @@ msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, fuzzy, qt-format #| msgctxt "@item" #| msgid "Other encoding (%1)" @@ -172,7 +172,7 @@ msgid "Other encoding (%1)" msgstr "Bảng mã khác (%1)" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, fuzzy, qt-format #| msgctxt "@item %1 character set, %2 encoding" #| msgid "%1 ( %2 )" @@ -180,7 +180,7 @@ msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains more than one " @@ -188,40 +188,40 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a @.\n" "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "" -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "local part." msgstr "" -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "domain part." msgstr "" -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " "comments/brackets." msgstr "" -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 #, fuzzy #| msgctxt "@info" #| msgid "The date you entered is invalid" @@ -229,28 +229,28 @@ msgid "The email address you entered is valid." msgstr "Bạn vừa nhập ngày không hợp lệ" -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " "angle bracket." msgstr "" -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " "closing angle brackets." msgstr "" -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "unexpected comma." msgstr "" -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it ended unexpectedly.\n" @@ -258,14 +258,14 @@ "the last character in your email address." msgstr "" -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " "which does not end." msgstr "" -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -279,14 +279,14 @@ "character." msgstr "" -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "invalid display name." msgstr "" -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -294,12 +294,12 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 msgctxt "QObject|" msgid "" "The email address you entered is not valid.\n" @@ -307,7 +307,7 @@ "form joe@example.org." msgstr "" -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Disabled" @@ -315,7 +315,7 @@ msgid "Disabled" msgstr "Đã tắt" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Universal" @@ -323,7 +323,7 @@ msgid "Universal" msgstr "Thế giới" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Unicode" @@ -331,7 +331,7 @@ msgid "Unicode" msgstr "Unicode" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Cyrillic" @@ -339,7 +339,7 @@ msgid "Cyrillic" msgstr "Cyrillic" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Western European" @@ -347,7 +347,7 @@ msgid "Western European" msgstr "Tây Âu" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Central European" @@ -355,7 +355,7 @@ msgid "Central European" msgstr "Trung Âu" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Greek" @@ -363,7 +363,7 @@ msgid "Greek" msgstr "Hi Lạp" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 #, fuzzy #| msgctxt "@item Spelling dictionary" #| msgid "Hebrew" @@ -371,7 +371,7 @@ msgid "Hebrew" msgstr "Do Thái" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 #, fuzzy #| msgctxt "@item Spelling dictionary" #| msgid "Turkish" @@ -379,7 +379,7 @@ msgid "Turkish" msgstr "Thổ Nhĩ Kì" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Japanese" @@ -387,7 +387,7 @@ msgid "Japanese" msgstr "Nhật Bản" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Baltic" @@ -395,7 +395,7 @@ msgid "Baltic" msgstr "Ban-tích" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Chinese Traditional" @@ -403,7 +403,7 @@ msgid "Chinese Traditional" msgstr "Tiếng Trung phồn thể" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Chinese Simplified" @@ -411,7 +411,7 @@ msgid "Chinese Simplified" msgstr "Tiếng Trung giản thể" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Korean" @@ -419,7 +419,7 @@ msgid "Korean" msgstr "Hàn Quốc" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Thai" @@ -427,7 +427,7 @@ msgid "Thai" msgstr "Thái" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Arabic" diff -Nru kcodecs-5.79.0/po/wa/kcodecs5_qt.po kcodecs-5.80.0/po/wa/kcodecs5_qt.po --- kcodecs-5.79.0/po/wa/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/wa/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -159,7 +159,7 @@ msgid "Other" msgstr "Ôte" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, fuzzy, qt-format #| msgctxt "@item %1 character set, %2 encoding" #| msgid "%1 ( %2 )" @@ -167,7 +167,7 @@ msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, fuzzy, qt-format #| msgctxt "@item" #| msgid "Other encoding (%1)" @@ -175,7 +175,7 @@ msgid "Other encoding (%1)" msgstr "Ôte ecôdaedje (%1)" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, fuzzy, qt-format #| msgctxt "@item %1 character set, %2 encoding" #| msgid "%1 ( %2 )" @@ -183,7 +183,7 @@ msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains more than one " @@ -191,67 +191,67 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a @.\n" "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "" -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "local part." msgstr "" -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "domain part." msgstr "" -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " "comments/brackets." msgstr "" -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 #, fuzzy msgctxt "QObject|" msgid "The email address you entered is valid." msgstr "L' acertineure n' est nén valåbe" -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " "angle bracket." msgstr "" -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " "closing angle brackets." msgstr "" -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "unexpected comma." msgstr "" -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it ended unexpectedly.\n" @@ -259,14 +259,14 @@ "the last character in your email address." msgstr "" -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " "which does not end." msgstr "" -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -280,14 +280,14 @@ "character." msgstr "" -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "invalid display name." msgstr "" -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -295,12 +295,12 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 msgctxt "QObject|" msgid "" "The email address you entered is not valid.\n" @@ -308,7 +308,7 @@ "form joe@example.org." msgstr "" -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Disabled" @@ -316,7 +316,7 @@ msgid "Disabled" msgstr "Essocté" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Universal" @@ -324,7 +324,7 @@ msgid "Universal" msgstr "Univiersel" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Unicode" @@ -332,7 +332,7 @@ msgid "Unicode" msgstr "Unicôde" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Cyrillic" @@ -340,7 +340,7 @@ msgid "Cyrillic" msgstr "Cirilike" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Western European" @@ -348,7 +348,7 @@ msgid "Western European" msgstr "Urope di l' ouwess" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Central European" @@ -356,7 +356,7 @@ msgid "Central European" msgstr "Urope cintråle" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Greek" @@ -364,7 +364,7 @@ msgid "Greek" msgstr "Grek" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 #, fuzzy #| msgctxt "@item Spelling dictionary" #| msgid "Hebrew" @@ -372,7 +372,7 @@ msgid "Hebrew" msgstr "Ebreu" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 #, fuzzy #| msgctxt "@item Spelling dictionary" #| msgid "Turkish" @@ -380,7 +380,7 @@ msgid "Turkish" msgstr "Turk" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Japanese" @@ -388,7 +388,7 @@ msgid "Japanese" msgstr "Djaponès" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Baltic" @@ -396,7 +396,7 @@ msgid "Baltic" msgstr "Baltike" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Chinese Traditional" @@ -404,7 +404,7 @@ msgid "Chinese Traditional" msgstr "Chinwès tradicionel" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Chinese Simplified" @@ -412,7 +412,7 @@ msgid "Chinese Simplified" msgstr "Chinwès simplifyî" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Korean" @@ -420,7 +420,7 @@ msgid "Korean" msgstr "Corêyin" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Thai" @@ -428,7 +428,7 @@ msgid "Thai" msgstr "Taylandès" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 #, fuzzy #| msgctxt "@item Text character set" #| msgid "Arabic" diff -Nru kcodecs-5.79.0/po/xh/kcodecs5_qt.po kcodecs-5.80.0/po/xh/kcodecs5_qt.po --- kcodecs-5.79.0/po/xh/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/xh/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -142,25 +142,25 @@ msgid "Other" msgstr "Enye" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, fuzzy, qt-format msgctxt "KCharsets|@item %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 %2" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, fuzzy, qt-format msgctxt "KCharsets|@item" msgid "Other encoding (%1)" msgstr "Cwangcisa &Ukhowudo" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, fuzzy, qt-format msgctxt "KCharsets|@item Text encoding: %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 %2" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains more than one " @@ -168,68 +168,68 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a @.\n" "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "" -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "local part." msgstr "" -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "domain part." msgstr "" -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " "comments/brackets." msgstr "" -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 #, fuzzy #| msgid "The email address this bug report is sent to." msgctxt "QObject|" msgid "The email address you entered is valid." msgstr "Idilesi ye email eli gciwane ethunyelwe kuyo." -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " "angle bracket." msgstr "" -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " "closing angle brackets." msgstr "" -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "unexpected comma." msgstr "" -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it ended unexpectedly.\n" @@ -237,14 +237,14 @@ "the last character in your email address." msgstr "" -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " "which does not end." msgstr "" -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -258,14 +258,14 @@ "character." msgstr "" -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "invalid display name." msgstr "" -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -273,12 +273,12 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 msgctxt "QObject|" msgid "" "The email address you entered is not valid.\n" @@ -286,110 +286,110 @@ "form joe@example.org." msgstr "" -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 #, fuzzy msgctxt "KEncodingProber|@item Text character set" msgid "Disabled" msgstr "Uhlelo lwenziwe" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 #, fuzzy msgctxt "KEncodingProber|@item Text character set" msgid "Universal" msgstr "Imizekelo" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 #, fuzzy #| msgid "Unicode" msgctxt "KEncodingProber|@item Text character set" msgid "Unicode" msgstr "Ikhowudi enye" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 #, fuzzy #| msgid "Cyrillic" msgctxt "KEncodingProber|@item Text character set" msgid "Cyrillic" msgstr "Cyrillic" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 #, fuzzy #| msgid "Western European" msgctxt "KEncodingProber|@item Text character set" msgid "Western European" msgstr "Western European" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 #, fuzzy #| msgid "Central European" msgctxt "KEncodingProber|@item Text character set" msgid "Central European" msgstr "Central European" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 #, fuzzy #| msgid "Greek" msgctxt "KEncodingProber|@item Text character set" msgid "Greek" msgstr "Greek" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 #, fuzzy #| msgid "Hebrew" msgctxt "KEncodingProber|@item Text character set" msgid "Hebrew" msgstr "Hebrew" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 #, fuzzy #| msgid "Turkish" msgctxt "KEncodingProber|@item Text character set" msgid "Turkish" msgstr "Turkish" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 #, fuzzy #| msgid "Japanese" msgctxt "KEncodingProber|@item Text character set" msgid "Japanese" msgstr "Japanese" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 #, fuzzy #| msgid "Baltic" msgctxt "KEncodingProber|@item Text character set" msgid "Baltic" msgstr "Baltic" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 #, fuzzy #| msgid "Chinese Traditional" msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Traditional" msgstr "Ezakwantu Zamatshayina" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 #, fuzzy #| msgid "Chinese Simplified" msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Simplified" msgstr "Ingcaciso elula Yamatshayina" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 #, fuzzy #| msgid "Korean" msgctxt "KEncodingProber|@item Text character set" msgid "Korean" msgstr "Korean" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 #, fuzzy #| msgid "Thai" msgctxt "KEncodingProber|@item Text character set" msgid "Thai" msgstr "Thai" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 #, fuzzy #| msgid "Arabic" msgctxt "KEncodingProber|@item Text character set" diff -Nru kcodecs-5.79.0/po/zh_CN/kcodecs5_qt.po kcodecs-5.80.0/po/zh_CN/kcodecs5_qt.po --- kcodecs-5.79.0/po/zh_CN/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/zh_CN/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: kdeorg\n" -"PO-Revision-Date: 2021-02-04 11:58\n" +"PO-Revision-Date: 2021-03-02 16:16\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" @@ -112,25 +112,25 @@ msgid "Other" msgstr "其它" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, qt-format msgctxt "KCharsets|@item %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, qt-format msgctxt "KCharsets|@item" msgid "Other encoding (%1)" msgstr "其它编码 (%1)" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, qt-format msgctxt "KCharsets|@item Text encoding: %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains more than one " @@ -140,7 +140,7 @@ "您输入的电子邮件地址无效,因为它包含多个 @ 符号。请订正该电子邮件地址,否则将" "无法创建有效的邮件。" -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a @.\n" @@ -149,59 +149,59 @@ "您输入的电子邮件地址无效,因为它不包含 @ 符号。请订正该电子邮件地址,否则将无" "法创建有效的邮件。" -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "您必须在电子邮件地址框中输入内容。" -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "local part." msgstr "您输入的电子邮件地址无效,因为它不包含用户名。" -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "domain part." msgstr "您输入的电子邮件地址无效,因为它不包含域名。" -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " "comments/brackets." msgstr "您输入的电子邮件地址无效,因为它包含未闭合的括号。" -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 msgctxt "QObject|" msgid "The email address you entered is valid." msgstr "您所输入的电子邮件地址有效。" -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " "angle bracket." msgstr "您输入的电子邮件地址无效,因为它包含未闭合的尖括号。" -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " "closing angle brackets." msgstr "您输入的电子邮件地址无效,因为它包含了过多的尖括号。" -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "unexpected comma." msgstr "您输入的电子邮件地址无效,因为它包含了不正常的逗号。" -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it ended unexpectedly.\n" @@ -211,14 +211,14 @@ "您输入的电子邮件地址无效,因为它的结尾不正常。您可能在该电子邮件地址的最后一" "个字符处使用了类似“\\”的转码字符。" -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " "which does not end." msgstr "您输入的电子邮件地址无效,因为它包含未闭合的引号。" -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -234,14 +234,14 @@ "character." msgstr "您输入的电子邮件地址无效,因为它包含非法字符。" -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "invalid display name." msgstr "您输入的电子邮件地址无效,因为它包含无效的显示名称。" -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -251,12 +251,12 @@ "您输入的电子邮件地址无效,因为它不包含“.”字符。请订正该电子邮件地址,否则将无" "法创建有效的邮件。" -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "电子邮件地址有未知问题" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 msgctxt "QObject|" msgid "" "The email address you entered is not valid.\n" @@ -267,82 +267,82 @@ "它可能是一个虚设的电子邮件地址,\n" "类似于“joe@example.org”。" -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 msgctxt "KEncodingProber|@item Text character set" msgid "Disabled" msgstr "已禁用" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 msgctxt "KEncodingProber|@item Text character set" msgid "Universal" msgstr "通用" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 msgctxt "KEncodingProber|@item Text character set" msgid "Unicode" msgstr "Unicode" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 msgctxt "KEncodingProber|@item Text character set" msgid "Cyrillic" msgstr "西里尔语" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 msgctxt "KEncodingProber|@item Text character set" msgid "Western European" msgstr "西欧语言" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 msgctxt "KEncodingProber|@item Text character set" msgid "Central European" msgstr "中欧语言" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 msgctxt "KEncodingProber|@item Text character set" msgid "Greek" msgstr "希腊语" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 msgctxt "KEncodingProber|@item Text character set" msgid "Hebrew" msgstr "希伯来语" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 msgctxt "KEncodingProber|@item Text character set" msgid "Turkish" msgstr "土耳其语" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 msgctxt "KEncodingProber|@item Text character set" msgid "Japanese" msgstr "日语" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 msgctxt "KEncodingProber|@item Text character set" msgid "Baltic" msgstr "波罗的海语言" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Traditional" msgstr "繁体中文" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Simplified" msgstr "简体中文" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 msgctxt "KEncodingProber|@item Text character set" msgid "Korean" msgstr "朝鲜语" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 msgctxt "KEncodingProber|@item Text character set" msgid "Thai" msgstr "泰语" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 msgctxt "KEncodingProber|@item Text character set" msgid "Arabic" msgstr "阿拉伯语" diff -Nru kcodecs-5.79.0/po/zh_HK/kcodecs5_qt.po kcodecs-5.80.0/po/zh_HK/kcodecs5_qt.po --- kcodecs-5.79.0/po/zh_HK/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/zh_HK/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -155,7 +155,7 @@ msgid "Other" msgstr "其他" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, fuzzy, qt-format #| msgctxt "Descriptive Encoding Name" #| msgid "%1 ( %2 )" @@ -163,13 +163,13 @@ msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, fuzzy, qt-format msgctxt "KCharsets|@item" msgid "Other encoding (%1)" msgstr "設定編碼(&E)..." -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, fuzzy, qt-format #| msgctxt "Descriptive Encoding Name" #| msgid "%1 ( %2 )" @@ -177,7 +177,7 @@ msgid "%1 ( %2 )" msgstr "%1 ( %2 )" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains more than one " @@ -185,68 +185,68 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a @.\n" "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "" -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "local part." msgstr "" -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "domain part." msgstr "" -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " "comments/brackets." msgstr "" -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 #, fuzzy #| msgid "The email address this bug report is sent to." msgctxt "QObject|" msgid "The email address you entered is valid." msgstr "本問題回覆是寄往此 email 地址" -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " "angle bracket." msgstr "" -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " "closing angle brackets." msgstr "" -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "unexpected comma." msgstr "" -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it ended unexpectedly.\n" @@ -254,14 +254,14 @@ "the last character in your email address." msgstr "" -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " "which does not end." msgstr "" -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -275,14 +275,14 @@ "character." msgstr "" -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "invalid display name." msgstr "" -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -290,12 +290,12 @@ "You will not create valid messages if you do not change your address." msgstr "" -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 msgctxt "QObject|" msgid "" "The email address you entered is not valid.\n" @@ -303,111 +303,111 @@ "form joe@example.org." msgstr "" -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 #, fuzzy msgctxt "KEncodingProber|@item Text character set" msgid "Disabled" msgstr "編輯已啟用" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 #, fuzzy #| msgid "Install" msgctxt "KEncodingProber|@item Text character set" msgid "Universal" msgstr "安裝" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 #, fuzzy #| msgid "Unicode" msgctxt "KEncodingProber|@item Text character set" msgid "Unicode" msgstr "Unicode" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 #, fuzzy #| msgid "Cyrillic" msgctxt "KEncodingProber|@item Text character set" msgid "Cyrillic" msgstr "斯拉夫文" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 #, fuzzy #| msgid "Western European" msgctxt "KEncodingProber|@item Text character set" msgid "Western European" msgstr "西歐語系" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 #, fuzzy #| msgid "Central European" msgctxt "KEncodingProber|@item Text character set" msgid "Central European" msgstr "中歐語系" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 #, fuzzy #| msgid "Greek" msgctxt "KEncodingProber|@item Text character set" msgid "Greek" msgstr "希臘文" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 #, fuzzy #| msgid "Hebrew" msgctxt "KEncodingProber|@item Text character set" msgid "Hebrew" msgstr "希伯來文" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 #, fuzzy #| msgid "Turkish" msgctxt "KEncodingProber|@item Text character set" msgid "Turkish" msgstr "土耳其文" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 #, fuzzy #| msgid "Japanese" msgctxt "KEncodingProber|@item Text character set" msgid "Japanese" msgstr "日文" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 #, fuzzy #| msgid "Baltic" msgctxt "KEncodingProber|@item Text character set" msgid "Baltic" msgstr "波羅的海語系" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 #, fuzzy #| msgid "Chinese Traditional" msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Traditional" msgstr "繁體中文" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 #, fuzzy #| msgid "Chinese Simplified" msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Simplified" msgstr "簡體中文" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 #, fuzzy #| msgid "Korean" msgctxt "KEncodingProber|@item Text character set" msgid "Korean" msgstr "韓文" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 #, fuzzy #| msgid "Thai" msgctxt "KEncodingProber|@item Text character set" msgid "Thai" msgstr "泰文" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 #, fuzzy #| msgid "Arabic" msgctxt "KEncodingProber|@item Text character set" diff -Nru kcodecs-5.79.0/po/zh_TW/kcodecs5_qt.po kcodecs-5.80.0/po/zh_TW/kcodecs5_qt.po --- kcodecs-5.79.0/po/zh_TW/kcodecs5_qt.po 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/po/zh_TW/kcodecs5_qt.po 2021-03-06 16:19:34.000000000 +0000 @@ -113,25 +113,25 @@ msgid "Other" msgstr "其他" -#: kcharsets.cpp:653 +#: kcharsets.cpp:629 #, qt-format msgctxt "KCharsets|@item %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1(%2)" -#: kcharsets.cpp:656 +#: kcharsets.cpp:631 #, qt-format msgctxt "KCharsets|@item" msgid "Other encoding (%1)" msgstr "其他編碼(%1)" -#: kcharsets.cpp:685 +#: kcharsets.cpp:660 #, qt-format msgctxt "KCharsets|@item Text encoding: %1 character set, %2 encoding" msgid "%1 ( %2 )" msgstr "%1(%2)" -#: kemailaddress.cpp:514 +#: kemailaddress.cpp:503 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains more than one " @@ -141,7 +141,7 @@ "您輸入的電子郵件地址是不合法的,因為有一個以上的 @ 符號。\n" "您必須改變您的電子郵件地址才能建立訊息。" -#: kemailaddress.cpp:519 +#: kemailaddress.cpp:509 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a @.\n" @@ -150,59 +150,59 @@ "您輸入的電子郵件地址是不合法的,因為沒有任何的 @ 符號。\n" "您必須改變您的電子郵件地址才能建立訊息。" -#: kemailaddress.cpp:524 +#: kemailaddress.cpp:515 msgctxt "QObject|" msgid "You have to enter something in the email address field." msgstr "您必須輸入電子郵件地址。" -#: kemailaddress.cpp:526 +#: kemailaddress.cpp:517 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "local part." msgstr "您輸入的電子郵件地址是不合法的,因為沒有包含區域部份。" -#: kemailaddress.cpp:529 +#: kemailaddress.cpp:521 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " "domain part." msgstr "您輸入的電子郵件地址是不合法的,因為沒有包含網域部份。" -#: kemailaddress.cpp:532 +#: kemailaddress.cpp:525 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains unclosed " "comments/brackets." msgstr "您輸入的電子郵件地址是不合法的,因為有不對稱的註解或括號。" -#: kemailaddress.cpp:535 +#: kemailaddress.cpp:529 msgctxt "QObject|" msgid "The email address you entered is valid." msgstr "您輸入的電子郵件地址是合法的。" -#: kemailaddress.cpp:537 +#: kemailaddress.cpp:531 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains an unclosed " "angle bracket." msgstr "您輸入的電子郵件地址是不合法的,因為有不對稱的尖括號。" -#: kemailaddress.cpp:540 +#: kemailaddress.cpp:535 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains too many " "closing angle brackets." msgstr "您輸入的電子郵件地址是不合法的,因為有太多不對稱的尖括號。" -#: kemailaddress.cpp:543 +#: kemailaddress.cpp:539 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "unexpected comma." msgstr "您輸入的電子郵件地址是不合法的,因為有非預期的逗號。" -#: kemailaddress.cpp:546 +#: kemailaddress.cpp:543 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it ended unexpectedly.\n" @@ -212,14 +212,14 @@ "您輸入的電子郵件地址是不合法的,因為在不該結束的地方結束。\n" "這可能是您用了跳脫字元,如 '\\' 做為電子郵件地址的最後一個字元。" -#: kemailaddress.cpp:551 +#: kemailaddress.cpp:549 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it contains quoted text " "which does not end." msgstr "您輸入的電子郵件地址是不合法的,因為有引號,但沒有結束。" -#: kemailaddress.cpp:554 +#: kemailaddress.cpp:553 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not seem to " @@ -233,14 +233,14 @@ "character." msgstr "您輸入的電子郵件地址是不合法的,因為有不合法的字元。" -#: kemailaddress.cpp:561 +#: kemailaddress.cpp:562 msgctxt "QObject|" msgid "" "The email address you have entered is not valid because it contains an " "invalid display name." msgstr "您輸入的電子郵件地址是不合法的,因為有不合法的顯示名稱。" -#: kemailaddress.cpp:564 +#: kemailaddress.cpp:566 msgctxt "QObject|" msgid "" "The email address you entered is not valid because it does not contain a " @@ -250,12 +250,12 @@ "您輸入的電子郵件地址是不合法的,因為沒有任何的點(.)符號。\n" "您必須改變您的電子郵件地址才能建立訊息。" -#: kemailaddress.cpp:570 +#: kemailaddress.cpp:572 msgctxt "QObject|" msgid "Unknown problem with email address" msgstr "電子郵件地址有不明的錯誤。" -#: kemailaddress.cpp:631 +#: kemailaddress.cpp:632 msgctxt "QObject|" msgid "" "The email address you entered is not valid.\n" @@ -265,82 +265,82 @@ "您輸入的電子郵件地址是不合法的。\n" "其似乎並未包含任何實際上的電子郵件地址,如 joe@example.org 等。" -#: kencodingprober.cpp:221 kencodingprober.cpp:262 +#: kencodingprober.cpp:225 kencodingprober.cpp:266 msgctxt "KEncodingProber|@item Text character set" msgid "Disabled" msgstr "已關閉" -#: kencodingprober.cpp:223 kencodingprober.cpp:265 +#: kencodingprober.cpp:227 kencodingprober.cpp:269 msgctxt "KEncodingProber|@item Text character set" msgid "Universal" msgstr "通用" -#: kencodingprober.cpp:225 kencodingprober.cpp:307 +#: kencodingprober.cpp:229 kencodingprober.cpp:311 msgctxt "KEncodingProber|@item Text character set" msgid "Unicode" msgstr "萬國碼" -#: kencodingprober.cpp:227 kencodingprober.cpp:277 +#: kencodingprober.cpp:231 kencodingprober.cpp:281 msgctxt "KEncodingProber|@item Text character set" msgid "Cyrillic" msgstr "斯拉夫語系" -#: kencodingprober.cpp:229 kencodingprober.cpp:292 +#: kencodingprober.cpp:233 kencodingprober.cpp:296 msgctxt "KEncodingProber|@item Text character set" msgid "Western European" msgstr "西歐語系" -#: kencodingprober.cpp:231 kencodingprober.cpp:274 +#: kencodingprober.cpp:235 kencodingprober.cpp:278 msgctxt "KEncodingProber|@item Text character set" msgid "Central European" msgstr "中歐語系" -#: kencodingprober.cpp:233 kencodingprober.cpp:280 +#: kencodingprober.cpp:237 kencodingprober.cpp:284 msgctxt "KEncodingProber|@item Text character set" msgid "Greek" msgstr "希臘語" -#: kencodingprober.cpp:235 kencodingprober.cpp:283 +#: kencodingprober.cpp:239 kencodingprober.cpp:287 msgctxt "KEncodingProber|@item Text character set" msgid "Hebrew" msgstr "希伯來語" -#: kencodingprober.cpp:237 kencodingprober.cpp:289 +#: kencodingprober.cpp:241 kencodingprober.cpp:293 msgctxt "KEncodingProber|@item Text character set" msgid "Turkish" msgstr "土耳其語" -#: kencodingprober.cpp:239 kencodingprober.cpp:286 +#: kencodingprober.cpp:243 kencodingprober.cpp:290 msgctxt "KEncodingProber|@item Text character set" msgid "Japanese" msgstr "日語" -#: kencodingprober.cpp:241 kencodingprober.cpp:271 +#: kencodingprober.cpp:245 kencodingprober.cpp:275 msgctxt "KEncodingProber|@item Text character set" msgid "Baltic" msgstr "波羅的海語系" -#: kencodingprober.cpp:243 kencodingprober.cpp:295 +#: kencodingprober.cpp:247 kencodingprober.cpp:299 msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Traditional" msgstr "正體中文" -#: kencodingprober.cpp:245 kencodingprober.cpp:298 +#: kencodingprober.cpp:249 kencodingprober.cpp:302 msgctxt "KEncodingProber|@item Text character set" msgid "Chinese Simplified" msgstr "簡體中文" -#: kencodingprober.cpp:247 kencodingprober.cpp:301 +#: kencodingprober.cpp:251 kencodingprober.cpp:305 msgctxt "KEncodingProber|@item Text character set" msgid "Korean" msgstr "韓文" -#: kencodingprober.cpp:249 kencodingprober.cpp:304 +#: kencodingprober.cpp:253 kencodingprober.cpp:308 msgctxt "KEncodingProber|@item Text character set" msgid "Thai" msgstr "泰文" -#: kencodingprober.cpp:251 kencodingprober.cpp:268 +#: kencodingprober.cpp:255 kencodingprober.cpp:272 msgctxt "KEncodingProber|@item Text character set" msgid "Arabic" msgstr "阿拉伯文" diff -Nru kcodecs-5.79.0/src/kcharsets.cpp kcodecs-5.80.0/src/kcharsets.cpp --- kcodecs-5.79.0/src/kcharsets.cpp 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/src/kcharsets.cpp 2021-03-06 16:19:34.000000000 +0000 @@ -13,10 +13,10 @@ #include #include +#include #include #include -#include /* * The encoding names (like "ISO 8859-1") in this list are user-visible, @@ -217,20 +217,11 @@ "TSCII\0" "\0"; -static const int language_for_encoding_indices[] = { - 0, 11, 28, 11, 40, 11, 52, 11, - 60, 11, 67, 78, 95, 78, 106, 117, - 124, 117, 136, 148, 169, 78, 177, 185, - 193, 117, 201, 208, 217, 208, 228, 208, - 236, 208, 243, 208, 250, 255, 275, 255, - 286, 294, 313, 294, 317, 294, 324, 331, - 338, 331, 345, 350, 359, 350, 364, 350, - 371, 382, 388, 382, 396, 407, 414, 407, - 422, 433, 440, 433, 453, 433, 461, 185, - 472, 479, 484, 479, 496, 502, 510, 502, - 517, 502, 522, 502, 527, 502, 543, 552, - 567, 580, 586, 580, 593, 580, -1 -}; +static const int language_for_encoding_indices[] = {0, 11, 28, 11, 40, 11, 52, 11, 60, 11, 67, 78, 95, 78, 106, 117, 124, 117, 136, + 148, 169, 78, 177, 185, 193, 117, 201, 208, 217, 208, 228, 208, 236, 208, 243, 208, 250, 255, + 275, 255, 286, 294, 313, 294, 317, 294, 324, 331, 338, 331, 345, 350, 359, 350, 364, 350, 371, + 382, 388, 382, 396, 407, 414, 407, 422, 433, 440, 433, 453, 433, 461, 185, 472, 479, 484, 479, + 496, 502, 510, 502, 517, 502, 522, 502, 527, 502, 543, 552, 567, 580, 586, 580, 593, 580, -1}; /* * GENERATED CODE ENDS HERE @@ -406,19 +397,10 @@ "csiso2022jp\0" "\0"; -static const int builtin_indices[] = { - 0, 11, 18, 11, 30, 39, 50, 39, - 58, 39, 64, 82, 88, 93, 109, 93, - 120, 135, 143, 135, 158, 164, 168, 164, - 175, 164, 189, 196, 201, 208, 214, 221, - 233, 240, 246, 240, 262, 240, 278, 240, - 294, 240, 310, 240, 326, 240, 342, 240, - 358, 368, 373, 368, 368, 368, 383, 395, - 400, 411, 418, 429, 436, 411, 448, 429, - 460, 469, 481, 493, 505, 517, 524, 517, - 535, 517, 542, 208, 557, 208, 572, 469, - 582, 469, 592, 469, 596, 383, -1 -}; +static const int builtin_indices[] = {0, 11, 18, 11, 30, 39, 50, 39, 58, 39, 64, 82, 88, 93, 109, 93, 120, 135, 143, 135, 158, 164, + 168, 164, 175, 164, 189, 196, 201, 208, 214, 221, 233, 240, 246, 240, 262, 240, 278, 240, 294, 240, 310, 240, + 326, 240, 342, 240, 358, 368, 373, 368, 368, 368, 383, 395, 400, 411, 418, 429, 436, 411, 448, 429, 460, 469, + 481, 493, 505, 517, 524, 517, 535, 517, 542, 208, 557, 208, 572, 469, 582, 469, 592, 469, 596, 383, -1}; /* * GENERATED CODE ENDS HERE @@ -466,10 +448,7 @@ "pt-154\0" "\0"; -static const int conversion_hints_indices[] = { - 0, 7, 18, 25, 36, 18, 43, 50, - 63, 50, 76, 50, -1 -}; +static const int conversion_hints_indices[] = {0, 7, 18, 25, 36, 18, 43, 50, 63, 50, 76, 50, -1}; /* * GENERATED CODE ENDS HERE @@ -483,8 +462,7 @@ // search an array of items index/data, find first matching index // and return data, or return 0 -static inline -const char *kcharsets_array_search(const char *start, const int *indices, const char *entry) +static inline const char *kcharsets_array_search(const char *start, const int *indices, const char *entry) { for (int i = 0; indices[i] != -1; i += 2) if (qstrcmp(start + indices[i], entry) == 0) { @@ -505,7 +483,7 @@ QHash codecForNameDict; KCharsets *kc; - //Cache list so QStrings can be implicitly shared + // Cache list so QStrings can be implicitly shared QList encodingsByScript; }; @@ -556,10 +534,10 @@ const entity *e = KCodecsEntities::kde_findEntity(raw.data(), raw.length()); if (!e) { - //qCDebug(KCODECS_LOG) << "unknown entity " << str <<", len = " << str.length(); + // qCDebug(KCODECS_LOG) << "unknown entity " << str <<", len = " << str.length(); return QChar::Null; } - //qCDebug(KCODECS_LOG) << "got entity " << str << " = " << e->code; + // qCDebug(KCODECS_LOG) << "got entity " << str << " = " << e->code; return QChar(e->code); } @@ -624,7 +602,7 @@ const uint ampersandPos = ampersand - text.unicode(); - text[(int)ampersandPos ] = entityValue; + text[(int)ampersandPos] = entityValue; text.remove(ampersandPos + 1, entityLength + 1); p = text.unicode() + ampersandPos; end = text.unicode() + text.length(); @@ -646,12 +624,9 @@ QString KCharsets::descriptionForEncoding(const QString &encoding) const { - const char *lang = kcharsets_array_search(language_for_encoding_string, - language_for_encoding_indices, - encoding.toUtf8().data()); + const char *lang = kcharsets_array_search(language_for_encoding_string, language_for_encoding_indices, encoding.toUtf8().data()); if (lang) - return tr("%1 ( %2 )", "@item %1 character set, %2 encoding") - .arg(tr(lang, "@item Text character set"), encoding); + return tr("%1 ( %2 )", "@item %1 character set, %2 encoding").arg(tr(lang, "@item Text character set"), encoding); else { return tr("Other encoding (%1)", "@item").arg(encoding); } @@ -708,7 +683,6 @@ if (i == d->encodingsByScript.size()) { d->encodingsByScript.append(QStringList() << description << name); } - } return d->encodingsByScript; } @@ -764,7 +738,7 @@ return d->codecForNameDict.value(n); } - // If the name is not in the hash table, call directly QTextCoded::codecForName. + // If the name is not in the hash table, call directly QTextCodec::codecForName. // We assume that QTextCodec is smarter and more maintained than this code. codec = QTextCodec::codecForName(n); if (codec) { @@ -780,8 +754,8 @@ name.chop(8); changed = true; } - if (name.startsWith("x-")) { // krazy:exclude=strings - name.remove(0, 2); // remove x- at start + if (name.startsWith("x-")) { // krazy:exclude=strings + name.remove(0, 2); // remove x- at start changed = true; } diff -Nru kcodecs-5.79.0/src/kcharsets.h kcodecs-5.80.0/src/kcharsets.h --- kcodecs-5.79.0/src/kcharsets.h 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/src/kcharsets.h 2021-03-06 16:19:34.000000000 +0000 @@ -41,7 +41,6 @@ KCharsets(); public: - /** * Destructor. */ @@ -126,7 +125,8 @@ /** * Lists the available encoding names grouped by script (or language that uses them). - * @returns the list of lists consisting of description followed by encoding names (i.e. encodingsByScript().at(i).at(0) is a description for encodingsByScript().at(i).at(k), k>0) + * @returns the list of lists consisting of description followed by encoding names (i.e. encodingsByScript().at(i).at(0) is a description for + * encodingsByScript().at(i).at(k), k>0) */ QList encodingsByScript() const; diff -Nru kcodecs-5.79.0/src/kcodecsbase64.cpp kcodecs-5.80.0/src/kcodecsbase64.cpp --- kcodecs-5.79.0/src/kcodecsbase64.cpp 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/src/kcodecsbase64.cpp 2021-03-06 16:19:34.000000000 +0000 @@ -25,42 +25,29 @@ namespace KCodecs { - // codec for base64 as specified in RFC 2045 -//class Base64Codec; -//class Base64Decoder; -//class Base64Encoder; +// class Base64Codec; +// class Base64Decoder; +// class Base64Encoder; // codec for the B encoding as specified in RFC 2047 -//class Rfc2047BEncodingCodec; -//class Rfc2047BEncodingEncoder; -//class Rfc2047BEncodingDecoder; +// class Rfc2047BEncodingCodec; +// class Rfc2047BEncodingEncoder; +// class Rfc2047BEncodingDecoder; //@cond PRIVATE static const uchar base64DecodeMap[128] = { - 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, - 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, + 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, - 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 62, 64, 64, 64, 63, - 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 64, 64, 64, 64, 64, 64, + 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 62, 64, 64, 64, 63, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 64, 64, 64, 64, 64, 64, - 64, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, - 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 64, 64, 64, 64, 64, + 64, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 64, 64, 64, 64, 64, - 64, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, - 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 64, 64, 64, 64, 64 -}; + 64, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 64, 64, 64, 64, 64}; -static const char base64EncodeMap[64] = { - 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', - 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', - 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', - 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f', - 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', - 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', - 'w', 'x', 'y', 'z', '0', '1', '2', '3', - '4', '5', '6', '7', '8', '9', '+', '/' -}; +static const char base64EncodeMap[64] = {'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', + 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', + 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '+', '/'}; //@endcond class Base64Decoder : public Decoder @@ -80,10 +67,11 @@ } public: - virtual ~Base64Decoder() {} + virtual ~Base64Decoder() + { + } - bool decode(const char *&scursor, const char *const send, - char *&dcursor, const char *const dend) override; + bool decode(const char *&scursor, const char *const send, char *&dcursor, const char *const dend) override; // ### really needs no finishing??? bool finish(char *&dcursor, const char *const dend) override { @@ -114,21 +102,21 @@ { } - bool generic_finish(char *&dcursor, const char *const dend, - bool withLFatEnd); + bool generic_finish(char *&dcursor, const char *const dend, bool withLFatEnd); public: - virtual ~Base64Encoder() {} + virtual ~Base64Encoder() + { + } - bool encode(const char *&scursor, const char *const send, - char *&dcursor, const char *const dend) override; + bool encode(const char *&scursor, const char *const send, char *&dcursor, const char *const dend) override; bool finish(char *&dcursor, const char *const dend) override; protected: bool writeBase64(uchar ch, char *&dcursor, const char *const dend) { - return write(base64EncodeMap[ ch ], dcursor, dend); + return write(base64EncodeMap[ch], dcursor, dend); } }; @@ -142,8 +130,7 @@ } public: - bool encode(const char *&scursor, const char *const send, - char *&dcursor, const char *const dend) override; + bool encode(const char *&scursor, const char *const send, char *&dcursor, const char *const dend) override; bool finish(char *&dcursor, const char *const dend) override; }; @@ -166,8 +153,7 @@ /********************************************************/ /********************************************************/ -bool Base64Decoder::decode(const char *&scursor, const char *const send, - char *&dcursor, const char *const dend) +bool Base64Decoder::decode(const char *&scursor, const char *const send, char *&dcursor, const char *const dend) { while (dcursor != dend && scursor != send) { uchar ch = *scursor++; @@ -175,7 +161,7 @@ // try converting ch to a 6-bit value: if (ch < 128) { - value = base64DecodeMap[ ch ]; + value = base64DecodeMap[ch]; } else { value = 64; } @@ -187,7 +173,7 @@ if (mStepNo == 0 || mStepNo == 1) { if (!mSawPadding) { // malformed - //qWarning() << "Base64Decoder: unexpected padding" + // qWarning() << "Base64Decoder: unexpected padding" // "character in input stream"; } mSawPadding = true; @@ -209,7 +195,7 @@ } if (mSawPadding) { - //qWarning() << "Base64Decoder: Embedded padding character" + // qWarning() << "Base64Decoder: Embedded padding character" // "encountered!"; return true; } @@ -241,8 +227,7 @@ return scursor == send; } // Base64Decoder::decode() -bool Base64Encoder::encode(const char *&scursor, const char *const send, - char *&dcursor, const char *const dend) +bool Base64Encoder::encode(const char *&scursor, const char *const send, char *&dcursor, const char *const dend) { const uint maxPacketsPerLine = 76 / 4; @@ -273,18 +258,18 @@ switch (mStepNo) { case 0: assert(mNextbits == 0); - writeBase64(ch >> 2, dcursor, dend); // top-most 6 bits -> output - mNextbits = (ch & 0x3) << 4; // 0..1 bits -> 4..5 in mNextbits + writeBase64(ch >> 2, dcursor, dend); // top-most 6 bits -> output + mNextbits = (ch & 0x3) << 4; // 0..1 bits -> 4..5 in mNextbits break; case 1: assert((mNextbits & ~0x30) == 0); - writeBase64(mNextbits | ch >> 4, dcursor, dend); // 4..7 bits -> 0..3 in value - mNextbits = (ch & 0xf) << 2; // 0..3 bits -> 2..5 in mNextbits + writeBase64(mNextbits | ch >> 4, dcursor, dend); // 4..7 bits -> 0..3 in value + mNextbits = (ch & 0xf) << 2; // 0..3 bits -> 2..5 in mNextbits break; case 2: assert((mNextbits & ~0x3C) == 0); - writeBase64(mNextbits | ch >> 6, dcursor, dend); // 6..7 bits -> 0..1 in value - writeBase64(ch & 0x3F, dcursor, dend); // 0..5 bits -> output + writeBase64(mNextbits | ch >> 6, dcursor, dend); // 6..7 bits -> 0..1 in value + writeBase64(ch & 0x3F, dcursor, dend); // 0..5 bits -> output mNextbits = 0; mWrittenPacketsOnThisLine++; break; @@ -301,10 +286,7 @@ return scursor == send; } -bool Rfc2047BEncodingEncoder::encode(const char *&scursor, - const char *const send, - char *&dcursor, - const char *const dend) +bool Rfc2047BEncodingEncoder::encode(const char *&scursor, const char *const send, char *&dcursor, const char *const dend) { // detect when the caller doesn't adhere to our rules: if (mInsideFinishing) { @@ -327,18 +309,18 @@ switch (mStepNo) { case 0: assert(mNextbits == 0); - writeBase64(ch >> 2, dcursor, dend); // top-most 6 bits -> output - mNextbits = (ch & 0x3) << 4; // 0..1 bits -> 4..5 in mNextbits + writeBase64(ch >> 2, dcursor, dend); // top-most 6 bits -> output + mNextbits = (ch & 0x3) << 4; // 0..1 bits -> 4..5 in mNextbits break; case 1: assert((mNextbits & ~0x30) == 0); - writeBase64(mNextbits | ch >> 4, dcursor, dend); // 4..7 bits -> 0..3 in value - mNextbits = (ch & 0xf) << 2; // 0..3 bits -> 2..5 in mNextbits + writeBase64(mNextbits | ch >> 4, dcursor, dend); // 4..7 bits -> 0..3 in value + mNextbits = (ch & 0xf) << 2; // 0..3 bits -> 2..5 in mNextbits break; case 2: assert((mNextbits & ~0x3C) == 0); - writeBase64(mNextbits | ch >> 6, dcursor, dend); // 6..7 bits -> 0..1 in value - writeBase64(ch & 0x3F, dcursor, dend); // 0..5 bits -> output + writeBase64(mNextbits | ch >> 6, dcursor, dend); // 6..7 bits -> 0..1 in value + writeBase64(ch & 0x3F, dcursor, dend); // 0..5 bits -> output mNextbits = 0; break; default: @@ -359,14 +341,12 @@ return generic_finish(dcursor, dend, true); } -bool Rfc2047BEncodingEncoder::finish(char *&dcursor, - const char *const dend) +bool Rfc2047BEncodingEncoder::finish(char *&dcursor, const char *const dend) { return generic_finish(dcursor, dend, false); } -bool Base64Encoder::generic_finish(char *&dcursor, const char *const dend, - bool withLFatEnd) +bool Base64Encoder::generic_finish(char *&dcursor, const char *const dend, bool withLFatEnd) { if (mInsideFinishing) { return flushOutputBuffer(dcursor, dend); diff -Nru kcodecs-5.79.0/src/kcodecsbase64.h kcodecs-5.80.0/src/kcodecsbase64.h --- kcodecs-5.79.0/src/kcodecsbase64.h 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/src/kcodecsbase64.h 2021-03-06 16:19:34.000000000 +0000 @@ -40,7 +40,6 @@ namespace KCodecs { - /** @brief A class representing the @ref codec for @ref Base64 as specified in @@ -54,12 +53,15 @@ */ Base64Codec() : Codec() - {} + { + } /** Destroys the codec. */ - ~Base64Codec() override {} + ~Base64Codec() override + { + } /** @copydoc @@ -132,12 +134,15 @@ */ Rfc2047BEncodingCodec() : Base64Codec() - {} + { + } /** Destroys the codec. */ - virtual ~Rfc2047BEncodingCodec() {} + virtual ~Rfc2047BEncodingCodec() + { + } /** @copydoc diff -Nru kcodecs-5.79.0/src/kcodecs.cpp kcodecs-5.80.0/src/kcodecs.cpp --- kcodecs-5.79.0/src/kcodecs.cpp 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/src/kcodecs.cpp 2021-03-06 16:19:34.000000000 +0000 @@ -22,25 +22,25 @@ */ #include "kcodecs.h" +#include "kcharsets.h" +#include "kcodecs_debug.h" #include "kcodecs_p.h" #include "kcodecsbase64.h" #include "kcodecsidentity.h" #include "kcodecsqp.h" #include "kcodecsuuencode.h" -#include "kcharsets.h" -#include "kcodecs_debug.h" #include #include #include #include -#include #include +#include #include -#include #include +#include #if defined(Q_OS_WIN) #define strncasecmp _strnicmp @@ -48,10 +48,8 @@ namespace KCodecs { - static QList charsetCache; - QByteArray cachedCharset(const QByteArray &name) { for (const QByteArray &charset : qAsConst(charsetCache)) { @@ -64,7 +62,6 @@ return charsetCache.last(); } - } // namespace KCodecs /******************************** KCodecs ********************************/ @@ -105,8 +102,7 @@ } #endif -void KCodecs::base64Encode(const QByteArray &in, QByteArray &out, - bool insertLFs) +void KCodecs::base64Encode(const QByteArray &in, QByteArray &out, bool insertLFs) { Q_UNUSED(insertLFs); out = base64Encode(in); @@ -154,9 +150,12 @@ namespace KCodecs { // parse the encoded-word (scursor points to after the initial '=') -bool parseEncodedWord(const char *&scursor, const char *const send, - QString *result, QByteArray *language, - QByteArray *usedCS, const QByteArray &defaultCS, +bool parseEncodedWord(const char *&scursor, + const char *const send, + QString *result, + QByteArray *language, + QByteArray *usedCS, + const QByteArray &defaultCS, CharsetOption charsetOption) { assert(result); @@ -185,7 +184,7 @@ // find delimiting '?' (and the '*' separating charset and language // tags, if any): - for (; scursor != send ; scursor++) { + for (; scursor != send; scursor++) { if (*scursor == '?') { break; } else if (*scursor == '*' && languageStart == nullptr) { @@ -205,8 +204,7 @@ QByteArray maybeLanguage(languageStart, scursor - languageStart); // extract charset information (keep in mind: the size given to the // ctor is one off due to the \0 terminator): - QByteArray maybeCharset(charsetStart, - (languageStart ? languageStart - 1 : scursor) - charsetStart); + QByteArray maybeCharset(charsetStart, (languageStart ? languageStart - 1 : scursor) - charsetStart); // // STEP 2: @@ -218,7 +216,7 @@ const char *encodingStart = scursor; // find next '?' (ending the encoding tag): - for (; scursor != send ; scursor++) { + for (; scursor != send; scursor++) { if (*scursor == '?') { break; } @@ -248,10 +246,10 @@ const char *encodedTextStart = scursor; // find the '?=' sequence (ending the encoded-text): - for (; scursor != send ; scursor++) { + for (; scursor != send; scursor++) { if (*scursor == '?') { if (scursor + 1 != send) { - if (*(scursor + 1) != '=') { // We expect a '=' after the '?', but we got something else; ignore + if (*(scursor + 1) != '=') { // We expect a '=' after the '?', but we got something else; ignore // qCDebug(KCODECS_LOG) << "Stray '?' in q-encoded word, ignoring this."; continue; } else { // yep, found a '?=' sequence @@ -298,7 +296,7 @@ cs = cachedCharset(defaultCS); } else { textCodec = KCharsets::charsets()->codecForName(QLatin1String(maybeCharset), matchOK); - if (!matchOK) { //no suitable codec found => use default charset + if (!matchOK) { // no suitable codec found => use default charset textCodec = KCharsets::charsets()->codecForName(QLatin1String(defaultCS), matchOK); cs = cachedCharset(defaultCS); } else { @@ -330,8 +328,7 @@ // if (!dec->decode(encodedTextStart, encodedTextEnd, bbegin, bend)) { - qWarning() << codec->name() << "codec lies about its maxDecodedSizeFor(" - << encodedTextLength << ")\nresult may be truncated"; + qWarning() << codec->name() << "codec lies about its maxDecodedSizeFor(" << encodedTextLength << ")\nresult may be truncated"; } *result = textCodec->toUnicode(buffer.data(), bbegin - buffer.data()); @@ -354,9 +351,7 @@ return decodeRFC2047String(msg.toUtf8(), &usedCS, "utf-8", NoOption); } -QString KCodecs::decodeRFC2047String(const QByteArray &src, QByteArray *usedCS, - const QByteArray &defaultCS, - CharsetOption charsetOption) +QString KCodecs::decodeRFC2047String(const QByteArray &src, QByteArray *usedCS, const QByteArray &defaultCS, CharsetOption charsetOption) { QByteArray result; QByteArray spaceBuffer; @@ -411,7 +406,6 @@ } } - QByteArray KCodecs::encodeRFC2047String(const QString &src, const QByteArray &charset) { QByteArray result; @@ -423,7 +417,7 @@ QByteArray usedCS; if (!ok) { - //no codec available => try local8Bit and hope the best ;-) + // no codec available => try local8Bit and hope the best ;-) codec = QTextCodec::codecForLocale(); usedCS = codec->name(); } else { @@ -443,19 +437,19 @@ encoded8Bit = codec->fromUnicode(src); } - if (usedCS.contains("8859-")) { // use "B"-Encoding for non iso-8859-x charsets + if (usedCS.contains("8859-")) { // use "B"-Encoding for non iso-8859-x charsets useQEncoding = true; } uint encoded8BitLength = encoded8Bit.length(); for (unsigned int i = 0; i < encoded8BitLength; i++) { - if (encoded8Bit[i] == ' ') { // encoding starts at word boundaries + if (encoded8Bit[i] == ' ') { // encoding starts at word boundaries start = i + 1; } // encode escape character, for japanese encodings... if (((signed char)encoded8Bit[i] < 0) || (encoded8Bit[i] == '\033')) { - end = start; // non us-ascii char found, now we determine where to stop encoding + end = start; // non us-ascii char found, now we determine where to stop encoding nonAscii = true; break; } @@ -469,7 +463,7 @@ for (int x = end; x < encoded8Bit.length(); x++) { if (((signed char)encoded8Bit[x] < 0) || (encoded8Bit[x] == '\033')) { - end = x; // we found another non-ascii word + end = x; // we found another non-ascii word while ((end < encoded8Bit.length()) && (encoded8Bit[end] != ' ')) { // we encode complete words @@ -483,18 +477,18 @@ if (useQEncoding) { result += "?Q?"; - char c, hexcode;// "Q"-encoding implementation described in RFC 2047 + char c, hexcode; // "Q"-encoding implementation described in RFC 2047 for (int i = start; i < end; i++) { c = encoded8Bit[i]; - if (c == ' ') { // make the result readable with not MIME-capable readers + if (c == ' ') { // make the result readable with not MIME-capable readers result += '_'; } else { - if (((c >= 'a') && (c <= 'z')) || // paranoid mode, encode *all* special chars to avoid problems - ((c >= 'A') && (c <= 'Z')) || // with "From" & "To" headers - ((c >= '0') && (c <= '9'))) { + if (((c >= 'a') && (c <= 'z')) || // paranoid mode, encode *all* special chars to avoid problems + ((c >= 'A') && (c <= 'Z')) || // with "From" & "To" headers + ((c >= '0') && (c <= '9'))) { result += c; } else { - result += '='; // "stolen" from KMail ;-) + result += '='; // "stolen" from KMail ;-) hexcode = ((c & 0xF0) >> 4) + 48; if (hexcode >= 58) { hexcode += 7; @@ -528,20 +522,20 @@ //@cond PRIVATE namespace { -static QHash *allCodecs = nullptr; +static QHash *allCodecs = nullptr; Q_GLOBAL_STATIC(QMutex, dictLock) static void createCodecs() { - //all->insert( "7bit", new KCodecs::SevenBitCodec() ); - //all->insert( "8bit", new KCodecs::EightBitCodec() ); + // all->insert( "7bit", new KCodecs::SevenBitCodec() ); + // all->insert( "8bit", new KCodecs::EightBitCodec() ); allCodecs->insert("base64", new KCodecs::Base64Codec()); allCodecs->insert("quoted-printable", new KCodecs::QuotedPrintableCodec()); allCodecs->insert("b", new KCodecs::Rfc2047BEncodingCodec()); allCodecs->insert("q", new KCodecs::Rfc2047QEncodingCodec()); allCodecs->insert("x-kmime-rfc2231", new KCodecs::Rfc2231EncodingCodec()); allCodecs->insert("x-uuencode", new KCodecs::UUCodec()); - //all->insert( "binary", new KCodecs::BinaryCodec() ); + // all->insert( "binary", new KCodecs::BinaryCodec() ); } static void cleanupCodecs() @@ -566,7 +560,7 @@ { QMutexLocker locker(dictLock); // protect "allCodecs" if (!allCodecs) { - allCodecs = new QHash(); + allCodecs = new QHash(); qAddPostRoutine(cleanupCodecs); createCodecs(); } @@ -580,9 +574,7 @@ return codec; } -bool KCodecs::Codec::encode(const char *&scursor, const char *const send, - char *&dcursor, const char *const dend, - NewlineType newline) const +bool KCodecs::Codec::encode(const char *&scursor, const char *const send, char *&dcursor, const char *const dend, NewlineType newline) const { // get an encoder: QScopedPointer enc(makeEncoder(newline)); @@ -654,9 +646,7 @@ return result; } -bool KCodecs::Codec::decode(const char *&scursor, const char *const send, - char *&dcursor, const char *const dend, - NewlineType newline) const +bool KCodecs::Codec::decode(const char *&scursor, const char *const send, char *&dcursor, const char *const dend, NewlineType newline) const { // get a decoder: QScopedPointer dec(makeDecoder(newline)); @@ -679,7 +669,6 @@ return true; // successfully encoded. } - /******************************************************************************/ /* KCodecs::Encoder */ @@ -696,7 +685,7 @@ KCodecs::Encoder::~Encoder() = default; -bool KCodecs::Encoder::write(char ch, char*& dcursor, const char*const dend) +bool KCodecs::Encoder::write(char ch, char *&dcursor, const char *const dend) { if (dcursor != dend) { // if there's space in the output stream, write there: @@ -705,10 +694,9 @@ } else { // else buffer the output: if (d->outputBufferCursor >= maxBufferedChars) { - qCritical() - << "KCodecs::Encoder: internal buffer overflow!"; + qCritical() << "KCodecs::Encoder: internal buffer overflow!"; } else { - d->outputBuffer[ d->outputBufferCursor++ ] = ch; + d->outputBuffer[d->outputBufferCursor++] = ch; } return false; } @@ -720,7 +708,7 @@ { int i; // copy output buffer to output stream: - for (i = 0 ; dcursor != dend && i < d->outputBufferCursor ; ++i) { + for (i = 0; dcursor != dend && i < d->outputBufferCursor; ++i) { *dcursor++ = d->outputBuffer[i]; } @@ -736,7 +724,7 @@ return !numCharsLeft; } -bool KCodecs::Encoder::writeCRLF(char*& dcursor, const char*const dend) +bool KCodecs::Encoder::writeCRLF(char *&dcursor, const char *const dend) { if (d->newline == Codec::NewlineCRLF) { write('\r', dcursor, dend); @@ -744,8 +732,6 @@ return write('\n', dcursor, dend); } - - /******************************************************************************/ /* KCodecs::Decoder */ diff -Nru kcodecs-5.79.0/src/kcodecs.h kcodecs-5.80.0/src/kcodecs.h --- kcodecs-5.79.0/src/kcodecs.h 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/src/kcodecs.h 2021-03-06 16:19:34.000000000 +0000 @@ -13,7 +13,9 @@ #define KCODECS_H #include + #include + #include #if KCODECS_ENABLE_DEPRECATED_SINCE(5, 79) @@ -23,7 +25,8 @@ #define KBase64 KBase64_is_deprecated_use_KCodecs #endif -template class QHash; +template +class QHash; class QByteArray; class QIODevice; @@ -60,7 +63,6 @@ */ namespace KCodecs { - /** * Encodes the given data using the quoted-printable algorithm. * @@ -70,8 +72,7 @@ * breaks, too. * @return quoted-printable encoded string. */ -KCODECS_EXPORT QByteArray quotedPrintableEncode(const QByteArray &in, - bool useCRLF = true); +KCODECS_EXPORT QByteArray quotedPrintableEncode(const QByteArray &in, bool useCRLF = true); /** * Encodes the given data using the quoted-printable algorithm. @@ -91,8 +92,7 @@ * CRLF line breaks and the output will have CRLF line * breaks, too. */ -KCODECS_EXPORT void quotedPrintableEncode(const QByteArray &in, QByteArray &out, - bool useCRLF); +KCODECS_EXPORT void quotedPrintableEncode(const QByteArray &in, QByteArray &out, bool useCRLF); /** * Decodes a quoted-printable encoded data. @@ -242,8 +242,7 @@ * @param out encoded data. * @param insertLFs limit the number of characters per line. */ -KCODECS_EXPORT void base64Encode(const QByteArray &in, QByteArray &out, - bool insertLFs = false); +KCODECS_EXPORT void base64Encode(const QByteArray &in, QByteArray &out, bool insertLFs = false); /** * Decodes the given data that was encoded using the @@ -286,10 +285,9 @@ * Charset options for RFC2047 encoder * @since 5.5 */ -enum CharsetOption -{ - NoOption = 0, /// No special option - ForceDefaultCharset = 1 /// Force use of the default charset +enum CharsetOption { + NoOption = 0, /// No special option + ForceDefaultCharset = 1, /// Force use of the default charset }; /** @@ -305,7 +303,8 @@ * @return the decoded string. * @since 5.5 */ -KCODECS_EXPORT QString decodeRFC2047String(const QByteArray &src, QByteArray *usedCS, +KCODECS_EXPORT QString decodeRFC2047String(const QByteArray &src, + QByteArray *usedCS, const QByteArray &defaultCS = QByteArray(), CharsetOption option = NoOption); @@ -325,7 +324,6 @@ */ KCODECS_EXPORT QByteArray encodeRFC2047String(const QString &src, const QByteArray &charset); - class Encoder; class EncoderPrivate; class Decoder; @@ -375,7 +373,7 @@ public: enum NewlineType { NewlineLF, - NewlineCRLF + NewlineCRLF, }; /** @@ -466,9 +464,7 @@ @return false if the encoded data didn't fit into the output buffer; true otherwise. */ - virtual bool encode(const char *&scursor, const char *const send, - char *&dcursor, const char *const dend, - NewlineType newline = NewlineLF) const; + virtual bool encode(const char *&scursor, const char *const send, char *&dcursor, const char *const dend, NewlineType newline = NewlineLF) const; /** Convenience wrapper that can be used for small chunks of data @@ -506,9 +502,7 @@ @return false if the decoded data didn't fit into the output buffer; true otherwise. */ - virtual bool decode(const char *&scursor, const char *const send, - char *&dcursor, const char *const dend, - NewlineType newline = NewlineLF) const; + virtual bool decode(const char *&scursor, const char *const send, char *&dcursor, const char *const dend, NewlineType newline = NewlineLF) const; /** Even more convenient, but also a bit slower and more memory @@ -520,8 +514,7 @@ @param src is a QByteArray containing the data to encode. @param newline whether make new lines using @ref CRLF, or @ref LF (default is @ref LF). */ - virtual QByteArray encode(const QByteArray &src, - NewlineType newline = NewlineLF) const; + virtual QByteArray encode(const QByteArray &src, NewlineType newline = NewlineLF) const; /** Even more convenient, but also a bit slower and more memory @@ -533,8 +526,7 @@ @param src is a QByteArray containing the data to decode. @param newline whether make new lines using @ref CRLF, or @ref LF (default is @ref LF). */ - virtual QByteArray decode(const QByteArray &src, - NewlineType newline = NewlineLF) const; + virtual QByteArray decode(const QByteArray &src, NewlineType newline = NewlineLF) const; /** Returns the name of the encoding. Guaranteed to be lowercase. @@ -544,13 +536,17 @@ /** Destroys the codec. */ - virtual ~Codec() {} + virtual ~Codec() + { + } protected: /** Constructs the codec. */ - Codec() {} + Codec() + { + } }; /** @@ -664,8 +660,7 @@ @param dcursor is a pointer to the start of the output buffer. @param dend is a pointer to the end of the output buffer. */ - virtual bool decode(const char *&scursor, const char *const send, - char *&dcursor, const char *const dend) = 0; + virtual bool decode(const char *&scursor, const char *const send, char *&dcursor, const char *const dend) = 0; /** Call this method to finalize the output stream. Writes all @@ -694,7 +689,6 @@ */ class KCODECS_EXPORT Encoder { - protected: friend class Codec; friend class EncoderPrivate; @@ -721,8 +715,7 @@ @param dcursor is a pointer to the start of the output buffer. @param dend is a pointer to the end of the output buffer. */ - virtual bool encode(const char *&scursor, const char *const send, - char *&dcursor, const char *const dend) = 0; + virtual bool encode(const char *&scursor, const char *const send, char *&dcursor, const char *const dend) = 0; /** Call this method to finalize the output stream. Writes all remaining @@ -738,7 +731,7 @@ The maximum number of characters permitted in the output buffer. */ enum { - maxBufferedChars = 8 /**< Eight */ + maxBufferedChars = 8, /**< Eight */ }; /** diff -Nru kcodecs-5.79.0/src/kcodecsidentity.cpp kcodecs-5.80.0/src/kcodecsidentity.cpp --- kcodecs-5.79.0/src/kcodecsidentity.cpp 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/src/kcodecsidentity.cpp 2021-03-06 16:19:34.000000000 +0000 @@ -39,16 +39,16 @@ } public: - ~IdentityEnDecoder() {} + ~IdentityEnDecoder() + { + } - bool encode(const char *&scursor, const char *const send, - char *&dcursor, const char *const dend) override + bool encode(const char *&scursor, const char *const send, char *&dcursor, const char *const dend) override { return decode(scursor, send, dcursor, dend); } - bool decode(const char *&scursor, const char *const send, - char *&dcursor, const char *const dend) override; + bool decode(const char *&scursor, const char *const send, char *&dcursor, const char *const dend) override; bool finish(char *&dcursor, const char *const dend) override { @@ -72,8 +72,7 @@ /********************************************************/ /********************************************************/ -bool IdentityEnDecoder::decode(const char *&scursor, const char *const send, - char *&dcursor, const char *const dend) +bool IdentityEnDecoder::decode(const char *&scursor, const char *const send, char *&dcursor, const char *const dend) { const int size = qMin(send - scursor, dcursor - dend); if (size > 0) { diff -Nru kcodecs-5.79.0/src/kcodecsidentity.h kcodecs-5.80.0/src/kcodecsidentity.h --- kcodecs-5.79.0/src/kcodecsidentity.h 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/src/kcodecsidentity.h 2021-03-06 16:19:34.000000000 +0000 @@ -25,7 +25,6 @@ namespace KCodecs { - /** @brief A class representing the Identify @ref codec. @@ -38,15 +37,18 @@ */ IdentityCodec() : Codec() - {} + { + } /** Destroys the codec. */ - ~IdentityCodec() override {} + ~IdentityCodec() override + { + } - using Codec::encode; using Codec::decode; + using Codec::encode; /** @copydoc @@ -111,12 +113,15 @@ */ SevenBitCodec() : IdentityCodec() - {} + { + } /** Destroys the codec. */ - ~SevenBitCodec() override {} + ~SevenBitCodec() override + { + } /** @copydoc @@ -140,12 +145,15 @@ */ EightBitCodec() : IdentityCodec() - {} + { + } /** Destroys the codec. */ - ~EightBitCodec() override {} + ~EightBitCodec() override + { + } /** @copydoc @@ -169,12 +177,15 @@ */ BinaryCodec() : IdentityCodec() - {} + { + } /** Destroys the codec. */ - ~BinaryCodec() override {} + ~BinaryCodec() override + { + } /** @copydoc diff -Nru kcodecs-5.79.0/src/kcodecs_p.h kcodecs-5.80.0/src/kcodecs_p.h --- kcodecs-5.79.0/src/kcodecs_p.h 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/src/kcodecs_p.h 2021-03-06 16:19:34.000000000 +0000 @@ -11,7 +11,6 @@ namespace KCodecs { - class EncoderPrivate { public: @@ -21,13 +20,12 @@ An output buffer to simplify some codecs. Used with write() and flushOutputBuffer(). */ - char outputBuffer[ Encoder::maxBufferedChars ]; + char outputBuffer[Encoder::maxBufferedChars]; uchar outputBufferCursor; const Codec::NewlineType newline; }; - class DecoderPrivate { public: diff -Nru kcodecs-5.79.0/src/kcodecsqp.cpp kcodecs-5.80.0/src/kcodecsqp.cpp --- kcodecs-5.79.0/src/kcodecsqp.cpp 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/src/kcodecsqp.cpp 2021-03-06 16:19:34.000000000 +0000 @@ -27,14 +27,8 @@ namespace KCodecs { - // none except a-zA-Z0-9!*+-/ -const uchar eTextMap[16] = { - 0x00, 0x00, 0x00, 0x00, - 0x40, 0x35, 0xFF, 0xC0, - 0x7F, 0xFF, 0xFF, 0xE0, - 0x7F, 0xFF, 0xFF, 0xE0 -}; +const uchar eTextMap[16] = {0x00, 0x00, 0x00, 0x00, 0x40, 0x35, 0xFF, 0xC0, 0x7F, 0xFF, 0xFF, 0xE0, 0x7F, 0xFF, 0xFF, 0xE0}; // some helpful functions: @@ -91,15 +85,18 @@ char mInputBuffer[16]; uchar mCurrentLineLength; // 0..76 uchar mAccu; - uint mInputBufferReadCursor : 4; // 0..15 + uint mInputBufferReadCursor : 4; // 0..15 uint mInputBufferWriteCursor : 4; // 0..15 enum { - Never, AtBOL, Definitely - } mAccuNeedsEncoding : 2; - bool mSawLineEnd : 1; - bool mSawCR : 1; - bool mFinishing : 1; - bool mFinished : 1; + Never, + AtBOL, + Definitely, + } mAccuNeedsEncoding : 2; + bool mSawLineEnd : 1; + bool mSawCR : 1; + bool mFinishing : 1; + bool mFinished : 1; + protected: friend class QuotedPrintableCodec; QuotedPrintableEncoder(Codec::NewlineType newline = Codec::NewlineLF) @@ -113,7 +110,8 @@ , mSawCR(false) , mFinishing(false) , mFinished(false) - {} + { + } bool needsEncoding(uchar ch) { @@ -132,10 +130,11 @@ void createOutputBuffer(char *&dcursor, const char *const dend); public: - virtual ~QuotedPrintableEncoder() {} + virtual ~QuotedPrintableEncoder() + { + } - bool encode(const char *&scursor, const char *const send, - char *&dcursor, const char *const dend) override; + bool encode(const char *&scursor, const char *const send, char *&dcursor, const char *const dend) override; bool finish(char *&dcursor, const char *const dend) override; }; @@ -163,12 +162,12 @@ /** @p mLastChar holds the first char of an encoded char, so that we are able to keep the first char if the second char is invalid. */ char mLastChar; + protected: friend class QuotedPrintableCodec; friend class Rfc2047QEncodingCodec; friend class Rfc2231EncodingCodec; - QuotedPrintableDecoder(Codec::NewlineType newline = Codec::NewlineLF, - bool aQEncoding = false, char aEscapeChar = '=') + QuotedPrintableDecoder(Codec::NewlineType newline = Codec::NewlineLF, bool aQEncoding = false, char aEscapeChar = '=') : Decoder(newline) , mEscapeChar(aEscapeChar) , mBadChar(0) @@ -179,28 +178,29 @@ , mExpectLF(false) , mHaveAccu(false) , mLastChar(0) - {} + { + } public: - virtual ~QuotedPrintableDecoder() {} + virtual ~QuotedPrintableDecoder() + { + } - bool decode(const char *&scursor, const char *const send, - char *&dcursor, const char *const dend) override; + bool decode(const char *&scursor, const char *const send, char *&dcursor, const char *const dend) override; bool finish(char *&dcursor, const char *const dend) override; }; class Rfc2047QEncodingEncoder : public Encoder { - uchar mAccu; - uchar mStepNo; + uchar mAccu; + uchar mStepNo; const char mEscapeChar; - bool mInsideFinishing : 1; + bool mInsideFinishing : 1; protected: friend class Rfc2047QEncodingCodec; friend class Rfc2231EncodingCodec; - Rfc2047QEncodingEncoder(Codec::NewlineType newline = Codec::NewlineLF, - char aEscapeChar = '=') + Rfc2047QEncodingEncoder(Codec::NewlineType newline = Codec::NewlineLF, char aEscapeChar = '=') : Encoder(newline) , mAccu(0) , mStepNo(0) @@ -213,7 +213,7 @@ bool isEText(uchar ch) { - return (ch < 128) && (eTextMap[ ch / 8 ] & 0x80 >> ch % 8); + return (ch < 128) && (eTextMap[ch / 8] & 0x80 >> ch % 8); } // this code assumes that isEText( mEscapeChar ) == false! @@ -232,10 +232,11 @@ } public: - virtual ~Rfc2047QEncodingEncoder() {} + virtual ~Rfc2047QEncodingEncoder() + { + } - bool encode(const char *&scursor, const char *const send, - char *&dcursor, const char *const dend) override; + bool encode(const char *&scursor, const char *const send, char *&dcursor, const char *const dend) override; bool finish(char *&dcursor, const char *const dend) override; }; @@ -305,9 +306,7 @@ /********************************************************/ /********************************************************/ -bool QuotedPrintableDecoder::decode(const char *&scursor, - const char *const send, - char *&dcursor, const char *const dend) +bool QuotedPrintableDecoder::decode(const char *&scursor, const char *const send, char *&dcursor, const char *const dend) { if (d->newline == Codec::NewlineCRLF) { qWarning() << "CRLF output for decoders isn't yet supported!"; @@ -354,7 +353,7 @@ uchar value = 255; if (mExpectLF && ch != '\n') { - //qWarning() << "QuotedPrintableDecoder:" + // qWarning() << "QuotedPrintableDecoder:" // "illegally formed soft linebreak or lonely CR!"; mInsideHexChar = false; mExpectLF = false; @@ -381,7 +380,7 @@ } // else fall through default: - //qWarning() << "QuotedPrintableDecoder:" + // qWarning() << "QuotedPrintableDecoder:" // "illegally formed hex char! Outputting verbatim."; mBadChar = ch; mFlushing = true; @@ -437,7 +436,7 @@ } else if (ch == '\r') { mExpectLF = true; } else { - //qWarning() << "QuotedPrintableDecoder:" << ch << + // qWarning() << "QuotedPrintableDecoder:" << ch << // "illegal character in input stream!"; *dcursor++ = char(ch); } @@ -475,8 +474,7 @@ return !(mHaveAccu || mFlushing); } -bool QuotedPrintableEncoder::fillInputBuffer(const char *&scursor, - const char *const send) +bool QuotedPrintableEncoder::fillInputBuffer(const char *&scursor, const char *const send) { // Don't read more if there's still a tail of a line in the buffer: if (mSawLineEnd) { @@ -485,8 +483,7 @@ // Read until the buffer is full or we have found CRLF or LF (which // don't end up in the input buffer): - for (; (mInputBufferWriteCursor + 1) % 16 != mInputBufferReadCursor && - scursor != send ; mInputBufferWriteCursor++) { + for (; (mInputBufferWriteCursor + 1) % 16 != mInputBufferReadCursor && scursor != send; mInputBufferWriteCursor++) { char ch = *scursor++; if (ch == '\r') { mSawCR = true; @@ -503,7 +500,7 @@ } else { mSawCR = false; } - mInputBuffer[ mInputBufferWriteCursor ] = ch; + mInputBuffer[mInputBufferWriteCursor] = ch; } mSawLineEnd = false; return false; // didn't see a line ending... @@ -511,7 +508,6 @@ bool QuotedPrintableEncoder::processNextChar() { - // If we process a buffer which doesn't end in a line break, we // can't process all of it, since the next chars that will be read // could be a line break. So we empty the buffer only until a fixed @@ -521,16 +517,16 @@ assert(d->outputBufferCursor == 0); - int bufferFill = - int(mInputBufferWriteCursor) - int(mInputBufferReadCursor) ; + int bufferFill = int(mInputBufferWriteCursor) - int(mInputBufferReadCursor); if (bufferFill < 0) { bufferFill += 16; } assert(bufferFill >= 0 && bufferFill <= 15); - if (!mFinishing && !mSawLineEnd && - bufferFill < minBufferFillWithoutLineEnd) { + if (!mFinishing // + && !mSawLineEnd // + && bufferFill < minBufferFillWithoutLineEnd) { return false; } @@ -540,12 +536,12 @@ } // Real processing goes here: - mAccu = mInputBuffer[ mInputBufferReadCursor++ ]; - if (needsEncoding(mAccu)) { // always needs encoding or + mAccu = mInputBuffer[mInputBufferReadCursor++]; + if (needsEncoding(mAccu)) { // always needs encoding or mAccuNeedsEncoding = Definitely; - } else if ((mSawLineEnd || mFinishing) && // needs encoding at end of line - bufferFill == 1 && // or end of buffer - needsEncodingAtEOL(mAccu)) { + } else if ((mSawLineEnd || mFinishing) // needs encoding at end of line + && bufferFill == 1 // or end of buffer + && needsEncodingAtEOL(mAccu)) { mAccuNeedsEncoding = Definitely; } else if (needsEncodingAtBOL(mAccu)) { mAccuNeedsEncoding = AtBOL; @@ -561,15 +557,16 @@ // line breaks as necessary. Depends on processNextChar's directions // on whether or not to encode the current char, and whether or not // the current char is the last one in it's input line: -void QuotedPrintableEncoder::createOutputBuffer(char *&dcursor, - const char *const dend) +void QuotedPrintableEncoder::createOutputBuffer(char *&dcursor, const char *const dend) { const int maxLineLength = 76; // rfc 2045 assert(d->outputBufferCursor == 0); + /* clang-format off */ bool lastOneOnThisLine = mSawLineEnd && mInputBufferReadCursor == mInputBufferWriteCursor; + /* clang-format on */ int neededSpace = 1; if (mAccuNeedsEncoding == Definitely) { @@ -588,8 +585,8 @@ mCurrentLineLength = 0; } - if (Never == mAccuNeedsEncoding || - (AtBOL == mAccuNeedsEncoding && mCurrentLineLength != 0)) { + if (Never == mAccuNeedsEncoding // + || (AtBOL == mAccuNeedsEncoding && mCurrentLineLength != 0)) { write(mAccu, dcursor, dend); mCurrentLineLength++; } else { @@ -600,9 +597,7 @@ } } -bool QuotedPrintableEncoder::encode(const char *&scursor, - const char *const send, - char *&dcursor, const char *const dend) +bool QuotedPrintableEncoder::encode(const char *&scursor, const char *const send, char *&dcursor, const char *const dend) { // support probing by the caller: if (mFinishing) { @@ -623,8 +618,7 @@ if (processNextChar()) { // there was one... createOutputBuffer(dcursor, dend); - } else if (mSawLineEnd && - mInputBufferWriteCursor == mInputBufferReadCursor) { + } else if (mSawLineEnd && mInputBufferWriteCursor == mInputBufferReadCursor) { // load a hard line break into output buffer: writeCRLF(dcursor, dend); // signal fillInputBuffer() we are ready for the next line: @@ -664,8 +658,7 @@ if (processNextChar()) { // there was one... createOutputBuffer(dcursor, dend); - } else if (mSawLineEnd && - mInputBufferWriteCursor == mInputBufferReadCursor) { + } else if (mSawLineEnd && mInputBufferWriteCursor == mInputBufferReadCursor) { // load a hard line break into output buffer: writeCRLF(dcursor, dend); mSawLineEnd = false; @@ -680,9 +673,7 @@ } // finish -bool Rfc2047QEncodingEncoder::encode(const char *&scursor, - const char *const send, - char *&dcursor, const char *const dend) +bool Rfc2047QEncodingEncoder::encode(const char *&scursor, const char *const send, char *&dcursor, const char *const dend) { if (mInsideFinishing) { return true; @@ -716,7 +707,8 @@ value = lowNibble(mAccu); mStepNo = 0; break; - default: assert(0); + default: + assert(0); } // and write: @@ -726,7 +718,6 @@ return scursor == send; } // encode - bool Rfc2047QEncodingEncoder::finish(char *&dcursor, const char *const dend) { mInsideFinishing = true; @@ -745,7 +736,8 @@ value = lowNibble(mAccu); mStepNo = 0; break; - default: assert(0); + default: + assert(0); } // and write: diff -Nru kcodecs-5.79.0/src/kcodecsqp.h kcodecs-5.80.0/src/kcodecsqp.h --- kcodecs-5.79.0/src/kcodecsqp.h 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/src/kcodecsqp.h 2021-03-06 16:19:34.000000000 +0000 @@ -34,7 +34,6 @@ namespace KCodecs { - /** @brief A class representing the @ref codec for @ref QuotedPrintable as specified in @@ -48,12 +47,15 @@ */ QuotedPrintableCodec() : Codec() - {} + { + } /** Destroys the codec. */ - ~QuotedPrintableCodec() override {} + ~QuotedPrintableCodec() override + { + } /** @copydoc @@ -110,12 +112,15 @@ */ Rfc2047QEncodingCodec() : Codec() - {} + { + } /** Destroys the codec. */ - ~Rfc2047QEncodingCodec() override {} + ~Rfc2047QEncodingCodec() override + { + } /** @copydoc @@ -169,12 +174,15 @@ */ Rfc2231EncodingCodec() : Codec() - {} + { + } /** Destroys the codec. */ - ~Rfc2231EncodingCodec() override {} + ~Rfc2231EncodingCodec() override + { + } /** @copydoc diff -Nru kcodecs-5.79.0/src/kcodecsuuencode.cpp kcodecs-5.80.0/src/kcodecsuuencode.cpp --- kcodecs-5.79.0/src/kcodecsuuencode.cpp 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/src/kcodecsuuencode.cpp 2021-03-06 16:19:34.000000000 +0000 @@ -24,7 +24,6 @@ namespace KCodecs { - class UUDecoder : public Decoder { uint mStepNo; @@ -32,10 +31,10 @@ uchar mCurrentOctetCount; // (on current line) uchar mOutbits; bool mLastWasCRLF : 1; - bool mSawBegin : 1; // whether we already saw ^begin... + bool mSawBegin : 1; // whether we already saw ^begin... uint mIntoBeginLine : 3; // count #chars we compared against "begin" 0..5 - bool mSawEnd : 1; // whether we already saw ^end... - uint mIntoEndLine : 2; // count #chars we compared against "end" 0..3 + bool mSawEnd : 1; // whether we already saw ^end... + uint mIntoEndLine : 2; // count #chars we compared against "end" 0..3 void searchForBegin(const char *&scursor, const char *const send); @@ -52,13 +51,15 @@ , mIntoBeginLine(0) , mSawEnd(false) , mIntoEndLine(0) - {} + { + } public: - virtual ~UUDecoder() {} + virtual ~UUDecoder() + { + } - bool decode(const char *&scursor, const char *const send, - char *&dcursor, const char *const dend) override; + bool decode(const char *&scursor, const char *const send, char *&dcursor, const char *const dend) override; // ### really needs no finishing??? bool finish(char *&dcursor, const char *const dend) override { @@ -108,23 +109,21 @@ } else if (mSawBegin) { // OK, skip stuff until the next \n } else { - //qWarning() << "UUDecoder: garbage before \"begin\", resetting parser"; + // qWarning() << "UUDecoder: garbage before \"begin\", resetting parser"; mIntoBeginLine = 0; } } - } // uuencoding just shifts all 6-bit octets by 32 (SP/' '), except NUL, // which gets mapped to 0x60 static inline uchar uuDecode(uchar c) { - return (c - ' ') // undo shift and - & 0x3F; // map 0x40 (0x60-' ') to 0... + return (c - ' ') // undo shift and + & 0x3F; // map 0x40 (0x60-' ') to 0... } -bool UUDecoder::decode(const char *&scursor, const char *const send, - char *&dcursor, const char *const dend) +bool UUDecoder::decode(const char *&scursor, const char *const send, char *&dcursor, const char *const dend) { // First, check whether we still need to find the "begin" line: if (!mSawBegin || mIntoBeginLine != 0) { @@ -153,7 +152,7 @@ } continue; } else { - //qWarning() << "UUDecoder: invalid line octet count looks like \"end\" (mIntoEndLine =" + // qWarning() << "UUDecoder: invalid line octet count looks like \"end\" (mIntoEndLine =" // << mIntoEndLine << ")!"; mIntoEndLine = 0; // fall through... @@ -170,7 +169,7 @@ mCurrentOctetCount = 0; // try to decode the chars-on-this-line announcement: - if (ch == 'e') { // maybe the beginning of the "end"? ;-) + if (ch == 'e') { // maybe the beginning of the "end"? ;-) mIntoEndLine = 1; } else if (ch > 0x60) { // ### invalid line length char: what shall we do?? @@ -188,7 +187,7 @@ continue; // invalid char } else if (ch > ' ') { value = uuDecode(ch); - } else if (ch == '\n') { // line end + } else if (ch == '\n') { // line end mLastWasCRLF = true; continue; } else { @@ -232,7 +231,6 @@ // << "UUDecoder: mismatch between announced (" // << mAnnouncedOctetCount << ") and actual line octet count!"; } - } // return false when caller should call us again: diff -Nru kcodecs-5.79.0/src/kcodecsuuencode.h kcodecs-5.80.0/src/kcodecsuuencode.h --- kcodecs-5.79.0/src/kcodecsuuencode.h 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/src/kcodecsuuencode.h 2021-03-06 16:19:34.000000000 +0000 @@ -25,7 +25,6 @@ namespace KCodecs { - /** @brief A class representing the @ref UUEncode @ref codec. @@ -38,12 +37,15 @@ */ UUCodec() : Codec() - {} + { + } /** Destroys the codec. */ - ~UUCodec() override {} + ~UUCodec() override + { + } /** @copydoc diff -Nru kcodecs-5.79.0/src/kemailaddress.cpp kcodecs-5.80.0/src/kemailaddress.cpp --- kcodecs-5.79.0/src/kemailaddress.cpp 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/src/kemailaddress.cpp 2021-03-06 16:19:34.000000000 +0000 @@ -38,17 +38,17 @@ // the following conversion to latin1 is o.k. because // we can safely ignore all non-latin1 characters switch (aStr[index].toLatin1()) { - case '"' : // start or end of quoted string + case '"': // start or end of quoted string if (commentlevel == 0) { insidequote = !insidequote; } break; - case '(' : // start of comment + case '(': // start of comment if (!insidequote) { ++commentlevel; } break; - case ')' : // end of comment + case ')': // end of comment if (!insidequote) { if (commentlevel > 0) { --commentlevel; @@ -57,11 +57,11 @@ } } break; - case '\\' : // quoted character + case '\\': // quoted character index++; // ignore the quoted character break; - case ',' : - case ';' : + case ',': + case ';': if (!insidequote && (commentlevel == 0)) { addr = aStr.mid(addrstart, index - addrstart); if (!addr.isEmpty()) { @@ -85,11 +85,8 @@ //----------------------------------------------------------------------------- // Used by KEmailAddress::splitAddress(...) and KEmailAddress::firstEmailAddress(...). -KEmailAddress::EmailParseResult splitAddressInternal(const QByteArray &address, - QByteArray &displayName, - QByteArray &addrSpec, - QByteArray &comment, - bool allowMultipleAddresses) +KEmailAddress::EmailParseResult +splitAddressInternal(const QByteArray &address, QByteArray &displayName, QByteArray &addrSpec, QByteArray &comment, bool allowMultipleAddresses) { // qCDebug(KCODECS_LOG) << "address"; displayName = ""; @@ -107,7 +104,7 @@ enum { TopLevel, InComment, - InAngleAddress + InAngleAddress, } context = TopLevel; bool inQuotedString = false; int commentLevel = 0; @@ -115,13 +112,13 @@ for (const char *p = address.data(); *p && !stop; ++p) { switch (context) { - case TopLevel : { + case TopLevel: { switch (*p) { - case '"' : + case '"': inQuotedString = !inQuotedString; displayName += *p; break; - case '(' : + case '(': if (!inQuotedString) { context = InComment; commentLevel = 1; @@ -129,14 +126,14 @@ displayName += *p; } break; - case '<' : + case '<': if (!inQuotedString) { context = InAngleAddress; } else { displayName += *p; } break; - case '\\' : // quoted character + case '\\': // quoted character displayName += *p; ++p; // skip the '\' if (*p) { @@ -145,7 +142,7 @@ return UnexpectedEnd; } break; - case ',' : + case ',': if (!inQuotedString) { if (allowMultipleAddresses) { stop = true; @@ -156,18 +153,18 @@ displayName += *p; } break; - default : + default: displayName += *p; } break; } - case InComment : { + case InComment: { switch (*p) { - case '(' : + case '(': ++commentLevel; comment += *p; break; - case ')' : + case ')': --commentLevel; if (commentLevel == 0) { context = TopLevel; @@ -176,7 +173,7 @@ comment += *p; } break; - case '\\' : // quoted character + case '\\': // quoted character comment += *p; ++p; // skip the '\' if (*p) { @@ -185,25 +182,25 @@ return UnexpectedEnd; } break; - default : + default: comment += *p; } break; } - case InAngleAddress : { + case InAngleAddress: { switch (*p) { - case '"' : + case '"': inQuotedString = !inQuotedString; addrSpec += *p; break; - case '>' : + case '>': if (!inQuotedString) { context = TopLevel; } else { addrSpec += *p; } break; - case '\\' : // quoted character + case '\\': // quoted character addrSpec += *p; ++p; // skip the '\' if (*p) { @@ -212,7 +209,7 @@ return UnexpectedEnd; } break; - default : + default: addrSpec += *p; } break; @@ -251,20 +248,13 @@ } //----------------------------------------------------------------------------- -EmailParseResult KEmailAddress::splitAddress(const QByteArray &address, - QByteArray &displayName, - QByteArray &addrSpec, - QByteArray &comment) +EmailParseResult KEmailAddress::splitAddress(const QByteArray &address, QByteArray &displayName, QByteArray &addrSpec, QByteArray &comment) { - return splitAddressInternal(address, displayName, addrSpec, comment, - false/* don't allow multiple addresses */); + return splitAddressInternal(address, displayName, addrSpec, comment, false /* don't allow multiple addresses */); } //----------------------------------------------------------------------------- -EmailParseResult KEmailAddress::splitAddress(const QString &address, - QString &displayName, - QString &addrSpec, - QString &comment) +EmailParseResult KEmailAddress::splitAddress(const QString &address, QString &displayName, QString &addrSpec, QString &comment) { QByteArray d, a, c; // FIXME: toUtf8() is probably not safe here, what if the second byte of a multi-byte character @@ -311,7 +301,7 @@ enum { TopLevel, InComment, - InAngleAddress + InAngleAddress, } context = TopLevel; bool inQuotedString = false; int commentLevel = 0; @@ -320,61 +310,61 @@ for (unsigned int index = 0; index < strlen; index++) { switch (context) { - case TopLevel : { + case TopLevel: { switch (aStr[index].toLatin1()) { - case '"' : + case '"': inQuotedString = !inQuotedString; break; - case '(' : + case '(': if (!inQuotedString) { context = InComment; commentLevel = 1; } break; - case '[' : + case '[': if (!inQuotedString) { return InvalidDisplayName; } break; - case ']' : + case ']': if (!inQuotedString) { return InvalidDisplayName; } break; - case ':' : + case ':': if (!inQuotedString) { return DisallowedChar; } break; - case '<' : + case '<': if (!inQuotedString) { context = InAngleAddress; } break; - case '\\' : // quoted character + case '\\': // quoted character ++index; // skip the '\' if ((index + 1) > strlen) { return UnexpectedEnd; } break; - case ',' : + case ',': if (!inQuotedString) { return UnexpectedComma; } break; - case ')' : + case ')': if (!inQuotedString) { return UnbalancedParens; } break; - case '>' : + case '>': if (!inQuotedString) { return UnopenedAngleAddr; } break; - case '@' : + case '@': if (!inQuotedString) { - if (index == 0) { // Missing local part + if (index == 0) { // Missing local part return MissingLocalPart; } else if (index == strlen - 1) { return MissingDomainPart; @@ -386,7 +376,7 @@ } } break; - case '.' : + case '.': if (inQuotedString) { --dotCount; } @@ -394,18 +384,18 @@ } break; } - case InComment : { + case InComment: { switch (aStr[index].toLatin1()) { - case '(' : + case '(': ++commentLevel; break; - case ')' : + case ')': --commentLevel; if (commentLevel == 0) { context = TopLevel; } break; - case '\\' : // quoted character + case '\\': // quoted character ++index; // skip the '\' if ((index + 1) > strlen) { return UnexpectedEnd; @@ -415,17 +405,17 @@ break; } - case InAngleAddress : { + case InAngleAddress: { switch (aStr[index].toLatin1()) { - case ',' : + case ',': if (!inQuotedString) { return UnexpectedComma; } break; - case '"' : + case '"': inQuotedString = !inQuotedString; break; - case '@' : + case '@': if (inQuotedString) { --atCount; } @@ -433,18 +423,18 @@ tooManyAtsFlag = false; } break; - case '.' : + case '.': if (inQuotedString) { --dotCount; } break; - case '>' : + case '>': if (!inQuotedString) { context = TopLevel; break; } break; - case '\\' : // quoted character + case '\\': // quoted character ++index; // skip the '\' if ((index + 1) > strlen) { return UnexpectedEnd; @@ -484,8 +474,7 @@ } //----------------------------------------------------------------------------- -KEmailAddress::EmailParseResult KEmailAddress::isValidAddressList(const QString &aStr, - QString &badAddr) +KEmailAddress::EmailParseResult KEmailAddress::isValidAddressList(const QString &aStr, QString &badAddr) { if (aStr.isEmpty()) { return AddressEmpty; @@ -510,62 +499,75 @@ QString KEmailAddress::emailParseResultToString(EmailParseResult errorCode) { switch (errorCode) { - case TooManyAts : - return QObject::tr("The email address you entered is not valid because it " - "contains more than one @.\n" - "You will not create valid messages if you do not " - "change your address."); - case TooFewAts : - return QObject::tr("The email address you entered is not valid because it " - "does not contain a @.\n" - "You will not create valid messages if you do not " - "change your address."); - case AddressEmpty : + case TooManyAts: + return QObject::tr( + "The email address you entered is not valid because it " + "contains more than one @.\n" + "You will not create valid messages if you do not " + "change your address."); + case TooFewAts: + return QObject::tr( + "The email address you entered is not valid because it " + "does not contain a @.\n" + "You will not create valid messages if you do not " + "change your address."); + case AddressEmpty: return QObject::tr("You have to enter something in the email address field."); - case MissingLocalPart : - return QObject::tr("The email address you entered is not valid because it " - "does not contain a local part."); - case MissingDomainPart : - return QObject::tr("The email address you entered is not valid because it " - "does not contain a domain part."); - case UnbalancedParens : - return QObject::tr("The email address you entered is not valid because it " - "contains unclosed comments/brackets."); - case AddressOk : + case MissingLocalPart: + return QObject::tr( + "The email address you entered is not valid because it " + "does not contain a local part."); + case MissingDomainPart: + return QObject::tr( + "The email address you entered is not valid because it " + "does not contain a domain part."); + case UnbalancedParens: + return QObject::tr( + "The email address you entered is not valid because it " + "contains unclosed comments/brackets."); + case AddressOk: return QObject::tr("The email address you entered is valid."); - case UnclosedAngleAddr : - return QObject::tr("The email address you entered is not valid because it " - "contains an unclosed angle bracket."); - case UnopenedAngleAddr : - return QObject::tr("The email address you entered is not valid because it " - "contains too many closing angle brackets."); - case UnexpectedComma : - return QObject::tr("The email address you have entered is not valid because it " - "contains an unexpected comma."); - case UnexpectedEnd : - return QObject::tr("The email address you entered is not valid because it ended " - "unexpectedly.\nThis probably means you have used an escaping " - "type character like a '\\' as the last character in your " - "email address."); - case UnbalancedQuote : - return QObject::tr("The email address you entered is not valid because it " - "contains quoted text which does not end."); - case NoAddressSpec : - return QObject::tr("The email address you entered is not valid because it " - "does not seem to contain an actual email address, i.e. " - "something of the form joe@example.org."); - case DisallowedChar : - return QObject::tr("The email address you entered is not valid because it " - "contains an illegal character."); - case InvalidDisplayName : - return QObject::tr("The email address you have entered is not valid because it " - "contains an invalid display name."); - case TooFewDots : - return QObject::tr("The email address you entered is not valid because it " - "does not contain a \'.\'.\n" - "You will not create valid messages if you do not " - "change your address."); - + case UnclosedAngleAddr: + return QObject::tr( + "The email address you entered is not valid because it " + "contains an unclosed angle bracket."); + case UnopenedAngleAddr: + return QObject::tr( + "The email address you entered is not valid because it " + "contains too many closing angle brackets."); + case UnexpectedComma: + return QObject::tr( + "The email address you have entered is not valid because it " + "contains an unexpected comma."); + case UnexpectedEnd: + return QObject::tr( + "The email address you entered is not valid because it ended " + "unexpectedly.\nThis probably means you have used an escaping " + "type character like a '\\' as the last character in your " + "email address."); + case UnbalancedQuote: + return QObject::tr( + "The email address you entered is not valid because it " + "contains quoted text which does not end."); + case NoAddressSpec: + return QObject::tr( + "The email address you entered is not valid because it " + "does not seem to contain an actual email address, i.e. " + "something of the form joe@example.org."); + case DisallowedChar: + return QObject::tr( + "The email address you entered is not valid because it " + "contains an illegal character."); + case InvalidDisplayName: + return QObject::tr( + "The email address you have entered is not valid because it " + "contains an invalid display name."); + case TooFewDots: + return QObject::tr( + "The email address you entered is not valid because it " + "does not contain a \'.\'.\n" + "You will not create valid messages if you do not " + "change your address."); } return QObject::tr("Unknown problem with email address"); } @@ -595,11 +597,11 @@ unsigned int strlen = localPart.length(); for (unsigned int index = 0; index < strlen; index++) { - switch (localPart[ index ].toLatin1()) { - case '"' : + switch (localPart[index].toLatin1()) { + case '"': inQuotedString = !inQuotedString; break; - case '@' : + case '@': if (inQuotedString) { --atCount; } @@ -609,28 +611,28 @@ QString addrRx; - if (localPart[ 0 ] == QLatin1Char('\"') || localPart[ localPart.length() - 1 ] == QLatin1Char('\"')) { + if (localPart[0] == QLatin1Char('\"') || localPart[localPart.length() - 1] == QLatin1Char('\"')) { addrRx = QStringLiteral("\"[a-zA-Z@]*[\\w.@-]*[a-zA-Z0-9@]\"@"); } else { addrRx = QStringLiteral("[a-zA-Z]*[~|{}`\\^?=/+*'&%$#!_\\w.-]*[~|{}`\\^?=/+*'&%$#!_a-zA-Z0-9-]@"); } - if (domainPart[ 0 ] == QLatin1Char('[') || domainPart[ domainPart.length() - 1 ] == QLatin1Char(']')) { + if (domainPart[0] == QLatin1Char('[') || domainPart[domainPart.length() - 1] == QLatin1Char(']')) { addrRx += QStringLiteral("\\[[0-9]{1,3}(\\.[0-9]{1,3}){3}\\]"); } else { addrRx += QStringLiteral("[\\w#-]+(\\.[\\w#-]+)*"); } - const QRegularExpression rx(QRegularExpression::anchoredPattern(addrRx), - QRegularExpression::UseUnicodePropertiesOption); - return rx.match(aStr).hasMatch(); + const QRegularExpression rx(QRegularExpression::anchoredPattern(addrRx), QRegularExpression::UseUnicodePropertiesOption); + return rx.match(aStr).hasMatch(); } //----------------------------------------------------------------------------- QString KEmailAddress::simpleEmailAddressErrorMsg() { - return QObject::tr("The email address you entered is not valid.\nIt " - "does not seem to contain an actual email address, i.e. " - "something of the form joe@example.org."); + return QObject::tr( + "The email address you entered is not valid.\nIt " + "does not seem to contain an actual email address, i.e. " + "something of the form joe@example.org."); } //----------------------------------------------------------------------------- @@ -643,15 +645,12 @@ QByteArray KEmailAddress::extractEmailAddress(const QByteArray &address, QString &errorMessage) { QByteArray dummy1, dummy2, addrSpec; - const EmailParseResult result = - splitAddressInternal(address, dummy1, addrSpec, dummy2, - false/* don't allow multiple addresses */); + const EmailParseResult result = splitAddressInternal(address, dummy1, addrSpec, dummy2, false /* don't allow multiple addresses */); if (result != AddressOk) { addrSpec = QByteArray(); if (result != AddressEmpty) { errorMessage = emailParseResultToString(result); - qCDebug(KCODECS_LOG) << "Input:" << address << "\nError:" - << errorMessage; + qCDebug(KCODECS_LOG) << "Input:" << address << "\nError:" << errorMessage; } } else { errorMessage.clear(); @@ -682,16 +681,12 @@ QByteArray KEmailAddress::firstEmailAddress(const QByteArray &addresses, QString &errorMessage) { QByteArray dummy1, dummy2, addrSpec; - const EmailParseResult result = - splitAddressInternal(addresses, dummy1, addrSpec, dummy2, - true/* allow multiple addresses */); + const EmailParseResult result = splitAddressInternal(addresses, dummy1, addrSpec, dummy2, true /* allow multiple addresses */); if (result != AddressOk) { addrSpec = QByteArray(); if (result != AddressEmpty) { - errorMessage = emailParseResultToString(result); - qCDebug(KCODECS_LOG) << "Input: aStr\nError:" - << errorMessage; + qCDebug(KCODECS_LOG) << "Input: aStr\nError:" << errorMessage; } } else { errorMessage.clear(); @@ -713,8 +708,7 @@ } //----------------------------------------------------------------------------- -bool KEmailAddress::extractEmailAddressAndName(const QString &aStr, - QString &mail, QString &name) +bool KEmailAddress::extractEmailAddressAndName(const QString &aStr, QString &mail, QString &name) { name.clear(); mail.clear(); @@ -784,7 +778,7 @@ } bInComment = false; } else { - name.prepend(c); // all comment stuff is part of the name + name.prepend(c); // all comment stuff is part of the name } } else if (bInQuotesOutsideOfEmail) { if (QLatin1Char(cQuotes) == c) { @@ -850,14 +844,14 @@ } } else { // nested ")", add it - name.append(QLatin1Char(')')); // name can't be empty here + name.append(QLatin1Char(')')); // name can't be empty here } } else { if (QLatin1Char('(') == c) { // nested "(" ++parenthesesNesting; } - name.append(c); // all comment stuff is part of the name + name.append(c); // all comment stuff is part of the name } } else if (bInQuotesOutsideOfEmail) { if (QLatin1Char(cQuotes) == c) { @@ -907,16 +901,14 @@ } //----------------------------------------------------------------------------- -bool KEmailAddress::compareEmail(const QString &email1, const QString &email2, - bool matchName) +bool KEmailAddress::compareEmail(const QString &email1, const QString &email2, bool matchName) { QString e1Name, e1Email, e2Name, e2Email; extractEmailAddressAndName(email1, e1Email, e1Name); extractEmailAddressAndName(email2, e2Email, e2Name); - return e1Email == e2Email && - (!matchName || (e1Name == e2Name)); + return e1Email == e2Email && (!matchName || (e1Name == e2Name)); } //----------------------------------------------------------------------------- @@ -935,9 +927,7 @@ return result; } -QString KEmailAddress::normalizedAddress(const QString &displayName, - const QString &addrSpec, - const QString &comment) +QString KEmailAddress::normalizedAddress(const QString &displayName, const QString &addrSpec, const QString &comment) { const QString realDisplayName = removeBidiControlChars(displayName); if (realDisplayName.isEmpty() && comment.isEmpty()) { @@ -1000,20 +990,14 @@ QByteArray displayName, addrSpec, comment; - for (QStringList::ConstIterator it = addressList.begin(); - (it != addressList.end()); - ++it) { + for (QStringList::ConstIterator it = addressList.begin(); (it != addressList.end()); ++it) { if (!(*it).isEmpty()) { - if (splitAddress((*it).toUtf8(), - displayName, addrSpec, comment) == AddressOk) { + if (splitAddress((*it).toUtf8(), displayName, addrSpec, comment) == AddressOk) { QByteArray cs; displayName = KCodecs::decodeRFC2047String(displayName, &cs).toUtf8(); comment = KCodecs::decodeRFC2047String(comment, &cs).toUtf8(); - normalizedAddressList - << normalizedAddress(QString::fromUtf8(displayName), - fromIdn(QString::fromUtf8(addrSpec)), - QString::fromUtf8(comment)); + normalizedAddressList << normalizedAddress(QString::fromUtf8(displayName), fromIdn(QString::fromUtf8(addrSpec)), QString::fromUtf8(comment)); } } } @@ -1028,7 +1012,7 @@ //----------------------------------------------------------------------------- QString KEmailAddress::normalizeAddressesAndEncodeIdn(const QString &str) { - //qCDebug(KCODECS_LOG) << str; + // qCDebug(KCODECS_LOG) << str; if (str.isEmpty()) { return str; } @@ -1038,16 +1022,10 @@ QByteArray displayName, addrSpec, comment; - for (QStringList::ConstIterator it = addressList.begin(); - (it != addressList.end()); - ++it) { + for (QStringList::ConstIterator it = addressList.begin(); (it != addressList.end()); ++it) { if (!(*it).isEmpty()) { - if (splitAddress((*it).toUtf8(), - displayName, addrSpec, comment) == AddressOk) { - - normalizedAddressList << normalizedAddress(QString::fromUtf8(displayName), - toIdn(QString::fromUtf8(addrSpec)), - QString::fromUtf8(comment)); + if (splitAddress((*it).toUtf8(), displayName, addrSpec, comment) == AddressOk) { + normalizedAddressList << normalizedAddress(QString::fromUtf8(displayName), toIdn(QString::fromUtf8(addrSpec)), QString::fromUtf8(comment)); } } } @@ -1074,18 +1052,18 @@ unsigned int len = 0; for (int i = 0, total = str.length(); i < total; ++i, ++len) { const QChar &c = str[i]; - if (c == QLatin1Char('"')) { // unescaped doublequote + if (c == QLatin1Char('"')) { // unescaped doublequote escaped.append(QLatin1Char('\\')); ++len; - } else if (c == QLatin1Char('\\')) { // escaped character + } else if (c == QLatin1Char('\\')) { // escaped character escaped.append(QLatin1Char('\\')); ++len; ++i; - if (i >= str.length()) { // handle trailing '\' gracefully + if (i >= str.length()) { // handle trailing '\' gracefully break; } } - //Keep str[i] as we increase i previously + // Keep str[i] as we increase i previously escaped.append(str[i]); } escaped.truncate(len); diff -Nru kcodecs-5.79.0/src/kemailaddress.h kcodecs-5.80.0/src/kemailaddress.h --- kcodecs-5.79.0/src/kemailaddress.h 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/src/kemailaddress.h 2021-03-06 16:19:34.000000000 +0000 @@ -18,8 +18,8 @@ #include -#include #include +#include #include @@ -28,7 +28,6 @@ */ namespace KEmailAddress { - /** @defgroup emailvalidation Email Validation Functions @@ -49,22 +48,22 @@ and isValidSimpleAddress(). */ enum EmailParseResult { - AddressOk, /**< Email is valid */ - AddressEmpty, /**< The address is empty */ - UnexpectedEnd, /**< Something is unbalanced */ - UnbalancedParens, /**< Unbalanced ( ) */ - MissingDomainPart, /**< No domain in address */ - UnclosedAngleAddr, /**< \< with no matching \> */ - UnopenedAngleAddr, /**< \> with no preceding \< */ - TooManyAts, /**< More than one \@ in address */ - UnexpectedComma, /**< Comma not allowed here */ - TooFewAts, /**< Missing \@ in address */ - MissingLocalPart, /**< No address specified, only domain */ - UnbalancedQuote, /**< Quotes (single or double) not matched */ + AddressOk, /**< Email is valid */ + AddressEmpty, /**< The address is empty */ + UnexpectedEnd, /**< Something is unbalanced */ + UnbalancedParens, /**< Unbalanced ( ) */ + MissingDomainPart, /**< No domain in address */ + UnclosedAngleAddr, /**< \< with no matching \> */ + UnopenedAngleAddr, /**< \> with no preceding \< */ + TooManyAts, /**< More than one \@ in address */ + UnexpectedComma, /**< Comma not allowed here */ + TooFewAts, /**< Missing \@ in address */ + MissingLocalPart, /**< No address specified, only domain */ + UnbalancedQuote, /**< Quotes (single or double) not matched */ NoAddressSpec, - DisallowedChar, /**< An invalid character detected in address */ - InvalidDisplayName, /**< An invalid displayname detected in address */ - TooFewDots /**< Missing \. in address */ + DisallowedChar, /**< An invalid character detected in address */ + InvalidDisplayName, /**< An invalid displayname detected in address */ + TooFewDots, /**< Missing \. in address */ }; /** Split a comma separated list of email addresses. @@ -97,10 +96,7 @@ appropriate error code is returned. */ KCODECS_EXPORT -EmailParseResult splitAddress(const QByteArray &address, - QByteArray &displayName, - QByteArray &addrSpec, - QByteArray &comment); +EmailParseResult splitAddress(const QByteArray &address, QByteArray &displayName, QByteArray &addrSpec, QByteArray &comment); /** This is an overloaded member function, provided for convenience. @@ -126,10 +122,7 @@ appropriate error code is returned. */ KCODECS_EXPORT -EmailParseResult splitAddress(const QString &address, - QString &displayName, - QString &addrSpec, - QString &comment); +EmailParseResult splitAddress(const QString &address, QString &displayName, QString &addrSpec, QString &comment); /** Validates an email address in the form of "Joe User" . @@ -155,8 +148,7 @@ appropriate error code is returned. */ KCODECS_EXPORT -EmailParseResult isValidAddressList(const QString &aStr, - QString &badAddr); +EmailParseResult isValidAddressList(const QString &aStr, QString &badAddr); /** Translate the enum errorcodes from emailParseResult @@ -320,7 +312,6 @@ KCODECS_EXPORT QString firstEmailAddress(const QString &addresses, QString &errorMessage); - /** Return email address and name from string. Examples: @@ -340,8 +331,7 @@ @return true if both name and email address are not empty */ KCODECS_EXPORT -bool extractEmailAddressAndName(const QString &aStr, QString &mail, - QString &name); +bool extractEmailAddressAndName(const QString &aStr, QString &mail, QString &name); /** Compare two email addresses. If matchName is false, it just checks @@ -355,8 +345,7 @@ @return true if the comparison matches true in all other cases */ KCODECS_EXPORT -bool compareEmail(const QString &email1, const QString &email2, - bool matchName); +bool compareEmail(const QString &email1, const QString &email2, bool matchName); /** Returns a normalized address built from the given parts. The normalized @@ -373,9 +362,7 @@ @return a normalized address built from the given parts */ KCODECS_EXPORT -QString normalizedAddress(const QString &displayName, - const QString &addrSpec, - const QString &comment = QString()); +QString normalizedAddress(const QString &displayName, const QString &addrSpec, const QString &comment = QString()); /** @} */ @@ -434,19 +421,19 @@ QString quoteNameIfNecessary(const QString &str); /** - * Creates a valid mailto: URL from the given mailbox. - * @param mailbox The mailbox, which means the display name and the address specification, for - * example "Thomas McGuire" . The display name is optional. - * @return a valid mailto: URL for the given mailbox. - */ + * Creates a valid mailto: URL from the given mailbox. + * @param mailbox The mailbox, which means the display name and the address specification, for + * example "Thomas McGuire" . The display name is optional. + * @return a valid mailto: URL for the given mailbox. + */ KCODECS_EXPORT QUrl encodeMailtoUrl(const QString &mailbox); /** - * Extracts the mailbox out of the mailto: URL. - * @param mailtoUrl the URL with the mailto protocol, which contains the mailbox to be extracted - * @return the mailbox, which means the display name and the address specification. - */ + * Extracts the mailbox out of the mailto: URL. + * @param mailtoUrl the URL with the mailto protocol, which contains the mailbox to be extracted + * @return the mailbox, which means the display name and the address specification. + */ KCODECS_EXPORT QString decodeMailtoUrl(const QUrl &mailtoUrl); diff -Nru kcodecs-5.79.0/src/kencodingprober.cpp kcodecs-5.80.0/src/kencodingprober.cpp --- kcodecs-5.79.0/src/kencodingprober.cpp 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/src/kencodingprober.cpp 2021-03-06 16:19:34.000000000 +0000 @@ -8,20 +8,24 @@ #include "kencodingprober.h" -#include "probers/nsCharSetProber.h" -#include "probers/nsUniversalDetector.h" #include "probers/ChineseGroupProber.h" #include "probers/JapaneseGroupProber.h" #include "probers/UnicodeGroupProber.h" -#include "probers/nsSBCSGroupProber.h" +#include "probers/nsCharSetProber.h" #include "probers/nsMBCSGroupProber.h" +#include "probers/nsSBCSGroupProber.h" +#include "probers/nsUniversalDetector.h" #include class KEncodingProberPrivate { public: - KEncodingProberPrivate(): prober(nullptr), mStart(true) {} + KEncodingProberPrivate() + : prober(nullptr) + , mStart(true) + { + } ~KEncodingProberPrivate() { delete prober; @@ -30,10 +34,10 @@ { proberType = pType; /* handle multi-byte encodings carefully , because they're hard to detect, - * and have to use some Stastics methods. - * for single-byte encodings (most western encodings), nsSBCSGroupProber is ok, - * because encoding state machine can detect many such encodings. - */ + * and have to use some Stastics methods. + * for single-byte encodings (most western encodings), nsSBCSGroupProber is ok, + * because encoding state machine can detect many such encodings. + */ delete prober; @@ -83,46 +87,45 @@ switch (aBuf[0]) { case '\xEF': if (('\xBB' == aBuf[1]) && ('\xBF' == aBuf[2])) - // EF BB BF UTF-8 encoded BOM + // EF BB BF UTF-8 encoded BOM { proberState = KEncodingProber::FoundIt; } break; case '\xFE': if (('\xFF' == aBuf[1]) && ('\x00' == aBuf[2]) && ('\x00' == aBuf[3])) - // FE FF 00 00 UCS-4, unusual octet order BOM (3412) + // FE FF 00 00 UCS-4, unusual octet order BOM (3412) { proberState = KEncodingProber::FoundIt; } else if ('\xFF' == aBuf[1]) - // FE FF UTF-16, big endian BOM + // FE FF UTF-16, big endian BOM { proberState = KEncodingProber::FoundIt; } break; case '\x00': if (('\x00' == aBuf[1]) && ('\xFE' == aBuf[2]) && ('\xFF' == aBuf[3])) - // 00 00 FE FF UTF-32, big-endian BOM + // 00 00 FE FF UTF-32, big-endian BOM { proberState = KEncodingProber::FoundIt; } else if (('\x00' == aBuf[1]) && ('\xFF' == aBuf[2]) && ('\xFE' == aBuf[3])) - // 00 00 FF FE UCS-4, unusual octet order BOM (2143) + // 00 00 FF FE UCS-4, unusual octet order BOM (2143) { proberState = KEncodingProber::FoundIt; } break; case '\xFF': if (('\xFE' == aBuf[1]) && ('\x00' == aBuf[2]) && ('\x00' == aBuf[3])) - // FF FE 00 00 UTF-32, little-endian BOM + // FF FE 00 00 UTF-32, little-endian BOM { proberState = KEncodingProber::FoundIt; } else if ('\xFE' == aBuf[1]) - // FF FE UTF-16, little endian BOM + // FF FE UTF-16, little endian BOM { proberState = KEncodingProber::FoundIt; } break; - } // switch - + } // switch } } KEncodingProber::ProberType proberType; @@ -131,7 +134,8 @@ bool mStart; }; -KEncodingProber::KEncodingProber(KEncodingProber::ProberType proberType): d(new KEncodingProberPrivate()) +KEncodingProber::KEncodingProber(KEncodingProber::ProberType proberType) + : d(new KEncodingProberPrivate()) { setProberType(proberType); } diff -Nru kcodecs-5.79.0/src/kencodingprober.h kcodecs-5.80.0/src/kencodingprober.h --- kcodecs-5.79.0/src/kencodingprober.h 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/src/kencodingprober.h 2021-03-06 16:19:34.000000000 +0000 @@ -61,11 +61,10 @@ Q_DECLARE_TR_FUNCTIONS(KEncodingProber) public: - enum ProberState { - FoundIt, /**< Sure find the encoding */ - NotMe, /**< Sure not included in current ProberType's all supported encodings */ - Probing /**< Need more data to make a decision */ + FoundIt, /**< Sure find the encoding */ + NotMe, /**< Sure not included in current ProberType's all supported encodings */ + Probing, /**< Need more data to make a decision */ }; enum ProberType { @@ -87,7 +86,7 @@ Thai, Turkish, Unicode, - WesternEuropean + WesternEuropean, }; /** @@ -98,7 +97,7 @@ ~KEncodingProber(); KEncodingProber(const KEncodingProber &) = delete; - KEncodingProber& operator=(const KEncodingProber &) = delete; + KEncodingProber &operator=(const KEncodingProber &) = delete; /** * reset the prober's internal state and data. diff -Nru kcodecs-5.79.0/src/probers/CharDistribution.cpp kcodecs-5.80.0/src/probers/CharDistribution.cpp --- kcodecs-5.79.0/src/probers/CharDistribution.cpp 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/src/probers/CharDistribution.cpp 2021-03-06 16:19:34.000000000 +0000 @@ -6,20 +6,20 @@ #include "CharDistribution.h" -#include "tables/JISFreq.tab" #include "tables/Big5Freq.tab" #include "tables/EUCKRFreq.tab" #include "tables/GB2312Freq.tab" +#include "tables/JISFreq.tab" #define SURE_YES 0.99f -#define SURE_NO 0.01f +#define SURE_NO 0.01f namespace kencodingprober { -//return confidence base on received data +// return confidence base on received data float CharDistributionAnalysis::GetConfidence() { - //if we didn't receive any character in our consideration range, return negative answer + // if we didn't receive any character in our consideration range, return negative answer if (mTotalChars <= 0) { return SURE_NO; } @@ -31,7 +31,7 @@ return r; } } - //normalize confidence, (we don't want to be 100% sure) + // normalize confidence, (we don't want to be 100% sure) return SURE_YES; } @@ -70,4 +70,3 @@ mTypicalDistributionRatio = JIS_TYPICAL_DISTRIBUTION_RATIO; } } - diff -Nru kcodecs-5.79.0/src/probers/CharDistribution.h kcodecs-5.80.0/src/probers/CharDistribution.h --- kcodecs-5.79.0/src/probers/CharDistribution.h 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/src/probers/CharDistribution.h 2021-03-06 16:19:34.000000000 +0000 @@ -15,29 +15,33 @@ namespace kencodingprober { -class KCODECS_NO_EXPORT CharDistributionAnalysis +class KCODECS_NO_EXPORT CharDistributionAnalysis { public: CharDistributionAnalysis() { Reset(); } - virtual ~CharDistributionAnalysis() {} + virtual ~CharDistributionAnalysis() + { + } - //feed a block of data and do distribution analysis - void HandleData(const char * /* aBuf */, unsigned int /* aLen */) {} + // feed a block of data and do distribution analysis + void HandleData(const char * /* aBuf */, unsigned int /* aLen */) + { + } - //Feed a character with known length + // Feed a character with known length void HandleOneChar(const char *aStr, unsigned int aCharLen) { int order; - //we only care about 2-bytes character in our distribution analysis + // we only care about 2-bytes character in our distribution analysis order = (aCharLen == 2) ? GetOrder(aStr) : -1; if (order >= 0) { mTotalChars++; - //order is valid + // order is valid if ((unsigned int)order < mTableSize) { if (512 > mCharToFreqOrder[order]) { mFreqChars++; @@ -46,22 +50,24 @@ } } - //return confidence base on existing data + // return confidence base on existing data float GetConfidence(); - //Reset analyser, clear any state - void Reset(void) + // Reset analyser, clear any state + void Reset(void) { mDone = false; mTotalChars = 0; mFreqChars = 0; } - //This function is for future extension. Caller can use this function to control - //analyser's behavior - void SetOpion() {} + // This function is for future extension. Caller can use this function to control + // analyser's behavior + void SetOpion() + { + } - //It is not necessary to receive all data to draw conclusion. For charset detection, + // It is not necessary to receive all data to draw conclusion. For charset detection, // certain amount of data is enough bool GotEnoughData() { @@ -69,43 +75,44 @@ } protected: - //we do not handle character base on its original encoding string, but - //convert this encoding string to a number, here called order. - //This allow multiple encoding of a language to share one frequency table + // we do not handle character base on its original encoding string, but + // convert this encoding string to a number, here called order. + // This allow multiple encoding of a language to share one frequency table virtual int GetOrder(const char * /* str */) { return -1; } - //If this flag is set to true, detection is done and conclusion has been made - bool mDone; + // If this flag is set to true, detection is done and conclusion has been made + bool mDone; - //The number of characters whose frequency order is less than 512 + // The number of characters whose frequency order is less than 512 unsigned int mFreqChars; - //Total character encounted. + // Total character encounted. unsigned int mTotalChars; - //Mapping table to get frequency order from char order (get from GetOrder()) - const short *mCharToFreqOrder; + // Mapping table to get frequency order from char order (get from GetOrder()) + const short *mCharToFreqOrder; - //Size of above table + // Size of above table unsigned int mTableSize; - //This is a constant value varies from language to language, it is used in - //calculating confidence. See my paper for further detail. - float mTypicalDistributionRatio; + // This is a constant value varies from language to language, it is used in + // calculating confidence. See my paper for further detail. + float mTypicalDistributionRatio; }; -class KCODECS_NO_EXPORT EUCKRDistributionAnalysis : public CharDistributionAnalysis +class KCODECS_NO_EXPORT EUCKRDistributionAnalysis : public CharDistributionAnalysis { public: EUCKRDistributionAnalysis(); + protected: - //for euc-KR encoding, we are interested + // for euc-KR encoding, we are interested // first byte range: 0xb0 -- 0xfe // second byte range: 0xa1 -- 0xfe - //no validation needed here. State machine has done that + // no validation needed here. State machine has done that int GetOrder(const char *str) override { if ((unsigned char)*str >= (unsigned char)0xb0) { @@ -116,15 +123,16 @@ } }; -class KCODECS_NO_EXPORT GB2312DistributionAnalysis : public CharDistributionAnalysis +class KCODECS_NO_EXPORT GB2312DistributionAnalysis : public CharDistributionAnalysis { public: GB2312DistributionAnalysis(); + protected: - //for GB2312 encoding, we are interested + // for GB2312 encoding, we are interested // first byte range: 0xb0 -- 0xfe // second byte range: 0xa1 -- 0xfe - //no validation needed here. State machine has done that + // no validation needed here. State machine has done that int GetOrder(const char *str) override { if ((unsigned char)*str >= (unsigned char)0xb0 && (unsigned char)str[1] >= (unsigned char)0xa1) { @@ -135,15 +143,16 @@ } }; -class KCODECS_NO_EXPORT Big5DistributionAnalysis : public CharDistributionAnalysis +class KCODECS_NO_EXPORT Big5DistributionAnalysis : public CharDistributionAnalysis { public: Big5DistributionAnalysis(); + protected: - //for big5 encoding, we are interested + // for big5 encoding, we are interested // first byte range: 0xa4 -- 0xfe // second byte range: 0x40 -- 0x7e , 0xa1 -- 0xfe - //no validation needed here. State machine has done that + // no validation needed here. State machine has done that int GetOrder(const char *str) override { if ((unsigned char)*str >= (unsigned char)0xa4) @@ -158,15 +167,16 @@ } }; -class KCODECS_NO_EXPORT SJISDistributionAnalysis : public CharDistributionAnalysis +class KCODECS_NO_EXPORT SJISDistributionAnalysis : public CharDistributionAnalysis { public: SJISDistributionAnalysis(); + protected: - //for sjis encoding, we are interested + // for sjis encoding, we are interested // first byte range: 0x81 -- 0x9f , 0xe0 -- 0xfe // second byte range: 0x40 -- 0x7e, 0x81 -- oxfe - //no validation needed here. State machine has done that + // no validation needed here. State machine has done that int GetOrder(const char *str) override { int order; @@ -177,7 +187,7 @@ } else { return -1; } - order += (unsigned char) * (str + 1) - 0x40; + order += (unsigned char)*(str + 1) - 0x40; if ((unsigned char)str[1] > (unsigned char)0x7f) { order--; } @@ -185,15 +195,16 @@ } }; -class KCODECS_NO_EXPORT EUCJPDistributionAnalysis : public CharDistributionAnalysis +class KCODECS_NO_EXPORT EUCJPDistributionAnalysis : public CharDistributionAnalysis { public: EUCJPDistributionAnalysis(); + protected: - //for euc-JP encoding, we are interested + // for euc-JP encoding, we are interested // first byte range: 0xa0 -- 0xfe // second byte range: 0xa1 -- 0xfe - //no validation needed here. State machine has done that + // no validation needed here. State machine has done that int GetOrder(const char *str) override { if ((unsigned char)*str >= (unsigned char)0xa0) { @@ -204,5 +215,4 @@ } }; } -#endif //CharDistribution_h__ - +#endif // CharDistribution_h__ diff -Nru kcodecs-5.79.0/src/probers/ChineseGroupProber.cpp kcodecs-5.80.0/src/probers/ChineseGroupProber.cpp --- kcodecs-5.79.0/src/probers/ChineseGroupProber.cpp 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/src/probers/ChineseGroupProber.cpp 2021-03-06 16:19:34.000000000 +0000 @@ -7,8 +7,8 @@ #include "ChineseGroupProber.h" #include "UnicodeGroupProber.h" -#include "nsGB2312Prober.h" #include "nsBig5Prober.h" +#include "nsGB2312Prober.h" #include #include @@ -44,13 +44,13 @@ if (mBestGuess == -1) { GetConfidence(); if (mBestGuess == -1) { - mBestGuess = 1; // assume it's GB18030 + mBestGuess = 1; // assume it's GB18030 } } return mProbers[mBestGuess]->GetCharSetName(); } -void ChineseGroupProber::Reset(void) +void ChineseGroupProber::Reset(void) { mActiveNum = 0; for (unsigned int i = 0; i < CN_NUM_OF_PROBERS; i++) { @@ -71,10 +71,10 @@ nsProbingState st; unsigned int i; - //do filtering to reduce load to probers + // do filtering to reduce load to probers char *highbyteBuf; char *hptr; - bool keepNext = true; //assume previous is not ascii, it will do no harm except add some noise + bool keepNext = true; // assume previous is not ascii, it will do no harm except add some noise hptr = highbyteBuf = (char *)malloc(aLen); if (!hptr) { return mState; @@ -84,7 +84,7 @@ *hptr++ = aBuf[i]; keepNext = true; } else { - //if previous is highbyte, keep this even it is a ASCII + // if previous is highbyte, keep this even it is a ASCII if (keepNext) { *hptr++ = aBuf[i]; keepNext = false; diff -Nru kcodecs-5.79.0/src/probers/ChineseGroupProber.h kcodecs-5.80.0/src/probers/ChineseGroupProber.h --- kcodecs-5.79.0/src/probers/ChineseGroupProber.h 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/src/probers/ChineseGroupProber.h 2021-03-06 16:19:34.000000000 +0000 @@ -9,10 +9,10 @@ #include "nsCharSetProber.h" -#define CN_NUM_OF_PROBERS 3 +#define CN_NUM_OF_PROBERS 3 namespace kencodingprober { -class KCODECS_NO_EXPORT ChineseGroupProber: public nsCharSetProber +class KCODECS_NO_EXPORT ChineseGroupProber : public nsCharSetProber { public: ChineseGroupProber(); @@ -23,21 +23,22 @@ { return mState; } - void Reset(void) override; - float GetConfidence(void) override; - void SetOpion() override {} + void Reset(void) override; + float GetConfidence(void) override; + void SetOpion() override + { + } #ifdef DEBUG_PROBE - void DumpStatus() override; + void DumpStatus() override; #endif protected: nsProbingState mState; nsCharSetProber *mProbers[CN_NUM_OF_PROBERS]; - bool mIsActive[CN_NUM_OF_PROBERS]; + bool mIsActive[CN_NUM_OF_PROBERS]; int mBestGuess; unsigned int mActiveNum; }; } #endif /* CHINESEGROUPPROBER_H */ - diff -Nru kcodecs-5.79.0/src/probers/JapaneseGroupProber.cpp kcodecs-5.80.0/src/probers/JapaneseGroupProber.cpp --- kcodecs-5.79.0/src/probers/JapaneseGroupProber.cpp 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/src/probers/JapaneseGroupProber.cpp 2021-03-06 16:19:34.000000000 +0000 @@ -6,7 +6,6 @@ #include "JapaneseGroupProber.h" - #include #include @@ -41,13 +40,13 @@ if (mBestGuess == -1) { GetConfidence(); if (mBestGuess == -1) { - mBestGuess = 1; // assume it's GB18030 + mBestGuess = 1; // assume it's GB18030 } } return mProbers[mBestGuess]->GetCharSetName(); } -void JapaneseGroupProber::Reset(void) +void JapaneseGroupProber::Reset(void) { mActiveNum = 0; for (unsigned int i = 0; i < JP_NUM_OF_PROBERS; i++) { @@ -68,10 +67,10 @@ nsProbingState st; unsigned int i; - //do filtering to reduce load to probers + // do filtering to reduce load to probers char *highbyteBuf; char *hptr; - bool keepNext = true; //assume previous is not ascii, it will do no harm except add some noise + bool keepNext = true; // assume previous is not ascii, it will do no harm except add some noise hptr = highbyteBuf = (char *)malloc(aLen); if (!hptr) { return mState; @@ -81,7 +80,7 @@ *hptr++ = aBuf[i]; keepNext = true; } else { - //if previous is highbyte, keep this even it is a ASCII + // if previous is highbyte, keep this even it is a ASCII if (keepNext) { *hptr++ = aBuf[i]; keepNext = false; diff -Nru kcodecs-5.79.0/src/probers/JapaneseGroupProber.h kcodecs-5.80.0/src/probers/JapaneseGroupProber.h --- kcodecs-5.79.0/src/probers/JapaneseGroupProber.h 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/src/probers/JapaneseGroupProber.h 2021-03-06 16:19:34.000000000 +0000 @@ -7,15 +7,15 @@ #ifndef JAPANESEGROUPPROBER_H #define JAPANESEGROUPPROBER_H -#include "nsCharSetProber.h" #include "UnicodeGroupProber.h" -#include "nsSJISProber.h" +#include "nsCharSetProber.h" #include "nsEUCJPProber.h" +#include "nsSJISProber.h" -#define JP_NUM_OF_PROBERS 3 +#define JP_NUM_OF_PROBERS 3 namespace kencodingprober { -class KCODECS_NO_EXPORT JapaneseGroupProber: public nsCharSetProber +class KCODECS_NO_EXPORT JapaneseGroupProber : public nsCharSetProber { public: JapaneseGroupProber(); @@ -26,21 +26,22 @@ { return mState; } - void Reset(void) override; - float GetConfidence(void) override; - void SetOpion() override {} + void Reset(void) override; + float GetConfidence(void) override; + void SetOpion() override + { + } #ifdef DEBUG_PROBE - void DumpStatus() override; + void DumpStatus() override; #endif protected: nsProbingState mState; nsCharSetProber *mProbers[JP_NUM_OF_PROBERS]; - bool mIsActive[JP_NUM_OF_PROBERS]; + bool mIsActive[JP_NUM_OF_PROBERS]; int mBestGuess; unsigned int mActiveNum; }; } #endif /* JAPANESEGROUPPROBER_H */ - diff -Nru kcodecs-5.79.0/src/probers/JpCntx.cpp kcodecs-5.80.0/src/probers/JpCntx.cpp --- kcodecs-5.79.0/src/probers/JpCntx.cpp 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/src/probers/JpCntx.cpp 2021-03-06 16:19:34.000000000 +0000 @@ -8,94 +8,343 @@ namespace kencodingprober { -//This is hiragana 2-char sequence table, the number in each cell represents its frequency category +// This is hiragana 2-char sequence table, the number in each cell represents its frequency category const char jp2CharContext[83][83] = { - { 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1,}, - { 2, 4, 0, 4, 0, 3, 0, 4, 0, 3, 4, 4, 4, 2, 4, 3, 3, 4, 3, 2, 3, 3, 4, 2, 3, 3, 3, 2, 4, 1, 4, 3, 3, 1, 5, 4, 3, 4, 3, 4, 3, 5, 3, 0, 3, 5, 4, 2, 0, 3, 1, 0, 3, 3, 0, 3, 3, 0, 1, 1, 0, 4, 3, 0, 3, 3, 0, 4, 0, 2, 0, 3, 5, 5, 5, 5, 4, 0, 4, 1, 0, 3, 4,}, - { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2,}, - { 0, 4, 0, 5, 0, 5, 0, 4, 0, 4, 5, 4, 4, 3, 5, 3, 5, 1, 5, 3, 4, 3, 4, 4, 3, 4, 3, 3, 4, 3, 5, 4, 4, 3, 5, 5, 3, 5, 5, 5, 3, 5, 5, 3, 4, 5, 5, 3, 1, 3, 2, 0, 3, 4, 0, 4, 2, 0, 4, 2, 1, 5, 3, 2, 3, 5, 0, 4, 0, 2, 0, 5, 4, 4, 5, 4, 5, 0, 4, 0, 0, 4, 4,}, - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,}, - { 0, 3, 0, 4, 0, 3, 0, 3, 0, 4, 5, 4, 3, 3, 3, 3, 4, 3, 5, 4, 4, 3, 5, 4, 4, 3, 4, 3, 4, 4, 4, 4, 5, 3, 4, 4, 3, 4, 5, 5, 4, 5, 5, 1, 4, 5, 4, 3, 0, 3, 3, 1, 3, 3, 0, 4, 4, 0, 3, 3, 1, 5, 3, 3, 3, 5, 0, 4, 0, 3, 0, 4, 4, 3, 4, 3, 3, 0, 4, 1, 1, 3, 4,}, - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,}, - { 0, 4, 0, 3, 0, 3, 0, 4, 0, 3, 4, 4, 3, 2, 2, 1, 2, 1, 3, 1, 3, 3, 3, 3, 3, 4, 3, 1, 3, 3, 5, 3, 3, 0, 4, 3, 0, 5, 4, 3, 3, 5, 4, 4, 3, 4, 4, 5, 0, 1, 2, 0, 1, 2, 0, 2, 2, 0, 1, 0, 0, 5, 2, 2, 1, 4, 0, 3, 0, 1, 0, 4, 4, 3, 5, 4, 3, 0, 2, 1, 0, 4, 3,}, - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,}, - { 0, 3, 0, 5, 0, 4, 0, 2, 1, 4, 4, 2, 4, 1, 4, 2, 4, 2, 4, 3, 3, 3, 4, 3, 3, 3, 3, 1, 4, 2, 3, 3, 3, 1, 4, 4, 1, 1, 1, 4, 3, 3, 2, 0, 2, 4, 3, 2, 0, 3, 3, 0, 3, 1, 1, 0, 0, 0, 3, 3, 0, 4, 2, 2, 3, 4, 0, 4, 0, 3, 0, 4, 4, 5, 3, 4, 4, 0, 3, 0, 0, 1, 4,}, - { 1, 4, 0, 4, 0, 4, 0, 4, 0, 3, 5, 4, 4, 3, 4, 3, 5, 4, 3, 3, 4, 3, 5, 4, 4, 4, 4, 3, 4, 2, 4, 3, 3, 1, 5, 4, 3, 2, 4, 5, 4, 5, 5, 4, 4, 5, 4, 4, 0, 3, 2, 2, 3, 3, 0, 4, 3, 1, 3, 2, 1, 4, 3, 3, 4, 5, 0, 3, 0, 2, 0, 4, 5, 5, 4, 5, 4, 0, 4, 0, 0, 5, 4,}, - { 0, 5, 0, 5, 0, 4, 0, 3, 0, 4, 4, 3, 4, 3, 3, 3, 4, 0, 4, 4, 4, 3, 4, 3, 4, 3, 3, 1, 4, 2, 4, 3, 4, 0, 5, 4, 1, 4, 5, 4, 4, 5, 3, 2, 4, 3, 4, 3, 2, 4, 1, 3, 3, 3, 2, 3, 2, 0, 4, 3, 3, 4, 3, 3, 3, 4, 0, 4, 0, 3, 0, 4, 5, 4, 4, 4, 3, 0, 4, 1, 0, 1, 3,}, - { 0, 3, 1, 4, 0, 3, 0, 2, 0, 3, 4, 4, 3, 1, 4, 2, 3, 3, 4, 3, 4, 3, 4, 3, 4, 4, 3, 2, 3, 1, 5, 4, 4, 1, 4, 4, 3, 5, 4, 4, 3, 5, 5, 4, 3, 4, 4, 3, 1, 2, 3, 1, 2, 2, 0, 3, 2, 0, 3, 1, 0, 5, 3, 3, 3, 4, 3, 3, 3, 3, 4, 4, 4, 4, 5, 4, 2, 0, 3, 3, 2, 4, 3,}, - { 0, 2, 0, 3, 0, 1, 0, 1, 0, 0, 3, 2, 0, 0, 2, 0, 1, 0, 2, 1, 3, 3, 3, 1, 2, 3, 1, 0, 1, 0, 4, 2, 1, 1, 3, 3, 0, 4, 3, 3, 1, 4, 3, 3, 0, 3, 3, 2, 0, 0, 0, 0, 1, 0, 0, 2, 0, 0, 0, 0, 0, 4, 1, 0, 2, 3, 2, 2, 2, 1, 3, 3, 3, 4, 4, 3, 2, 0, 3, 1, 0, 3, 3,}, - { 0, 4, 0, 4, 0, 3, 0, 3, 0, 4, 4, 4, 3, 3, 3, 3, 3, 3, 4, 3, 4, 2, 4, 3, 4, 3, 3, 2, 4, 3, 4, 5, 4, 1, 4, 5, 3, 5, 4, 5, 3, 5, 4, 0, 3, 5, 5, 3, 1, 3, 3, 2, 2, 3, 0, 3, 4, 1, 3, 3, 2, 4, 3, 3, 3, 4, 0, 4, 0, 3, 0, 4, 5, 4, 4, 5, 3, 0, 4, 1, 0, 3, 4,}, - { 0, 2, 0, 3, 0, 3, 0, 0, 0, 2, 2, 2, 1, 0, 1, 0, 0, 0, 3, 0, 3, 0, 3, 0, 1, 3, 1, 0, 3, 1, 3, 3, 3, 1, 3, 3, 3, 0, 1, 3, 1, 3, 4, 0, 0, 3, 1, 1, 0, 3, 2, 0, 0, 0, 0, 1, 3, 0, 1, 0, 0, 3, 3, 2, 0, 3, 0, 0, 0, 0, 0, 3, 4, 3, 4, 3, 3, 0, 3, 0, 0, 2, 3,}, - { 2, 3, 0, 3, 0, 2, 0, 1, 0, 3, 3, 4, 3, 1, 3, 1, 1, 1, 3, 1, 4, 3, 4, 3, 3, 3, 0, 0, 3, 1, 5, 4, 3, 1, 4, 3, 2, 5, 5, 4, 4, 4, 4, 3, 3, 4, 4, 4, 0, 2, 1, 1, 3, 2, 0, 1, 2, 0, 0, 1, 0, 4, 1, 3, 3, 3, 0, 3, 0, 1, 0, 4, 4, 4, 5, 5, 3, 0, 2, 0, 0, 4, 4,}, - { 0, 2, 0, 1, 0, 3, 1, 3, 0, 2, 3, 3, 3, 0, 3, 1, 0, 0, 3, 0, 3, 2, 3, 1, 3, 2, 1, 1, 0, 0, 4, 2, 1, 0, 2, 3, 1, 4, 3, 2, 0, 4, 4, 3, 1, 3, 1, 3, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 4, 1, 1, 1, 2, 0, 3, 0, 0, 0, 3, 4, 2, 4, 3, 2, 0, 1, 0, 0, 3, 3,}, - { 0, 1, 0, 4, 0, 5, 0, 4, 0, 2, 4, 4, 2, 3, 3, 2, 3, 3, 5, 3, 3, 3, 4, 3, 4, 2, 3, 0, 4, 3, 3, 3, 4, 1, 4, 3, 2, 1, 5, 5, 3, 4, 5, 1, 3, 5, 4, 2, 0, 3, 3, 0, 1, 3, 0, 4, 2, 0, 1, 3, 1, 4, 3, 3, 3, 3, 0, 3, 0, 1, 0, 3, 4, 4, 4, 5, 5, 0, 3, 0, 1, 4, 5,}, - { 0, 2, 0, 3, 0, 3, 0, 0, 0, 2, 3, 1, 3, 0, 4, 0, 1, 1, 3, 0, 3, 4, 3, 2, 3, 1, 0, 3, 3, 2, 3, 1, 3, 0, 2, 3, 0, 2, 1, 4, 1, 2, 2, 0, 0, 3, 3, 0, 0, 2, 0, 0, 0, 1, 0, 0, 0, 0, 2, 2, 0, 3, 2, 1, 3, 3, 0, 2, 0, 2, 0, 0, 3, 3, 1, 2, 4, 0, 3, 0, 2, 2, 3,}, - { 2, 4, 0, 5, 0, 4, 0, 4, 0, 2, 4, 4, 4, 3, 4, 3, 3, 3, 1, 2, 4, 3, 4, 3, 4, 4, 5, 0, 3, 3, 3, 3, 2, 0, 4, 3, 1, 4, 3, 4, 1, 4, 4, 3, 3, 4, 4, 3, 1, 2, 3, 0, 4, 2, 0, 4, 1, 0, 3, 3, 0, 4, 3, 3, 3, 4, 0, 4, 0, 2, 0, 3, 5, 3, 4, 5, 2, 0, 3, 0, 0, 4, 5,}, - { 0, 3, 0, 4, 0, 1, 0, 1, 0, 1, 3, 2, 2, 1, 3, 0, 3, 0, 2, 0, 2, 0, 3, 0, 2, 0, 0, 0, 1, 0, 1, 1, 0, 0, 3, 1, 0, 0, 0, 4, 0, 3, 1, 0, 2, 1, 3, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 4, 2, 2, 3, 1, 0, 3, 0, 0, 0, 1, 4, 4, 4, 3, 0, 0, 4, 0, 0, 1, 4,}, - { 1, 4, 1, 5, 0, 3, 0, 3, 0, 4, 5, 4, 4, 3, 5, 3, 3, 4, 4, 3, 4, 1, 3, 3, 3, 3, 2, 1, 4, 1, 5, 4, 3, 1, 4, 4, 3, 5, 4, 4, 3, 5, 4, 3, 3, 4, 4, 4, 0, 3, 3, 1, 2, 3, 0, 3, 1, 0, 3, 3, 0, 5, 4, 4, 4, 4, 4, 4, 3, 3, 5, 4, 4, 3, 3, 5, 4, 0, 3, 2, 0, 4, 4,}, - { 0, 2, 0, 3, 0, 1, 0, 0, 0, 1, 3, 3, 3, 2, 4, 1, 3, 0, 3, 1, 3, 0, 2, 2, 1, 1, 0, 0, 2, 0, 4, 3, 1, 0, 4, 3, 0, 4, 4, 4, 1, 4, 3, 1, 1, 3, 3, 1, 0, 2, 0, 0, 1, 3, 0, 0, 0, 0, 2, 0, 0, 4, 3, 2, 4, 3, 5, 4, 3, 3, 3, 4, 3, 3, 4, 3, 3, 0, 2, 1, 0, 3, 3,}, - { 0, 2, 0, 4, 0, 3, 0, 2, 0, 2, 5, 5, 3, 4, 4, 4, 4, 1, 4, 3, 3, 0, 4, 3, 4, 3, 1, 3, 3, 2, 4, 3, 0, 3, 4, 3, 0, 3, 4, 4, 2, 4, 4, 0, 4, 5, 3, 3, 2, 2, 1, 1, 1, 2, 0, 1, 5, 0, 3, 3, 2, 4, 3, 3, 3, 4, 0, 3, 0, 2, 0, 4, 4, 3, 5, 5, 0, 0, 3, 0, 2, 3, 3,}, - { 0, 3, 0, 4, 0, 3, 0, 1, 0, 3, 4, 3, 3, 1, 3, 3, 3, 0, 3, 1, 3, 0, 4, 3, 3, 1, 1, 0, 3, 0, 3, 3, 0, 0, 4, 4, 0, 1, 5, 4, 3, 3, 5, 0, 3, 3, 4, 3, 0, 2, 0, 1, 1, 1, 0, 1, 3, 0, 1, 2, 1, 3, 3, 2, 3, 3, 0, 3, 0, 1, 0, 1, 3, 3, 4, 4, 1, 0, 1, 2, 2, 1, 3,}, - { 0, 1, 0, 4, 0, 4, 0, 3, 0, 1, 3, 3, 3, 2, 3, 1, 1, 0, 3, 0, 3, 3, 4, 3, 2, 4, 2, 0, 1, 0, 4, 3, 2, 0, 4, 3, 0, 5, 3, 3, 2, 4, 4, 4, 3, 3, 3, 4, 0, 1, 3, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 4, 2, 3, 3, 3, 0, 3, 0, 0, 0, 4, 4, 4, 5, 3, 2, 0, 3, 3, 0, 3, 5,}, - { 0, 2, 0, 3, 0, 0, 0, 3, 0, 1, 3, 0, 2, 0, 0, 0, 1, 0, 3, 1, 1, 3, 3, 0, 0, 3, 0, 0, 3, 0, 2, 3, 1, 0, 3, 1, 0, 3, 3, 2, 0, 4, 2, 2, 0, 2, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 2, 0, 1, 0, 1, 0, 0, 0, 1, 3, 1, 2, 0, 0, 0, 1, 0, 0, 1, 4,}, - { 0, 3, 0, 3, 0, 5, 0, 1, 0, 2, 4, 3, 1, 3, 3, 2, 1, 1, 5, 2, 1, 0, 5, 1, 2, 0, 0, 0, 3, 3, 2, 2, 3, 2, 4, 3, 0, 0, 3, 3, 1, 3, 3, 0, 2, 5, 3, 4, 0, 3, 3, 0, 1, 2, 0, 2, 2, 0, 3, 2, 0, 2, 2, 3, 3, 3, 0, 2, 0, 1, 0, 3, 4, 4, 2, 5, 4, 0, 3, 0, 0, 3, 5,}, - { 0, 3, 0, 3, 0, 3, 0, 1, 0, 3, 3, 3, 3, 0, 3, 0, 2, 0, 2, 1, 1, 0, 2, 0, 1, 0, 0, 0, 2, 1, 0, 0, 1, 0, 3, 2, 0, 0, 3, 3, 1, 2, 3, 1, 0, 3, 3, 0, 0, 1, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 2, 3, 1, 2, 3, 0, 3, 0, 1, 0, 3, 2, 1, 0, 4, 3, 0, 1, 1, 0, 3, 3,}, - { 0, 4, 0, 5, 0, 3, 0, 3, 0, 4, 5, 5, 4, 3, 5, 3, 4, 3, 5, 3, 3, 2, 5, 3, 4, 4, 4, 3, 4, 3, 4, 5, 5, 3, 4, 4, 3, 4, 4, 5, 4, 4, 4, 3, 4, 5, 5, 4, 2, 3, 4, 2, 3, 4, 0, 3, 3, 1, 4, 3, 2, 4, 3, 3, 5, 5, 0, 3, 0, 3, 0, 5, 5, 5, 5, 4, 4, 0, 4, 0, 1, 4, 4,}, - { 0, 4, 0, 4, 0, 3, 0, 3, 0, 3, 5, 4, 4, 2, 3, 2, 5, 1, 3, 2, 5, 1, 4, 2, 3, 2, 3, 3, 4, 3, 3, 3, 3, 2, 5, 4, 1, 3, 3, 5, 3, 4, 4, 0, 4, 4, 3, 1, 1, 3, 1, 0, 2, 3, 0, 2, 3, 0, 3, 0, 0, 4, 3, 1, 3, 4, 0, 3, 0, 2, 0, 4, 4, 4, 3, 4, 5, 0, 4, 0, 0, 3, 4,}, - { 0, 3, 0, 3, 0, 3, 1, 2, 0, 3, 4, 4, 3, 3, 3, 0, 2, 2, 4, 3, 3, 1, 3, 3, 3, 1, 1, 0, 3, 1, 4, 3, 2, 3, 4, 4, 2, 4, 4, 4, 3, 4, 4, 3, 2, 4, 4, 3, 1, 3, 3, 1, 3, 3, 0, 4, 1, 0, 2, 2, 1, 4, 3, 2, 3, 3, 5, 4, 3, 3, 5, 4, 4, 3, 3, 0, 4, 0, 3, 2, 2, 4, 4,}, - { 0, 2, 0, 1, 0, 0, 0, 0, 0, 1, 2, 1, 3, 0, 0, 0, 0, 0, 2, 0, 1, 2, 1, 0, 0, 1, 0, 0, 0, 0, 3, 0, 0, 1, 0, 1, 1, 3, 1, 0, 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 2, 2, 0, 3, 4, 0, 0, 0, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1,}, - { 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 4, 0, 4, 1, 4, 0, 3, 0, 4, 0, 3, 0, 4, 0, 3, 0, 3, 0, 4, 1, 5, 1, 4, 0, 0, 3, 0, 5, 0, 5, 2, 0, 1, 0, 0, 0, 2, 1, 4, 0, 1, 3, 0, 0, 3, 0, 0, 3, 1, 1, 4, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0,}, - { 1, 4, 0, 5, 0, 3, 0, 2, 0, 3, 5, 4, 4, 3, 4, 3, 5, 3, 4, 3, 3, 0, 4, 3, 3, 3, 3, 3, 3, 2, 4, 4, 3, 1, 3, 4, 4, 5, 4, 4, 3, 4, 4, 1, 3, 5, 4, 3, 3, 3, 1, 2, 2, 3, 3, 1, 3, 1, 3, 3, 3, 5, 3, 3, 4, 5, 0, 3, 0, 3, 0, 3, 4, 3, 4, 4, 3, 0, 3, 0, 2, 4, 3,}, - { 0, 1, 0, 4, 0, 0, 0, 0, 0, 1, 4, 0, 4, 1, 4, 2, 4, 0, 3, 0, 1, 0, 1, 0, 0, 0, 0, 0, 2, 0, 3, 1, 1, 1, 0, 3, 0, 0, 0, 1, 2, 1, 0, 0, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 0, 0, 3, 0, 0, 0, 0, 3, 2, 0, 2, 2, 0, 1, 0, 0, 0, 2, 3, 2, 3, 3, 0, 0, 0, 0, 2, 1, 0,}, - { 0, 5, 1, 5, 0, 3, 0, 3, 0, 5, 4, 4, 5, 1, 5, 3, 3, 0, 4, 3, 4, 3, 5, 3, 4, 3, 3, 2, 4, 3, 4, 3, 3, 0, 3, 3, 1, 4, 4, 3, 4, 4, 4, 3, 4, 5, 5, 3, 2, 3, 1, 1, 3, 3, 1, 3, 1, 1, 3, 3, 2, 4, 5, 3, 3, 5, 0, 4, 0, 3, 0, 4, 4, 3, 5, 3, 3, 0, 3, 4, 0, 4, 3,}, - { 0, 5, 0, 5, 0, 3, 0, 2, 0, 4, 4, 3, 5, 2, 4, 3, 3, 3, 4, 4, 4, 3, 5, 3, 5, 3, 3, 1, 4, 0, 4, 3, 3, 0, 3, 3, 0, 4, 4, 4, 4, 5, 4, 3, 3, 5, 5, 3, 2, 3, 1, 2, 3, 2, 0, 1, 0, 0, 3, 2, 2, 4, 4, 3, 1, 5, 0, 4, 0, 3, 0, 4, 3, 1, 3, 2, 1, 0, 3, 3, 0, 3, 3,}, - { 0, 4, 0, 5, 0, 5, 0, 4, 0, 4, 5, 5, 5, 3, 4, 3, 3, 2, 5, 4, 4, 3, 5, 3, 5, 3, 4, 0, 4, 3, 4, 4, 3, 2, 4, 4, 3, 4, 5, 4, 4, 5, 5, 0, 3, 5, 5, 4, 1, 3, 3, 2, 3, 3, 1, 3, 1, 0, 4, 3, 1, 4, 4, 3, 4, 5, 0, 4, 0, 2, 0, 4, 3, 4, 4, 3, 3, 0, 4, 0, 0, 5, 5,}, - { 0, 4, 0, 4, 0, 5, 0, 1, 1, 3, 3, 4, 4, 3, 4, 1, 3, 0, 5, 1, 3, 0, 3, 1, 3, 1, 1, 0, 3, 0, 3, 3, 4, 0, 4, 3, 0, 4, 4, 4, 3, 4, 4, 0, 3, 5, 4, 1, 0, 3, 0, 0, 2, 3, 0, 3, 1, 0, 3, 1, 0, 3, 2, 1, 3, 5, 0, 3, 0, 1, 0, 3, 2, 3, 3, 4, 4, 0, 2, 2, 0, 4, 4,}, - { 2, 4, 0, 5, 0, 4, 0, 3, 0, 4, 5, 5, 4, 3, 5, 3, 5, 3, 5, 3, 5, 2, 5, 3, 4, 3, 3, 4, 3, 4, 5, 3, 2, 1, 5, 4, 3, 2, 3, 4, 5, 3, 4, 1, 2, 5, 4, 3, 0, 3, 3, 0, 3, 2, 0, 2, 3, 0, 4, 1, 0, 3, 4, 3, 3, 5, 0, 3, 0, 1, 0, 4, 5, 5, 5, 4, 3, 0, 4, 2, 0, 3, 5,}, - { 0, 5, 0, 4, 0, 4, 0, 2, 0, 5, 4, 3, 4, 3, 4, 3, 3, 3, 4, 3, 4, 2, 5, 3, 5, 3, 4, 1, 4, 3, 4, 4, 4, 0, 3, 5, 0, 4, 4, 4, 4, 5, 3, 1, 3, 4, 5, 3, 3, 3, 3, 3, 3, 3, 0, 2, 2, 0, 3, 3, 2, 4, 3, 3, 3, 5, 3, 4, 1, 3, 3, 5, 3, 2, 0, 0, 0, 0, 4, 3, 1, 3, 3,}, - { 0, 1, 0, 3, 0, 3, 0, 1, 0, 1, 3, 3, 3, 2, 3, 3, 3, 0, 3, 0, 0, 0, 3, 1, 3, 0, 0, 0, 2, 2, 2, 3, 0, 0, 3, 2, 0, 1, 2, 4, 1, 3, 3, 0, 0, 3, 3, 3, 0, 1, 0, 0, 2, 1, 0, 0, 3, 0, 3, 1, 0, 3, 0, 0, 1, 3, 0, 2, 0, 1, 0, 3, 3, 1, 3, 3, 0, 0, 1, 1, 0, 3, 3,}, - { 0, 2, 0, 3, 0, 2, 1, 4, 0, 2, 2, 3, 1, 1, 3, 1, 1, 0, 2, 0, 3, 1, 2, 3, 1, 3, 0, 0, 1, 0, 4, 3, 2, 3, 3, 3, 1, 4, 2, 3, 3, 3, 3, 1, 0, 3, 1, 4, 0, 1, 1, 0, 1, 2, 0, 1, 1, 0, 1, 1, 0, 3, 1, 3, 2, 2, 0, 1, 0, 0, 0, 2, 3, 3, 3, 1, 0, 0, 0, 0, 0, 2, 3,}, - { 0, 5, 0, 4, 0, 5, 0, 2, 0, 4, 5, 5, 3, 3, 4, 3, 3, 1, 5, 4, 4, 2, 4, 4, 4, 3, 4, 2, 4, 3, 5, 5, 4, 3, 3, 4, 3, 3, 5, 5, 4, 5, 5, 1, 3, 4, 5, 3, 1, 4, 3, 1, 3, 3, 0, 3, 3, 1, 4, 3, 1, 4, 5, 3, 3, 5, 0, 4, 0, 3, 0, 5, 3, 3, 1, 4, 3, 0, 4, 0, 1, 5, 3,}, - { 0, 5, 0, 5, 0, 4, 0, 2, 0, 4, 4, 3, 4, 3, 3, 3, 3, 3, 5, 4, 4, 4, 4, 4, 4, 5, 3, 3, 5, 2, 4, 4, 4, 3, 4, 4, 3, 3, 4, 4, 5, 5, 3, 3, 4, 3, 4, 3, 3, 4, 3, 3, 3, 3, 1, 2, 2, 1, 4, 3, 3, 5, 4, 4, 3, 4, 0, 4, 0, 3, 0, 4, 4, 4, 4, 4, 1, 0, 4, 2, 0, 2, 4,}, - { 0, 4, 0, 4, 0, 3, 0, 1, 0, 3, 5, 2, 3, 0, 3, 0, 2, 1, 4, 2, 3, 3, 4, 1, 4, 3, 3, 2, 4, 1, 3, 3, 3, 0, 3, 3, 0, 0, 3, 3, 3, 5, 3, 3, 3, 3, 3, 2, 0, 2, 0, 0, 2, 0, 0, 2, 0, 0, 1, 0, 0, 3, 1, 2, 2, 3, 0, 3, 0, 2, 0, 4, 4, 3, 3, 4, 1, 0, 3, 0, 0, 2, 4,}, - { 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 2, 0, 0, 0, 0, 0, 1, 0, 2, 0, 1, 0, 0, 0, 0, 0, 3, 1, 3, 0, 3, 2, 0, 0, 0, 1, 0, 3, 2, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 4, 0, 2, 0, 0, 0, 0, 0, 0, 2,}, - { 0, 2, 1, 3, 0, 2, 0, 2, 0, 3, 3, 3, 3, 1, 3, 1, 3, 3, 3, 3, 3, 3, 4, 2, 2, 1, 2, 1, 4, 0, 4, 3, 1, 3, 3, 3, 2, 4, 3, 5, 4, 3, 3, 3, 3, 3, 3, 3, 0, 1, 3, 0, 2, 0, 0, 1, 0, 0, 1, 0, 0, 4, 2, 0, 2, 3, 0, 3, 3, 0, 3, 3, 4, 2, 3, 1, 4, 0, 1, 2, 0, 2, 3,}, - { 0, 3, 0, 3, 0, 1, 0, 3, 0, 2, 3, 3, 3, 0, 3, 1, 2, 0, 3, 3, 2, 3, 3, 2, 3, 2, 3, 1, 3, 0, 4, 3, 2, 0, 3, 3, 1, 4, 3, 3, 2, 3, 4, 3, 1, 3, 3, 1, 1, 0, 1, 1, 0, 1, 0, 1, 0, 1, 0, 0, 0, 4, 1, 1, 0, 3, 0, 3, 1, 0, 2, 3, 3, 3, 3, 3, 1, 0, 0, 2, 0, 3, 3,}, - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 2, 0, 3, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 3, 0, 3, 0, 3, 1, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 2, 0, 2, 3, 0, 0, 0, 0, 0, 0, 0, 0, 3,}, - { 0, 2, 0, 3, 1, 3, 0, 3, 0, 2, 3, 3, 3, 1, 3, 1, 3, 1, 3, 1, 3, 3, 3, 1, 3, 0, 2, 3, 1, 1, 4, 3, 3, 2, 3, 3, 1, 2, 2, 4, 1, 3, 3, 0, 1, 4, 2, 3, 0, 1, 3, 0, 3, 0, 0, 1, 3, 0, 2, 0, 0, 3, 3, 2, 1, 3, 0, 3, 0, 2, 0, 3, 4, 4, 4, 3, 1, 0, 3, 0, 0, 3, 3,}, - { 0, 2, 0, 1, 0, 2, 0, 0, 0, 1, 3, 2, 2, 1, 3, 0, 1, 1, 3, 0, 3, 2, 3, 1, 2, 0, 2, 0, 1, 1, 3, 3, 3, 0, 3, 3, 1, 1, 2, 3, 2, 3, 3, 1, 2, 3, 2, 0, 0, 1, 0, 0, 0, 0, 0, 0, 3, 0, 1, 0, 0, 2, 1, 2, 1, 3, 0, 3, 0, 0, 0, 3, 4, 4, 4, 3, 2, 0, 2, 0, 0, 2, 4,}, - { 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 3, 1, 0, 0, 0, 0, 0, 0, 0, 3,}, - { 0, 3, 0, 3, 0, 2, 0, 3, 0, 3, 3, 3, 2, 3, 2, 2, 2, 0, 3, 1, 3, 3, 3, 2, 3, 3, 0, 0, 3, 0, 3, 2, 2, 0, 2, 3, 1, 4, 3, 4, 3, 3, 2, 3, 1, 5, 4, 4, 0, 3, 1, 2, 1, 3, 0, 3, 1, 1, 2, 0, 2, 3, 1, 3, 1, 3, 0, 3, 0, 1, 0, 3, 3, 4, 4, 2, 1, 0, 2, 1, 0, 2, 4,}, - { 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 4, 2, 5, 1, 4, 0, 2, 0, 2, 1, 3, 1, 4, 0, 2, 1, 0, 0, 2, 1, 4, 1, 1, 0, 3, 3, 0, 5, 1, 3, 2, 3, 3, 1, 0, 3, 2, 3, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 4, 0, 1, 0, 3, 0, 2, 0, 1, 0, 3, 3, 3, 4, 3, 3, 0, 0, 0, 0, 2, 3,}, - { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 2, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 0, 0, 1, 0, 0, 0, 0, 0, 3,}, - { 0, 1, 0, 3, 0, 4, 0, 3, 0, 2, 4, 3, 1, 0, 3, 2, 2, 1, 3, 1, 2, 2, 3, 1, 1, 1, 2, 1, 3, 0, 1, 2, 0, 1, 3, 2, 1, 3, 0, 5, 5, 1, 0, 0, 1, 3, 2, 1, 0, 3, 0, 0, 1, 0, 0, 0, 0, 0, 3, 4, 0, 1, 1, 1, 3, 2, 0, 2, 0, 1, 0, 2, 3, 3, 1, 2, 3, 0, 1, 0, 1, 0, 4,}, - { 0, 0, 0, 1, 0, 3, 0, 3, 0, 2, 2, 1, 0, 0, 4, 0, 3, 0, 3, 1, 3, 0, 3, 0, 3, 0, 1, 0, 3, 0, 3, 1, 3, 0, 3, 3, 0, 0, 1, 2, 1, 1, 1, 0, 1, 2, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 1, 2, 0, 0, 2, 0, 0, 0, 0, 2, 3, 3, 3, 3, 0, 0, 0, 0, 1, 4,}, - { 0, 0, 0, 3, 0, 3, 0, 0, 0, 0, 3, 1, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 3, 0, 2, 0, 2, 3, 0, 0, 2, 2, 3, 1, 2, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 2, 0, 0, 0, 0, 2, 3,}, - { 2, 4, 0, 5, 0, 5, 0, 4, 0, 3, 4, 3, 3, 3, 4, 3, 3, 3, 4, 3, 4, 4, 5, 4, 5, 5, 5, 2, 3, 0, 5, 5, 4, 1, 5, 4, 3, 1, 5, 4, 3, 4, 4, 3, 3, 4, 3, 3, 0, 3, 2, 0, 2, 3, 0, 3, 0, 0, 3, 3, 0, 5, 3, 2, 3, 3, 0, 3, 0, 3, 0, 3, 4, 5, 4, 5, 3, 0, 4, 3, 0, 3, 4,}, - { 0, 3, 0, 3, 0, 3, 0, 3, 0, 3, 3, 4, 3, 2, 3, 2, 3, 0, 4, 3, 3, 3, 3, 3, 3, 3, 3, 0, 3, 2, 4, 3, 3, 1, 3, 4, 3, 4, 4, 4, 3, 4, 4, 3, 2, 4, 4, 1, 0, 2, 0, 0, 1, 1, 0, 2, 0, 0, 3, 1, 0, 5, 3, 2, 1, 3, 0, 3, 0, 1, 2, 4, 3, 2, 4, 3, 3, 0, 3, 2, 0, 4, 4,}, - { 0, 3, 0, 3, 0, 1, 0, 0, 0, 1, 4, 3, 3, 2, 3, 1, 3, 1, 4, 2, 3, 2, 4, 2, 3, 4, 3, 0, 2, 2, 3, 3, 3, 0, 3, 3, 3, 0, 3, 4, 1, 3, 3, 0, 3, 4, 3, 3, 0, 1, 1, 0, 1, 0, 0, 0, 4, 0, 3, 0, 0, 3, 1, 2, 1, 3, 0, 4, 0, 1, 0, 4, 3, 3, 4, 3, 3, 0, 2, 0, 0, 3, 3,}, - { 0, 3, 0, 4, 0, 1, 0, 3, 0, 3, 4, 3, 3, 0, 3, 3, 3, 1, 3, 1, 3, 3, 4, 3, 3, 3, 0, 0, 3, 1, 5, 3, 3, 1, 3, 3, 2, 5, 4, 3, 3, 4, 5, 3, 2, 5, 3, 4, 0, 1, 0, 0, 0, 0, 0, 2, 0, 0, 1, 1, 0, 4, 2, 2, 1, 3, 0, 3, 0, 2, 0, 4, 4, 3, 5, 3, 2, 0, 1, 1, 0, 3, 4,}, - { 0, 5, 0, 4, 0, 5, 0, 2, 0, 4, 4, 3, 3, 2, 3, 3, 3, 1, 4, 3, 4, 1, 5, 3, 4, 3, 4, 0, 4, 2, 4, 3, 4, 1, 5, 4, 0, 4, 4, 4, 4, 5, 4, 1, 3, 5, 4, 2, 1, 4, 1, 1, 3, 2, 0, 3, 1, 0, 3, 2, 1, 4, 3, 3, 3, 4, 0, 4, 0, 3, 0, 4, 4, 4, 3, 3, 3, 0, 4, 2, 0, 3, 4,}, - { 1, 4, 0, 4, 0, 3, 0, 1, 0, 3, 3, 3, 1, 1, 3, 3, 2, 2, 3, 3, 1, 0, 3, 2, 2, 1, 2, 0, 3, 1, 2, 1, 2, 0, 3, 2, 0, 2, 2, 3, 3, 4, 3, 0, 3, 3, 1, 2, 0, 1, 1, 3, 1, 2, 0, 0, 3, 0, 1, 1, 0, 3, 2, 2, 3, 3, 0, 3, 0, 0, 0, 2, 3, 3, 4, 3, 3, 0, 1, 0, 0, 1, 4,}, - { 0, 4, 0, 4, 0, 4, 0, 0, 0, 3, 4, 4, 3, 1, 4, 2, 3, 2, 3, 3, 3, 1, 4, 3, 4, 0, 3, 0, 4, 2, 3, 3, 2, 2, 5, 4, 2, 1, 3, 4, 3, 4, 3, 1, 3, 3, 4, 2, 0, 2, 1, 0, 3, 3, 0, 0, 2, 0, 3, 1, 0, 4, 4, 3, 4, 3, 0, 4, 0, 1, 0, 2, 4, 4, 4, 4, 4, 0, 3, 2, 0, 3, 3,}, - { 0, 0, 0, 1, 0, 4, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 3, 2, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 2,}, - { 0, 2, 0, 3, 0, 4, 0, 4, 0, 1, 3, 3, 3, 0, 4, 0, 2, 1, 2, 1, 1, 1, 2, 0, 3, 1, 1, 0, 1, 0, 3, 1, 0, 0, 3, 3, 2, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 2, 0, 2, 2, 0, 3, 1, 0, 0, 1, 0, 1, 1, 0, 1, 2, 0, 3, 0, 0, 0, 0, 1, 0, 0, 3, 3, 4, 3, 1, 0, 1, 0, 3, 0, 2,}, - { 0, 0, 0, 3, 0, 5, 0, 0, 0, 0, 1, 0, 2, 0, 3, 1, 0, 1, 3, 0, 0, 0, 2, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 4, 0, 0, 0, 2, 3, 0, 1, 4, 1, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 3, 0, 0, 0, 0, 0, 3,}, - { 0, 2, 0, 5, 0, 5, 0, 1, 0, 2, 4, 3, 3, 2, 5, 1, 3, 2, 3, 3, 3, 0, 4, 1, 2, 0, 3, 0, 4, 0, 2, 2, 1, 1, 5, 3, 0, 0, 1, 4, 2, 3, 2, 0, 3, 3, 3, 2, 0, 2, 4, 1, 1, 2, 0, 1, 1, 0, 3, 1, 0, 1, 3, 1, 2, 3, 0, 2, 0, 0, 0, 1, 3, 5, 4, 4, 4, 0, 3, 0, 0, 1, 3,}, - { 0, 4, 0, 5, 0, 4, 0, 4, 0, 4, 5, 4, 3, 3, 4, 3, 3, 3, 4, 3, 4, 4, 5, 3, 4, 5, 4, 2, 4, 2, 3, 4, 3, 1, 4, 4, 1, 3, 5, 4, 4, 5, 5, 4, 4, 5, 5, 5, 2, 3, 3, 1, 4, 3, 1, 3, 3, 0, 3, 3, 1, 4, 3, 4, 4, 4, 0, 3, 0, 4, 0, 3, 3, 4, 4, 5, 0, 0, 4, 3, 0, 4, 5,}, - { 0, 4, 0, 4, 0, 3, 0, 3, 0, 3, 4, 4, 4, 3, 3, 2, 4, 3, 4, 3, 4, 3, 5, 3, 4, 3, 2, 1, 4, 2, 4, 4, 3, 1, 3, 4, 2, 4, 5, 5, 3, 4, 5, 4, 1, 5, 4, 3, 0, 3, 2, 2, 3, 2, 1, 3, 1, 0, 3, 3, 3, 5, 3, 3, 3, 5, 4, 4, 2, 3, 3, 4, 3, 3, 3, 2, 1, 0, 3, 2, 1, 4, 3,}, - { 0, 4, 0, 5, 0, 4, 0, 3, 0, 3, 5, 5, 3, 2, 4, 3, 4, 0, 5, 4, 4, 1, 4, 4, 4, 3, 3, 3, 4, 3, 5, 5, 2, 3, 3, 4, 1, 2, 5, 5, 3, 5, 5, 2, 3, 5, 5, 4, 0, 3, 2, 0, 3, 3, 1, 1, 5, 1, 4, 1, 0, 4, 3, 2, 3, 5, 0, 4, 0, 3, 0, 5, 4, 3, 4, 3, 0, 0, 4, 1, 0, 4, 4,}, - { 1, 3, 0, 4, 0, 2, 0, 2, 0, 2, 5, 5, 3, 3, 3, 3, 3, 0, 4, 2, 3, 4, 4, 4, 3, 4, 0, 0, 3, 4, 5, 4, 3, 3, 3, 3, 2, 5, 5, 4, 5, 5, 5, 4, 3, 5, 5, 5, 1, 3, 1, 0, 1, 0, 0, 3, 2, 0, 4, 2, 0, 5, 2, 3, 2, 4, 1, 3, 0, 3, 0, 4, 5, 4, 5, 4, 3, 0, 4, 2, 0, 5, 4,}, - { 0, 3, 0, 4, 0, 5, 0, 3, 0, 3, 4, 4, 3, 2, 3, 2, 3, 3, 3, 3, 3, 2, 4, 3, 3, 2, 2, 0, 3, 3, 3, 3, 3, 1, 3, 3, 3, 0, 4, 4, 3, 4, 4, 1, 1, 4, 4, 2, 0, 3, 1, 0, 1, 1, 0, 4, 1, 0, 2, 3, 1, 3, 3, 1, 3, 4, 0, 3, 0, 1, 0, 3, 1, 3, 0, 0, 1, 0, 2, 0, 0, 4, 4,}, - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,}, - { 0, 3, 0, 3, 0, 2, 0, 3, 0, 1, 5, 4, 3, 3, 3, 1, 4, 2, 1, 2, 3, 4, 4, 2, 4, 4, 5, 0, 3, 1, 4, 3, 4, 0, 4, 3, 3, 3, 2, 3, 2, 5, 3, 4, 3, 2, 2, 3, 0, 0, 3, 0, 2, 1, 0, 1, 2, 0, 0, 0, 0, 2, 1, 1, 3, 1, 0, 2, 0, 4, 0, 3, 4, 4, 4, 5, 2, 0, 2, 0, 0, 1, 3,}, - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1, 1, 0, 0, 0, 4, 2, 1, 1, 0, 1, 0, 3, 2, 0, 0, 3, 1, 1, 1, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 1, 0, 0, 0, 2, 0, 0, 0, 1, 4, 0, 4, 2, 1, 0, 0, 0, 0, 0, 1,}, - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 3, 1, 0, 0, 0, 2, 0, 2, 1, 0, 0, 1, 2, 1, 0, 1, 1, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 3, 1, 0, 0, 0, 0, 0, 1, 0, 0, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 2,}, - { 0, 4, 0, 4, 0, 4, 0, 3, 0, 4, 4, 3, 4, 2, 4, 3, 2, 0, 4, 4, 4, 3, 5, 3, 5, 3, 3, 2, 4, 2, 4, 3, 4, 3, 1, 4, 0, 2, 3, 4, 4, 4, 3, 3, 3, 4, 4, 4, 3, 4, 1, 3, 4, 3, 2, 1, 2, 1, 3, 3, 3, 4, 4, 3, 3, 5, 0, 4, 0, 3, 0, 4, 3, 3, 3, 2, 1, 0, 3, 0, 0, 3, 3,}, - { 0, 4, 0, 3, 0, 3, 0, 3, 0, 3, 5, 5, 3, 3, 3, 3, 4, 3, 4, 3, 3, 3, 4, 4, 4, 3, 3, 3, 3, 4, 3, 5, 3, 3, 1, 3, 2, 4, 5, 5, 5, 5, 4, 3, 4, 5, 5, 3, 2, 2, 3, 3, 3, 3, 2, 3, 3, 1, 2, 3, 2, 4, 3, 3, 3, 4, 0, 4, 0, 2, 0, 4, 3, 2, 2, 1, 2, 0, 3, 0, 0, 4, 1,}, + { + 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, + }, + { + 2, 4, 0, 4, 0, 3, 0, 4, 0, 3, 4, 4, 4, 2, 4, 3, 3, 4, 3, 2, 3, 3, 4, 2, 3, 3, 3, 2, 4, 1, 4, 3, 3, 1, 5, 4, 3, 4, 3, 4, 3, 5, + 3, 0, 3, 5, 4, 2, 0, 3, 1, 0, 3, 3, 0, 3, 3, 0, 1, 1, 0, 4, 3, 0, 3, 3, 0, 4, 0, 2, 0, 3, 5, 5, 5, 5, 4, 0, 4, 1, 0, 3, 4, + }, + { + 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, + }, + { + 0, 4, 0, 5, 0, 5, 0, 4, 0, 4, 5, 4, 4, 3, 5, 3, 5, 1, 5, 3, 4, 3, 4, 4, 3, 4, 3, 3, 4, 3, 5, 4, 4, 3, 5, 5, 3, 5, 5, 5, 3, 5, + 5, 3, 4, 5, 5, 3, 1, 3, 2, 0, 3, 4, 0, 4, 2, 0, 4, 2, 1, 5, 3, 2, 3, 5, 0, 4, 0, 2, 0, 5, 4, 4, 5, 4, 5, 0, 4, 0, 0, 4, 4, + }, + { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + }, + { + 0, 3, 0, 4, 0, 3, 0, 3, 0, 4, 5, 4, 3, 3, 3, 3, 4, 3, 5, 4, 4, 3, 5, 4, 4, 3, 4, 3, 4, 4, 4, 4, 5, 3, 4, 4, 3, 4, 5, 5, 4, 5, + 5, 1, 4, 5, 4, 3, 0, 3, 3, 1, 3, 3, 0, 4, 4, 0, 3, 3, 1, 5, 3, 3, 3, 5, 0, 4, 0, 3, 0, 4, 4, 3, 4, 3, 3, 0, 4, 1, 1, 3, 4, + }, + { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + }, + { + 0, 4, 0, 3, 0, 3, 0, 4, 0, 3, 4, 4, 3, 2, 2, 1, 2, 1, 3, 1, 3, 3, 3, 3, 3, 4, 3, 1, 3, 3, 5, 3, 3, 0, 4, 3, 0, 5, 4, 3, 3, 5, + 4, 4, 3, 4, 4, 5, 0, 1, 2, 0, 1, 2, 0, 2, 2, 0, 1, 0, 0, 5, 2, 2, 1, 4, 0, 3, 0, 1, 0, 4, 4, 3, 5, 4, 3, 0, 2, 1, 0, 4, 3, + }, + { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + }, + { + 0, 3, 0, 5, 0, 4, 0, 2, 1, 4, 4, 2, 4, 1, 4, 2, 4, 2, 4, 3, 3, 3, 4, 3, 3, 3, 3, 1, 4, 2, 3, 3, 3, 1, 4, 4, 1, 1, 1, 4, 3, 3, + 2, 0, 2, 4, 3, 2, 0, 3, 3, 0, 3, 1, 1, 0, 0, 0, 3, 3, 0, 4, 2, 2, 3, 4, 0, 4, 0, 3, 0, 4, 4, 5, 3, 4, 4, 0, 3, 0, 0, 1, 4, + }, + { + 1, 4, 0, 4, 0, 4, 0, 4, 0, 3, 5, 4, 4, 3, 4, 3, 5, 4, 3, 3, 4, 3, 5, 4, 4, 4, 4, 3, 4, 2, 4, 3, 3, 1, 5, 4, 3, 2, 4, 5, 4, 5, + 5, 4, 4, 5, 4, 4, 0, 3, 2, 2, 3, 3, 0, 4, 3, 1, 3, 2, 1, 4, 3, 3, 4, 5, 0, 3, 0, 2, 0, 4, 5, 5, 4, 5, 4, 0, 4, 0, 0, 5, 4, + }, + { + 0, 5, 0, 5, 0, 4, 0, 3, 0, 4, 4, 3, 4, 3, 3, 3, 4, 0, 4, 4, 4, 3, 4, 3, 4, 3, 3, 1, 4, 2, 4, 3, 4, 0, 5, 4, 1, 4, 5, 4, 4, 5, + 3, 2, 4, 3, 4, 3, 2, 4, 1, 3, 3, 3, 2, 3, 2, 0, 4, 3, 3, 4, 3, 3, 3, 4, 0, 4, 0, 3, 0, 4, 5, 4, 4, 4, 3, 0, 4, 1, 0, 1, 3, + }, + { + 0, 3, 1, 4, 0, 3, 0, 2, 0, 3, 4, 4, 3, 1, 4, 2, 3, 3, 4, 3, 4, 3, 4, 3, 4, 4, 3, 2, 3, 1, 5, 4, 4, 1, 4, 4, 3, 5, 4, 4, 3, 5, + 5, 4, 3, 4, 4, 3, 1, 2, 3, 1, 2, 2, 0, 3, 2, 0, 3, 1, 0, 5, 3, 3, 3, 4, 3, 3, 3, 3, 4, 4, 4, 4, 5, 4, 2, 0, 3, 3, 2, 4, 3, + }, + { + 0, 2, 0, 3, 0, 1, 0, 1, 0, 0, 3, 2, 0, 0, 2, 0, 1, 0, 2, 1, 3, 3, 3, 1, 2, 3, 1, 0, 1, 0, 4, 2, 1, 1, 3, 3, 0, 4, 3, 3, 1, 4, + 3, 3, 0, 3, 3, 2, 0, 0, 0, 0, 1, 0, 0, 2, 0, 0, 0, 0, 0, 4, 1, 0, 2, 3, 2, 2, 2, 1, 3, 3, 3, 4, 4, 3, 2, 0, 3, 1, 0, 3, 3, + }, + { + 0, 4, 0, 4, 0, 3, 0, 3, 0, 4, 4, 4, 3, 3, 3, 3, 3, 3, 4, 3, 4, 2, 4, 3, 4, 3, 3, 2, 4, 3, 4, 5, 4, 1, 4, 5, 3, 5, 4, 5, 3, 5, + 4, 0, 3, 5, 5, 3, 1, 3, 3, 2, 2, 3, 0, 3, 4, 1, 3, 3, 2, 4, 3, 3, 3, 4, 0, 4, 0, 3, 0, 4, 5, 4, 4, 5, 3, 0, 4, 1, 0, 3, 4, + }, + { + 0, 2, 0, 3, 0, 3, 0, 0, 0, 2, 2, 2, 1, 0, 1, 0, 0, 0, 3, 0, 3, 0, 3, 0, 1, 3, 1, 0, 3, 1, 3, 3, 3, 1, 3, 3, 3, 0, 1, 3, 1, 3, + 4, 0, 0, 3, 1, 1, 0, 3, 2, 0, 0, 0, 0, 1, 3, 0, 1, 0, 0, 3, 3, 2, 0, 3, 0, 0, 0, 0, 0, 3, 4, 3, 4, 3, 3, 0, 3, 0, 0, 2, 3, + }, + { + 2, 3, 0, 3, 0, 2, 0, 1, 0, 3, 3, 4, 3, 1, 3, 1, 1, 1, 3, 1, 4, 3, 4, 3, 3, 3, 0, 0, 3, 1, 5, 4, 3, 1, 4, 3, 2, 5, 5, 4, 4, 4, + 4, 3, 3, 4, 4, 4, 0, 2, 1, 1, 3, 2, 0, 1, 2, 0, 0, 1, 0, 4, 1, 3, 3, 3, 0, 3, 0, 1, 0, 4, 4, 4, 5, 5, 3, 0, 2, 0, 0, 4, 4, + }, + { + 0, 2, 0, 1, 0, 3, 1, 3, 0, 2, 3, 3, 3, 0, 3, 1, 0, 0, 3, 0, 3, 2, 3, 1, 3, 2, 1, 1, 0, 0, 4, 2, 1, 0, 2, 3, 1, 4, 3, 2, 0, 4, + 4, 3, 1, 3, 1, 3, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 4, 1, 1, 1, 2, 0, 3, 0, 0, 0, 3, 4, 2, 4, 3, 2, 0, 1, 0, 0, 3, 3, + }, + { + 0, 1, 0, 4, 0, 5, 0, 4, 0, 2, 4, 4, 2, 3, 3, 2, 3, 3, 5, 3, 3, 3, 4, 3, 4, 2, 3, 0, 4, 3, 3, 3, 4, 1, 4, 3, 2, 1, 5, 5, 3, 4, + 5, 1, 3, 5, 4, 2, 0, 3, 3, 0, 1, 3, 0, 4, 2, 0, 1, 3, 1, 4, 3, 3, 3, 3, 0, 3, 0, 1, 0, 3, 4, 4, 4, 5, 5, 0, 3, 0, 1, 4, 5, + }, + { + 0, 2, 0, 3, 0, 3, 0, 0, 0, 2, 3, 1, 3, 0, 4, 0, 1, 1, 3, 0, 3, 4, 3, 2, 3, 1, 0, 3, 3, 2, 3, 1, 3, 0, 2, 3, 0, 2, 1, 4, 1, 2, + 2, 0, 0, 3, 3, 0, 0, 2, 0, 0, 0, 1, 0, 0, 0, 0, 2, 2, 0, 3, 2, 1, 3, 3, 0, 2, 0, 2, 0, 0, 3, 3, 1, 2, 4, 0, 3, 0, 2, 2, 3, + }, + { + 2, 4, 0, 5, 0, 4, 0, 4, 0, 2, 4, 4, 4, 3, 4, 3, 3, 3, 1, 2, 4, 3, 4, 3, 4, 4, 5, 0, 3, 3, 3, 3, 2, 0, 4, 3, 1, 4, 3, 4, 1, 4, + 4, 3, 3, 4, 4, 3, 1, 2, 3, 0, 4, 2, 0, 4, 1, 0, 3, 3, 0, 4, 3, 3, 3, 4, 0, 4, 0, 2, 0, 3, 5, 3, 4, 5, 2, 0, 3, 0, 0, 4, 5, + }, + { + 0, 3, 0, 4, 0, 1, 0, 1, 0, 1, 3, 2, 2, 1, 3, 0, 3, 0, 2, 0, 2, 0, 3, 0, 2, 0, 0, 0, 1, 0, 1, 1, 0, 0, 3, 1, 0, 0, 0, 4, 0, 3, + 1, 0, 2, 1, 3, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 4, 2, 2, 3, 1, 0, 3, 0, 0, 0, 1, 4, 4, 4, 3, 0, 0, 4, 0, 0, 1, 4, + }, + { + 1, 4, 1, 5, 0, 3, 0, 3, 0, 4, 5, 4, 4, 3, 5, 3, 3, 4, 4, 3, 4, 1, 3, 3, 3, 3, 2, 1, 4, 1, 5, 4, 3, 1, 4, 4, 3, 5, 4, 4, 3, 5, + 4, 3, 3, 4, 4, 4, 0, 3, 3, 1, 2, 3, 0, 3, 1, 0, 3, 3, 0, 5, 4, 4, 4, 4, 4, 4, 3, 3, 5, 4, 4, 3, 3, 5, 4, 0, 3, 2, 0, 4, 4, + }, + { + 0, 2, 0, 3, 0, 1, 0, 0, 0, 1, 3, 3, 3, 2, 4, 1, 3, 0, 3, 1, 3, 0, 2, 2, 1, 1, 0, 0, 2, 0, 4, 3, 1, 0, 4, 3, 0, 4, 4, 4, 1, 4, + 3, 1, 1, 3, 3, 1, 0, 2, 0, 0, 1, 3, 0, 0, 0, 0, 2, 0, 0, 4, 3, 2, 4, 3, 5, 4, 3, 3, 3, 4, 3, 3, 4, 3, 3, 0, 2, 1, 0, 3, 3, + }, + { + 0, 2, 0, 4, 0, 3, 0, 2, 0, 2, 5, 5, 3, 4, 4, 4, 4, 1, 4, 3, 3, 0, 4, 3, 4, 3, 1, 3, 3, 2, 4, 3, 0, 3, 4, 3, 0, 3, 4, 4, 2, 4, + 4, 0, 4, 5, 3, 3, 2, 2, 1, 1, 1, 2, 0, 1, 5, 0, 3, 3, 2, 4, 3, 3, 3, 4, 0, 3, 0, 2, 0, 4, 4, 3, 5, 5, 0, 0, 3, 0, 2, 3, 3, + }, + { + 0, 3, 0, 4, 0, 3, 0, 1, 0, 3, 4, 3, 3, 1, 3, 3, 3, 0, 3, 1, 3, 0, 4, 3, 3, 1, 1, 0, 3, 0, 3, 3, 0, 0, 4, 4, 0, 1, 5, 4, 3, 3, + 5, 0, 3, 3, 4, 3, 0, 2, 0, 1, 1, 1, 0, 1, 3, 0, 1, 2, 1, 3, 3, 2, 3, 3, 0, 3, 0, 1, 0, 1, 3, 3, 4, 4, 1, 0, 1, 2, 2, 1, 3, + }, + { + 0, 1, 0, 4, 0, 4, 0, 3, 0, 1, 3, 3, 3, 2, 3, 1, 1, 0, 3, 0, 3, 3, 4, 3, 2, 4, 2, 0, 1, 0, 4, 3, 2, 0, 4, 3, 0, 5, 3, 3, 2, 4, + 4, 4, 3, 3, 3, 4, 0, 1, 3, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 4, 2, 3, 3, 3, 0, 3, 0, 0, 0, 4, 4, 4, 5, 3, 2, 0, 3, 3, 0, 3, 5, + }, + { + 0, 2, 0, 3, 0, 0, 0, 3, 0, 1, 3, 0, 2, 0, 0, 0, 1, 0, 3, 1, 1, 3, 3, 0, 0, 3, 0, 0, 3, 0, 2, 3, 1, 0, 3, 1, 0, 3, 3, 2, 0, 4, + 2, 2, 0, 2, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 2, 0, 1, 0, 1, 0, 0, 0, 1, 3, 1, 2, 0, 0, 0, 1, 0, 0, 1, 4, + }, + { + 0, 3, 0, 3, 0, 5, 0, 1, 0, 2, 4, 3, 1, 3, 3, 2, 1, 1, 5, 2, 1, 0, 5, 1, 2, 0, 0, 0, 3, 3, 2, 2, 3, 2, 4, 3, 0, 0, 3, 3, 1, 3, + 3, 0, 2, 5, 3, 4, 0, 3, 3, 0, 1, 2, 0, 2, 2, 0, 3, 2, 0, 2, 2, 3, 3, 3, 0, 2, 0, 1, 0, 3, 4, 4, 2, 5, 4, 0, 3, 0, 0, 3, 5, + }, + { + 0, 3, 0, 3, 0, 3, 0, 1, 0, 3, 3, 3, 3, 0, 3, 0, 2, 0, 2, 1, 1, 0, 2, 0, 1, 0, 0, 0, 2, 1, 0, 0, 1, 0, 3, 2, 0, 0, 3, 3, 1, 2, + 3, 1, 0, 3, 3, 0, 0, 1, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 2, 3, 1, 2, 3, 0, 3, 0, 1, 0, 3, 2, 1, 0, 4, 3, 0, 1, 1, 0, 3, 3, + }, + { + 0, 4, 0, 5, 0, 3, 0, 3, 0, 4, 5, 5, 4, 3, 5, 3, 4, 3, 5, 3, 3, 2, 5, 3, 4, 4, 4, 3, 4, 3, 4, 5, 5, 3, 4, 4, 3, 4, 4, 5, 4, 4, + 4, 3, 4, 5, 5, 4, 2, 3, 4, 2, 3, 4, 0, 3, 3, 1, 4, 3, 2, 4, 3, 3, 5, 5, 0, 3, 0, 3, 0, 5, 5, 5, 5, 4, 4, 0, 4, 0, 1, 4, 4, + }, + { + 0, 4, 0, 4, 0, 3, 0, 3, 0, 3, 5, 4, 4, 2, 3, 2, 5, 1, 3, 2, 5, 1, 4, 2, 3, 2, 3, 3, 4, 3, 3, 3, 3, 2, 5, 4, 1, 3, 3, 5, 3, 4, + 4, 0, 4, 4, 3, 1, 1, 3, 1, 0, 2, 3, 0, 2, 3, 0, 3, 0, 0, 4, 3, 1, 3, 4, 0, 3, 0, 2, 0, 4, 4, 4, 3, 4, 5, 0, 4, 0, 0, 3, 4, + }, + { + 0, 3, 0, 3, 0, 3, 1, 2, 0, 3, 4, 4, 3, 3, 3, 0, 2, 2, 4, 3, 3, 1, 3, 3, 3, 1, 1, 0, 3, 1, 4, 3, 2, 3, 4, 4, 2, 4, 4, 4, 3, 4, + 4, 3, 2, 4, 4, 3, 1, 3, 3, 1, 3, 3, 0, 4, 1, 0, 2, 2, 1, 4, 3, 2, 3, 3, 5, 4, 3, 3, 5, 4, 4, 3, 3, 0, 4, 0, 3, 2, 2, 4, 4, + }, + { + 0, 2, 0, 1, 0, 0, 0, 0, 0, 1, 2, 1, 3, 0, 0, 0, 0, 0, 2, 0, 1, 2, 1, 0, 0, 1, 0, 0, 0, 0, 3, 0, 0, 1, 0, 1, 1, 3, 1, 0, 0, 0, + 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 2, 2, 0, 3, 4, 0, 0, 0, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, + }, + { + 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 4, 0, 4, 1, 4, 0, 3, 0, 4, 0, 3, 0, 4, 0, 3, 0, 3, 0, 4, 1, 5, 1, 4, 0, 0, 3, 0, 5, 0, 5, 2, 0, + 1, 0, 0, 0, 2, 1, 4, 0, 1, 3, 0, 0, 3, 0, 0, 3, 1, 1, 4, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, + }, + { + 1, 4, 0, 5, 0, 3, 0, 2, 0, 3, 5, 4, 4, 3, 4, 3, 5, 3, 4, 3, 3, 0, 4, 3, 3, 3, 3, 3, 3, 2, 4, 4, 3, 1, 3, 4, 4, 5, 4, 4, 3, 4, + 4, 1, 3, 5, 4, 3, 3, 3, 1, 2, 2, 3, 3, 1, 3, 1, 3, 3, 3, 5, 3, 3, 4, 5, 0, 3, 0, 3, 0, 3, 4, 3, 4, 4, 3, 0, 3, 0, 2, 4, 3, + }, + { + 0, 1, 0, 4, 0, 0, 0, 0, 0, 1, 4, 0, 4, 1, 4, 2, 4, 0, 3, 0, 1, 0, 1, 0, 0, 0, 0, 0, 2, 0, 3, 1, 1, 1, 0, 3, 0, 0, 0, 1, 2, 1, + 0, 0, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 0, 0, 3, 0, 0, 0, 0, 3, 2, 0, 2, 2, 0, 1, 0, 0, 0, 2, 3, 2, 3, 3, 0, 0, 0, 0, 2, 1, 0, + }, + { + 0, 5, 1, 5, 0, 3, 0, 3, 0, 5, 4, 4, 5, 1, 5, 3, 3, 0, 4, 3, 4, 3, 5, 3, 4, 3, 3, 2, 4, 3, 4, 3, 3, 0, 3, 3, 1, 4, 4, 3, 4, 4, + 4, 3, 4, 5, 5, 3, 2, 3, 1, 1, 3, 3, 1, 3, 1, 1, 3, 3, 2, 4, 5, 3, 3, 5, 0, 4, 0, 3, 0, 4, 4, 3, 5, 3, 3, 0, 3, 4, 0, 4, 3, + }, + { + 0, 5, 0, 5, 0, 3, 0, 2, 0, 4, 4, 3, 5, 2, 4, 3, 3, 3, 4, 4, 4, 3, 5, 3, 5, 3, 3, 1, 4, 0, 4, 3, 3, 0, 3, 3, 0, 4, 4, 4, 4, 5, + 4, 3, 3, 5, 5, 3, 2, 3, 1, 2, 3, 2, 0, 1, 0, 0, 3, 2, 2, 4, 4, 3, 1, 5, 0, 4, 0, 3, 0, 4, 3, 1, 3, 2, 1, 0, 3, 3, 0, 3, 3, + }, + { + 0, 4, 0, 5, 0, 5, 0, 4, 0, 4, 5, 5, 5, 3, 4, 3, 3, 2, 5, 4, 4, 3, 5, 3, 5, 3, 4, 0, 4, 3, 4, 4, 3, 2, 4, 4, 3, 4, 5, 4, 4, 5, + 5, 0, 3, 5, 5, 4, 1, 3, 3, 2, 3, 3, 1, 3, 1, 0, 4, 3, 1, 4, 4, 3, 4, 5, 0, 4, 0, 2, 0, 4, 3, 4, 4, 3, 3, 0, 4, 0, 0, 5, 5, + }, + { + 0, 4, 0, 4, 0, 5, 0, 1, 1, 3, 3, 4, 4, 3, 4, 1, 3, 0, 5, 1, 3, 0, 3, 1, 3, 1, 1, 0, 3, 0, 3, 3, 4, 0, 4, 3, 0, 4, 4, 4, 3, 4, + 4, 0, 3, 5, 4, 1, 0, 3, 0, 0, 2, 3, 0, 3, 1, 0, 3, 1, 0, 3, 2, 1, 3, 5, 0, 3, 0, 1, 0, 3, 2, 3, 3, 4, 4, 0, 2, 2, 0, 4, 4, + }, + { + 2, 4, 0, 5, 0, 4, 0, 3, 0, 4, 5, 5, 4, 3, 5, 3, 5, 3, 5, 3, 5, 2, 5, 3, 4, 3, 3, 4, 3, 4, 5, 3, 2, 1, 5, 4, 3, 2, 3, 4, 5, 3, + 4, 1, 2, 5, 4, 3, 0, 3, 3, 0, 3, 2, 0, 2, 3, 0, 4, 1, 0, 3, 4, 3, 3, 5, 0, 3, 0, 1, 0, 4, 5, 5, 5, 4, 3, 0, 4, 2, 0, 3, 5, + }, + { + 0, 5, 0, 4, 0, 4, 0, 2, 0, 5, 4, 3, 4, 3, 4, 3, 3, 3, 4, 3, 4, 2, 5, 3, 5, 3, 4, 1, 4, 3, 4, 4, 4, 0, 3, 5, 0, 4, 4, 4, 4, 5, + 3, 1, 3, 4, 5, 3, 3, 3, 3, 3, 3, 3, 0, 2, 2, 0, 3, 3, 2, 4, 3, 3, 3, 5, 3, 4, 1, 3, 3, 5, 3, 2, 0, 0, 0, 0, 4, 3, 1, 3, 3, + }, + { + 0, 1, 0, 3, 0, 3, 0, 1, 0, 1, 3, 3, 3, 2, 3, 3, 3, 0, 3, 0, 0, 0, 3, 1, 3, 0, 0, 0, 2, 2, 2, 3, 0, 0, 3, 2, 0, 1, 2, 4, 1, 3, + 3, 0, 0, 3, 3, 3, 0, 1, 0, 0, 2, 1, 0, 0, 3, 0, 3, 1, 0, 3, 0, 0, 1, 3, 0, 2, 0, 1, 0, 3, 3, 1, 3, 3, 0, 0, 1, 1, 0, 3, 3, + }, + { + 0, 2, 0, 3, 0, 2, 1, 4, 0, 2, 2, 3, 1, 1, 3, 1, 1, 0, 2, 0, 3, 1, 2, 3, 1, 3, 0, 0, 1, 0, 4, 3, 2, 3, 3, 3, 1, 4, 2, 3, 3, 3, + 3, 1, 0, 3, 1, 4, 0, 1, 1, 0, 1, 2, 0, 1, 1, 0, 1, 1, 0, 3, 1, 3, 2, 2, 0, 1, 0, 0, 0, 2, 3, 3, 3, 1, 0, 0, 0, 0, 0, 2, 3, + }, + { + 0, 5, 0, 4, 0, 5, 0, 2, 0, 4, 5, 5, 3, 3, 4, 3, 3, 1, 5, 4, 4, 2, 4, 4, 4, 3, 4, 2, 4, 3, 5, 5, 4, 3, 3, 4, 3, 3, 5, 5, 4, 5, + 5, 1, 3, 4, 5, 3, 1, 4, 3, 1, 3, 3, 0, 3, 3, 1, 4, 3, 1, 4, 5, 3, 3, 5, 0, 4, 0, 3, 0, 5, 3, 3, 1, 4, 3, 0, 4, 0, 1, 5, 3, + }, + { + 0, 5, 0, 5, 0, 4, 0, 2, 0, 4, 4, 3, 4, 3, 3, 3, 3, 3, 5, 4, 4, 4, 4, 4, 4, 5, 3, 3, 5, 2, 4, 4, 4, 3, 4, 4, 3, 3, 4, 4, 5, 5, + 3, 3, 4, 3, 4, 3, 3, 4, 3, 3, 3, 3, 1, 2, 2, 1, 4, 3, 3, 5, 4, 4, 3, 4, 0, 4, 0, 3, 0, 4, 4, 4, 4, 4, 1, 0, 4, 2, 0, 2, 4, + }, + { + 0, 4, 0, 4, 0, 3, 0, 1, 0, 3, 5, 2, 3, 0, 3, 0, 2, 1, 4, 2, 3, 3, 4, 1, 4, 3, 3, 2, 4, 1, 3, 3, 3, 0, 3, 3, 0, 0, 3, 3, 3, 5, + 3, 3, 3, 3, 3, 2, 0, 2, 0, 0, 2, 0, 0, 2, 0, 0, 1, 0, 0, 3, 1, 2, 2, 3, 0, 3, 0, 2, 0, 4, 4, 3, 3, 4, 1, 0, 3, 0, 0, 2, 4, + }, + { + 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 2, 0, 0, 0, 0, 0, 1, 0, 2, 0, 1, 0, 0, 0, 0, 0, 3, 1, 3, 0, 3, 2, 0, 0, 0, 1, 0, 3, + 2, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 4, 0, 2, 0, 0, 0, 0, 0, 0, 2, + }, + { + 0, 2, 1, 3, 0, 2, 0, 2, 0, 3, 3, 3, 3, 1, 3, 1, 3, 3, 3, 3, 3, 3, 4, 2, 2, 1, 2, 1, 4, 0, 4, 3, 1, 3, 3, 3, 2, 4, 3, 5, 4, 3, + 3, 3, 3, 3, 3, 3, 0, 1, 3, 0, 2, 0, 0, 1, 0, 0, 1, 0, 0, 4, 2, 0, 2, 3, 0, 3, 3, 0, 3, 3, 4, 2, 3, 1, 4, 0, 1, 2, 0, 2, 3, + }, + { + 0, 3, 0, 3, 0, 1, 0, 3, 0, 2, 3, 3, 3, 0, 3, 1, 2, 0, 3, 3, 2, 3, 3, 2, 3, 2, 3, 1, 3, 0, 4, 3, 2, 0, 3, 3, 1, 4, 3, 3, 2, 3, + 4, 3, 1, 3, 3, 1, 1, 0, 1, 1, 0, 1, 0, 1, 0, 1, 0, 0, 0, 4, 1, 1, 0, 3, 0, 3, 1, 0, 2, 3, 3, 3, 3, 3, 1, 0, 0, 2, 0, 3, 3, + }, + { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 2, 0, 3, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 3, 0, 3, 0, 3, 1, 0, 1, 0, 1, 0, 0, + 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 2, 0, 2, 3, 0, 0, 0, 0, 0, 0, 0, 0, 3, + }, + { + 0, 2, 0, 3, 1, 3, 0, 3, 0, 2, 3, 3, 3, 1, 3, 1, 3, 1, 3, 1, 3, 3, 3, 1, 3, 0, 2, 3, 1, 1, 4, 3, 3, 2, 3, 3, 1, 2, 2, 4, 1, 3, + 3, 0, 1, 4, 2, 3, 0, 1, 3, 0, 3, 0, 0, 1, 3, 0, 2, 0, 0, 3, 3, 2, 1, 3, 0, 3, 0, 2, 0, 3, 4, 4, 4, 3, 1, 0, 3, 0, 0, 3, 3, + }, + { + 0, 2, 0, 1, 0, 2, 0, 0, 0, 1, 3, 2, 2, 1, 3, 0, 1, 1, 3, 0, 3, 2, 3, 1, 2, 0, 2, 0, 1, 1, 3, 3, 3, 0, 3, 3, 1, 1, 2, 3, 2, 3, + 3, 1, 2, 3, 2, 0, 0, 1, 0, 0, 0, 0, 0, 0, 3, 0, 1, 0, 0, 2, 1, 2, 1, 3, 0, 3, 0, 0, 0, 3, 4, 4, 4, 3, 2, 0, 2, 0, 0, 2, 4, + }, + { + 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 0, 0, 0, 1, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 3, 1, 0, 0, 0, 0, 0, 0, 0, 3, + }, + { + 0, 3, 0, 3, 0, 2, 0, 3, 0, 3, 3, 3, 2, 3, 2, 2, 2, 0, 3, 1, 3, 3, 3, 2, 3, 3, 0, 0, 3, 0, 3, 2, 2, 0, 2, 3, 1, 4, 3, 4, 3, 3, + 2, 3, 1, 5, 4, 4, 0, 3, 1, 2, 1, 3, 0, 3, 1, 1, 2, 0, 2, 3, 1, 3, 1, 3, 0, 3, 0, 1, 0, 3, 3, 4, 4, 2, 1, 0, 2, 1, 0, 2, 4, + }, + { + 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 4, 2, 5, 1, 4, 0, 2, 0, 2, 1, 3, 1, 4, 0, 2, 1, 0, 0, 2, 1, 4, 1, 1, 0, 3, 3, 0, 5, 1, 3, 2, 3, + 3, 1, 0, 3, 2, 3, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 4, 0, 1, 0, 3, 0, 2, 0, 1, 0, 3, 3, 3, 4, 3, 3, 0, 0, 0, 0, 2, 3, + }, + { + 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 2, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 0, 0, 1, 0, 0, 0, 0, 0, 3, + }, + { + 0, 1, 0, 3, 0, 4, 0, 3, 0, 2, 4, 3, 1, 0, 3, 2, 2, 1, 3, 1, 2, 2, 3, 1, 1, 1, 2, 1, 3, 0, 1, 2, 0, 1, 3, 2, 1, 3, 0, 5, 5, 1, + 0, 0, 1, 3, 2, 1, 0, 3, 0, 0, 1, 0, 0, 0, 0, 0, 3, 4, 0, 1, 1, 1, 3, 2, 0, 2, 0, 1, 0, 2, 3, 3, 1, 2, 3, 0, 1, 0, 1, 0, 4, + }, + { + 0, 0, 0, 1, 0, 3, 0, 3, 0, 2, 2, 1, 0, 0, 4, 0, 3, 0, 3, 1, 3, 0, 3, 0, 3, 0, 1, 0, 3, 0, 3, 1, 3, 0, 3, 3, 0, 0, 1, 2, 1, 1, + 1, 0, 1, 2, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 1, 2, 0, 0, 2, 0, 0, 0, 0, 2, 3, 3, 3, 3, 0, 0, 0, 0, 1, 4, + }, + { + 0, 0, 0, 3, 0, 3, 0, 0, 0, 0, 3, 1, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 3, 0, 2, 0, 2, 3, 0, 0, 2, 2, 3, 1, + 2, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 2, 0, 0, 0, 0, 2, 3, + }, + { + 2, 4, 0, 5, 0, 5, 0, 4, 0, 3, 4, 3, 3, 3, 4, 3, 3, 3, 4, 3, 4, 4, 5, 4, 5, 5, 5, 2, 3, 0, 5, 5, 4, 1, 5, 4, 3, 1, 5, 4, 3, 4, + 4, 3, 3, 4, 3, 3, 0, 3, 2, 0, 2, 3, 0, 3, 0, 0, 3, 3, 0, 5, 3, 2, 3, 3, 0, 3, 0, 3, 0, 3, 4, 5, 4, 5, 3, 0, 4, 3, 0, 3, 4, + }, + { + 0, 3, 0, 3, 0, 3, 0, 3, 0, 3, 3, 4, 3, 2, 3, 2, 3, 0, 4, 3, 3, 3, 3, 3, 3, 3, 3, 0, 3, 2, 4, 3, 3, 1, 3, 4, 3, 4, 4, 4, 3, 4, + 4, 3, 2, 4, 4, 1, 0, 2, 0, 0, 1, 1, 0, 2, 0, 0, 3, 1, 0, 5, 3, 2, 1, 3, 0, 3, 0, 1, 2, 4, 3, 2, 4, 3, 3, 0, 3, 2, 0, 4, 4, + }, + { + 0, 3, 0, 3, 0, 1, 0, 0, 0, 1, 4, 3, 3, 2, 3, 1, 3, 1, 4, 2, 3, 2, 4, 2, 3, 4, 3, 0, 2, 2, 3, 3, 3, 0, 3, 3, 3, 0, 3, 4, 1, 3, + 3, 0, 3, 4, 3, 3, 0, 1, 1, 0, 1, 0, 0, 0, 4, 0, 3, 0, 0, 3, 1, 2, 1, 3, 0, 4, 0, 1, 0, 4, 3, 3, 4, 3, 3, 0, 2, 0, 0, 3, 3, + }, + { + 0, 3, 0, 4, 0, 1, 0, 3, 0, 3, 4, 3, 3, 0, 3, 3, 3, 1, 3, 1, 3, 3, 4, 3, 3, 3, 0, 0, 3, 1, 5, 3, 3, 1, 3, 3, 2, 5, 4, 3, 3, 4, + 5, 3, 2, 5, 3, 4, 0, 1, 0, 0, 0, 0, 0, 2, 0, 0, 1, 1, 0, 4, 2, 2, 1, 3, 0, 3, 0, 2, 0, 4, 4, 3, 5, 3, 2, 0, 1, 1, 0, 3, 4, + }, + { + 0, 5, 0, 4, 0, 5, 0, 2, 0, 4, 4, 3, 3, 2, 3, 3, 3, 1, 4, 3, 4, 1, 5, 3, 4, 3, 4, 0, 4, 2, 4, 3, 4, 1, 5, 4, 0, 4, 4, 4, 4, 5, + 4, 1, 3, 5, 4, 2, 1, 4, 1, 1, 3, 2, 0, 3, 1, 0, 3, 2, 1, 4, 3, 3, 3, 4, 0, 4, 0, 3, 0, 4, 4, 4, 3, 3, 3, 0, 4, 2, 0, 3, 4, + }, + { + 1, 4, 0, 4, 0, 3, 0, 1, 0, 3, 3, 3, 1, 1, 3, 3, 2, 2, 3, 3, 1, 0, 3, 2, 2, 1, 2, 0, 3, 1, 2, 1, 2, 0, 3, 2, 0, 2, 2, 3, 3, 4, + 3, 0, 3, 3, 1, 2, 0, 1, 1, 3, 1, 2, 0, 0, 3, 0, 1, 1, 0, 3, 2, 2, 3, 3, 0, 3, 0, 0, 0, 2, 3, 3, 4, 3, 3, 0, 1, 0, 0, 1, 4, + }, + { + 0, 4, 0, 4, 0, 4, 0, 0, 0, 3, 4, 4, 3, 1, 4, 2, 3, 2, 3, 3, 3, 1, 4, 3, 4, 0, 3, 0, 4, 2, 3, 3, 2, 2, 5, 4, 2, 1, 3, 4, 3, 4, + 3, 1, 3, 3, 4, 2, 0, 2, 1, 0, 3, 3, 0, 0, 2, 0, 3, 1, 0, 4, 4, 3, 4, 3, 0, 4, 0, 1, 0, 2, 4, 4, 4, 4, 4, 0, 3, 2, 0, 3, 3, + }, + { + 0, 0, 0, 1, 0, 4, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 3, 2, 0, 0, 1, 0, 0, 0, + 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 2, + }, + { + 0, 2, 0, 3, 0, 4, 0, 4, 0, 1, 3, 3, 3, 0, 4, 0, 2, 1, 2, 1, 1, 1, 2, 0, 3, 1, 1, 0, 1, 0, 3, 1, 0, 0, 3, 3, 2, 0, 1, 1, 0, 0, + 0, 0, 0, 1, 0, 2, 0, 2, 2, 0, 3, 1, 0, 0, 1, 0, 1, 1, 0, 1, 2, 0, 3, 0, 0, 0, 0, 1, 0, 0, 3, 3, 4, 3, 1, 0, 1, 0, 3, 0, 2, + }, + { + 0, 0, 0, 3, 0, 5, 0, 0, 0, 0, 1, 0, 2, 0, 3, 1, 0, 1, 3, 0, 0, 0, 2, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 4, 0, 0, 0, 2, 3, 0, 1, + 4, 1, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 3, 0, 0, 0, 0, 0, 3, + }, + { + 0, 2, 0, 5, 0, 5, 0, 1, 0, 2, 4, 3, 3, 2, 5, 1, 3, 2, 3, 3, 3, 0, 4, 1, 2, 0, 3, 0, 4, 0, 2, 2, 1, 1, 5, 3, 0, 0, 1, 4, 2, 3, + 2, 0, 3, 3, 3, 2, 0, 2, 4, 1, 1, 2, 0, 1, 1, 0, 3, 1, 0, 1, 3, 1, 2, 3, 0, 2, 0, 0, 0, 1, 3, 5, 4, 4, 4, 0, 3, 0, 0, 1, 3, + }, + { + 0, 4, 0, 5, 0, 4, 0, 4, 0, 4, 5, 4, 3, 3, 4, 3, 3, 3, 4, 3, 4, 4, 5, 3, 4, 5, 4, 2, 4, 2, 3, 4, 3, 1, 4, 4, 1, 3, 5, 4, 4, 5, + 5, 4, 4, 5, 5, 5, 2, 3, 3, 1, 4, 3, 1, 3, 3, 0, 3, 3, 1, 4, 3, 4, 4, 4, 0, 3, 0, 4, 0, 3, 3, 4, 4, 5, 0, 0, 4, 3, 0, 4, 5, + }, + { + 0, 4, 0, 4, 0, 3, 0, 3, 0, 3, 4, 4, 4, 3, 3, 2, 4, 3, 4, 3, 4, 3, 5, 3, 4, 3, 2, 1, 4, 2, 4, 4, 3, 1, 3, 4, 2, 4, 5, 5, 3, 4, + 5, 4, 1, 5, 4, 3, 0, 3, 2, 2, 3, 2, 1, 3, 1, 0, 3, 3, 3, 5, 3, 3, 3, 5, 4, 4, 2, 3, 3, 4, 3, 3, 3, 2, 1, 0, 3, 2, 1, 4, 3, + }, + { + 0, 4, 0, 5, 0, 4, 0, 3, 0, 3, 5, 5, 3, 2, 4, 3, 4, 0, 5, 4, 4, 1, 4, 4, 4, 3, 3, 3, 4, 3, 5, 5, 2, 3, 3, 4, 1, 2, 5, 5, 3, 5, + 5, 2, 3, 5, 5, 4, 0, 3, 2, 0, 3, 3, 1, 1, 5, 1, 4, 1, 0, 4, 3, 2, 3, 5, 0, 4, 0, 3, 0, 5, 4, 3, 4, 3, 0, 0, 4, 1, 0, 4, 4, + }, + { + 1, 3, 0, 4, 0, 2, 0, 2, 0, 2, 5, 5, 3, 3, 3, 3, 3, 0, 4, 2, 3, 4, 4, 4, 3, 4, 0, 0, 3, 4, 5, 4, 3, 3, 3, 3, 2, 5, 5, 4, 5, 5, + 5, 4, 3, 5, 5, 5, 1, 3, 1, 0, 1, 0, 0, 3, 2, 0, 4, 2, 0, 5, 2, 3, 2, 4, 1, 3, 0, 3, 0, 4, 5, 4, 5, 4, 3, 0, 4, 2, 0, 5, 4, + }, + { + 0, 3, 0, 4, 0, 5, 0, 3, 0, 3, 4, 4, 3, 2, 3, 2, 3, 3, 3, 3, 3, 2, 4, 3, 3, 2, 2, 0, 3, 3, 3, 3, 3, 1, 3, 3, 3, 0, 4, 4, 3, 4, + 4, 1, 1, 4, 4, 2, 0, 3, 1, 0, 1, 1, 0, 4, 1, 0, 2, 3, 1, 3, 3, 1, 3, 4, 0, 3, 0, 1, 0, 3, 1, 3, 0, 0, 1, 0, 2, 0, 0, 4, 4, + }, + { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + }, + { + 0, 3, 0, 3, 0, 2, 0, 3, 0, 1, 5, 4, 3, 3, 3, 1, 4, 2, 1, 2, 3, 4, 4, 2, 4, 4, 5, 0, 3, 1, 4, 3, 4, 0, 4, 3, 3, 3, 2, 3, 2, 5, + 3, 4, 3, 2, 2, 3, 0, 0, 3, 0, 2, 1, 0, 1, 2, 0, 0, 0, 0, 2, 1, 1, 3, 1, 0, 2, 0, 4, 0, 3, 4, 4, 4, 5, 2, 0, 2, 0, 0, 1, 3, + }, + { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1, 1, 0, 0, 0, 4, 2, 1, 1, 0, 1, 0, 3, 2, 0, 0, 3, + 1, 1, 1, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 1, 0, 0, 0, 2, 0, 0, 0, 1, 4, 0, 4, 2, 1, 0, 0, 0, 0, 0, 1, + }, + { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 3, 1, 0, 0, 0, 2, 0, 2, 1, 0, 0, 1, + 2, 1, 0, 1, 1, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 3, 1, 0, 0, 0, 0, 0, 1, 0, 0, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 2, + }, + { + 0, 4, 0, 4, 0, 4, 0, 3, 0, 4, 4, 3, 4, 2, 4, 3, 2, 0, 4, 4, 4, 3, 5, 3, 5, 3, 3, 2, 4, 2, 4, 3, 4, 3, 1, 4, 0, 2, 3, 4, 4, 4, + 3, 3, 3, 4, 4, 4, 3, 4, 1, 3, 4, 3, 2, 1, 2, 1, 3, 3, 3, 4, 4, 3, 3, 5, 0, 4, 0, 3, 0, 4, 3, 3, 3, 2, 1, 0, 3, 0, 0, 3, 3, + }, + { + 0, 4, 0, 3, 0, 3, 0, 3, 0, 3, 5, 5, 3, 3, 3, 3, 4, 3, 4, 3, 3, 3, 4, 4, 4, 3, 3, 3, 3, 4, 3, 5, 3, 3, 1, 3, 2, 4, 5, 5, 5, 5, + 4, 3, 4, 5, 5, 3, 2, 2, 3, 3, 3, 3, 2, 3, 3, 1, 2, 3, 2, 4, 3, 3, 3, 4, 0, 4, 0, 2, 0, 4, 3, 2, 2, 1, 2, 0, 3, 0, 0, 4, 1, + }, }; -#define MINIMUM_DATA_THRESHOLD 4 +#define MINIMUM_DATA_THRESHOLD 4 void JapaneseContextAnalysis::HandleData(const char *aBuf, unsigned int aLen) { @@ -107,12 +356,12 @@ return; } - //The buffer we got is byte oriented, and a character may span in more than one - //buffers. In case the last one or two byte in last buffer is not complete, we - //record how many byte needed to complete that character and skip these bytes here. - //We can choose to record those bytes as well and analyze the character once it - //is complete, but since a character will not make much difference, by simply skipping - //this character will simply our logic and improve performance. + // The buffer we got is byte oriented, and a character may span in more than one + // buffers. In case the last one or two byte in last buffer is not complete, we + // record how many byte needed to complete that character and skip these bytes here. + // We can choose to record those bytes as well and analyze the character once it + // is complete, but since a character will not make much difference, by simply skipping + // this character will simply our logic and improve performance. for (i = mNeedToSkipCharNum; i < aLen;) { order = GetOrder(aBuf + i, &charLen); i += charLen; @@ -121,7 +370,7 @@ mLastCharOrder = -1; } else { if (order != -1 && mLastCharOrder != -1) { - mTotalRel ++; + mTotalRel++; if (mTotalRel > MAX_REL_THRESHOLD) { mDone = true; break; @@ -147,9 +396,9 @@ } #define DONT_KNOW (float)-1 -float JapaneseContextAnalysis::GetConfidence() +float JapaneseContextAnalysis::GetConfidence() { - //This is just one way to calculate confidence. It works well for me. + // This is just one way to calculate confidence. It works well for me. if (mTotalRel > MINIMUM_DATA_THRESHOLD) { return ((float)(mTotalRel - mRelSample[0])) / mTotalRel; } else { @@ -159,29 +408,29 @@ int SJISContextAnalysis::GetOrder(const char *str, unsigned int *charLen) { - //find out current char's byte length - if (((unsigned char)*str >= (unsigned char)0x81 && (unsigned char)*str <= (unsigned char)0x9f) || - ((unsigned char)*str >= (unsigned char)0xe0 && (unsigned char)*str <= (unsigned char)0xfc)) { + // find out current char's byte length + if (((unsigned char)*str >= (unsigned char)0x81 && (unsigned char)*str <= (unsigned char)0x9f) + || ((unsigned char)*str >= (unsigned char)0xe0 && (unsigned char)*str <= (unsigned char)0xfc)) { *charLen = 2; } else { *charLen = 1; } - //return its order if it is hiragana - if (*str == '\202' && - (unsigned char) * (str + 1) >= (unsigned char)0x9f && - (unsigned char) * (str + 1) <= (unsigned char)0xf1) { - return (unsigned char) * (str + 1) - (unsigned char)0x9f; + // return its order if it is hiragana + if (*str == '\202' // + && (unsigned char)*(str + 1) >= (unsigned char)0x9f // + && (unsigned char)*(str + 1) <= (unsigned char)0xf1) { + return (unsigned char)*(str + 1) - (unsigned char)0x9f; } return -1; } int EUCJPContextAnalysis::GetOrder(const char *str, unsigned int *charLen) { - //find out current char's byte length - if ((unsigned char)*str == (unsigned char)0x8e || - ((unsigned char)*str >= (unsigned char)0xa1 && - (unsigned char)*str <= (unsigned char)0xfe)) { + // find out current char's byte length + if ((unsigned char)*str == (unsigned char)0x8e // + || ((unsigned char)*str >= (unsigned char)0xa1 // + && (unsigned char)*str <= (unsigned char)0xfe)) { *charLen = 2; } else if ((unsigned char)*str == (unsigned char)0x8f) { *charLen = 3; @@ -189,13 +438,12 @@ *charLen = 1; } - //return its order if it is hiragana - if ((unsigned char)*str == (unsigned char)0xa4 && - (unsigned char) * (str + 1) >= (unsigned char)0xa1 && - (unsigned char) * (str + 1) <= (unsigned char)0xf3) { - return (unsigned char) * (str + 1) - (unsigned char)0xa1; + // return its order if it is hiragana + if ((unsigned char)*str == (unsigned char)0xa4 // + && (unsigned char)*(str + 1) >= (unsigned char)0xa1 // + && (unsigned char)*(str + 1) <= (unsigned char)0xf3) { + return (unsigned char)*(str + 1) - (unsigned char)0xa1; } return -1; } } - diff -Nru kcodecs-5.79.0/src/probers/JpCntx.h kcodecs-5.80.0/src/probers/JpCntx.h --- kcodecs-5.79.0/src/probers/JpCntx.h 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/src/probers/JpCntx.h 2021-03-06 16:19:34.000000000 +0000 @@ -13,11 +13,11 @@ #define NUM_OF_CATEGORY 6 -#define ENOUGH_REL_THRESHOLD 100 -#define MAX_REL_THRESHOLD 1000 +#define ENOUGH_REL_THRESHOLD 100 +#define MAX_REL_THRESHOLD 1000 namespace kencodingprober { -//hiragana frequency category table +// hiragana frequency category table extern const char jp2CharContext[83][83]; class KCODECS_NO_EXPORT JapaneseContextAnalysis @@ -27,7 +27,9 @@ { Reset(); } - virtual ~JapaneseContextAnalysis() {} + virtual ~JapaneseContextAnalysis() + { + } void HandleData(const char *aBuf, unsigned int aLen); @@ -35,7 +37,7 @@ { int order; - //if we received enough data, stop here + // if we received enough data, stop here if (mTotalRel > MAX_REL_THRESHOLD) { mDone = true; } @@ -43,19 +45,21 @@ return; } - //Only 2-bytes characters are of our interest + // Only 2-bytes characters are of our interest order = (aCharLen == 2) ? GetOrder(aStr) : -1; if (order != -1 && mLastCharOrder != -1) { mTotalRel++; - //count this sequence to its category counter + // count this sequence to its category counter mRelSample[(int)jp2CharContext[mLastCharOrder][order]]++; } mLastCharOrder = order; } float GetConfidence(); - void Reset(void); - void SetOpion() {} + void Reset(void); + void SetOpion() + { + } bool GotEnoughData() { return mTotalRel > ENOUGH_REL_THRESHOLD; @@ -65,36 +69,34 @@ virtual int GetOrder(const char *str, unsigned int *charLen) = 0; virtual int GetOrder(const char *str) = 0; - //category counters, each interger counts sequence in its category + // category counters, each interger counts sequence in its category unsigned int mRelSample[NUM_OF_CATEGORY]; - //total sequence received + // total sequence received unsigned int mTotalRel; - //The order of previous char - int mLastCharOrder; + // The order of previous char + int mLastCharOrder; - //if last byte in current buffer is not the last byte of a character, we - //need to know how many byte to skip in next buffer. + // if last byte in current buffer is not the last byte of a character, we + // need to know how many byte to skip in next buffer. unsigned int mNeedToSkipCharNum; - //If this flag is set to true, detection is done and conclusion has been made - bool mDone; + // If this flag is set to true, detection is done and conclusion has been made + bool mDone; }; class KCODECS_NO_EXPORT SJISContextAnalysis : public JapaneseContextAnalysis { - //SJISContextAnalysis(){}; + // SJISContextAnalysis(){}; protected: int GetOrder(const char *str, unsigned int *charLen) override; int GetOrder(const char *str) override { - //We only interested in Hiragana, so first byte is '\202' - if (*str == '\202' && - (unsigned char) * (str + 1) >= (unsigned char)0x9f && - (unsigned char) * (str + 1) <= (unsigned char)0xf1) { - return (unsigned char) * (str + 1) - (unsigned char)0x9f; + // We only interested in Hiragana, so first byte is '\202' + if (*str == '\202' && (unsigned char)*(str + 1) >= (unsigned char)0x9f && (unsigned char)*(str + 1) <= (unsigned char)0xf1) { + return (unsigned char)*(str + 1) - (unsigned char)0x9f; } return -1; } @@ -105,16 +107,15 @@ protected: int GetOrder(const char *str, unsigned int *charLen) override; int GetOrder(const char *str) override - //We only interested in Hiragana, so first byte is '\244' + // We only interested in Hiragana, so first byte is '\244' { - if (*str == '\244' && - (unsigned char) * (str + 1) >= (unsigned char)0xa1 && - (unsigned char) * (str + 1) <= (unsigned char)0xf3) { - return (unsigned char) * (str + 1) - (unsigned char)0xa1; + if (*str == '\244' // + && (unsigned char)*(str + 1) >= (unsigned char)0xa1 // + && (unsigned char)*(str + 1) <= (unsigned char)0xf3) { + return (unsigned char)*(str + 1) - (unsigned char)0xa1; } return -1; } }; } #endif /* __JPCNTX_H__ */ - diff -Nru kcodecs-5.79.0/src/probers/LangBulgarianModel.cpp kcodecs-5.80.0/src/probers/LangBulgarianModel.cpp --- kcodecs-5.79.0/src/probers/LangBulgarianModel.cpp 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/src/probers/LangBulgarianModel.cpp 2021-03-06 16:19:34.000000000 +0000 @@ -15,198 +15,137 @@ namespace kencodingprober { -//Character Mapping Table: -//this talbe is modified base on win1251BulgarianCharToOrderMap, so -//only number <64 is sure valid +// Character Mapping Table: +// this talbe is modified base on win1251BulgarianCharToOrderMap, so +// only number <64 is sure valid const unsigned char Latin5_BulgarianCharToOrderMap[] = { - 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 254, 255, 255, 254, 255, 255, //00 - 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, //10 - +253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, //20 - 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 253, 253, 253, 253, 253, 253, //30 - 253, 77, 90, 99, 100, 72, 109, 107, 101, 79, 185, 81, 102, 76, 94, 82, //40 - 110, 186, 108, 91, 74, 119, 84, 96, 111, 187, 115, 253, 253, 253, 253, 253, //50 - 253, 65, 69, 70, 66, 63, 68, 112, 103, 92, 194, 104, 95, 86, 87, 71, //60 - 116, 195, 85, 93, 97, 113, 196, 197, 198, 199, 200, 253, 253, 253, 253, 253, //70 - 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, //80 - 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, //90 - 81, 226, 227, 228, 229, 230, 105, 231, 232, 233, 234, 235, 236, 45, 237, 238, //a0 - 31, 32, 35, 43, 37, 44, 55, 47, 40, 59, 33, 46, 38, 36, 41, 30, //b0 - 39, 28, 34, 51, 48, 49, 53, 50, 54, 57, 61, 239, 67, 240, 60, 56, //c0 - 1, 18, 9, 20, 11, 3, 23, 15, 2, 26, 12, 10, 14, 6, 4, 13, //d0 - 7, 8, 5, 19, 29, 25, 22, 21, 27, 24, 17, 75, 52, 241, 42, 16, //e0 - 62, 242, 243, 244, 58, 245, 98, 246, 247, 248, 249, 250, 251, 91, 252, 253, //f0 + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 254, 255, 255, 254, 255, 255, // 00 + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, // 10 + +253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, // 20 + 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 253, 253, 253, 253, 253, 253, // 30 + 253, 77, 90, 99, 100, 72, 109, 107, 101, 79, 185, 81, 102, 76, 94, 82, // 40 + 110, 186, 108, 91, 74, 119, 84, 96, 111, 187, 115, 253, 253, 253, 253, 253, // 50 + 253, 65, 69, 70, 66, 63, 68, 112, 103, 92, 194, 104, 95, 86, 87, 71, // 60 + 116, 195, 85, 93, 97, 113, 196, 197, 198, 199, 200, 253, 253, 253, 253, 253, // 70 + 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, // 80 + 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, // 90 + 81, 226, 227, 228, 229, 230, 105, 231, 232, 233, 234, 235, 236, 45, 237, 238, // a0 + 31, 32, 35, 43, 37, 44, 55, 47, 40, 59, 33, 46, 38, 36, 41, 30, // b0 + 39, 28, 34, 51, 48, 49, 53, 50, 54, 57, 61, 239, 67, 240, 60, 56, // c0 + 1, 18, 9, 20, 11, 3, 23, 15, 2, 26, 12, 10, 14, 6, 4, 13, // d0 + 7, 8, 5, 19, 29, 25, 22, 21, 27, 24, 17, 75, 52, 241, 42, 16, // e0 + 62, 242, 243, 244, 58, 245, 98, 246, 247, 248, 249, 250, 251, 91, 252, 253, // f0 }; const unsigned char win1251BulgarianCharToOrderMap[] = { - 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 254, 255, 255, 254, 255, 255, //00 - 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, //10 - +253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, //20 - 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 253, 253, 253, 253, 253, 253, //30 - 253, 77, 90, 99, 100, 72, 109, 107, 101, 79, 185, 81, 102, 76, 94, 82, //40 - 110, 186, 108, 91, 74, 119, 84, 96, 111, 187, 115, 253, 253, 253, 253, 253, //50 - 253, 65, 69, 70, 66, 63, 68, 112, 103, 92, 194, 104, 95, 86, 87, 71, //60 - 116, 195, 85, 93, 97, 113, 196, 197, 198, 199, 200, 253, 253, 253, 253, 253, //70 - 206, 207, 208, 209, 210, 211, 212, 213, 120, 214, 215, 216, 217, 218, 219, 220, //80 - 221, 78, 64, 83, 121, 98, 117, 105, 222, 223, 224, 225, 226, 227, 228, 229, //90 - 88, 230, 231, 232, 233, 122, 89, 106, 234, 235, 236, 237, 238, 45, 239, 240, //a0 - 73, 80, 118, 114, 241, 242, 243, 244, 245, 62, 58, 246, 247, 248, 249, 250, //b0 - 31, 32, 35, 43, 37, 44, 55, 47, 40, 59, 33, 46, 38, 36, 41, 30, //c0 - 39, 28, 34, 51, 48, 49, 53, 50, 54, 57, 61, 251, 67, 252, 60, 56, //d0 - 1, 18, 9, 20, 11, 3, 23, 15, 2, 26, 12, 10, 14, 6, 4, 13, //e0 - 7, 8, 5, 19, 29, 25, 22, 21, 27, 24, 17, 75, 52, 253, 42, 16, //f0 + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 254, 255, 255, 254, 255, 255, // 00 + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, // 10 + +253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, // 20 + 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 253, 253, 253, 253, 253, 253, // 30 + 253, 77, 90, 99, 100, 72, 109, 107, 101, 79, 185, 81, 102, 76, 94, 82, // 40 + 110, 186, 108, 91, 74, 119, 84, 96, 111, 187, 115, 253, 253, 253, 253, 253, // 50 + 253, 65, 69, 70, 66, 63, 68, 112, 103, 92, 194, 104, 95, 86, 87, 71, // 60 + 116, 195, 85, 93, 97, 113, 196, 197, 198, 199, 200, 253, 253, 253, 253, 253, // 70 + 206, 207, 208, 209, 210, 211, 212, 213, 120, 214, 215, 216, 217, 218, 219, 220, // 80 + 221, 78, 64, 83, 121, 98, 117, 105, 222, 223, 224, 225, 226, 227, 228, 229, // 90 + 88, 230, 231, 232, 233, 122, 89, 106, 234, 235, 236, 237, 238, 45, 239, 240, // a0 + 73, 80, 118, 114, 241, 242, 243, 244, 245, 62, 58, 246, 247, 248, 249, 250, // b0 + 31, 32, 35, 43, 37, 44, 55, 47, 40, 59, 33, 46, 38, 36, 41, 30, // c0 + 39, 28, 34, 51, 48, 49, 53, 50, 54, 57, 61, 251, 67, 252, 60, 56, // d0 + 1, 18, 9, 20, 11, 3, 23, 15, 2, 26, 12, 10, 14, 6, 4, 13, // e0 + 7, 8, 5, 19, 29, 25, 22, 21, 27, 24, 17, 75, 52, 253, 42, 16, // f0 }; -//Model Table: -//total sequences: 100% -//first 512 sequences: 96.9392% -//first 1024 sequences:3.0618% -//rest sequences: 0.2992% -//negative sequences: 0.0020% +// Model Table: +// total sequences: 100% +// first 512 sequences: 96.9392% +// first 1024 sequences:3.0618% +// rest sequences: 0.2992% +// negative sequences: 0.0020% const char BulgarianLangModel[] = { - 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 3, 3, 3, 3, 3, 3, 3, 3, 2, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 3, 3, 3, 2, 2, 3, 2, 2, 1, 2, 2, - 3, 1, 3, 3, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 3, 0, 1, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 3, 2, 3, 3, 3, 3, 3, 3, 3, 3, 0, 3, 1, 0, - 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, - 3, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 1, 3, 2, 3, 3, 3, 3, 3, 3, 3, 3, 0, 3, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 3, 2, 3, 3, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 1, 3, 2, 3, 3, 3, 3, 3, 3, 3, 3, 0, 3, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 3, 2, 2, 1, 3, 3, 3, 3, 2, 2, 2, 1, 1, 2, 0, 1, 0, 1, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, - 3, 3, 3, 3, 3, 3, 3, 2, 3, 2, 2, 3, 3, 1, 1, 2, 3, 3, 2, 3, 3, 3, 3, 2, 1, 2, 0, 2, 0, 3, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, - 3, 3, 3, 3, 3, 3, 3, 1, 3, 3, 3, 3, 3, 2, 3, 2, 3, 3, 3, 3, 3, 2, 3, 3, 1, 3, 0, 3, 0, 2, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, - 3, 3, 3, 3, 3, 3, 3, 3, 1, 3, 3, 2, 3, 3, 3, 1, 3, 3, 2, 3, 2, 2, 2, 0, 0, 2, 0, 2, 0, 2, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 3, 3, 3, 2, 2, 3, 3, 3, 1, 2, 2, 3, 2, 1, 1, 2, 0, 2, 0, 0, 0, 0, - 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, - 3, 3, 3, 3, 3, 3, 3, 2, 3, 3, 1, 2, 3, 2, 2, 2, 3, 3, 3, 3, 3, 2, 2, 3, 1, 2, 0, 2, 1, 2, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 1, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, - 3, 3, 3, 3, 3, 1, 3, 3, 3, 3, 3, 2, 3, 3, 3, 2, 3, 3, 2, 3, 2, 2, 2, 3, 1, 2, 0, 1, 0, 1, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 1, 1, 1, 2, 2, 1, 3, 1, 3, 2, 2, 3, 0, 0, 1, 0, 1, 0, 1, 0, 0, - 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, - 3, 3, 3, 3, 3, 2, 2, 3, 2, 2, 3, 1, 2, 1, 1, 1, 2, 3, 1, 3, 1, 2, 2, 0, 1, 1, 1, 1, 0, 1, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, - 3, 3, 3, 3, 3, 1, 3, 2, 2, 3, 3, 1, 2, 3, 1, 1, 3, 3, 3, 3, 1, 2, 2, 1, 1, 1, 0, 2, 0, 2, 0, 1, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 1, 2, 2, 3, 3, 3, 2, 2, 1, 1, 2, 0, 2, 0, 1, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, - 3, 0, 1, 2, 1, 3, 3, 2, 3, 3, 3, 3, 3, 2, 3, 2, 1, 0, 3, 1, 2, 1, 2, 1, 2, 3, 2, 1, 0, 1, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 1, 1, 1, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 3, 1, 3, 3, 2, 3, 3, 2, 2, 2, 0, 1, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 2, 3, 3, 3, 3, 0, 3, 3, 3, 3, 3, 2, 1, 1, 2, 1, 3, 3, 0, 3, 1, 1, 1, 1, 3, 2, 0, 1, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, - 3, 3, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 1, 1, 3, 1, 3, 3, 2, 3, 2, 2, 2, 3, 0, 2, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 3, 3, 3, 3, 3, 2, 3, 3, 2, 2, 3, 2, 1, 1, 1, 1, 1, 3, 1, 3, 1, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 3, 3, 3, 3, 3, 2, 3, 2, 0, 3, 2, 0, 3, 0, 2, 0, 0, 2, 1, 3, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, - 3, 3, 3, 3, 2, 1, 1, 1, 1, 2, 1, 1, 2, 1, 1, 1, 2, 2, 1, 2, 1, 1, 1, 0, 1, 1, 0, 1, 0, 1, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, - 3, 3, 3, 3, 2, 1, 3, 1, 1, 2, 1, 3, 2, 1, 1, 0, 1, 2, 3, 2, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 2, 3, 3, 3, 3, 2, 2, 1, 0, 1, 0, 0, 1, 0, 0, 0, 2, 1, 0, 3, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, - 3, 3, 3, 2, 3, 2, 3, 3, 1, 3, 2, 1, 1, 1, 2, 1, 1, 2, 1, 3, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 3, 1, 1, 2, 2, 3, 3, 2, 3, 2, 2, 2, 3, 1, 2, 2, 1, 1, 2, 1, 1, 2, 2, 0, 1, 1, 0, 1, 0, 2, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 3, 3, 3, 3, 2, 1, 3, 1, 0, 2, 2, 1, 3, 2, 1, 0, 0, 2, 0, 2, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, - 3, 3, 3, 3, 3, 3, 1, 2, 0, 2, 3, 1, 2, 3, 2, 0, 1, 3, 1, 2, 1, 1, 1, 0, 0, 1, 0, 0, 2, 2, 2, 3, - 2, 2, 2, 2, 1, 2, 1, 1, 2, 2, 1, 1, 2, 0, 1, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 1, 1, 0, 1, - 3, 3, 3, 3, 3, 2, 1, 2, 2, 1, 2, 0, 2, 0, 1, 0, 1, 2, 1, 2, 1, 1, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, - 3, 3, 2, 3, 3, 1, 1, 3, 1, 0, 3, 2, 1, 0, 0, 0, 1, 2, 0, 2, 0, 1, 0, 0, 0, 1, 0, 1, 2, 1, 2, 2, - 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 0, 1, 2, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, - 3, 1, 0, 1, 0, 2, 3, 2, 2, 2, 3, 2, 2, 2, 2, 2, 1, 0, 2, 1, 2, 1, 1, 1, 0, 1, 2, 1, 2, 2, 2, 1, - 1, 1, 2, 2, 2, 2, 1, 2, 1, 1, 0, 1, 2, 1, 2, 2, 2, 1, 1, 1, 0, 1, 1, 1, 1, 2, 0, 1, 0, 0, 0, 0, - 2, 3, 2, 3, 3, 0, 0, 2, 1, 0, 2, 1, 0, 0, 0, 0, 2, 3, 0, 2, 0, 0, 0, 0, 0, 1, 0, 0, 2, 0, 1, 2, - 2, 1, 2, 1, 2, 2, 1, 1, 1, 2, 1, 1, 1, 0, 1, 2, 2, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0, 1, 2, 0, 0, - 3, 3, 2, 2, 3, 0, 2, 3, 1, 1, 2, 0, 0, 0, 1, 0, 0, 2, 0, 2, 0, 0, 0, 1, 0, 1, 0, 1, 2, 0, 2, 2, - 1, 1, 1, 1, 2, 1, 0, 1, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, - 2, 3, 2, 3, 3, 0, 0, 3, 0, 1, 1, 0, 1, 0, 0, 0, 2, 2, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 1, 2, - 2, 2, 1, 1, 1, 1, 1, 2, 2, 2, 1, 0, 2, 0, 1, 0, 1, 0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, - 3, 3, 3, 3, 2, 2, 2, 2, 2, 0, 2, 1, 1, 1, 1, 2, 1, 2, 1, 1, 0, 2, 0, 1, 0, 1, 0, 0, 2, 0, 1, 2, - 1, 1, 1, 1, 1, 1, 1, 2, 2, 1, 1, 0, 2, 0, 1, 0, 2, 0, 0, 1, 1, 1, 0, 0, 2, 0, 0, 0, 1, 1, 0, 0, - 2, 3, 3, 3, 3, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 1, 2, 0, 1, 2, - 2, 2, 2, 1, 1, 2, 1, 1, 2, 2, 2, 1, 2, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 0, 0, 1, 1, 1, 0, 0, - 2, 3, 3, 3, 3, 0, 2, 2, 0, 2, 1, 0, 0, 0, 1, 1, 1, 2, 0, 2, 0, 0, 0, 3, 0, 0, 0, 0, 2, 0, 2, 2, - 1, 1, 1, 2, 1, 2, 1, 1, 2, 2, 2, 1, 2, 0, 1, 1, 1, 0, 1, 1, 1, 1, 0, 2, 1, 0, 0, 0, 1, 1, 0, 0, - 2, 3, 3, 3, 3, 0, 2, 1, 0, 0, 2, 0, 0, 0, 0, 0, 1, 2, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 1, 2, - 1, 1, 1, 2, 1, 1, 1, 1, 2, 2, 2, 0, 1, 0, 1, 1, 1, 0, 0, 1, 1, 1, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, - 3, 3, 2, 2, 3, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 2, 2, - 1, 1, 1, 1, 1, 2, 1, 1, 2, 2, 1, 2, 2, 1, 0, 1, 1, 1, 1, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, - 3, 1, 0, 1, 0, 2, 2, 2, 2, 3, 2, 1, 1, 1, 2, 3, 0, 0, 1, 0, 2, 1, 1, 0, 1, 1, 1, 1, 2, 1, 1, 1, - 1, 2, 2, 1, 2, 1, 2, 2, 1, 1, 0, 1, 2, 1, 2, 2, 1, 1, 1, 0, 0, 1, 1, 1, 2, 1, 0, 1, 0, 0, 0, 0, - 2, 1, 0, 1, 0, 3, 1, 2, 2, 2, 2, 1, 2, 2, 1, 1, 1, 0, 2, 1, 2, 2, 1, 1, 2, 1, 1, 0, 2, 1, 1, 1, - 1, 2, 2, 2, 2, 2, 2, 2, 1, 2, 0, 1, 1, 0, 2, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 0, 1, 0, 0, 0, 0, - 2, 1, 1, 1, 1, 2, 2, 2, 2, 1, 2, 2, 2, 1, 2, 2, 1, 1, 2, 1, 2, 3, 2, 2, 1, 1, 1, 1, 0, 1, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 2, 2, 2, 3, 2, 0, 1, 2, 0, 1, 2, 1, 1, 0, 1, 0, 1, 2, 1, 2, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 2, - 1, 1, 0, 0, 1, 1, 0, 1, 1, 1, 1, 0, 2, 0, 1, 1, 1, 0, 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, - 2, 0, 0, 0, 0, 1, 2, 2, 2, 2, 2, 2, 2, 1, 2, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 2, 1, 1, 1, - 1, 2, 2, 2, 2, 1, 1, 2, 1, 2, 1, 1, 1, 0, 2, 1, 2, 1, 1, 1, 0, 2, 1, 1, 1, 1, 0, 1, 0, 0, 0, 0, - 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, - 1, 1, 0, 1, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 2, 2, 2, 3, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 2, - 1, 1, 1, 1, 1, 1, 0, 0, 2, 2, 2, 2, 2, 0, 1, 1, 0, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, 0, 1, 1, 0, 1, - 2, 3, 1, 2, 1, 0, 1, 1, 0, 2, 2, 2, 0, 0, 1, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 2, - 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, - 2, 2, 2, 2, 2, 0, 0, 2, 0, 0, 2, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 2, 2, - 1, 1, 1, 1, 1, 0, 0, 1, 2, 1, 1, 0, 1, 0, 1, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 1, 2, 2, 2, 2, 0, 0, 2, 0, 1, 1, 0, 0, 0, 1, 0, 0, 2, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, - 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 1, 2, 2, 3, 2, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 2, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 2, - 1, 1, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 2, 1, 2, 2, 2, 1, 2, 1, 2, 2, 1, 1, 2, 1, 1, 1, 0, 1, 1, 1, 1, 2, 0, 1, 0, 1, 1, 1, 1, 0, 1, 1, - 1, 1, 2, 1, 1, 1, 1, 1, 1, 0, 0, 1, 2, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, - 1, 0, 0, 1, 3, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 2, 2, 2, 2, 1, 0, 0, 1, 0, 2, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 1, - 0, 2, 0, 1, 0, 0, 1, 1, 2, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 1, 2, 2, 2, 2, 0, 1, 1, 0, 2, 1, 0, 1, 1, 1, 0, 0, 1, 0, 2, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, - 0, 1, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 1, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 2, 2, 2, 2, 2, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, - 0, 1, 0, 1, 1, 1, 0, 0, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 2, 0, 1, 0, 0, 1, 2, 1, 1, 1, 1, 1, 1, 2, 2, 1, 0, 0, 1, 0, 1, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, - 1, 1, 2, 1, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 2, 2, 1, 2, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, - 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 1, 0, 0, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, - 0, 1, 1, 0, 1, 1, 1, 0, 0, 1, 0, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, - 1, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 0, 2, 0, 0, 2, 0, 1, 0, 0, 1, 0, 0, 1, - 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, - 1, 1, 1, 1, 1, 1, 1, 2, 0, 0, 0, 0, 0, 0, 2, 1, 0, 1, 1, 0, 0, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, - 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 0, 1, 1, 1, 1, 1, 0, 1, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, + 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 3, 3, 3, 3, 3, 3, 3, 3, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 0, 3, 3, 3, 2, 2, 3, 2, 2, 1, 2, 2, 3, 1, 3, 3, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 3, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 3, 2, 3, 3, 3, 3, 3, 3, 3, 3, + 0, 3, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 3, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 1, 3, 2, 3, 3, 3, 3, 3, 3, 3, 3, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 2, 3, 3, + 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 1, 3, 2, 3, 3, 3, 3, 3, 3, 3, 3, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 3, 2, 2, 1, 3, 3, 3, 3, 2, 2, 2, 1, 1, 2, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 3, 3, 3, 3, 3, 3, 3, 2, 3, 2, 2, 3, 3, 1, 1, 2, 3, 3, 2, 3, 3, 3, 3, 2, 1, 2, 0, 2, 0, 3, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 3, 3, 3, 3, 3, 3, 3, 1, 3, 3, 3, 3, 3, 2, 3, 2, 3, 3, 3, 3, + 3, 2, 3, 3, 1, 3, 0, 3, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 3, 3, 3, 3, 3, 3, 3, 3, + 1, 3, 3, 2, 3, 3, 3, 1, 3, 3, 2, 3, 2, 2, 2, 0, 0, 2, 0, 2, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 1, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 3, 3, 3, 2, 2, 3, 3, 3, 1, 2, 2, 3, 2, 1, 1, 2, 0, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 1, 0, 0, + 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 3, 3, 3, 3, 3, 3, 3, 2, 3, 3, 1, 2, 3, 2, 2, 2, 3, 3, 3, 3, 3, 2, 2, 3, 1, 2, 0, 2, 1, 2, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 3, 0, 0, 1, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 3, 3, 3, 3, 3, 1, 3, 3, 3, 3, 3, 2, 3, 3, 3, 2, 3, 3, 2, 3, 2, 2, 2, 3, + 1, 2, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 1, + 1, 1, 2, 2, 1, 3, 1, 3, 2, 2, 3, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, + 3, 3, 3, 3, 3, 2, 2, 3, 2, 2, 3, 1, 2, 1, 1, 1, 2, 3, 1, 3, 1, 2, 2, 0, 1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 3, 3, 3, 3, 3, 1, 3, 2, 2, 3, 3, 1, 2, 3, 1, 1, 3, 3, 3, 3, 1, 2, 2, 1, 1, 1, 0, 2, 0, 2, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 1, 2, 2, 3, 3, 3, 2, 2, 1, 1, 2, 0, 2, + 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 3, 0, 1, 2, 1, 3, 3, 2, 3, 3, 3, 3, 3, 2, 3, 2, + 1, 0, 3, 1, 2, 1, 2, 1, 2, 3, 2, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 2, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 3, 1, 3, 3, 2, 3, 3, 2, 2, 2, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 2, 3, 3, 3, 3, 0, 3, 3, 3, 3, 3, 2, 1, 1, 2, 1, 3, 3, 0, 3, 1, 1, 1, 1, 3, 2, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 3, 3, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 1, 1, 3, 1, 3, 3, 2, 3, 2, 2, 2, 3, 0, 2, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 3, 3, 2, 3, 3, 2, 2, 3, 2, 1, 1, 1, 1, 1, 3, 1, 3, + 1, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 3, 3, 2, 3, 2, + 0, 3, 2, 0, 3, 0, 2, 0, 0, 2, 1, 3, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 1, 3, 3, 3, 3, 2, 1, 1, 1, 1, 2, 1, 1, 2, 1, 1, 1, 2, 2, 1, 2, 1, 1, 1, 0, 1, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 3, 3, 3, 3, 2, 1, 3, 1, 1, 2, 1, 3, 2, 1, 1, 0, 1, 2, 3, 2, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 3, 3, 3, 3, 2, 2, 1, 0, 1, 0, 0, 1, 0, 0, 0, 2, 1, 0, 3, 0, 0, 1, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 3, 3, 3, 2, 3, 2, 3, 3, 1, 3, 2, 1, + 1, 1, 2, 1, 1, 2, 1, 3, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 3, 1, 1, 2, 2, 3, 3, 2, 3, 2, 2, 2, 3, 1, 2, 2, 1, 1, 2, 1, 1, 2, 2, 0, 1, 1, 0, 1, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 3, 2, 1, 3, 1, 0, 2, 2, 1, 3, 2, 1, 0, 0, 2, 0, 2, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 3, 3, 3, 3, 3, 3, 1, 2, 0, 2, 3, 1, 2, 3, 2, 0, 1, 3, 1, 2, 1, 1, 1, 0, 0, 1, 0, 0, + 2, 2, 2, 3, 2, 2, 2, 2, 1, 2, 1, 1, 2, 2, 1, 1, 2, 0, 1, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 1, 1, 0, 1, 3, 3, 3, 3, 3, 2, 1, 2, 2, 1, 2, 0, 2, 0, 1, 0, + 1, 2, 1, 2, 1, 1, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 3, 3, 2, 3, + 3, 1, 1, 3, 1, 0, 3, 2, 1, 0, 0, 0, 1, 2, 0, 2, 0, 1, 0, 0, 0, 1, 0, 1, 2, 1, 2, 2, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 0, 1, 2, 1, 1, 1, 0, + 0, 0, 0, 0, 1, 1, 0, 0, 3, 1, 0, 1, 0, 2, 3, 2, 2, 2, 3, 2, 2, 2, 2, 2, 1, 0, 2, 1, 2, 1, 1, 1, 0, 1, 2, 1, 2, 2, 2, 1, 1, 1, 2, 2, 2, 2, 1, 2, 1, 1, 0, 1, + 2, 1, 2, 2, 2, 1, 1, 1, 0, 1, 1, 1, 1, 2, 0, 1, 0, 0, 0, 0, 2, 3, 2, 3, 3, 0, 0, 2, 1, 0, 2, 1, 0, 0, 0, 0, 2, 3, 0, 2, 0, 0, 0, 0, 0, 1, 0, 0, 2, 0, 1, 2, + 2, 1, 2, 1, 2, 2, 1, 1, 1, 2, 1, 1, 1, 0, 1, 2, 2, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0, 1, 2, 0, 0, 3, 3, 2, 2, 3, 0, 2, 3, 1, 1, 2, 0, 0, 0, 1, 0, 0, 2, 0, 2, + 0, 0, 0, 1, 0, 1, 0, 1, 2, 0, 2, 2, 1, 1, 1, 1, 2, 1, 0, 1, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 2, 3, 2, 3, 3, 0, 0, 3, + 0, 1, 1, 0, 1, 0, 0, 0, 2, 2, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 1, 2, 2, 2, 1, 1, 1, 1, 1, 2, 2, 2, 1, 0, 2, 0, 1, 0, 1, 0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, + 0, 1, 0, 0, 3, 3, 3, 3, 2, 2, 2, 2, 2, 0, 2, 1, 1, 1, 1, 2, 1, 2, 1, 1, 0, 2, 0, 1, 0, 1, 0, 0, 2, 0, 1, 2, 1, 1, 1, 1, 1, 1, 1, 2, 2, 1, 1, 0, 2, 0, 1, 0, + 2, 0, 0, 1, 1, 1, 0, 0, 2, 0, 0, 0, 1, 1, 0, 0, 2, 3, 3, 3, 3, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 1, 2, 0, 1, 2, 2, 2, 2, 1, + 1, 2, 1, 1, 2, 2, 2, 1, 2, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 0, 0, 1, 1, 1, 0, 0, 2, 3, 3, 3, 3, 0, 2, 2, 0, 2, 1, 0, 0, 0, 1, 1, 1, 2, 0, 2, 0, 0, 0, 3, + 0, 0, 0, 0, 2, 0, 2, 2, 1, 1, 1, 2, 1, 2, 1, 1, 2, 2, 2, 1, 2, 0, 1, 1, 1, 0, 1, 1, 1, 1, 0, 2, 1, 0, 0, 0, 1, 1, 0, 0, 2, 3, 3, 3, 3, 0, 2, 1, 0, 0, 2, 0, + 0, 0, 0, 0, 1, 2, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 1, 2, 1, 1, 1, 2, 1, 1, 1, 1, 2, 2, 2, 0, 1, 0, 1, 1, 1, 0, 0, 1, 1, 1, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, + 3, 3, 2, 2, 3, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 2, 2, 1, 1, 1, 1, 1, 2, 1, 1, 2, 2, 1, 2, 2, 1, 0, 1, 1, 1, 1, 1, + 0, 1, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 3, 1, 0, 1, 0, 2, 2, 2, 2, 3, 2, 1, 1, 1, 2, 3, 0, 0, 1, 0, 2, 1, 1, 0, 1, 1, 1, 1, 2, 1, 1, 1, 1, 2, 2, 1, 2, 1, 2, 2, + 1, 1, 0, 1, 2, 1, 2, 2, 1, 1, 1, 0, 0, 1, 1, 1, 2, 1, 0, 1, 0, 0, 0, 0, 2, 1, 0, 1, 0, 3, 1, 2, 2, 2, 2, 1, 2, 2, 1, 1, 1, 0, 2, 1, 2, 2, 1, 1, 2, 1, 1, 0, + 2, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 1, 2, 0, 1, 1, 0, 2, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 2, 1, 1, 1, 1, 2, 2, 2, 2, 1, 2, 2, 2, 1, 2, 2, + 1, 1, 2, 1, 2, 3, 2, 2, 1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 3, + 2, 0, 1, 2, 0, 1, 2, 1, 1, 0, 1, 0, 1, 2, 1, 2, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 2, 1, 1, 0, 0, 1, 1, 0, 1, 1, 1, 1, 0, 2, 0, 1, 1, 1, 0, 0, 1, 1, 0, 0, 0, + 0, 1, 0, 0, 0, 1, 0, 0, 2, 0, 0, 0, 0, 1, 2, 2, 2, 2, 2, 2, 2, 1, 2, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 2, 2, 2, 2, 1, 1, 2, 1, 2, 1, 1, + 1, 0, 2, 1, 2, 1, 1, 1, 0, 2, 1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, + 1, 1, 0, 1, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 3, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 0, 2, + 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 2, 1, 1, 1, 1, 1, 1, 0, 0, 2, 2, 2, 2, 2, 0, 1, 1, 0, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, 0, 1, 1, 0, 1, 2, 3, 1, 2, 1, 0, 1, 1, + 0, 2, 2, 2, 0, 0, 1, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 2, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, + 0, 1, 0, 0, 2, 2, 2, 2, 2, 0, 0, 2, 0, 0, 2, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 2, 2, 1, 1, 1, 1, 1, 0, 0, 1, 2, 1, 1, 0, 1, 0, 1, 0, + 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 2, 2, 2, 0, 0, 2, 0, 1, 1, 0, 0, 0, 1, 0, 0, 2, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 2, 3, 2, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 2, 0, 0, 0, 1, + 0, 0, 0, 0, 0, 0, 0, 2, 1, 1, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 2, 2, 2, 1, 2, 1, 2, 2, 1, 1, + 2, 1, 1, 1, 0, 1, 1, 1, 1, 2, 0, 1, 0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 0, 0, 1, 2, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, + 1, 0, 0, 1, 3, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 2, 1, 0, 0, 1, 0, 2, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 1, 0, 2, 0, 1, 0, 0, 1, 1, + 2, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 2, 2, 2, 0, 1, 1, 0, 2, 1, 0, 1, 1, 1, 0, 0, 1, 0, 2, 0, 1, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 1, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 2, 2, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0, 0, + 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 1, 1, 0, 0, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 1, 0, + 0, 1, 2, 1, 1, 1, 1, 1, 1, 2, 2, 1, 0, 0, 1, 0, 1, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 1, 1, 2, 1, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 1, 2, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, + 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1, 0, 1, 1, 1, 0, 0, 1, 0, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 0, 2, 0, 0, 2, 0, 1, 0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 2, 0, 0, 0, 0, 0, 0, 2, 1, + 0, 1, 1, 0, 0, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 0, 1, + 1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, }; -const SequenceModel KCODECS_NO_EXPORT Latin5BulgarianModel = { - Latin5_BulgarianCharToOrderMap, - BulgarianLangModel, - (float)0.969392, - false, - "ISO-8859-5" -}; +const SequenceModel KCODECS_NO_EXPORT Latin5BulgarianModel = {Latin5_BulgarianCharToOrderMap, BulgarianLangModel, (float)0.969392, false, "ISO-8859-5"}; -const SequenceModel KCODECS_NO_EXPORT Win1251BulgarianModel = { - win1251BulgarianCharToOrderMap, - BulgarianLangModel, - (float)0.969392, - false, - "windows-1251" -}; +const SequenceModel KCODECS_NO_EXPORT Win1251BulgarianModel = {win1251BulgarianCharToOrderMap, BulgarianLangModel, (float)0.969392, false, "windows-1251"}; } diff -Nru kcodecs-5.79.0/src/probers/LangCyrillicModel.cpp kcodecs-5.80.0/src/probers/LangCyrillicModel.cpp --- kcodecs-5.79.0/src/probers/LangCyrillicModel.cpp 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/src/probers/LangCyrillicModel.cpp 2021-03-06 16:19:34.000000000 +0000 @@ -8,305 +8,204 @@ namespace kencodingprober { -//KOI8-R language model -//Character Mapping Table: +// KOI8-R language model +// Character Mapping Table: static const unsigned char KOI8R_CharToOrderMap[] = { - 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 254, 255, 255, 254, 255, 255, //00 - 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, //10 - +253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, //20 - 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 253, 253, 253, 253, 253, 253, //30 - 253, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 74, 153, 75, 154, //40 - 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 253, 253, 253, 253, 253, //50 - 253, 71, 172, 66, 173, 65, 174, 76, 175, 64, 176, 177, 77, 72, 178, 69, //60 - 67, 179, 78, 73, 180, 181, 79, 182, 183, 184, 185, 253, 253, 253, 253, 253, //70 - 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, //80 - 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, //90 - 223, 224, 225, 68, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, //a0 - 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, //b0 - 27, 3, 21, 28, 13, 2, 39, 19, 26, 4, 23, 11, 8, 12, 5, 1, //c0 - 15, 16, 9, 7, 6, 14, 24, 10, 17, 18, 20, 25, 30, 29, 22, 54, //d0 - 59, 37, 44, 58, 41, 48, 53, 46, 55, 42, 60, 36, 49, 38, 31, 34, //e0 - 35, 43, 45, 32, 40, 52, 56, 33, 61, 62, 51, 57, 47, 63, 50, 70, //f0 + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 254, 255, 255, 254, 255, 255, // 00 + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, // 10 + +253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, // 20 + 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 253, 253, 253, 253, 253, 253, // 30 + 253, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 74, 153, 75, 154, // 40 + 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 253, 253, 253, 253, 253, // 50 + 253, 71, 172, 66, 173, 65, 174, 76, 175, 64, 176, 177, 77, 72, 178, 69, // 60 + 67, 179, 78, 73, 180, 181, 79, 182, 183, 184, 185, 253, 253, 253, 253, 253, // 70 + 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, // 80 + 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, // 90 + 223, 224, 225, 68, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, // a0 + 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, // b0 + 27, 3, 21, 28, 13, 2, 39, 19, 26, 4, 23, 11, 8, 12, 5, 1, // c0 + 15, 16, 9, 7, 6, 14, 24, 10, 17, 18, 20, 25, 30, 29, 22, 54, // d0 + 59, 37, 44, 58, 41, 48, 53, 46, 55, 42, 60, 36, 49, 38, 31, 34, // e0 + 35, 43, 45, 32, 40, 52, 56, 33, 61, 62, 51, 57, 47, 63, 50, 70, // f0 }; static const unsigned char win1251_CharToOrderMap[] = { - 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 254, 255, 255, 254, 255, 255, //00 - 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, //10 - +253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, //20 - 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 253, 253, 253, 253, 253, 253, //30 - 253, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 74, 153, 75, 154, //40 - 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 253, 253, 253, 253, 253, //50 - 253, 71, 172, 66, 173, 65, 174, 76, 175, 64, 176, 177, 77, 72, 178, 69, //60 - 67, 179, 78, 73, 180, 181, 79, 182, 183, 184, 185, 253, 253, 253, 253, 253, //70 - 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, - 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, - 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, - 239, 240, 241, 242, 243, 244, 245, 246, 68, 247, 248, 249, 250, 251, 252, 253, - 37, 44, 33, 46, 41, 48, 56, 51, 42, 60, 36, 49, 38, 31, 34, 35, - 45, 32, 40, 52, 53, 55, 58, 50, 57, 63, 70, 62, 61, 47, 59, 43, - 3, 21, 10, 19, 13, 2, 24, 20, 4, 23, 11, 8, 12, 5, 1, 15, - 9, 7, 6, 14, 39, 26, 28, 22, 25, 29, 54, 18, 17, 30, 27, 16, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 254, 255, 255, 254, 255, 255, // 00 + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, // 10 + +253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, // 20 + 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 253, 253, 253, 253, 253, 253, // 30 + 253, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 74, 153, 75, 154, // 40 + 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 253, 253, 253, 253, 253, // 50 + 253, 71, 172, 66, 173, 65, 174, 76, 175, 64, 176, 177, 77, 72, 178, 69, // 60 + 67, 179, 78, 73, 180, 181, 79, 182, 183, 184, 185, 253, 253, 253, 253, 253, // 70 + 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, + 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, + 243, 244, 245, 246, 68, 247, 248, 249, 250, 251, 252, 253, 37, 44, 33, 46, 41, 48, 56, 51, 42, 60, 36, 49, 38, 31, + 34, 35, 45, 32, 40, 52, 53, 55, 58, 50, 57, 63, 70, 62, 61, 47, 59, 43, 3, 21, 10, 19, 13, 2, 24, 20, + 4, 23, 11, 8, 12, 5, 1, 15, 9, 7, 6, 14, 39, 26, 28, 22, 25, 29, 54, 18, 17, 30, 27, 16, }; const unsigned char latin5_CharToOrderMap[] = { - 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 254, 255, 255, 254, 255, 255, //00 - 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, //10 - +253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, //20 - 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 253, 253, 253, 253, 253, 253, //30 - 253, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 74, 153, 75, 154, //40 - 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 253, 253, 253, 253, 253, //50 - 253, 71, 172, 66, 173, 65, 174, 76, 175, 64, 176, 177, 77, 72, 178, 69, //60 - 67, 179, 78, 73, 180, 181, 79, 182, 183, 184, 185, 253, 253, 253, 253, 253, //70 - 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, - 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, - 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, - 37, 44, 33, 46, 41, 48, 56, 51, 42, 60, 36, 49, 38, 31, 34, 35, - 45, 32, 40, 52, 53, 55, 58, 50, 57, 63, 70, 62, 61, 47, 59, 43, - 3, 21, 10, 19, 13, 2, 24, 20, 4, 23, 11, 8, 12, 5, 1, 15, - 9, 7, 6, 14, 39, 26, 28, 22, 25, 29, 54, 18, 17, 30, 27, 16, - 239, 68, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 255, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 254, 255, 255, 254, 255, 255, // 00 + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, // 10 + +253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, // 20 + 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 253, 253, 253, 253, 253, 253, // 30 + 253, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 74, 153, 75, 154, // 40 + 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 253, 253, 253, 253, 253, // 50 + 253, 71, 172, 66, 173, 65, 174, 76, 175, 64, 176, 177, 77, 72, 178, 69, // 60 + 67, 179, 78, 73, 180, 181, 79, 182, 183, 184, 185, 253, 253, 253, 253, 253, // 70 + 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, + 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 37, 44, 33, 46, + 41, 48, 56, 51, 42, 60, 36, 49, 38, 31, 34, 35, 45, 32, 40, 52, 53, 55, 58, 50, 57, 63, 70, 62, 61, 47, + 59, 43, 3, 21, 10, 19, 13, 2, 24, 20, 4, 23, 11, 8, 12, 5, 1, 15, 9, 7, 6, 14, 39, 26, 28, 22, + 25, 29, 54, 18, 17, 30, 27, 16, 239, 68, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 255, }; const unsigned char macCyrillic_CharToOrderMap[] = { - 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 254, 255, 255, 254, 255, 255, //00 - 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, //10 - +253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, //20 - 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 253, 253, 253, 253, 253, 253, //30 - 253, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 74, 153, 75, 154, //40 - 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 253, 253, 253, 253, 253, //50 - 253, 71, 172, 66, 173, 65, 174, 76, 175, 64, 176, 177, 77, 72, 178, 69, //60 - 67, 179, 78, 73, 180, 181, 79, 182, 183, 184, 185, 253, 253, 253, 253, 253, //70 - 37, 44, 33, 46, 41, 48, 56, 51, 42, 60, 36, 49, 38, 31, 34, 35, - 45, 32, 40, 52, 53, 55, 58, 50, 57, 63, 70, 62, 61, 47, 59, 43, - 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, - 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, - 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, - 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 68, 16, - 3, 21, 10, 19, 13, 2, 24, 20, 4, 23, 11, 8, 12, 5, 1, 15, - 9, 7, 6, 14, 39, 26, 28, 22, 25, 29, 54, 18, 17, 30, 27, 255, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 254, 255, 255, 254, 255, 255, // 00 + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, // 10 + +253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, // 20 + 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 253, 253, 253, 253, 253, 253, // 30 + 253, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 74, 153, 75, 154, // 40 + 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 253, 253, 253, 253, 253, // 50 + 253, 71, 172, 66, 173, 65, 174, 76, 175, 64, 176, 177, 77, 72, 178, 69, // 60 + 67, 179, 78, 73, 180, 181, 79, 182, 183, 184, 185, 253, 253, 253, 253, 253, // 70 + 37, 44, 33, 46, 41, 48, 56, 51, 42, 60, 36, 49, 38, 31, 34, 35, 45, 32, 40, 52, 53, 55, 58, 50, 57, 63, + 70, 62, 61, 47, 59, 43, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, + 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, + 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 68, 16, 3, 21, 10, 19, 13, 2, 24, 20, + 4, 23, 11, 8, 12, 5, 1, 15, 9, 7, 6, 14, 39, 26, 28, 22, 25, 29, 54, 18, 17, 30, 27, 255, }; const unsigned char IBM855_CharToOrderMap[] = { - 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 254, 255, 255, 254, 255, 255, //00 - 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, //10 - +253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, //20 - 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 253, 253, 253, 253, 253, 253, //30 - 253, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 74, 153, 75, 154, //40 - 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 253, 253, 253, 253, 253, //50 - 253, 71, 172, 66, 173, 65, 174, 76, 175, 64, 176, 177, 77, 72, 178, 69, //60 - 67, 179, 78, 73, 180, 181, 79, 182, 183, 184, 185, 253, 253, 253, 253, 253, //70 - 191, 192, 193, 194, 68, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, - 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 27, 59, 54, 70, - 3, 37, 21, 44, 28, 58, 13, 41, 2, 48, 39, 53, 19, 46, 218, 219, - 220, 221, 222, 223, 224, 26, 55, 4, 42, 225, 226, 227, 228, 23, 60, 229, - 230, 231, 232, 233, 234, 235, 11, 36, 236, 237, 238, 239, 240, 241, 242, 243, - 8, 49, 12, 38, 5, 31, 1, 34, 15, 244, 245, 246, 247, 35, 16, 248, - 43, 9, 45, 7, 32, 6, 40, 14, 52, 24, 56, 10, 33, 17, 61, 249, - 250, 18, 62, 20, 51, 25, 57, 30, 47, 29, 63, 22, 50, 251, 252, 255, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 254, 255, 255, 254, 255, 255, // 00 + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, // 10 + +253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, // 20 + 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 253, 253, 253, 253, 253, 253, // 30 + 253, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 74, 153, 75, 154, // 40 + 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 253, 253, 253, 253, 253, // 50 + 253, 71, 172, 66, 173, 65, 174, 76, 175, 64, 176, 177, 77, 72, 178, 69, // 60 + 67, 179, 78, 73, 180, 181, 79, 182, 183, 184, 185, 253, 253, 253, 253, 253, // 70 + 191, 192, 193, 194, 68, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, + 216, 217, 27, 59, 54, 70, 3, 37, 21, 44, 28, 58, 13, 41, 2, 48, 39, 53, 19, 46, 218, 219, 220, 221, 222, 223, + 224, 26, 55, 4, 42, 225, 226, 227, 228, 23, 60, 229, 230, 231, 232, 233, 234, 235, 11, 36, 236, 237, 238, 239, 240, 241, + 242, 243, 8, 49, 12, 38, 5, 31, 1, 34, 15, 244, 245, 246, 247, 35, 16, 248, 43, 9, 45, 7, 32, 6, 40, 14, + 52, 24, 56, 10, 33, 17, 61, 249, 250, 18, 62, 20, 51, 25, 57, 30, 47, 29, 63, 22, 50, 251, 252, 255, }; const unsigned char IBM866_CharToOrderMap[] = { - 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 254, 255, 255, 254, 255, 255, //00 - 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, //10 - +253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, //20 - 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 253, 253, 253, 253, 253, 253, //30 - 253, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 74, 153, 75, 154, //40 - 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 253, 253, 253, 253, 253, //50 - 253, 71, 172, 66, 173, 65, 174, 76, 175, 64, 176, 177, 77, 72, 178, 69, //60 - 67, 179, 78, 73, 180, 181, 79, 182, 183, 184, 185, 253, 253, 253, 253, 253, //70 - 37, 44, 33, 46, 41, 48, 56, 51, 42, 60, 36, 49, 38, 31, 34, 35, - 45, 32, 40, 52, 53, 55, 58, 50, 57, 63, 70, 62, 61, 47, 59, 43, - 3, 21, 10, 19, 13, 2, 24, 20, 4, 23, 11, 8, 12, 5, 1, 15, - 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, - 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, - 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, - 9, 7, 6, 14, 39, 26, 28, 22, 25, 29, 54, 18, 17, 30, 27, 16, - 239, 68, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 255, -}; - -//Model Table: -//total sequences: 100% -//first 512 sequences: 97.6601% -//first 1024 sequences: 2.3389% -//rest sequences: 0.1237% -//negative sequences: 0.0009% + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 254, 255, 255, 254, 255, 255, // 00 + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, // 10 + +253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, // 20 + 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 253, 253, 253, 253, 253, 253, // 30 + 253, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 74, 153, 75, 154, // 40 + 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 253, 253, 253, 253, 253, // 50 + 253, 71, 172, 66, 173, 65, 174, 76, 175, 64, 176, 177, 77, 72, 178, 69, // 60 + 67, 179, 78, 73, 180, 181, 79, 182, 183, 184, 185, 253, 253, 253, 253, 253, // 70 + 37, 44, 33, 46, 41, 48, 56, 51, 42, 60, 36, 49, 38, 31, 34, 35, 45, 32, 40, 52, 53, 55, 58, 50, 57, 63, + 70, 62, 61, 47, 59, 43, 3, 21, 10, 19, 13, 2, 24, 20, 4, 23, 11, 8, 12, 5, 1, 15, 191, 192, 193, 194, + 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, + 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 9, 7, 6, 14, 39, 26, 28, 22, + 25, 29, 54, 18, 17, 30, 27, 16, 239, 68, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 255, +}; + +// Model Table: +// total sequences: 100% +// first 512 sequences: 97.6601% +// first 1024 sequences: 2.3389% +// rest sequences: 0.1237% +// negative sequences: 0.0009% const char RussianLangModel[] = { - 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 1, 1, 3, 3, 3, 3, 1, 3, 3, 3, 2, 3, 2, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 3, 2, 2, 2, 2, 2, 0, 0, 2, - 3, 3, 3, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 3, 3, 0, 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 3, 2, 0, - 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 3, 3, 3, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 3, 3, 0, 0, 3, 3, 3, 3, 3, 3, 3, 3, 2, 3, 3, 1, 0, - 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 3, 2, 3, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 1, - 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 3, 3, 0, 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 1, - 0, 0, 0, 0, 0, 1, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 3, 3, 3, 3, 3, 3, 3, 3, 2, 2, 2, 3, 1, 3, 3, 1, 3, 3, 3, 3, 2, 2, 3, 0, 2, 2, 2, 3, 3, 2, 1, 0, - 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 3, 3, 3, 3, 3, 3, 2, 3, 3, 3, 3, 3, 2, 2, 3, 2, 3, 3, 3, 2, 1, 2, 2, 0, 1, 2, 2, 2, 2, 2, 2, 0, - 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 2, 2, 3, 0, 2, 2, 3, 3, 2, 1, 2, 0, - 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 3, 3, 3, 3, 3, 3, 2, 3, 3, 1, 2, 3, 2, 2, 3, 2, 3, 3, 3, 3, 2, 2, 3, 0, 3, 2, 2, 3, 1, 1, 1, 0, - 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 3, 3, 3, 3, 3, 3, 3, 3, 2, 2, 3, 3, 3, 3, 3, 2, 3, 3, 3, 3, 2, 2, 2, 0, 3, 3, 3, 2, 2, 2, 2, 0, - 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 3, 2, 3, 3, 3, 3, 3, 3, 2, 3, 2, 2, 0, 1, 3, 2, 1, 2, 2, 1, 0, - 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 1, 1, 3, 0, 1, 1, 1, 1, 2, 1, 1, 0, 2, 2, 2, 1, 2, 0, 1, 0, - 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 3, 3, 3, 3, 3, 3, 2, 3, 3, 2, 2, 2, 2, 1, 3, 2, 3, 2, 3, 2, 1, 2, 2, 0, 1, 1, 2, 1, 2, 1, 2, 0, - 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 2, 3, 2, 3, 3, 3, 2, 2, 2, 2, 0, 2, 2, 2, 2, 3, 1, 1, 0, - 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 3, 2, 3, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 1, 3, 2, 0, 0, 3, 3, 3, 3, 2, 3, 3, 3, 3, 2, 3, 2, 0, - 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 2, 3, 3, 3, 3, 3, 2, 2, 3, 3, 0, 2, 1, 0, 3, 2, 3, 2, 3, 0, 0, 1, 2, 0, 0, 1, 0, 1, 2, 1, 1, 0, - 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 3, 0, 3, 0, 2, 3, 3, 3, 3, 2, 3, 3, 3, 3, 1, 2, 2, 0, 0, 2, 3, 2, 2, 2, 3, 2, 3, 2, 2, 3, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 3, 2, 3, 0, 2, 3, 2, 3, 0, 1, 2, 3, 3, 2, 0, 2, 3, 0, 0, 2, 3, 2, 2, 0, 1, 3, 1, 3, 2, 2, 1, 0, - 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 3, 1, 3, 0, 2, 3, 3, 3, 3, 3, 3, 3, 3, 2, 1, 3, 2, 0, 0, 2, 2, 3, 3, 3, 2, 3, 3, 0, 2, 2, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 3, 3, 3, 3, 3, 3, 2, 2, 3, 3, 2, 2, 2, 3, 3, 0, 0, 1, 1, 1, 1, 1, 2, 0, 0, 1, 1, 1, 1, 0, 1, 0, - 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 3, 3, 3, 3, 3, 3, 2, 2, 3, 3, 3, 3, 3, 3, 3, 0, 3, 2, 3, 3, 2, 3, 2, 0, 2, 1, 0, 1, 1, 0, 1, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 3, 3, 3, 3, 3, 3, 2, 3, 3, 3, 2, 2, 2, 2, 3, 1, 3, 2, 3, 1, 1, 2, 1, 0, 2, 2, 2, 2, 1, 3, 1, 0, - 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 2, 2, 3, 3, 3, 3, 3, 1, 2, 2, 1, 3, 1, 0, 3, 0, 0, 3, 0, 0, 0, 1, 1, 0, 1, 2, 1, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 3, 2, 2, 1, 1, 3, 3, 3, 2, 2, 1, 2, 2, 3, 1, 1, 2, 0, 0, 2, 2, 1, 3, 0, 0, 2, 1, 1, 2, 1, 1, 0, - 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 3, 2, 3, 3, 3, 3, 1, 2, 2, 2, 1, 2, 1, 3, 3, 1, 1, 2, 1, 2, 1, 2, 2, 0, 2, 0, 0, 1, 1, 0, 1, 0, - 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 2, 3, 3, 3, 3, 3, 2, 1, 3, 2, 2, 3, 2, 0, 3, 2, 0, 3, 0, 1, 0, 1, 1, 0, 0, 1, 1, 1, 1, 0, 1, 0, - 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 3, 3, 2, 3, 3, 3, 2, 2, 2, 3, 3, 1, 2, 1, 2, 1, 0, 1, 0, 1, 1, 0, 1, 0, 0, 2, 1, 1, 1, 0, 1, 0, - 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 3, 1, 1, 2, 1, 2, 3, 3, 2, 2, 1, 2, 2, 3, 0, 2, 1, 0, 0, 2, 2, 3, 2, 1, 2, 2, 2, 2, 2, 3, 1, 0, - 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 3, 3, 3, 3, 3, 1, 1, 0, 1, 1, 2, 2, 1, 1, 3, 0, 0, 1, 3, 1, 1, 1, 0, 0, 0, 1, 0, 1, 1, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 2, 1, 3, 3, 3, 2, 0, 0, 0, 2, 1, 0, 1, 0, 2, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 2, 0, 1, 0, 0, 2, 3, 2, 2, 2, 1, 2, 2, 2, 1, 2, 1, 0, 0, 1, 1, 1, 0, 2, 0, 1, 1, 1, 0, 0, 1, 1, - 1, 0, 0, 0, 0, 0, 1, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 2, 3, 3, 3, 3, 0, 0, 0, 0, 1, 0, 0, 0, 0, 3, 0, 1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 1, 1, - 1, 0, 1, 0, 1, 2, 0, 0, 1, 1, 2, 1, 0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 0, 1, 0, 0, 1, 0, 0, 1, 1, 0, - 2, 2, 3, 2, 2, 2, 3, 1, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 2, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 0, 1, 1, 1, 0, 1, 1, 0, - 3, 3, 3, 2, 2, 2, 2, 3, 2, 2, 1, 1, 2, 2, 2, 2, 1, 1, 3, 1, 2, 1, 2, 0, 0, 1, 1, 0, 1, 0, 2, 1, - 1, 1, 1, 1, 1, 2, 1, 0, 1, 1, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1, 1, 0, - 2, 0, 0, 1, 0, 3, 2, 2, 2, 2, 1, 2, 1, 2, 1, 2, 0, 0, 0, 2, 1, 2, 2, 1, 1, 2, 2, 0, 1, 1, 0, 2, - 1, 1, 1, 1, 1, 0, 1, 1, 1, 2, 1, 1, 1, 2, 1, 0, 1, 2, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0, 1, 0, 0, 1, - 1, 3, 2, 2, 2, 1, 1, 1, 2, 3, 0, 0, 0, 0, 2, 0, 2, 2, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1, - 1, 0, 1, 1, 0, 1, 0, 1, 1, 0, 1, 1, 0, 2, 0, 0, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, - 2, 3, 2, 3, 2, 1, 2, 2, 2, 2, 1, 0, 0, 0, 2, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 2, 1, - 1, 1, 2, 1, 0, 2, 0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, - 3, 0, 0, 1, 0, 2, 2, 2, 3, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 2, 1, 2, 1, 1, 1, 2, 2, 0, 0, 0, 1, 2, - 1, 1, 1, 1, 1, 0, 1, 2, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 0, 1, - 2, 3, 2, 3, 3, 2, 0, 1, 1, 1, 0, 0, 1, 0, 2, 0, 1, 1, 3, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 2, 1, - 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, - 2, 3, 3, 3, 3, 1, 2, 2, 2, 2, 0, 1, 1, 0, 2, 1, 1, 1, 2, 1, 0, 1, 1, 0, 0, 1, 0, 1, 0, 0, 2, 0, - 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 2, 3, 3, 3, 2, 0, 0, 1, 1, 2, 2, 1, 0, 0, 2, 0, 1, 1, 3, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 1, 2, 1, - 1, 1, 2, 0, 1, 1, 1, 0, 1, 0, 1, 1, 0, 1, 0, 1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, - 1, 3, 2, 3, 2, 1, 0, 0, 2, 2, 2, 0, 1, 0, 2, 0, 1, 1, 1, 0, 1, 0, 0, 0, 3, 0, 1, 1, 0, 0, 2, 1, - 1, 1, 1, 0, 1, 1, 0, 0, 0, 0, 1, 1, 0, 1, 0, 0, 2, 1, 1, 0, 1, 0, 0, 0, 1, 0, 1, 0, 0, 1, 1, 0, - 3, 1, 2, 1, 1, 2, 2, 2, 2, 2, 2, 1, 2, 2, 1, 1, 0, 0, 0, 2, 2, 2, 0, 0, 0, 1, 2, 1, 0, 1, 0, 1, - 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 2, 1, 1, 1, 0, 1, 0, 1, 1, 0, 1, 1, 1, 0, 0, 1, - 3, 0, 0, 0, 0, 2, 0, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 1, 0, 1, 0, 1, 1, 0, 0, 1, 0, 1, - 1, 1, 0, 0, 1, 0, 0, 0, 1, 0, 1, 1, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, - 1, 3, 3, 2, 2, 0, 0, 0, 2, 2, 0, 0, 0, 1, 2, 0, 1, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 2, 1, - 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 1, 1, 0, 1, 1, 0, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, - 2, 3, 2, 3, 2, 0, 0, 0, 0, 1, 1, 0, 0, 0, 2, 0, 2, 0, 2, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 1, - 1, 1, 2, 0, 1, 2, 1, 0, 1, 1, 2, 1, 1, 1, 1, 1, 2, 1, 1, 0, 1, 0, 0, 1, 1, 1, 1, 1, 0, 1, 1, 0, - 1, 3, 2, 2, 2, 1, 0, 0, 2, 2, 1, 0, 1, 2, 2, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, - 0, 0, 1, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 1, 0, 0, 1, 0, 2, 3, 1, 2, 2, 2, 2, 2, 2, 1, 1, 0, 0, 0, 1, 0, 1, 0, 2, 1, 1, 1, 0, 0, 0, 0, 1, - 1, 1, 0, 1, 1, 0, 1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, - 2, 0, 2, 0, 0, 1, 0, 3, 2, 1, 2, 1, 2, 2, 0, 1, 0, 0, 0, 2, 1, 0, 0, 2, 1, 1, 1, 1, 0, 2, 0, 2, - 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 0, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 0, 1, 0, 0, 1, - 1, 2, 2, 2, 2, 1, 0, 0, 1, 0, 0, 0, 0, 0, 2, 0, 1, 1, 1, 1, 0, 0, 0, 0, 1, 0, 1, 2, 0, 0, 2, 0, - 1, 0, 1, 1, 1, 2, 1, 0, 1, 0, 1, 1, 0, 0, 1, 0, 1, 1, 1, 0, 1, 0, 0, 0, 1, 0, 0, 1, 0, 1, 1, 0, - 2, 1, 2, 2, 2, 0, 3, 0, 1, 1, 0, 0, 0, 0, 2, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, - 0, 0, 0, 1, 1, 1, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, - 1, 2, 2, 3, 2, 2, 0, 0, 1, 1, 2, 0, 1, 2, 1, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, - 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, - 2, 2, 1, 1, 2, 1, 2, 2, 2, 2, 2, 1, 2, 2, 0, 1, 0, 0, 0, 1, 2, 2, 2, 1, 2, 1, 1, 1, 1, 1, 2, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 0, 1, 1, 0, 0, 1, - 1, 2, 2, 2, 2, 0, 1, 0, 2, 2, 0, 0, 0, 0, 2, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, - 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 1, 2, 2, 2, 2, 0, 0, 0, 2, 2, 2, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, - 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 1, 2, 2, 2, 2, 0, 0, 0, 0, 1, 0, 0, 1, 1, 2, 0, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 2, 0, 0, 0, 1, - 0, 0, 1, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 1, 2, 2, 2, 1, 1, 2, 0, 2, 1, 1, 1, 1, 0, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 1, 1, - 0, 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 1, 0, 2, 1, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, - 0, 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, - 1, 0, 0, 0, 0, 2, 0, 1, 2, 1, 0, 1, 1, 1, 0, 1, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0, 1, 0, 0, 0, 0, 1, - 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, - 2, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, - 1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, - 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, - 1, 1, 1, 0, 1, 0, 1, 0, 0, 1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, - 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, - 1, 1, 0, 1, 1, 0, 1, 0, 1, 0, 0, 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 1, 0, 0, 0, - 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, -}; - -const SequenceModel Koi8rModel = { - KOI8R_CharToOrderMap, - RussianLangModel, - (float)0.976601, - false, - "KOI8-R" -}; - -const SequenceModel Win1251Model = { - win1251_CharToOrderMap, - RussianLangModel, - (float)0.976601, - false, - "windows-1251" -}; + 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 1, 1, 3, 3, 3, 3, 1, 3, 3, 3, 2, 3, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 0, 3, 2, 2, 2, 2, 2, 0, 0, 2, 3, 3, 3, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 3, 3, 0, 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 3, 2, 0, 0, 0, 0, 0, 0, 0, 0, 2, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 3, 3, 0, 0, 3, 3, 3, 3, 3, 3, 3, 3, 2, + 3, 3, 1, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 2, 3, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 0, 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 3, 3, 0, 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, 0, 0, 0, 0, 1, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 3, 3, 3, 3, 3, 2, 2, 2, 3, 1, 3, 3, 1, 3, 3, 3, 3, 2, 2, 3, 0, 2, 2, 2, 3, 3, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 3, 3, 3, 2, 3, 3, 3, 3, 3, 2, 2, 3, 2, 3, 3, 3, 2, 1, 2, 2, 0, 1, 2, 2, 2, 2, 2, 2, 0, + 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, + 2, 2, 3, 0, 2, 2, 3, 3, 2, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 3, 3, 3, 2, 3, + 3, 1, 2, 3, 2, 2, 3, 2, 3, 3, 3, 3, 2, 2, 3, 0, 3, 2, 2, 3, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 3, 3, 3, 3, 3, 3, 3, 3, 2, 2, 3, 3, 3, 3, 3, 2, 3, 3, 3, 3, 2, 2, 2, 0, 3, 3, 3, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 3, 2, 3, 3, 3, 3, 3, 3, 2, 3, 2, 2, 0, 1, 3, 2, 1, 2, 2, 1, 0, 0, 0, 0, 0, + 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 1, 1, 3, 0, 1, 1, 1, 1, 2, 1, 1, 0, + 2, 2, 2, 1, 2, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 3, 3, 3, 2, 3, 3, 2, 2, 2, + 2, 1, 3, 2, 3, 2, 3, 2, 1, 2, 2, 0, 1, 1, 2, 1, 2, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 2, 3, 2, 3, 3, 3, 2, 2, 2, 2, 0, 2, 2, 2, 2, 3, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 2, 3, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 1, 3, 2, 0, 0, 3, 3, 3, 3, 2, 3, 3, 3, 3, 2, 3, 2, 0, 0, 0, 0, 0, 0, 0, 0, 2, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 3, 3, 3, 3, 3, 2, 2, 3, 3, 0, 2, 1, 0, 3, 2, 3, 2, 3, 0, 0, 1, 2, 0, 0, 1, 0, 1, + 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 3, 0, 2, 3, 3, 3, 3, 2, 3, 3, 3, 3, 1, 2, + 2, 0, 0, 2, 3, 2, 2, 2, 3, 2, 3, 2, 2, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 2, 3, 0, + 2, 3, 2, 3, 0, 1, 2, 3, 3, 2, 0, 2, 3, 0, 0, 2, 3, 2, 2, 0, 1, 3, 1, 3, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 3, 0, 2, 3, 3, 3, 3, 3, 3, 3, 3, 2, 1, 3, 2, 0, 0, 2, 2, 3, 3, 3, 2, 3, 3, 0, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 3, 3, 3, 2, 2, 3, 3, 2, 2, 2, 3, 3, 0, 0, 1, 1, 1, 1, 1, 2, 0, 0, 1, 1, 1, 1, 0, 1, 0, + 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 3, 3, 3, 2, 2, 3, 3, 3, 3, 3, 3, 3, 0, 3, 2, 3, 3, + 2, 3, 2, 0, 2, 1, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 3, 3, 3, 2, 3, + 3, 3, 2, 2, 2, 2, 3, 1, 3, 2, 3, 1, 1, 2, 1, 0, 2, 2, 2, 2, 1, 3, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 2, 2, 3, 3, 3, 3, 3, 1, 2, 2, 1, 3, 1, 0, 3, 0, 0, 3, 0, 0, 0, 1, 1, 0, 1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 2, 2, 1, 1, 3, 3, 3, 2, 2, 1, 2, 2, 3, 1, 1, 2, 0, 0, 2, 2, 1, 3, 0, 0, 2, 1, 1, 2, 1, 1, 0, 0, 0, 0, 0, + 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 2, 3, 3, 3, 3, 1, 2, 2, 2, 1, 2, 1, 3, 3, 1, 1, 2, 1, 2, 1, 2, 2, 0, + 2, 0, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 3, 3, 3, 3, 3, 2, 1, 3, 2, 2, 3, + 2, 0, 3, 2, 0, 3, 0, 1, 0, 1, 1, 0, 0, 1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 3, 3, 2, 3, 3, 3, 2, 2, 2, 3, 3, 1, 2, 1, 2, 1, 0, 1, 0, 1, 1, 0, 1, 0, 0, 2, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 1, 2, 1, 2, 3, 3, 2, 2, 1, 2, 2, 3, 0, 2, 1, 0, 0, 2, 2, 3, 2, 1, 2, 2, 2, 2, 2, 3, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 3, 3, 1, 1, 0, 1, 1, 2, 2, 1, 1, 3, 0, 0, 1, 3, 1, 1, 1, 0, 0, 0, 1, 0, 1, + 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 3, 3, 3, 2, 0, 0, 0, 2, 1, 0, 1, 0, 2, 0, + 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 1, 0, + 0, 2, 3, 2, 2, 2, 1, 2, 2, 2, 1, 2, 1, 0, 0, 1, 1, 1, 0, 2, 0, 1, 1, 1, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 1, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 2, 3, 3, 3, 3, 0, 0, 0, 0, 1, 0, 0, 0, 0, 3, 0, 1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 1, 1, 1, 0, 1, 0, 1, 2, 0, 0, 1, 1, 2, 1, + 0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 0, 1, 0, 0, 1, 0, 0, 1, 1, 0, 2, 2, 3, 2, 2, 2, 3, 1, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 2, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 0, 1, 1, 1, 0, 1, 1, 0, 3, 3, 3, 2, 2, 2, 2, 3, 2, 2, 1, 1, 2, 2, 2, 2, 1, 1, 3, 1, + 2, 1, 2, 0, 0, 1, 1, 0, 1, 0, 2, 1, 1, 1, 1, 1, 1, 2, 1, 0, 1, 1, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1, 1, 0, 2, 0, 0, 1, 0, 3, 2, 2, + 2, 2, 1, 2, 1, 2, 1, 2, 0, 0, 0, 2, 1, 2, 2, 1, 1, 2, 2, 0, 1, 1, 0, 2, 1, 1, 1, 1, 1, 0, 1, 1, 1, 2, 1, 1, 1, 2, 1, 0, 1, 2, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0, + 1, 0, 0, 1, 1, 3, 2, 2, 2, 1, 1, 1, 2, 3, 0, 0, 0, 0, 2, 0, 2, 2, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1, 1, 0, 1, 1, 0, 1, 0, 1, 1, 0, 1, 1, 0, 2, 0, 0, + 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 2, 3, 2, 3, 2, 1, 2, 2, 2, 2, 1, 0, 0, 0, 2, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 2, 1, 1, 1, 2, 1, + 0, 2, 0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 3, 0, 0, 1, 0, 2, 2, 2, 3, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 2, 1, 2, 1, 1, + 1, 2, 2, 0, 0, 0, 1, 2, 1, 1, 1, 1, 1, 0, 1, 2, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 0, 1, 2, 3, 2, 3, 3, 2, 0, 1, 1, 1, 0, 0, + 1, 0, 2, 0, 1, 1, 3, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 2, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, + 2, 3, 3, 3, 3, 1, 2, 2, 2, 2, 0, 1, 1, 0, 2, 1, 1, 1, 2, 1, 0, 1, 1, 0, 0, 1, 0, 1, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 3, 3, 3, 2, 0, 0, 1, 1, 2, 2, 1, 0, 0, 2, 0, 1, 1, 3, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 1, 2, 1, 1, 1, 2, 0, 1, 1, 1, 0, + 1, 0, 1, 1, 0, 1, 0, 1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 1, 3, 2, 3, 2, 1, 0, 0, 2, 2, 2, 0, 1, 0, 2, 0, 1, 1, 1, 0, 1, 0, 0, 0, 3, 0, 1, 1, + 0, 0, 2, 1, 1, 1, 1, 0, 1, 1, 0, 0, 0, 0, 1, 1, 0, 1, 0, 0, 2, 1, 1, 0, 1, 0, 0, 0, 1, 0, 1, 0, 0, 1, 1, 0, 3, 1, 2, 1, 1, 2, 2, 2, 2, 2, 2, 1, 2, 2, 1, 1, + 0, 0, 0, 2, 2, 2, 0, 0, 0, 1, 2, 1, 0, 1, 0, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 2, 1, 1, 1, 0, 1, 0, 1, 1, 0, 1, 1, 1, 0, 0, 1, 3, 0, 0, 0, + 0, 2, 0, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 1, 0, 1, 0, 1, 1, 0, 0, 1, 0, 1, 1, 1, 0, 0, 1, 0, 0, 0, 1, 0, 1, 1, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 1, + 0, 0, 0, 1, 0, 0, 0, 1, 1, 3, 3, 2, 2, 0, 0, 0, 2, 2, 0, 0, 0, 1, 2, 0, 1, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 2, 1, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 1, 1, + 0, 1, 1, 0, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 2, 3, 2, 3, 2, 0, 0, 0, 0, 1, 1, 0, 0, 0, 2, 0, 2, 0, 2, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 1, + 1, 1, 2, 0, 1, 2, 1, 0, 1, 1, 2, 1, 1, 1, 1, 1, 2, 1, 1, 0, 1, 0, 0, 1, 1, 1, 1, 1, 0, 1, 1, 0, 1, 3, 2, 2, 2, 1, 0, 0, 2, 2, 1, 0, 1, 2, 2, 0, 0, 1, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 2, 3, 1, + 2, 2, 2, 2, 2, 2, 1, 1, 0, 0, 0, 1, 0, 1, 0, 2, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 0, 1, 1, 0, 1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 1, 0, 0, 0, 2, 0, 2, 0, 0, 1, 0, 3, 2, 1, 2, 1, 2, 2, 0, 1, 0, 0, 0, 2, 1, 0, 0, 2, 1, 1, 1, 1, 0, 2, 0, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 0, + 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 0, 1, 0, 0, 1, 1, 2, 2, 2, 2, 1, 0, 0, 1, 0, 0, 0, 0, 0, 2, 0, 1, 1, 1, 1, 0, 0, 0, 0, 1, 0, 1, 2, 0, 0, 2, 0, 1, 0, 1, 1, + 1, 2, 1, 0, 1, 0, 1, 1, 0, 0, 1, 0, 1, 1, 1, 0, 1, 0, 0, 0, 1, 0, 0, 1, 0, 1, 1, 0, 2, 1, 2, 2, 2, 0, 3, 0, 1, 1, 0, 0, 0, 0, 2, 0, 0, 1, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 1, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 2, 2, 3, 2, 2, 0, 0, 1, 1, 2, 0, + 1, 2, 1, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, + 2, 2, 1, 1, 2, 1, 2, 2, 2, 2, 2, 1, 2, 2, 0, 1, 0, 0, 0, 1, 2, 2, 2, 1, 2, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 0, 1, 1, 1, 0, + 0, 0, 0, 1, 1, 1, 0, 1, 1, 0, 0, 1, 1, 2, 2, 2, 2, 0, 1, 0, 2, 2, 0, 0, 0, 0, 2, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 1, 0, 0, 1, 0, 0, + 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 2, 2, 2, 0, 0, 0, 2, 2, 2, 0, 1, 0, 1, 0, + 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 2, 2, + 2, 0, 0, 0, 0, 1, 0, 0, 1, 1, 2, 0, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 2, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 2, 2, 1, 1, 2, 0, 2, 1, 1, 1, 1, 0, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0, + 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 2, 1, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, + 0, 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 2, 0, 1, 2, 1, 0, 1, 1, 1, 0, 1, 0, 0, 0, 1, + 0, 1, 0, 0, 1, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 2, 1, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, + 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 1, 0, 1, 0, 0, 1, 1, 1, 1, 0, 0, 0, + 1, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, + 1, 0, 1, 0, 1, 0, 0, 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 1, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, +}; + +const SequenceModel Koi8rModel = {KOI8R_CharToOrderMap, RussianLangModel, (float)0.976601, false, "KOI8-R"}; + +const SequenceModel Win1251Model = {win1251_CharToOrderMap, RussianLangModel, (float)0.976601, false, "windows-1251"}; -const SequenceModel Latin5Model = { - latin5_CharToOrderMap, - RussianLangModel, - (float)0.976601, - false, - "ISO-8859-5" -}; +const SequenceModel Latin5Model = {latin5_CharToOrderMap, RussianLangModel, (float)0.976601, false, "ISO-8859-5"}; -const SequenceModel MacCyrillicModel = { - macCyrillic_CharToOrderMap, - RussianLangModel, - (float)0.976601, - false, - "x-mac-cyrillic" -}; +const SequenceModel MacCyrillicModel = {macCyrillic_CharToOrderMap, RussianLangModel, (float)0.976601, false, "x-mac-cyrillic"}; -const SequenceModel Ibm866Model = { - IBM866_CharToOrderMap, - RussianLangModel, - (float)0.976601, - false, - "IBM866" -}; +const SequenceModel Ibm866Model = {IBM866_CharToOrderMap, RussianLangModel, (float)0.976601, false, "IBM866"}; -const SequenceModel Ibm855Model = { - IBM855_CharToOrderMap, - RussianLangModel, - (float)0.976601, - false, - "IBM855" -}; +const SequenceModel Ibm855Model = {IBM855_CharToOrderMap, RussianLangModel, (float)0.976601, false, "IBM855"}; } - diff -Nru kcodecs-5.79.0/src/probers/LangGreekModel.cpp kcodecs-5.80.0/src/probers/LangGreekModel.cpp --- kcodecs-5.79.0/src/probers/LangGreekModel.cpp 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/src/probers/LangGreekModel.cpp 2021-03-06 16:19:34.000000000 +0000 @@ -15,196 +15,134 @@ namespace kencodingprober { -//Character Mapping Table: +// Character Mapping Table: const unsigned char Latin7_CharToOrderMap[] = { - 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 254, 255, 255, 254, 255, 255, //00 - 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, //10 - +253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, //20 - 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 253, 253, 253, 253, 253, 253, //30 - 253, 82, 100, 104, 94, 98, 101, 116, 102, 111, 187, 117, 92, 88, 113, 85, //40 - 79, 118, 105, 83, 67, 114, 119, 95, 99, 109, 188, 253, 253, 253, 253, 253, //50 - 253, 72, 70, 80, 81, 60, 96, 93, 89, 68, 120, 97, 77, 86, 69, 55, //60 - 78, 115, 65, 66, 58, 76, 106, 103, 87, 107, 112, 253, 253, 253, 253, 253, //70 - 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, //80 - 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, //90 - +253, 233, 90, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 74, 253, 253, //a0 - 253, 253, 253, 253, 247, 248, 61, 36, 46, 71, 73, 253, 54, 253, 108, 123, //b0 - 110, 31, 51, 43, 41, 34, 91, 40, 52, 47, 44, 53, 38, 49, 59, 39, //c0 - 35, 48, 250, 37, 33, 45, 56, 50, 84, 57, 120, 121, 17, 18, 22, 15, //d0 - 124, 1, 29, 20, 21, 3, 32, 13, 25, 5, 11, 16, 10, 6, 30, 4, //e0 - 9, 8, 14, 7, 2, 12, 28, 23, 42, 24, 64, 75, 19, 26, 27, 253, //f0 + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 254, 255, 255, 254, 255, 255, // 00 + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, // 10 + +253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, // 20 + 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 253, 253, 253, 253, 253, 253, // 30 + 253, 82, 100, 104, 94, 98, 101, 116, 102, 111, 187, 117, 92, 88, 113, 85, // 40 + 79, 118, 105, 83, 67, 114, 119, 95, 99, 109, 188, 253, 253, 253, 253, 253, // 50 + 253, 72, 70, 80, 81, 60, 96, 93, 89, 68, 120, 97, 77, 86, 69, 55, // 60 + 78, 115, 65, 66, 58, 76, 106, 103, 87, 107, 112, 253, 253, 253, 253, 253, // 70 + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, // 80 + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, // 90 + +253, 233, 90, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 74, 253, 253, // a0 + 253, 253, 253, 253, 247, 248, 61, 36, 46, 71, 73, 253, 54, 253, 108, 123, // b0 + 110, 31, 51, 43, 41, 34, 91, 40, 52, 47, 44, 53, 38, 49, 59, 39, // c0 + 35, 48, 250, 37, 33, 45, 56, 50, 84, 57, 120, 121, 17, 18, 22, 15, // d0 + 124, 1, 29, 20, 21, 3, 32, 13, 25, 5, 11, 16, 10, 6, 30, 4, // e0 + 9, 8, 14, 7, 2, 12, 28, 23, 42, 24, 64, 75, 19, 26, 27, 253, // f0 }; const unsigned char win1253_CharToOrderMap[] = { - 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 254, 255, 255, 254, 255, 255, //00 - 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, //10 - +253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, //20 - 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 253, 253, 253, 253, 253, 253, //30 - 253, 82, 100, 104, 94, 98, 101, 116, 102, 111, 187, 117, 92, 88, 113, 85, //40 - 79, 118, 105, 83, 67, 114, 119, 95, 99, 109, 188, 253, 253, 253, 253, 253, //50 - 253, 72, 70, 80, 81, 60, 96, 93, 89, 68, 120, 97, 77, 86, 69, 55, //60 - 78, 115, 65, 66, 58, 76, 106, 103, 87, 107, 112, 253, 253, 253, 253, 253, //70 - 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, //80 - 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, //90 - +253, 233, 61, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 74, 253, 253, //a0 - 253, 253, 253, 253, 247, 253, 253, 36, 46, 71, 73, 253, 54, 253, 108, 123, //b0 - 110, 31, 51, 43, 41, 34, 91, 40, 52, 47, 44, 53, 38, 49, 59, 39, //c0 - 35, 48, 250, 37, 33, 45, 56, 50, 84, 57, 120, 121, 17, 18, 22, 15, //d0 - 124, 1, 29, 20, 21, 3, 32, 13, 25, 5, 11, 16, 10, 6, 30, 4, //e0 - 9, 8, 14, 7, 2, 12, 28, 23, 42, 24, 64, 75, 19, 26, 27, 253, //f0 + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 254, 255, 255, 254, 255, 255, // 00 + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, // 10 + +253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, // 20 + 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 253, 253, 253, 253, 253, 253, // 30 + 253, 82, 100, 104, 94, 98, 101, 116, 102, 111, 187, 117, 92, 88, 113, 85, // 40 + 79, 118, 105, 83, 67, 114, 119, 95, 99, 109, 188, 253, 253, 253, 253, 253, // 50 + 253, 72, 70, 80, 81, 60, 96, 93, 89, 68, 120, 97, 77, 86, 69, 55, // 60 + 78, 115, 65, 66, 58, 76, 106, 103, 87, 107, 112, 253, 253, 253, 253, 253, // 70 + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, // 80 + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, // 90 + +253, 233, 61, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 74, 253, 253, // a0 + 253, 253, 253, 253, 247, 253, 253, 36, 46, 71, 73, 253, 54, 253, 108, 123, // b0 + 110, 31, 51, 43, 41, 34, 91, 40, 52, 47, 44, 53, 38, 49, 59, 39, // c0 + 35, 48, 250, 37, 33, 45, 56, 50, 84, 57, 120, 121, 17, 18, 22, 15, // d0 + 124, 1, 29, 20, 21, 3, 32, 13, 25, 5, 11, 16, 10, 6, 30, 4, // e0 + 9, 8, 14, 7, 2, 12, 28, 23, 42, 24, 64, 75, 19, 26, 27, 253, // f0 }; -//Model Table: -//total sequences: 100% -//first 512 sequences: 98.2851% -//first 1024 sequences:1.7001% -//rest sequences: 0.0359% -//negative sequences: 0.0148% +// Model Table: +// total sequences: 100% +// first 512 sequences: 98.2851% +// first 1024 sequences:1.7001% +// rest sequences: 0.0359% +// negative sequences: 0.0148% const char GreekLangModel[] = { - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 3, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 1, 3, 3, 3, 0, 2, 2, 3, 3, 0, 3, 0, 3, 2, 0, 3, 3, 3, 0, - 3, 0, 0, 0, 2, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 3, 3, 3, 3, 3, 0, 3, 3, 0, 3, 2, 3, 3, 0, 3, 2, 3, 3, 3, 0, 0, 3, 0, 3, 0, 3, 3, 2, 0, 0, 0, - 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 2, 3, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 0, 3, 3, 3, 3, 0, 2, 3, 3, 0, 3, 3, 3, 3, 2, 3, 3, 3, 0, - 2, 0, 0, 0, 2, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 2, 3, 3, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 2, 1, 3, 3, 3, 3, 2, 3, 3, 2, 3, 3, 2, 0, - 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 3, 3, 3, 3, 0, 3, 3, 3, 3, 3, 3, 0, 3, 3, 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 3, 2, 3, 3, 0, - 2, 0, 1, 0, 2, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 3, 3, 3, 3, 3, 2, 3, 0, 0, 0, 0, 3, 3, 0, 3, 1, 3, 3, 3, 0, 3, 3, 0, 3, 3, 3, 3, 0, 0, 0, 0, - 2, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 3, 3, 3, 3, 3, 0, 3, 0, 3, 3, 3, 3, 3, 0, 3, 2, 2, 2, 3, 0, 2, 3, 3, 3, 3, 3, 2, 3, 3, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 3, 3, 3, 3, 3, 3, 2, 2, 2, 3, 3, 3, 3, 0, 3, 1, 3, 3, 3, 3, 2, 3, 3, 3, 3, 3, 3, 3, 2, 2, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 3, 3, 3, 3, 3, 2, 0, 3, 0, 0, 0, 3, 3, 2, 3, 3, 3, 3, 3, 0, 0, 3, 2, 3, 0, 2, 3, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 3, 0, 3, 3, 3, 3, 0, 0, 3, 3, 0, 2, 3, 0, 3, 0, 3, 3, 3, 0, 0, 3, 0, 3, 0, 2, 2, 3, 3, 0, 0, - 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 3, 3, 3, 3, 3, 2, 0, 3, 2, 3, 3, 3, 3, 0, 3, 3, 3, 3, 3, 0, 3, 3, 2, 3, 2, 3, 3, 2, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 3, 3, 2, 3, 2, 3, 3, 3, 3, 3, 3, 0, 2, 3, 2, 3, 2, 2, 2, 3, 2, 3, 3, 2, 3, 0, 2, 2, 2, 3, 0, - 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 3, 0, 0, 0, 3, 3, 3, 2, 3, 3, 0, 0, 3, 0, 3, 0, 0, 0, 3, 2, 0, 3, 0, 3, 0, 0, 2, 0, 2, 0, - 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 3, 3, 3, 3, 0, 3, 3, 3, 3, 3, 3, 0, 3, 3, 0, 3, 0, 0, 0, 3, 3, 0, 3, 3, 3, 0, 0, 1, 2, 3, 0, - 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 3, 3, 3, 3, 3, 2, 0, 0, 3, 2, 2, 3, 3, 0, 3, 3, 3, 3, 3, 2, 1, 3, 0, 3, 2, 3, 3, 2, 1, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 3, 3, 0, 2, 3, 3, 3, 3, 3, 3, 0, 0, 3, 0, 3, 0, 0, 0, 3, 3, 0, 3, 2, 3, 0, 0, 3, 3, 3, 0, - 3, 0, 0, 0, 2, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 3, 3, 3, 3, 0, 3, 3, 3, 3, 3, 3, 0, 0, 3, 0, 3, 0, 0, 0, 3, 2, 0, 3, 2, 3, 0, 0, 3, 2, 3, 0, - 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 3, 1, 2, 2, 3, 3, 3, 3, 3, 3, 0, 2, 3, 0, 3, 0, 0, 0, 3, 3, 0, 3, 0, 2, 0, 0, 2, 3, 1, 0, - 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 3, 0, 3, 3, 3, 3, 0, 3, 0, 3, 3, 2, 3, 0, 3, 3, 3, 3, 3, 3, 0, 3, 3, 3, 0, 2, 3, 0, 0, 3, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 3, 0, 3, 3, 3, 0, 0, 3, 0, 0, 0, 3, 3, 0, 3, 0, 2, 3, 3, 0, 0, 3, 0, 3, 0, 3, 3, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 3, 0, 0, 0, 3, 3, 3, 3, 3, 3, 0, 0, 3, 0, 2, 0, 0, 0, 3, 3, 0, 3, 0, 3, 0, 0, 2, 0, 2, 0, - 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 3, 3, 3, 3, 3, 3, 0, 3, 0, 2, 0, 3, 2, 0, 3, 2, 3, 2, 3, 0, 0, 3, 2, 3, 2, 3, 3, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 3, 0, 0, 2, 3, 3, 3, 3, 3, 0, 0, 0, 3, 0, 2, 1, 0, 0, 3, 2, 2, 2, 0, 3, 0, 0, 2, 2, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 3, 0, 3, 3, 3, 2, 0, 3, 0, 3, 0, 3, 3, 0, 2, 1, 2, 3, 3, 0, 0, 3, 0, 3, 0, 3, 3, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 2, 3, 3, 3, 0, 3, 3, 3, 3, 3, 3, 0, 2, 3, 0, 3, 0, 0, 0, 2, 1, 0, 2, 2, 3, 0, 0, 2, 2, 2, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 3, 0, 0, 2, 3, 3, 3, 2, 3, 0, 0, 1, 3, 0, 2, 0, 0, 0, 0, 3, 0, 1, 0, 2, 0, 0, 1, 1, 1, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 3, 3, 3, 3, 3, 1, 0, 3, 0, 0, 0, 3, 2, 0, 3, 2, 3, 3, 3, 0, 0, 3, 0, 3, 2, 2, 2, 1, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 3, 0, 3, 3, 3, 0, 0, 3, 0, 0, 0, 0, 2, 0, 2, 3, 3, 2, 2, 2, 2, 3, 0, 2, 0, 2, 2, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 3, 3, 3, 3, 2, 0, 0, 0, 0, 0, 0, 2, 3, 0, 2, 0, 2, 3, 2, 0, 0, 3, 0, 3, 0, 3, 1, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 3, 2, 3, 3, 2, 2, 3, 0, 2, 0, 3, 0, 0, 0, 2, 0, 0, 0, 0, 1, 2, 0, 2, 0, 2, 0, - 0, 2, 0, 2, 0, 2, 2, 0, 0, 1, 0, 2, 2, 2, 0, 2, 2, 2, 0, 2, 2, 2, 0, 0, 2, 0, 0, 1, 0, 0, 0, 0, - 0, 2, 0, 3, 3, 2, 0, 0, 0, 0, 0, 0, 1, 3, 0, 2, 0, 2, 2, 2, 0, 0, 2, 0, 3, 0, 0, 2, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 3, 0, 2, 3, 2, 0, 2, 2, 0, 2, 0, 2, 2, 0, 2, 0, 2, 2, 2, 0, 0, 0, 0, 0, 0, 2, 3, 0, 0, 0, 2, - 0, 1, 2, 0, 0, 0, 0, 2, 2, 0, 0, 0, 2, 1, 0, 2, 2, 0, 0, 0, 0, 0, 0, 1, 0, 2, 0, 0, 0, 0, 0, 0, - 0, 0, 2, 1, 0, 2, 3, 2, 2, 3, 2, 3, 2, 0, 0, 3, 3, 3, 0, 0, 3, 2, 0, 0, 0, 1, 1, 0, 2, 0, 2, 2, - 0, 2, 0, 2, 0, 2, 2, 0, 0, 2, 0, 2, 2, 2, 0, 2, 2, 2, 2, 0, 0, 2, 0, 0, 0, 2, 0, 1, 0, 0, 0, 0, - 0, 3, 0, 3, 3, 2, 2, 0, 3, 0, 0, 0, 2, 2, 0, 2, 2, 2, 1, 2, 0, 0, 1, 2, 2, 0, 0, 3, 0, 0, 0, 2, - 0, 1, 2, 0, 0, 0, 1, 2, 0, 0, 0, 0, 0, 0, 0, 2, 2, 0, 1, 0, 0, 2, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 2, 3, 3, 2, 2, 0, 0, 0, 2, 0, 2, 3, 3, 0, 2, 0, 0, 0, 0, 0, 0, 2, 2, 2, 0, 2, 2, 0, 2, 0, 2, - 0, 2, 2, 0, 0, 2, 2, 2, 2, 1, 0, 0, 2, 2, 0, 2, 0, 0, 2, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, - 0, 2, 0, 3, 2, 3, 0, 0, 0, 3, 0, 0, 2, 2, 0, 2, 0, 2, 2, 2, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 2, - 0, 0, 2, 2, 0, 0, 2, 2, 2, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 2, 0, 0, 3, 2, 0, 2, 2, 2, 2, 2, 0, 0, 0, 2, 0, 0, 0, 0, 2, 0, 1, 0, 0, 2, 0, 1, 0, 0, 0, - 0, 2, 2, 2, 0, 2, 2, 0, 1, 2, 0, 2, 2, 2, 0, 2, 2, 2, 2, 1, 2, 2, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 2, 0, 2, 0, 2, 2, 0, 0, 0, 0, 1, 2, 1, 0, 0, 2, 2, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 3, 2, 3, 0, 0, 2, 0, 0, 0, 2, 2, 0, 2, 0, 0, 0, 1, 0, 0, 2, 0, 2, 0, 2, 2, 0, 0, 0, 0, - 0, 0, 2, 0, 0, 0, 0, 2, 2, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, - 0, 2, 2, 3, 2, 2, 0, 0, 0, 0, 0, 0, 1, 3, 0, 2, 0, 2, 2, 0, 0, 0, 1, 0, 2, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 2, 0, 2, 0, 3, 2, 0, 2, 0, 0, 0, 0, 0, 0, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, - 0, 0, 2, 0, 0, 0, 0, 1, 1, 0, 0, 2, 1, 2, 0, 2, 2, 0, 1, 0, 0, 1, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, - 0, 3, 0, 2, 2, 2, 0, 0, 2, 0, 0, 0, 2, 0, 0, 0, 2, 3, 0, 2, 0, 0, 0, 0, 0, 0, 2, 2, 0, 0, 0, 2, - 0, 1, 2, 0, 0, 0, 1, 2, 2, 1, 0, 0, 0, 2, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 2, 1, 2, 0, 2, 2, 0, 2, 0, 0, 2, 0, 0, 0, 0, 1, 2, 1, 0, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 2, 0, 0, 0, 3, 1, 2, 2, 0, 2, 0, 0, 0, 0, 2, 0, 0, 0, 2, 0, 0, 3, 0, 0, 0, 0, 2, 2, 2, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 2, 1, 0, 2, 0, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 1, 0, 0, 0, 0, 0, 0, 2, - 0, 2, 2, 0, 0, 2, 2, 2, 2, 2, 0, 1, 2, 0, 0, 0, 2, 2, 0, 1, 0, 2, 0, 0, 2, 2, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 2, 0, 0, 0, 0, 2, - 0, 1, 2, 0, 0, 0, 0, 2, 2, 1, 0, 1, 0, 1, 0, 2, 2, 2, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, - 0, 2, 0, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 2, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 2, - 0, 2, 2, 0, 0, 0, 0, 2, 2, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 2, 0, 0, 0, - 0, 2, 2, 2, 2, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 1, - 0, 0, 2, 0, 0, 0, 0, 1, 2, 0, 0, 0, 0, 0, 0, 2, 2, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, - 0, 2, 0, 2, 2, 2, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 2, - 0, 0, 1, 0, 0, 0, 0, 2, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 3, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 2, - 0, 0, 2, 0, 0, 0, 0, 2, 2, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 2, 0, 2, 2, 1, 0, 0, 0, 0, 0, 0, 2, 0, 0, 2, 0, 2, 2, 2, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 2, - 0, 0, 2, 0, 0, 2, 0, 2, 2, 0, 0, 0, 0, 2, 0, 2, 0, 0, 0, 0, 0, 2, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, - 0, 0, 3, 0, 0, 0, 2, 2, 0, 2, 2, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 2, 0, 0, 0, 0, 0, - 0, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 1, - 0, 0, 0, 0, 0, 0, 0, 2, 1, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 2, 2, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 2, 0, 0, 0, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 2, 2, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 2, 0, 0, 0, - 0, 2, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 1, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 2, 0, 2, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 1, 3, 3, 3, 0, 2, 2, 3, 3, 0, 3, 0, 3, 2, 0, 3, 3, 3, 0, 3, 0, 0, 0, 2, 0, 0, 0, + 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 3, 3, 0, 3, 3, 0, 3, 2, 3, 3, 0, 3, 2, 3, 3, 3, 0, 0, 3, 0, 3, 0, 3, 3, + 2, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 3, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 0, 3, 3, + 3, 3, 0, 2, 3, 3, 0, 3, 3, 3, 3, 2, 3, 3, 3, 0, 2, 0, 0, 0, 2, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 3, 3, + 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 2, 1, 3, 3, 3, 3, 2, 3, 3, 2, 3, 3, 2, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 3, 0, 3, 3, 3, 3, 3, 3, 0, 3, 3, 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 3, 2, 3, 3, 0, 2, 0, 1, 0, 2, 0, 0, 0, 0, 0, 2, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 3, 3, 2, 3, 0, 0, 0, 0, 3, 3, 0, 3, 1, 3, 3, 3, 0, 3, 3, 0, 3, 3, 3, 3, 0, 0, 0, 0, + 2, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 3, 3, 0, 3, 0, 3, 3, 3, 3, 3, 0, 3, 2, 2, 2, 3, + 0, 2, 3, 3, 3, 3, 3, 2, 3, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 3, 3, 3, 2, + 2, 2, 3, 3, 3, 3, 0, 3, 1, 3, 3, 3, 3, 2, 3, 3, 3, 3, 3, 3, 3, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 3, 3, 3, 3, 3, 2, 0, 3, 0, 0, 0, 3, 3, 2, 3, 3, 3, 3, 3, 0, 0, 3, 2, 3, 0, 2, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 3, 3, 3, 3, 0, 0, 3, 3, 0, 2, 3, 0, 3, 0, 3, 3, 3, 0, 0, 3, 0, 3, 0, 2, 2, 3, 3, 0, 0, 0, 0, 1, 0, + 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 3, 3, 2, 0, 3, 2, 3, 3, 3, 3, 0, 3, 3, 3, 3, 3, 0, 3, 3, 2, + 3, 2, 3, 3, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 2, 3, 2, 3, 3, 3, 3, 3, 3, + 0, 2, 3, 2, 3, 2, 2, 2, 3, 2, 3, 3, 2, 3, 0, 2, 2, 2, 3, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 3, 0, 0, 0, 3, 3, 3, 2, 3, 3, 0, 0, 3, 0, 3, 0, 0, 0, 3, 2, 0, 3, 0, 3, 0, 0, 2, 0, 2, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 3, 0, 3, 3, 3, 3, 3, 3, 0, 3, 3, 0, 3, 0, 0, 0, 3, 3, 0, 3, 3, 3, 0, 0, + 1, 2, 3, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 3, 3, 2, 0, 0, 3, 2, 2, 3, 3, 0, 3, + 3, 3, 3, 3, 2, 1, 3, 0, 3, 2, 3, 3, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, + 0, 2, 3, 3, 3, 3, 3, 3, 0, 0, 3, 0, 3, 0, 0, 0, 3, 3, 0, 3, 2, 3, 0, 0, 3, 3, 3, 0, 3, 0, 0, 0, 2, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 3, 0, 3, 3, 3, 3, 3, 3, 0, 0, 3, 0, 3, 0, 0, 0, 3, 2, 0, 3, 2, 3, 0, 0, 3, 2, 3, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 2, 2, 3, 3, 3, 3, 3, 3, 0, 2, 3, 0, 3, 0, 0, 0, 3, 3, 0, 3, 0, 2, 0, 0, 2, 3, 1, 0, + 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 3, 3, 3, 3, 0, 3, 0, 3, 3, 2, 3, 0, 3, 3, 3, 3, 3, + 3, 0, 3, 3, 3, 0, 2, 3, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 3, 3, 3, 0, 0, + 3, 0, 0, 0, 3, 3, 0, 3, 0, 2, 3, 3, 0, 0, 3, 0, 3, 0, 3, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 3, 3, 3, 3, 3, 3, 0, 0, 3, 0, 2, 0, 0, 0, 3, 3, 0, 3, 0, 3, 0, 0, 2, 0, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 3, 3, 3, 0, 3, 0, 2, 0, 3, 2, 0, 3, 2, 3, 2, 3, 0, 0, 3, 2, 3, 2, 3, 3, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 2, 3, 3, 3, 3, 3, 0, 0, 0, 3, 0, 2, 1, 0, 0, 3, 2, 2, 2, + 0, 3, 0, 0, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 3, 3, 3, 2, 0, 3, 0, 3, 0, + 3, 3, 0, 2, 1, 2, 3, 3, 0, 0, 3, 0, 3, 0, 3, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 2, 3, 3, 3, 0, 3, 3, 3, 3, 3, 3, 0, 2, 3, 0, 3, 0, 0, 0, 2, 1, 0, 2, 2, 3, 0, 0, 2, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 2, 3, 3, 3, 2, 3, 0, 0, 1, 3, 0, 2, 0, 0, 0, 0, 3, 0, 1, 0, 2, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 3, 3, 1, 0, 3, 0, 0, 0, 3, 2, 0, 3, 2, 3, 3, 3, 0, 0, 3, 0, 3, 2, 2, 2, + 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 3, 3, 3, 0, 0, 3, 0, 0, 0, 0, 2, 0, 2, + 3, 3, 2, 2, 2, 2, 3, 0, 2, 0, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, + 3, 2, 0, 0, 0, 0, 0, 0, 2, 3, 0, 2, 0, 2, 3, 2, 0, 0, 3, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 2, 3, 3, 2, 2, 3, 0, 2, 0, 3, 0, 0, 0, 2, 0, 0, 0, 0, 1, 2, 0, 2, 0, 2, 0, 0, 2, 0, 2, 0, 2, 2, 0, 0, 1, 0, 2, + 2, 2, 0, 2, 2, 2, 0, 2, 2, 2, 0, 0, 2, 0, 0, 1, 0, 0, 0, 0, 0, 2, 0, 3, 3, 2, 0, 0, 0, 0, 0, 0, 1, 3, 0, 2, 0, 2, 2, 2, 0, 0, 2, 0, 3, 0, 0, 2, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 2, 3, 2, 0, 2, 2, 0, 2, 0, 2, 2, 0, 2, 0, 2, 2, 2, + 0, 0, 0, 0, 0, 0, 2, 3, 0, 0, 0, 2, 0, 1, 2, 0, 0, 0, 0, 2, 2, 0, 0, 0, 2, 1, 0, 2, 2, 0, 0, 0, 0, 0, 0, 1, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 0, 2, 3, 2, + 2, 3, 2, 3, 2, 0, 0, 3, 3, 3, 0, 0, 3, 2, 0, 0, 0, 1, 1, 0, 2, 0, 2, 2, 0, 2, 0, 2, 0, 2, 2, 0, 0, 2, 0, 2, 2, 2, 0, 2, 2, 2, 2, 0, 0, 2, 0, 0, 0, 2, 0, 1, + 0, 0, 0, 0, 0, 3, 0, 3, 3, 2, 2, 0, 3, 0, 0, 0, 2, 2, 0, 2, 2, 2, 1, 2, 0, 0, 1, 2, 2, 0, 0, 3, 0, 0, 0, 2, 0, 1, 2, 0, 0, 0, 1, 2, 0, 0, 0, 0, 0, 0, 0, 2, + 2, 0, 1, 0, 0, 2, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 3, 3, 2, 2, 0, 0, 0, 2, 0, 2, 3, 3, 0, 2, 0, 0, 0, 0, 0, 0, 2, 2, + 2, 0, 2, 2, 0, 2, 0, 2, 0, 2, 2, 0, 0, 2, 2, 2, 2, 1, 0, 0, 2, 2, 0, 2, 0, 0, 2, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 2, 0, 3, 2, 3, 0, 0, 0, 3, 0, 0, + 2, 2, 0, 2, 0, 2, 2, 2, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 2, 2, 0, 0, 2, 2, 2, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 2, 0, 0, 3, 2, 0, 2, 2, 2, 2, 2, 0, 0, 0, 2, 0, 0, 0, 0, 2, 0, 1, 0, 0, 2, 0, 1, 0, 0, 0, 0, 2, 2, 2, 0, 2, 2, 0, 1, 2, 0, 2, 2, 2, 0, 2, 2, 2, 2, 1, + 2, 2, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 2, 0, 2, 2, 0, + 0, 0, 0, 1, 2, 1, 0, 0, 2, 2, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 2, 3, 0, 0, 2, 0, 0, 0, 2, 2, 0, 2, 0, 0, 0, 1, 0, 0, 2, 0, 2, 0, 2, 2, + 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 2, 2, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 2, 2, 3, 2, 2, 0, 0, 0, 0, 0, 0, 1, 3, 0, 2, + 0, 2, 2, 0, 0, 0, 1, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 2, + 0, 3, 2, 0, 2, 0, 0, 0, 0, 0, 0, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 2, 0, 0, 0, 0, 1, 1, 0, 0, 2, 1, 2, 0, 2, 2, 0, 1, 0, 0, 1, 0, 0, + 0, 2, 0, 0, 0, 0, 0, 0, 0, 3, 0, 2, 2, 2, 0, 0, 2, 0, 0, 0, 2, 0, 0, 0, 2, 3, 0, 2, 0, 0, 0, 0, 0, 0, 2, 2, 0, 0, 0, 2, 0, 1, 2, 0, 0, 0, 1, 2, 2, 1, 0, 0, + 0, 2, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 2, 1, 2, 0, 2, 2, 0, 2, 0, 0, 2, 0, 0, 0, 0, 1, 2, 1, 0, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 3, 1, 2, 2, 0, 2, 0, 0, 0, 0, 2, 0, 0, 0, + 2, 0, 0, 3, 0, 0, 0, 0, 2, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 0, 2, 0, 1, 2, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 1, 0, 0, 0, 0, 0, 0, 2, 0, 2, 2, 0, 0, 2, 2, 2, 2, 2, 0, 1, 2, 0, 0, 0, 2, 2, 0, 1, 0, 2, 0, 0, 2, 2, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 2, 0, 0, 0, 0, 2, 0, 1, 2, 0, 0, 0, 0, 2, 2, 1, 0, 1, 0, 1, 0, 2, + 2, 2, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 2, 0, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 2, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 2, 0, 2, 2, 0, + 0, 0, 0, 2, 2, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 2, 0, 0, 0, 0, 2, 2, 2, 2, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, + 2, 0, 0, 0, 0, 0, 0, 1, 0, 0, 2, 0, 0, 0, 0, 1, 2, 0, 0, 0, 0, 0, 0, 2, 2, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 2, 0, 2, 2, 2, 0, 0, 2, 0, 0, 0, + 0, 0, 0, 0, 2, 2, 2, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 1, 0, 0, 0, 0, 2, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 3, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 2, 0, 0, 2, 0, 0, 0, 0, 2, 2, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 2, 2, 1, 0, 0, 0, 0, 0, 0, 2, 0, 0, 2, 0, 2, 2, 2, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 2, 0, 0, 2, 0, 0, 2, 0, 2, + 2, 0, 0, 0, 0, 2, 0, 2, 0, 0, 0, 0, 0, 2, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 2, 2, 0, 2, 2, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 2, 0, 0, 0, 0, 0, 0, 2, 2, 2, + 2, 2, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 2, 1, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 2, 0, 0, 0, 0, 0, 1, + 0, 0, 0, 0, 2, 2, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 2, 0, 0, 0, 0, 2, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 2, 0, + 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }; -const SequenceModel Latin7Model = { - Latin7_CharToOrderMap, - GreekLangModel, - (float)0.982851, - false, - "ISO-8859-7" -}; +const SequenceModel Latin7Model = {Latin7_CharToOrderMap, GreekLangModel, (float)0.982851, false, "ISO-8859-7"}; -const SequenceModel Win1253Model = { - win1253_CharToOrderMap, - GreekLangModel, - (float)0.982851, - false, - "windows-1253" -}; +const SequenceModel Win1253Model = {win1253_CharToOrderMap, GreekLangModel, (float)0.982851, false, "windows-1253"}; } - diff -Nru kcodecs-5.79.0/src/probers/LangHebrewModel.cpp kcodecs-5.80.0/src/probers/LangHebrewModel.cpp --- kcodecs-5.79.0/src/probers/LangHebrewModel.cpp 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/src/probers/LangHebrewModel.cpp 2021-03-06 16:19:34.000000000 +0000 @@ -16,170 +16,111 @@ namespace kencodingprober { -//Windows-1255 language model -//Character Mapping Table: +// Windows-1255 language model +// Character Mapping Table: const unsigned char win1255_CharToOrderMap[] = { - 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 254, 255, 255, 254, 255, 255, //00 - 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, //10 - +253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, //20 - 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 253, 253, 253, 253, 253, 253, //30 - 253, 69, 91, 79, 80, 92, 89, 97, 90, 68, 111, 112, 82, 73, 95, 85, //40 - 78, 121, 86, 71, 67, 102, 107, 84, 114, 103, 115, 253, 253, 253, 253, 253, //50 - 253, 50, 74, 60, 61, 42, 76, 70, 64, 53, 105, 93, 56, 65, 54, 49, //60 - 66, 110, 51, 43, 44, 63, 81, 77, 98, 75, 108, 253, 253, 253, 253, 253, //70 - 124, 202, 203, 204, 205, 40, 58, 206, 207, 208, 209, 210, 211, 212, 213, 214, - 215, 83, 52, 47, 46, 72, 32, 94, 216, 113, 217, 109, 218, 219, 220, 221, - 34, 116, 222, 118, 100, 223, 224, 117, 119, 104, 125, 225, 226, 87, 99, 227, - 106, 122, 123, 228, 55, 229, 230, 101, 231, 232, 120, 233, 48, 39, 57, 234, - 30, 59, 41, 88, 33, 37, 36, 31, 29, 35, 235, 62, 28, 236, 126, 237, - 238, 38, 45, 239, 240, 241, 242, 243, 127, 244, 245, 246, 247, 248, 249, 250, - 9, 8, 20, 16, 3, 2, 24, 14, 22, 1, 25, 15, 4, 11, 6, 23, - 12, 19, 13, 26, 18, 27, 21, 17, 7, 10, 5, 251, 252, 128, 96, 253, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 254, 255, 255, 254, 255, 255, // 00 + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, // 10 + +253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, // 20 + 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 253, 253, 253, 253, 253, 253, // 30 + 253, 69, 91, 79, 80, 92, 89, 97, 90, 68, 111, 112, 82, 73, 95, 85, // 40 + 78, 121, 86, 71, 67, 102, 107, 84, 114, 103, 115, 253, 253, 253, 253, 253, // 50 + 253, 50, 74, 60, 61, 42, 76, 70, 64, 53, 105, 93, 56, 65, 54, 49, // 60 + 66, 110, 51, 43, 44, 63, 81, 77, 98, 75, 108, 253, 253, 253, 253, 253, // 70 + 124, 202, 203, 204, 205, 40, 58, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 83, 52, 47, 46, 72, 32, 94, 216, 113, + 217, 109, 218, 219, 220, 221, 34, 116, 222, 118, 100, 223, 224, 117, 119, 104, 125, 225, 226, 87, 99, 227, 106, 122, 123, 228, + 55, 229, 230, 101, 231, 232, 120, 233, 48, 39, 57, 234, 30, 59, 41, 88, 33, 37, 36, 31, 29, 35, 235, 62, 28, 236, + 126, 237, 238, 38, 45, 239, 240, 241, 242, 243, 127, 244, 245, 246, 247, 248, 249, 250, 9, 8, 20, 16, 3, 2, 24, 14, + 22, 1, 25, 15, 4, 11, 6, 23, 12, 19, 13, 26, 18, 27, 21, 17, 7, 10, 5, 251, 252, 128, 96, 253, }; -//Model Table: -//total sequences: 100% -//first 512 sequences: 98.4004% -//first 1024 sequences: 1.5981% -//rest sequences: 0.087% -//negative sequences: 0.0015% +// Model Table: +// total sequences: 100% +// first 512 sequences: 98.4004% +// first 1024 sequences: 1.5981% +// rest sequences: 0.087% +// negative sequences: 0.0015% const char HebrewLangModel[] = { - 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 3, 2, 1, 2, 0, 1, 0, 0, - 3, 0, 3, 1, 0, 0, 1, 3, 2, 0, 1, 1, 2, 0, 2, 2, 2, 1, 1, 1, 1, 2, 1, 1, 1, 2, 0, 0, 2, 2, 0, 1, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 2, 2, 2, - 1, 2, 1, 2, 1, 2, 0, 0, 2, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 2, 2, - 1, 2, 1, 3, 1, 1, 0, 0, 2, 0, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 1, 0, 1, 2, 2, 1, 3, - 1, 2, 1, 1, 2, 2, 0, 0, 2, 2, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 3, 3, 2, 2, 2, 2, 3, 2, - 1, 2, 1, 2, 2, 2, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 3, 3, 2, 3, 2, 2, 3, 2, 2, 2, 1, 2, 2, 2, 2, - 1, 2, 1, 1, 2, 2, 0, 1, 2, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 0, 2, 2, 2, 2, 2, - 0, 2, 0, 2, 2, 2, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 3, 0, 2, 2, 2, - 0, 2, 1, 2, 2, 2, 0, 0, 2, 1, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 1, 0, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 1, 2, 3, 2, 2, 2, - 1, 2, 1, 2, 2, 2, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 0, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 3, 3, 3, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 1, 0, 2, 0, 2, - 0, 2, 1, 2, 2, 2, 0, 0, 1, 2, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 0, 0, 1, 0, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 3, 2, 3, 2, 2, 3, 2, 1, 2, 1, 1, 1, - 0, 1, 1, 1, 1, 1, 3, 0, 1, 0, 0, 0, 0, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, - 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 0, 1, 1, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, - 0, 0, 1, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 2, 2, 2, 2, 2, 2, - 0, 2, 0, 1, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 3, 3, 3, 2, 1, 2, 3, 3, 2, 3, 3, 3, 3, 2, 3, 2, 1, 2, 0, 2, 1, 2, - 0, 2, 0, 2, 2, 2, 0, 0, 1, 2, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 3, 3, 3, 1, 2, 2, 3, 3, 2, 3, 2, 3, 2, 2, 3, 1, 2, 2, 0, 2, 2, 2, - 0, 2, 1, 2, 2, 2, 0, 0, 1, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1, 0, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 3, 3, 3, 2, 3, 3, 2, 2, 2, 3, 3, 3, 3, 1, 3, 2, 2, 2, - 0, 2, 0, 1, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 2, 3, 3, 3, 2, 3, 2, 2, 2, 1, 2, 2, 0, 2, 2, 2, 2, - 0, 2, 0, 2, 2, 2, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 3, 3, 3, 1, 3, 2, 3, 3, 2, 3, 3, 2, 2, 1, 2, 2, 2, 2, 2, 2, - 0, 2, 1, 2, 1, 2, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, - 3, 3, 3, 3, 3, 3, 2, 3, 2, 3, 3, 2, 3, 3, 3, 3, 2, 3, 2, 3, 3, 3, 3, 3, 2, 2, 2, 2, 2, 2, 2, 1, - 0, 2, 0, 1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 3, 2, 3, 2, 1, 2, 3, 0, 2, 1, 2, 2, - 0, 2, 1, 1, 2, 1, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 2, 0, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 3, 3, 3, 3, 2, 1, 3, 1, 2, 2, 2, 1, 2, 3, 3, 1, 2, 1, 2, 2, 2, 2, - 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 2, 3, 3, 3, 1, 3, 3, 3, 1, 2, 2, 2, 2, 1, 1, 2, 2, 2, 2, 2, 2, - 0, 2, 0, 1, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, - 3, 3, 3, 3, 3, 3, 2, 3, 3, 3, 2, 2, 3, 3, 3, 2, 1, 2, 3, 2, 3, 2, 2, 2, 2, 1, 2, 1, 1, 1, 2, 2, - 0, 2, 1, 1, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, - 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, - 1, 0, 1, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 3, 3, 3, 3, 3, 2, 3, 3, 2, 3, 1, 2, 2, 2, 2, 3, 2, 3, 1, 1, 2, 2, 1, 2, 2, 1, 1, 0, 2, 2, 2, 2, - 0, 1, 0, 1, 2, 2, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, - 3, 0, 0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 2, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 3, 0, 1, 0, 1, 0, 1, 1, 0, 1, 1, 0, 0, 0, 1, 1, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 3, 0, 0, 0, 1, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, - 3, 2, 2, 1, 2, 2, 2, 2, 2, 2, 2, 1, 2, 2, 1, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 0, 3, 3, 3, - 0, 3, 0, 2, 2, 2, 2, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, - 2, 2, 2, 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 2, 2, 1, 2, 2, 2, 1, 1, 1, 2, 0, 1, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 2, 2, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 2, 3, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 2, 1, 0, 2, 1, 0, - 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 3, 1, 1, 2, 2, 2, 2, 2, 1, 2, 2, 2, 1, 1, 2, 2, 2, 2, 2, 2, 2, 1, 2, 2, 1, 0, 1, 1, 1, 1, 0, - 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 3, 2, 1, 1, 1, 1, 2, 1, 1, 2, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, - 2, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 2, 2, 2, 2, 2, 1, 2, 1, 2, 1, 1, 1, 1, 0, 0, 0, 0, - 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 1, 2, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 2, 1, 2, 1, 1, 2, 1, 1, 1, 2, 1, 2, 1, 2, 0, 1, 0, 1, - 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 3, 1, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 2, 2, 1, 2, 1, 1, 1, 1, 1, 1, 2, 1, 2, 1, 1, 0, 1, 0, 1, - 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 2, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, - 0, 2, 0, 1, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, - 3, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 2, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, - 0, 1, 1, 1, 2, 1, 2, 2, 2, 0, 2, 0, 2, 0, 1, 1, 2, 1, 1, 1, 1, 2, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 1, 0, 1, 0, 0, 0, 0, 0, 1, 0, 1, 2, 2, 0, 1, 0, 0, 1, 1, 2, 2, 1, 2, 0, 2, 0, 0, 0, 1, 2, 0, 1, - 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 2, 1, 2, 0, 2, 0, 0, 1, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 0, 0, 1, - 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 2, 1, 1, 0, 1, 0, 0, 1, 1, 1, 2, 2, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1, - 1, 1, 2, 1, 0, 1, 1, 1, 0, 1, 0, 1, 1, 1, 1, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 1, - 0, 2, 0, 1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 2, 1, 0, 0, 1, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 0, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 1, - 2, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 1, 0, 1, 0, 0, 1, 1, 2, 1, 1, 2, 0, 1, 0, 0, 0, 1, 1, 0, 1, - 1, 0, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 2, 0, 1, 0, 0, 0, 0, 2, 1, 1, 2, 0, 2, 0, 0, 0, 1, 1, 0, 1, - 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 2, 1, 1, 0, 1, 0, 0, 2, 2, 1, 2, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 1, - 2, 0, 1, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 2, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 1, 0, 1, - 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 2, 0, 0, 0, 0, 2, 1, 1, 1, 0, 2, 1, 1, 0, 0, 0, 2, 1, 0, 1, - 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 2, 0, 1, 0, 0, 1, 1, 0, 2, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 1, - 2, 2, 1, 1, 1, 0, 1, 1, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 2, 1, 1, 0, 1, 0, 0, 1, 1, 0, 1, 2, 1, 0, 2, 0, 0, 0, 1, 1, 0, 1, - 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, - 0, 1, 0, 0, 2, 0, 2, 1, 1, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 2, 0, 1, 0, 0, 1, 1, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1, - 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 0, 1, 0, 0, 2, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 1, 0, 1, - 0, 1, 1, 1, 2, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 0, + 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 3, 2, 1, 2, 0, 1, 0, 0, 3, 0, 3, 1, 0, 0, 1, 3, 2, 0, 1, 1, 2, 0, 2, 2, 2, 1, 1, 1, + 1, 2, 1, 1, 1, 2, 0, 0, 2, 2, 0, 1, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 2, 2, 2, 1, 2, 1, 2, 1, 2, 0, 0, + 2, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 2, 2, 2, 1, 2, 1, 3, 1, 1, 0, 0, 2, 0, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 1, 0, 1, 2, 2, 1, 3, 1, 2, 1, 1, 2, 2, 0, 0, 2, 2, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 3, 3, 2, 2, 2, 2, 3, 2, 1, 2, 1, 2, 2, 2, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, + 0, 0, 0, 0, 0, 0, 1, 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 3, 3, 2, 3, 2, 2, 3, 2, 2, 2, 1, 2, 2, 2, 2, 1, 2, 1, 1, 2, 2, 0, 1, 2, 0, 0, 0, + 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 0, 2, 2, 2, 2, 2, + 0, 2, 0, 2, 2, 2, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 2, 3, 0, 2, 2, 2, 0, 2, 1, 2, 2, 2, 0, 0, 2, 1, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 1, 0, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 1, 2, 3, 2, 2, 2, 1, 2, 1, 2, 2, 2, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, + 0, 1, 1, 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 3, 3, 3, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 1, 0, 2, 0, 2, 0, 2, 1, 2, 2, 2, 0, 0, 1, 2, 0, 0, 0, 0, 1, 0, + 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 0, 0, 1, 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 3, 2, 3, 2, 2, 3, 2, 1, 2, 1, 1, 1, 0, 1, 1, 1, + 1, 1, 3, 0, 1, 0, 0, 0, 0, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 0, 1, 1, 0, 0, + 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 2, 2, 2, 2, 2, 2, 0, 2, 0, 1, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 3, 3, 3, 2, 1, 2, 3, 3, 2, 3, 3, 3, 3, 2, 3, 2, 1, 2, 0, 2, 1, 2, 0, 2, 0, 2, 2, 2, 0, 0, 1, 2, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 3, 3, 3, 1, 2, 2, 3, 3, 2, 3, 2, 3, 2, 2, 3, 1, 2, 2, 0, 2, 2, 2, 0, 2, 1, 2, 2, 2, 0, 0, + 1, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1, 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 3, 3, 3, 2, 3, 3, 2, 2, 2, 3, 3, 3, 3, 1, + 3, 2, 2, 2, 0, 2, 0, 1, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 2, + 3, 3, 3, 2, 3, 2, 2, 2, 1, 2, 2, 0, 2, 2, 2, 2, 0, 2, 0, 2, 2, 2, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 2, 3, 3, 3, 1, 3, 2, 3, 3, 2, 3, 3, 2, 2, 1, 2, 2, 2, 2, 2, 2, 0, 2, 1, 2, 1, 2, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 1, + 0, 0, 0, 0, 0, 0, 1, 0, 3, 3, 3, 3, 3, 3, 2, 3, 2, 3, 3, 2, 3, 3, 3, 3, 2, 3, 2, 3, 3, 3, 3, 3, 2, 2, 2, 2, 2, 2, 2, 1, 0, 2, 0, 1, 2, 1, 0, 0, 0, 0, 0, 0, + 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 3, 2, 3, 2, 1, 2, 3, 0, 2, 1, 2, 2, + 0, 2, 1, 1, 2, 1, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 2, 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 3, 3, 3, 3, 2, 1, 3, 1, 2, 2, + 2, 1, 2, 3, 3, 1, 2, 1, 2, 2, 2, 2, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 0, 2, 3, 3, 3, 1, 3, 3, 3, 1, 2, 2, 2, 2, 1, 1, 2, 2, 2, 2, 2, 2, 0, 2, 0, 1, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, + 0, 0, 1, 0, 3, 3, 3, 3, 3, 3, 2, 3, 3, 3, 2, 2, 3, 3, 3, 2, 1, 2, 3, 2, 3, 2, 2, 2, 2, 1, 2, 1, 1, 1, 2, 2, 0, 2, 1, 1, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 1, 0, + 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 3, 3, 2, 3, 3, 2, 3, 1, 2, 2, 2, 2, 3, 2, 3, 1, 1, 2, 2, 1, 2, + 2, 1, 1, 0, 2, 2, 2, 2, 0, 1, 0, 1, 2, 2, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 3, 0, 0, 1, 1, 0, 1, 0, 0, 1, 1, 0, + 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 3, 0, 1, 0, 1, 0, 1, 1, 0, 1, 1, 0, 0, 0, 1, 1, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 1, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 3, 2, 2, 1, 2, 2, 2, 2, 2, 2, 2, 1, 2, 2, 1, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, + 0, 3, 3, 3, 0, 3, 0, 2, 2, 2, 2, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 2, 2, 2, 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 1, 2, 2, 1, 2, 2, 2, 1, 1, 1, 2, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 2, 3, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 2, 1, 0, 2, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 1, 2, 2, 2, 2, 2, 1, 2, 2, 2, 1, 1, 2, 2, 2, 2, 2, + 2, 2, 1, 2, 2, 1, 0, 1, 1, 1, 1, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 2, 1, 1, 1, 1, 2, 1, + 1, 2, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 0, 0, + 0, 1, 0, 0, 2, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 2, 2, 2, 2, 2, 1, 2, 1, 2, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 2, 1, 2, 1, 1, 2, 1, 1, 1, 2, 1, 2, 1, 2, 0, 1, 0, 1, 0, 0, 0, 0, + 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 2, 2, 1, 2, 1, 1, 1, 1, 1, 1, 2, + 1, 2, 1, 1, 0, 1, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 0, 2, 0, 1, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, + 3, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 2, 0, 1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 1, 1, 1, 2, 1, 2, 2, 2, 0, 2, 0, 2, 0, 1, 1, 2, 1, 1, 1, 1, 2, 1, 0, 1, 1, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1, 0, 1, 2, 2, 0, 1, 0, 0, 1, 1, 2, 2, 1, 2, 0, 2, 0, 0, 0, 1, 2, 0, 1, 2, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 2, 1, 2, 0, 2, 0, 0, 1, 1, 1, 1, 1, 1, 0, + 1, 0, 0, 0, 1, 0, 0, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 2, 1, + 1, 0, 1, 0, 0, 1, 1, 1, 2, 2, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1, 1, 1, 2, 1, 0, 1, 1, 1, 0, 1, 0, 1, 1, 1, 1, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 1, + 0, 2, 0, 1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 0, 0, 1, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, + 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 2, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 0, 1, 1, 0, 1, 0, 0, 0, + 1, 1, 0, 1, 2, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 1, 0, 1, 1, 1, 0, 1, 0, 0, 1, 1, 2, 1, 1, 2, 0, 1, 0, 0, 0, 1, 1, 0, 1, 1, 0, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 2, 0, 1, 0, 0, 0, 0, 2, 1, 1, 2, 0, 2, 0, 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 2, 1, 1, 0, 1, 0, 0, 2, 2, 1, 2, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 1, + 2, 0, 1, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 2, 0, 0, 0, 0, 0, 1, 1, + 0, 1, 0, 0, 1, 0, 0, 0, 0, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 1, 2, 2, 0, 0, 0, 0, 2, 1, 1, 1, 0, 2, 1, 1, 0, 0, 0, 2, 1, 0, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 2, 0, 1, 0, 0, 1, 1, 0, 2, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 1, 2, 2, 1, 1, 1, 0, 1, 1, 0, 1, 1, 0, 1, 0, 0, 0, + 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 2, 1, 1, 0, 1, 0, 0, 1, 1, 0, 1, 2, 1, 0, + 2, 0, 0, 0, 1, 1, 0, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 1, 0, 0, 2, 0, 2, 1, 1, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, + 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, + 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 2, 0, 1, 0, 0, 1, 1, 1, 0, 1, 0, 0, 1, 0, 0, 0, + 1, 0, 0, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 0, 1, 0, + 0, 2, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 1, 0, 1, 0, 1, 1, 1, 2, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 0, }; -const SequenceModel Win1255Model = { - win1255_CharToOrderMap, - HebrewLangModel, - (float)0.984004, - false, - "windows-1255" -}; +const SequenceModel Win1255Model = {win1255_CharToOrderMap, HebrewLangModel, (float)0.984004, false, "windows-1255"}; } - diff -Nru kcodecs-5.79.0/src/probers/LangHungarianModel.cpp kcodecs-5.80.0/src/probers/LangHungarianModel.cpp --- kcodecs-5.79.0/src/probers/LangHungarianModel.cpp 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/src/probers/LangHungarianModel.cpp 2021-03-06 16:19:34.000000000 +0000 @@ -15,196 +15,124 @@ namespace kencodingprober { -//Character Mapping Table: +// Character Mapping Table: const unsigned char Latin2_HungarianCharToOrderMap[] = { - 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 254, 255, 255, 254, 255, 255, //00 - 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, //10 - +253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, //20 - 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 253, 253, 253, 253, 253, 253, //30 - 253, 28, 40, 54, 45, 32, 50, 49, 38, 39, 53, 36, 41, 34, 35, 47, - 46, 71, 43, 33, 37, 57, 48, 64, 68, 55, 52, 253, 253, 253, 253, 253, - 253, 2, 18, 26, 17, 1, 27, 12, 20, 9, 22, 7, 6, 13, 4, 8, - 23, 67, 10, 5, 3, 21, 19, 65, 62, 16, 11, 253, 253, 253, 253, 253, - 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, - 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, - 191, 192, 193, 194, 195, 196, 197, 75, 198, 199, 200, 201, 202, 203, 204, 205, - 79, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, - 221, 51, 81, 222, 78, 223, 224, 225, 226, 44, 227, 228, 229, 61, 230, 231, - 232, 233, 234, 58, 235, 66, 59, 236, 237, 238, 60, 69, 63, 239, 240, 241, - 82, 14, 74, 242, 70, 80, 243, 72, 244, 15, 83, 77, 84, 30, 76, 85, - 245, 246, 247, 25, 73, 42, 24, 248, 249, 250, 31, 56, 29, 251, 252, 253, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 254, 255, 255, 254, 255, 255, // 00 + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, // 10 + +253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, // 20 + 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 253, 253, 253, 253, 253, 253, // 30 + 253, 28, 40, 54, 45, 32, 50, 49, 38, 39, 53, 36, 41, 34, 35, 47, 46, 71, 43, 33, 37, 57, 48, 64, 68, 55, 52, 253, + 253, 253, 253, 253, 253, 2, 18, 26, 17, 1, 27, 12, 20, 9, 22, 7, 6, 13, 4, 8, 23, 67, 10, 5, 3, 21, 19, 65, + 62, 16, 11, 253, 253, 253, 253, 253, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, + 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 75, 198, 199, 200, 201, 202, 203, 204, 205, + 79, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 51, 81, 222, 78, 223, 224, 225, 226, 44, 227, 228, + 229, 61, 230, 231, 232, 233, 234, 58, 235, 66, 59, 236, 237, 238, 60, 69, 63, 239, 240, 241, 82, 14, 74, 242, 70, 80, 243, 72, + 244, 15, 83, 77, 84, 30, 76, 85, 245, 246, 247, 25, 73, 42, 24, 248, 249, 250, 31, 56, 29, 251, 252, 253, }; const unsigned char win1250HungarianCharToOrderMap[] = { - 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 254, 255, 255, 254, 255, 255, //00 - 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, //10 - +253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, //20 - 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 253, 253, 253, 253, 253, 253, //30 - 253, 28, 40, 54, 45, 32, 50, 49, 38, 39, 53, 36, 41, 34, 35, 47, - 46, 72, 43, 33, 37, 57, 48, 64, 68, 55, 52, 253, 253, 253, 253, 253, - 253, 2, 18, 26, 17, 1, 27, 12, 20, 9, 22, 7, 6, 13, 4, 8, - 23, 67, 10, 5, 3, 21, 19, 65, 62, 16, 11, 253, 253, 253, 253, 253, - 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, - 177, 178, 179, 180, 78, 181, 69, 182, 183, 184, 185, 186, 187, 188, 189, 190, - 191, 192, 193, 194, 195, 196, 197, 76, 198, 199, 200, 201, 202, 203, 204, 205, - 81, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, - 221, 51, 83, 222, 80, 223, 224, 225, 226, 44, 227, 228, 229, 61, 230, 231, - 232, 233, 234, 58, 235, 66, 59, 236, 237, 238, 60, 70, 63, 239, 240, 241, - 84, 14, 75, 242, 71, 82, 243, 73, 244, 15, 85, 79, 86, 30, 77, 87, - 245, 246, 247, 25, 74, 42, 24, 248, 249, 250, 31, 56, 29, 251, 252, 253, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 254, 255, 255, 254, 255, 255, // 00 + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, // 10 + +253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, // 20 + 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 253, 253, 253, 253, 253, 253, // 30 + 253, 28, 40, 54, 45, 32, 50, 49, 38, 39, 53, 36, 41, 34, 35, 47, 46, 72, 43, 33, 37, 57, 48, 64, 68, 55, 52, 253, + 253, 253, 253, 253, 253, 2, 18, 26, 17, 1, 27, 12, 20, 9, 22, 7, 6, 13, 4, 8, 23, 67, 10, 5, 3, 21, 19, 65, + 62, 16, 11, 253, 253, 253, 253, 253, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, + 78, 181, 69, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 76, 198, 199, 200, 201, 202, 203, 204, 205, + 81, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 51, 83, 222, 80, 223, 224, 225, 226, 44, 227, 228, + 229, 61, 230, 231, 232, 233, 234, 58, 235, 66, 59, 236, 237, 238, 60, 70, 63, 239, 240, 241, 84, 14, 75, 242, 71, 82, 243, 73, + 244, 15, 85, 79, 86, 30, 77, 87, 245, 246, 247, 25, 74, 42, 24, 248, 249, 250, 31, 56, 29, 251, 252, 253, }; -//Model Table: -//total sequences: 100% -//first 512 sequences: 94.7368% -//first 1024 sequences:5.2623% -//rest sequences: 0.8894% -//negative sequences: 0.0009% +// Model Table: +// total sequences: 100% +// first 512 sequences: 94.7368% +// first 1024 sequences:5.2623% +// rest sequences: 0.8894% +// negative sequences: 0.0009% const char HungarianLangModel[] = { - 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 1, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 3, 3, 3, 3, 3, 3, 3, 3, 2, 2, 3, 3, 1, 1, 2, 2, 2, 2, 2, 1, 2, - 3, 2, 2, 3, 3, 3, 3, 3, 2, 3, 3, 3, 3, 3, 3, 1, 2, 3, 3, 3, 3, 2, 3, 3, 1, 1, 3, 3, 0, 1, 1, 1, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, - 3, 2, 1, 3, 3, 3, 3, 3, 2, 3, 3, 3, 3, 3, 1, 1, 2, 3, 3, 3, 3, 3, 3, 3, 1, 1, 3, 2, 0, 1, 1, 1, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 1, 1, 2, 3, 3, 3, 1, 3, 3, 3, 3, 3, 1, 3, 3, 2, 2, 0, 3, 2, 3, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, - 3, 3, 3, 3, 3, 3, 2, 3, 3, 3, 2, 3, 3, 2, 3, 3, 3, 3, 3, 2, 3, 3, 2, 2, 3, 2, 3, 2, 0, 3, 2, 2, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, - 3, 3, 3, 3, 3, 3, 2, 3, 3, 3, 3, 3, 2, 3, 3, 3, 1, 2, 3, 2, 2, 3, 1, 2, 3, 3, 2, 2, 0, 3, 3, 3, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 2, 3, 3, 3, 3, 3, 3, 2, 3, 3, 3, 3, 2, 3, 3, 3, 3, 0, 2, 3, 2, - 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 1, 1, 1, 3, 3, 2, 1, 3, 2, 2, 3, 2, 1, 3, 2, 2, 1, 0, 3, 3, 1, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, - 3, 2, 2, 3, 3, 3, 3, 3, 1, 2, 3, 3, 3, 3, 1, 2, 1, 3, 3, 3, 3, 2, 2, 3, 1, 1, 3, 2, 0, 1, 1, 1, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, - 3, 3, 3, 3, 3, 3, 3, 3, 2, 2, 3, 3, 3, 3, 3, 2, 1, 3, 3, 3, 3, 3, 2, 2, 1, 3, 3, 3, 0, 1, 1, 2, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 3, 3, 3, 2, 3, 3, 2, 3, 3, 3, 2, 0, 3, 2, 3, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 1, 0, - 3, 3, 3, 3, 3, 3, 2, 3, 3, 3, 2, 3, 2, 3, 3, 3, 1, 3, 2, 2, 2, 3, 1, 1, 3, 3, 1, 1, 0, 3, 3, 2, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, - 3, 3, 3, 3, 3, 3, 3, 2, 3, 3, 3, 2, 3, 2, 3, 3, 3, 2, 3, 3, 3, 3, 3, 1, 2, 3, 2, 2, 0, 2, 2, 2, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, - 3, 3, 3, 2, 2, 2, 3, 1, 3, 3, 2, 2, 1, 3, 3, 3, 1, 1, 3, 1, 2, 3, 2, 3, 2, 2, 2, 1, 0, 2, 2, 2, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, - 3, 1, 1, 3, 3, 3, 3, 3, 1, 2, 3, 3, 3, 3, 1, 2, 1, 3, 3, 3, 2, 2, 3, 2, 1, 0, 3, 2, 0, 1, 1, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 3, 1, 1, 3, 3, 3, 3, 3, 1, 2, 3, 3, 3, 3, 1, 1, 0, 3, 3, 3, 3, 0, 2, 3, 0, 0, 2, 1, 0, 1, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 3, 3, 3, 3, 3, 3, 2, 2, 3, 3, 2, 2, 2, 2, 3, 3, 0, 1, 2, 3, 2, 3, 2, 2, 3, 2, 1, 2, 0, 2, 2, 2, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, - 3, 3, 3, 3, 3, 3, 1, 2, 3, 3, 3, 2, 1, 2, 3, 3, 2, 2, 2, 3, 2, 3, 3, 1, 3, 3, 1, 1, 0, 2, 3, 2, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, - 3, 3, 3, 1, 2, 2, 2, 2, 3, 3, 3, 1, 1, 1, 3, 3, 1, 1, 3, 1, 1, 3, 2, 1, 2, 3, 1, 1, 0, 2, 2, 2, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, - 3, 3, 3, 2, 1, 2, 1, 1, 3, 3, 1, 1, 1, 1, 3, 3, 1, 1, 2, 2, 1, 2, 1, 1, 2, 2, 1, 1, 0, 2, 2, 1, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, - 3, 3, 3, 1, 1, 2, 1, 1, 3, 3, 1, 0, 1, 1, 3, 3, 2, 0, 1, 1, 2, 3, 1, 0, 2, 2, 1, 0, 0, 1, 3, 2, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, - 3, 2, 1, 3, 3, 3, 3, 3, 1, 2, 3, 2, 3, 3, 2, 1, 1, 3, 2, 3, 2, 1, 2, 2, 0, 1, 2, 1, 0, 0, 1, 1, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, - 3, 3, 3, 3, 2, 2, 2, 2, 3, 1, 2, 2, 1, 1, 3, 3, 0, 3, 2, 1, 2, 3, 2, 1, 3, 3, 1, 1, 0, 2, 1, 3, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, - 3, 3, 3, 2, 2, 2, 3, 2, 3, 3, 3, 2, 1, 1, 3, 3, 1, 1, 1, 2, 2, 3, 2, 3, 2, 2, 2, 1, 0, 2, 2, 1, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, - 1, 0, 0, 3, 3, 3, 3, 3, 0, 0, 3, 3, 2, 3, 0, 0, 0, 2, 3, 3, 1, 0, 1, 2, 0, 0, 1, 1, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 3, 1, 2, 3, 3, 3, 3, 3, 1, 2, 3, 3, 2, 2, 1, 1, 0, 3, 3, 2, 2, 1, 2, 2, 1, 0, 2, 2, 0, 1, 1, 1, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 3, 3, 2, 2, 1, 3, 1, 2, 3, 3, 2, 2, 1, 1, 2, 2, 1, 1, 1, 1, 3, 2, 1, 1, 1, 1, 2, 1, 0, 1, 2, 1, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 2, 3, 3, 1, 1, 1, 1, 1, 3, 3, 3, 0, 1, 1, 3, 3, 1, 1, 1, 1, 1, 2, 2, 0, 3, 1, 1, 2, 0, 2, 1, 1, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, - 3, 1, 0, 1, 2, 1, 2, 2, 0, 1, 2, 3, 1, 2, 0, 0, 0, 2, 1, 1, 1, 1, 1, 2, 0, 0, 1, 1, 0, 0, 0, 0, - 1, 2, 1, 2, 2, 2, 1, 2, 1, 2, 0, 2, 0, 2, 2, 1, 1, 2, 1, 1, 2, 1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, - 1, 1, 1, 2, 3, 2, 3, 3, 0, 1, 2, 2, 3, 1, 0, 1, 0, 2, 1, 2, 2, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 1, 0, 0, 3, 3, 2, 2, 1, 0, 0, 3, 2, 3, 2, 0, 0, 0, 1, 1, 3, 0, 0, 1, 1, 0, 0, 2, 1, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 3, 1, 1, 2, 2, 3, 3, 1, 0, 1, 3, 2, 3, 1, 1, 1, 0, 1, 1, 1, 1, 1, 3, 1, 0, 0, 2, 2, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 3, 1, 1, 1, 2, 2, 2, 1, 0, 1, 2, 3, 3, 2, 0, 0, 0, 2, 1, 1, 1, 2, 1, 1, 1, 0, 1, 1, 1, 0, 0, 0, - 1, 2, 2, 2, 2, 2, 1, 1, 1, 2, 0, 2, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0, 1, 1, - 3, 2, 2, 1, 0, 0, 1, 1, 2, 2, 0, 3, 0, 1, 2, 1, 1, 0, 0, 1, 1, 1, 0, 1, 1, 1, 1, 0, 2, 1, 1, 1, - 2, 2, 1, 1, 1, 2, 1, 2, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 2, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, - 2, 3, 3, 0, 1, 0, 0, 0, 3, 3, 1, 0, 0, 1, 2, 2, 1, 0, 0, 0, 0, 2, 0, 0, 1, 1, 1, 0, 2, 1, 1, 1, - 2, 1, 1, 1, 1, 1, 1, 2, 1, 1, 0, 1, 1, 0, 1, 1, 1, 0, 1, 2, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 0, 1, - 2, 3, 3, 0, 1, 0, 0, 0, 2, 2, 0, 0, 0, 0, 1, 2, 2, 0, 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 2, 0, 1, 0, - 2, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 0, 1, 1, 1, 1, 1, 0, 1, - 3, 2, 2, 0, 1, 0, 1, 0, 2, 3, 2, 0, 0, 1, 2, 2, 1, 0, 0, 1, 1, 1, 0, 0, 2, 1, 0, 1, 2, 2, 1, 1, - 2, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 0, 2, 1, 0, 1, 1, 0, 1, 1, 1, 0, 1, 1, 2, 1, 1, 0, 1, - 2, 2, 2, 0, 0, 1, 0, 0, 2, 2, 1, 1, 0, 0, 2, 1, 1, 0, 0, 0, 1, 2, 0, 0, 2, 1, 0, 0, 2, 1, 1, 1, - 2, 1, 1, 1, 1, 2, 1, 2, 1, 1, 1, 2, 2, 1, 1, 2, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, - 1, 2, 3, 0, 0, 0, 1, 0, 3, 2, 1, 0, 0, 1, 2, 1, 1, 0, 0, 0, 0, 2, 1, 0, 1, 1, 0, 0, 2, 1, 2, 1, - 1, 1, 0, 0, 0, 1, 0, 1, 1, 1, 1, 1, 2, 0, 0, 1, 0, 0, 0, 2, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, - 3, 0, 0, 2, 1, 2, 2, 1, 0, 0, 2, 1, 2, 2, 0, 0, 0, 2, 1, 1, 1, 0, 1, 1, 0, 0, 1, 1, 2, 0, 0, 0, - 1, 2, 1, 2, 2, 1, 1, 2, 1, 2, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 0, 0, 1, 1, 1, 1, 0, 0, 1, - 1, 3, 2, 0, 0, 0, 1, 0, 2, 2, 2, 0, 0, 0, 2, 2, 1, 0, 0, 0, 0, 3, 1, 1, 1, 1, 0, 0, 2, 1, 1, 1, - 2, 1, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 0, 2, 1, 0, 0, 1, 0, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 1, - 2, 3, 2, 0, 0, 0, 1, 0, 2, 2, 0, 0, 0, 0, 2, 1, 1, 0, 0, 0, 0, 2, 1, 0, 1, 1, 0, 0, 2, 1, 1, 0, - 2, 1, 1, 1, 1, 2, 1, 2, 1, 2, 0, 1, 1, 1, 0, 2, 1, 1, 1, 2, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 0, 1, - 3, 1, 1, 2, 2, 2, 3, 2, 1, 1, 2, 2, 1, 1, 0, 1, 0, 2, 2, 1, 1, 1, 1, 1, 0, 0, 1, 1, 0, 1, 1, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 2, 2, 2, 0, 0, 0, 0, 0, 2, 2, 0, 0, 0, 0, 2, 2, 1, 0, 0, 0, 1, 1, 0, 0, 1, 2, 0, 0, 2, 1, 1, 1, - 2, 2, 1, 1, 1, 2, 1, 2, 1, 1, 0, 1, 1, 1, 1, 2, 1, 1, 1, 2, 1, 1, 1, 1, 0, 1, 2, 1, 1, 1, 0, 1, - 1, 0, 0, 1, 2, 3, 2, 1, 0, 0, 2, 0, 1, 1, 0, 0, 0, 1, 1, 1, 1, 0, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, - 1, 2, 1, 2, 1, 2, 1, 1, 1, 2, 0, 2, 1, 1, 1, 0, 1, 2, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 2, 3, 2, 0, 0, 0, 0, 0, 1, 1, 2, 1, 0, 0, 1, 1, 1, 0, 0, 0, 0, 2, 0, 0, 1, 1, 0, 0, 2, 1, 1, 1, - 2, 1, 1, 1, 1, 1, 1, 2, 1, 0, 1, 1, 1, 1, 0, 2, 1, 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 1, 1, 0, 1, - 1, 2, 2, 0, 1, 1, 1, 0, 2, 2, 2, 0, 0, 0, 3, 2, 1, 0, 0, 0, 1, 1, 0, 0, 1, 1, 0, 1, 1, 1, 0, 0, - 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 0, 0, 1, 1, 1, 0, 1, 0, 1, - 2, 1, 0, 2, 1, 1, 2, 2, 1, 1, 2, 1, 1, 1, 0, 0, 0, 1, 1, 0, 1, 1, 1, 1, 0, 0, 1, 1, 1, 0, 0, 0, - 1, 2, 2, 2, 2, 2, 1, 1, 1, 2, 0, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 0, 0, 0, 1, 0, - 1, 2, 3, 0, 0, 0, 1, 0, 2, 2, 0, 0, 0, 0, 2, 2, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 2, 0, 1, 0, - 2, 1, 1, 1, 1, 1, 0, 2, 0, 0, 0, 1, 2, 1, 1, 1, 1, 0, 1, 2, 0, 1, 0, 1, 0, 1, 1, 1, 0, 1, 0, 1, - 2, 2, 2, 0, 0, 0, 1, 0, 2, 1, 2, 0, 0, 0, 1, 1, 2, 0, 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 2, 1, 0, 1, - 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 0, 1, 1, 1, 1, 1, 0, 1, - 1, 2, 2, 0, 0, 0, 1, 0, 2, 2, 2, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 2, 0, 0, 1, 1, 1, 0, 1, - 1, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 0, 0, 1, 0, 0, 1, 1, 0, 1, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1, - 1, 0, 0, 1, 0, 1, 2, 1, 0, 0, 1, 1, 1, 2, 0, 0, 0, 1, 1, 0, 1, 0, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, - 0, 2, 1, 2, 1, 1, 1, 1, 1, 2, 0, 2, 0, 1, 1, 0, 1, 2, 1, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, - 2, 1, 1, 0, 1, 2, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 2, 1, 0, 1, - 2, 2, 1, 1, 1, 1, 1, 2, 1, 1, 0, 1, 1, 1, 1, 2, 1, 1, 1, 2, 1, 1, 0, 1, 0, 1, 1, 1, 1, 1, 0, 1, - 1, 2, 2, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 2, 1, 0, 0, 0, 0, 0, 2, 0, 0, 2, 2, 0, 0, 2, 0, 0, 1, - 2, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 0, 1, 1, 0, 1, 0, 0, 0, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 0, 0, 1, - 1, 1, 2, 0, 0, 3, 1, 0, 2, 1, 1, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 1, 0, 1, 0, - 1, 2, 1, 0, 1, 1, 1, 2, 1, 1, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 0, 0, - 2, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 2, 0, 0, 0, - 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 0, 0, 1, 1, 1, 1, 1, 0, 1, - 2, 1, 1, 1, 2, 1, 1, 1, 0, 1, 1, 2, 1, 0, 0, 0, 0, 1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 1, 1, 0, 1, 1, 1, 1, 1, 0, 0, 1, 1, 2, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 1, 0, 0, 1, 0, 1, 0, 0, 0, - 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, - 2, 0, 0, 0, 1, 1, 1, 1, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 2, 0, 0, 1, 0, 0, 1, 0, 1, 0, 0, 0, - 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 0, 1, 1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 1, 0, 0, 1, 1, 1, 1, 1, 0, 0, 2, 1, 0, 1, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, - 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 0, 1, 0, 1, 1, 0, 1, 1, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 1, 0, 0, 1, 1, 1, 0, 0, 0, 0, 1, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 1, 1, 1, 1, 1, 0, 0, 1, 1, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 1, 1, 1, 0, 1, 0, 0, 1, 1, 0, 1, 0, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 0, 0, 1, 0, 0, 1, 0, 1, 0, 1, 1, 1, 0, 0, 1, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 1, 0, 0, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 0, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 1, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 3, 3, 3, 3, 3, 3, 3, 3, 2, + 2, 3, 3, 1, 1, 2, 2, 2, 2, 2, 1, 2, 3, 2, 2, 3, 3, 3, 3, 3, 2, 3, 3, 3, 3, 3, 3, 1, 2, 3, 3, 3, 3, 2, 3, 3, 1, 1, 3, 3, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 3, 2, 1, 3, 3, 3, 3, 3, 2, 3, 3, 3, 3, 3, 1, 1, 2, 3, 3, 3, 3, 3, 3, 3, 1, 1, 3, 2, + 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 1, 1, 2, 3, 3, + 3, 1, 3, 3, 3, 3, 3, 1, 3, 3, 2, 2, 0, 3, 2, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 3, + 3, 3, 2, 3, 3, 3, 2, 3, 3, 2, 3, 3, 3, 3, 3, 2, 3, 3, 2, 2, 3, 2, 3, 2, 0, 3, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 1, 0, 0, 0, 0, 0, 1, 0, 3, 3, 3, 3, 3, 3, 2, 3, 3, 3, 3, 3, 2, 3, 3, 3, 1, 2, 3, 2, 2, 3, 1, 2, 3, 3, 2, 2, 0, 3, 3, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 2, 3, 3, 3, 3, 3, 3, 2, 3, 3, 3, 3, 2, 3, 3, 3, 3, 0, 2, 3, 2, + 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 1, 1, 1, 3, 3, 2, 1, 3, 2, + 2, 3, 2, 1, 3, 2, 2, 1, 0, 3, 3, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 3, 2, 2, 3, 3, 3, 3, 3, + 1, 2, 3, 3, 3, 3, 1, 2, 1, 3, 3, 3, 3, 2, 2, 3, 1, 1, 3, 2, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 1, 0, 3, 3, 3, 3, 3, 3, 3, 3, 2, 2, 3, 3, 3, 3, 3, 2, 1, 3, 3, 3, 3, 3, 2, 2, 1, 3, 3, 3, 0, 1, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 3, 3, 3, 2, 3, 3, 2, 3, 3, 3, 2, 0, 3, 2, 3, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 1, 0, 3, 3, 3, 3, 3, 3, 2, 3, 3, 3, 2, 3, 2, 3, 3, 3, 1, 3, 2, 2, 2, 3, 1, 1, + 3, 3, 1, 1, 0, 3, 3, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 3, 3, 3, 3, 2, 3, 3, 3, 2, + 3, 2, 3, 3, 3, 2, 3, 3, 3, 3, 3, 1, 2, 3, 2, 2, 0, 2, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, + 3, 3, 3, 2, 2, 2, 3, 1, 3, 3, 2, 2, 1, 3, 3, 3, 1, 1, 3, 1, 2, 3, 2, 3, 2, 2, 2, 1, 0, 2, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 3, 1, 1, 3, 3, 3, 3, 3, 1, 2, 3, 3, 3, 3, 1, 2, 1, 3, 3, 3, 2, 2, 3, 2, 1, 0, 3, 2, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 1, 3, 3, 3, 3, 3, 1, 2, 3, 3, 3, 3, 1, 1, 0, 3, 3, 3, 3, 0, 2, 3, 0, 0, 2, 1, + 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 3, 3, 3, 2, 2, 3, 3, 2, 2, 2, 2, 3, 3, + 0, 1, 2, 3, 2, 3, 2, 2, 3, 2, 1, 2, 0, 2, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 3, + 3, 3, 1, 2, 3, 3, 3, 2, 1, 2, 3, 3, 2, 2, 2, 3, 2, 3, 3, 1, 3, 3, 1, 1, 0, 2, 3, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 1, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 1, 2, 2, 2, 2, 3, 3, 3, 1, 1, 1, 3, 3, 1, 1, 3, 1, 1, 3, 2, 1, 2, 3, 1, 1, 0, 2, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 2, 1, 2, 1, 1, 3, 3, 1, 1, 1, 1, 3, 3, 1, 1, 2, 2, 1, 2, 1, 1, 2, 2, 1, 1, 0, 2, 2, 1, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 1, 1, 2, 1, 1, 3, 3, 1, 0, 1, 1, 3, 3, 2, 0, 1, 1, + 2, 3, 1, 0, 2, 2, 1, 0, 0, 1, 3, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 3, 2, 1, 3, 3, 3, 3, 3, + 1, 2, 3, 2, 3, 3, 2, 1, 1, 3, 2, 3, 2, 1, 2, 2, 0, 1, 2, 1, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 1, 0, 3, 3, 3, 3, 2, 2, 2, 2, 3, 1, 2, 2, 1, 1, 3, 3, 0, 3, 2, 1, 2, 3, 2, 1, 3, 3, 1, 1, 0, 2, 1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 2, 2, 2, 3, 2, 3, 3, 3, 2, 1, 1, 3, 3, 1, 1, 1, 2, 2, 3, 2, 3, 2, 2, 2, 1, 0, 2, 2, 1, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 3, 3, 3, 3, 3, 0, 0, 3, 3, 2, 3, 0, 0, 0, 2, 3, 3, 1, 0, 1, 2, + 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 2, 3, 3, 3, 3, 3, 1, 2, 3, 3, + 2, 2, 1, 1, 0, 3, 3, 2, 2, 1, 2, 2, 1, 0, 2, 2, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 3, 3, 2, 2, 1, 3, 1, 2, 3, 3, 2, 2, 1, 1, 2, 2, 1, 1, 1, 1, 3, 2, 1, 1, 1, 1, 2, 1, 0, 1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, + 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 3, 3, 1, 1, 1, 1, 1, 3, 3, 3, 0, 1, 1, 3, 3, 1, 1, 1, 1, 1, 2, 2, 0, 3, 1, 1, 2, 0, 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 3, 1, 0, 1, 2, 1, 2, 2, 0, 1, 2, 3, 1, 2, 0, 0, 0, 2, 1, 1, 1, 1, 1, 2, 0, 0, 1, 1, + 0, 0, 0, 0, 1, 2, 1, 2, 2, 2, 1, 2, 1, 2, 0, 2, 0, 2, 2, 1, 1, 2, 1, 1, 2, 1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 1, 1, 1, 2, 3, 2, 3, 3, 0, 1, 2, 2, 3, 1, 0, 1, + 0, 2, 1, 2, 2, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 3, + 3, 2, 2, 1, 0, 0, 3, 2, 3, 2, 0, 0, 0, 1, 1, 3, 0, 0, 1, 1, 0, 0, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 1, 2, 2, 3, 3, 1, 0, 1, 3, 2, 3, 1, 1, 1, 0, 1, 1, 1, 1, 1, 3, 1, 0, 0, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 1, 1, 2, 2, 2, 1, 0, 1, 2, 3, 3, 2, 0, 0, 0, 2, 1, 1, 1, 2, 1, 1, 1, 0, 1, 1, 1, 0, 0, 0, + 1, 2, 2, 2, 2, 2, 1, 1, 1, 2, 0, 2, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0, 1, 1, 3, 2, 2, 1, 0, 0, 1, 1, 2, 2, 0, 3, 0, 1, 2, 1, 1, 0, 0, 1, + 1, 1, 0, 1, 1, 1, 1, 0, 2, 1, 1, 1, 2, 2, 1, 1, 1, 2, 1, 2, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 2, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 2, 3, 3, 0, 1, 0, 0, 0, + 3, 3, 1, 0, 0, 1, 2, 2, 1, 0, 0, 0, 0, 2, 0, 0, 1, 1, 1, 0, 2, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 2, 1, 1, 0, 1, 1, 0, 1, 1, 1, 0, 1, 2, 1, 1, 0, 1, 1, 1, 1, 1, + 1, 1, 0, 1, 2, 3, 3, 0, 1, 0, 0, 0, 2, 2, 0, 0, 0, 0, 1, 2, 2, 0, 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 2, 0, 1, 0, 2, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 2, 0, 1, 1, 1, 1, 1, 0, 1, 3, 2, 2, 0, 1, 0, 1, 0, 2, 3, 2, 0, 0, 1, 2, 2, 1, 0, 0, 1, 1, 1, 0, 0, 2, 1, 0, 1, 2, 2, 1, 1, 2, 1, 1, 1, + 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 0, 2, 1, 0, 1, 1, 0, 1, 1, 1, 0, 1, 1, 2, 1, 1, 0, 1, 2, 2, 2, 0, 0, 1, 0, 0, 2, 2, 1, 1, 0, 0, 2, 1, 1, 0, 0, 0, 1, 2, 0, 0, + 2, 1, 0, 0, 2, 1, 1, 1, 2, 1, 1, 1, 1, 2, 1, 2, 1, 1, 1, 2, 2, 1, 1, 2, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 2, 3, 0, 0, 0, 1, 0, 3, 2, 1, 0, + 0, 1, 2, 1, 1, 0, 0, 0, 0, 2, 1, 0, 1, 1, 0, 0, 2, 1, 2, 1, 1, 1, 0, 0, 0, 1, 0, 1, 1, 1, 1, 1, 2, 0, 0, 1, 0, 0, 0, 2, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, + 3, 0, 0, 2, 1, 2, 2, 1, 0, 0, 2, 1, 2, 2, 0, 0, 0, 2, 1, 1, 1, 0, 1, 1, 0, 0, 1, 1, 2, 0, 0, 0, 1, 2, 1, 2, 2, 1, 1, 2, 1, 2, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 2, 1, 1, 0, 0, 1, 1, 1, 1, 0, 0, 1, 1, 3, 2, 0, 0, 0, 1, 0, 2, 2, 2, 0, 0, 0, 2, 2, 1, 0, 0, 0, 0, 3, 1, 1, 1, 1, 0, 0, 2, 1, 1, 1, 2, 1, 0, 1, 1, 1, 0, 1, + 1, 1, 1, 1, 1, 1, 0, 2, 1, 0, 0, 1, 0, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 1, 2, 3, 2, 0, 0, 0, 1, 0, 2, 2, 0, 0, 0, 0, 2, 1, 1, 0, 0, 0, 0, 2, 1, 0, 1, 1, 0, 0, + 2, 1, 1, 0, 2, 1, 1, 1, 1, 2, 1, 2, 1, 2, 0, 1, 1, 1, 0, 2, 1, 1, 1, 2, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 0, 1, 3, 1, 1, 2, 2, 2, 3, 2, 1, 1, 2, 2, 1, 1, 0, 1, + 0, 2, 2, 1, 1, 1, 1, 1, 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 0, + 0, 0, 0, 0, 2, 2, 0, 0, 0, 0, 2, 2, 1, 0, 0, 0, 1, 1, 0, 0, 1, 2, 0, 0, 2, 1, 1, 1, 2, 2, 1, 1, 1, 2, 1, 2, 1, 1, 0, 1, 1, 1, 1, 2, 1, 1, 1, 2, 1, 1, 1, 1, + 0, 1, 2, 1, 1, 1, 0, 1, 1, 0, 0, 1, 2, 3, 2, 1, 0, 0, 2, 0, 1, 1, 0, 0, 0, 1, 1, 1, 1, 0, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 1, 2, 1, 2, 1, 2, 1, 1, 1, 2, 0, 2, + 1, 1, 1, 0, 1, 2, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 3, 2, 0, 0, 0, 0, 0, 1, 1, 2, 1, 0, 0, 1, 1, 1, 0, 0, 0, 0, 2, 0, 0, 1, 1, 0, 0, 2, 1, 1, 1, + 2, 1, 1, 1, 1, 1, 1, 2, 1, 0, 1, 1, 1, 1, 0, 2, 1, 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 1, 1, 0, 1, 1, 2, 2, 0, 1, 1, 1, 0, 2, 2, 2, 0, 0, 0, 3, 2, 1, 0, 0, 0, + 1, 1, 0, 0, 1, 1, 0, 1, 1, 1, 0, 0, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 0, 0, 1, 1, 1, 0, 1, 0, 1, 2, 1, 0, 2, 1, 1, 2, 2, + 1, 1, 2, 1, 1, 1, 0, 0, 0, 1, 1, 0, 1, 1, 1, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 2, 2, 2, 2, 2, 1, 1, 1, 2, 0, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 0, + 0, 0, 1, 0, 1, 2, 3, 0, 0, 0, 1, 0, 2, 2, 0, 0, 0, 0, 2, 2, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 2, 0, 1, 0, 2, 1, 1, 1, 1, 1, 0, 2, 0, 0, 0, 1, 2, 1, 1, 1, + 1, 0, 1, 2, 0, 1, 0, 1, 0, 1, 1, 1, 0, 1, 0, 1, 2, 2, 2, 0, 0, 0, 1, 0, 2, 1, 2, 0, 0, 0, 1, 1, 2, 0, 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 2, 1, 0, 1, 2, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 0, 1, 1, 1, 1, 1, 0, 1, 1, 2, 2, 0, 0, 0, 1, 0, 2, 2, 2, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0, + 2, 0, 0, 1, 1, 1, 0, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 0, 0, 1, 0, 0, 1, 1, 0, 1, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 1, 0, 1, 2, 1, 0, 0, 1, 1, + 1, 2, 0, 0, 0, 1, 1, 0, 1, 0, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 2, 1, 2, 1, 1, 1, 1, 1, 2, 0, 2, 0, 1, 1, 0, 1, 2, 1, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, + 2, 1, 1, 0, 1, 2, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 2, 1, 0, 1, 2, 2, 1, 1, 1, 1, 1, 2, 1, 1, 0, 1, 1, 1, 1, 2, 1, 1, 1, 2, + 1, 1, 0, 1, 0, 1, 1, 1, 1, 1, 0, 1, 1, 2, 2, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 2, 1, 0, 0, 0, 0, 0, 2, 0, 0, 2, 2, 0, 0, 2, 0, 0, 1, 2, 1, 1, 1, 1, 1, 1, 1, + 0, 1, 1, 0, 1, 1, 0, 1, 0, 0, 0, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 0, 0, 1, 1, 1, 2, 0, 0, 3, 1, 0, 2, 1, 1, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, + 1, 0, 1, 0, 1, 2, 1, 0, 1, 1, 1, 2, 1, 1, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 0, 0, 2, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, + 0, 1, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 2, 0, 0, 0, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 0, 0, 1, 1, 1, 1, 1, 0, 1, 2, 1, 1, 1, + 2, 1, 1, 1, 0, 1, 1, 2, 1, 0, 0, 0, 0, 1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 1, 1, 1, 0, 0, 1, 1, 2, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 1, 0, 0, 1, 0, 1, 0, 0, 0, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, + 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 2, 0, 0, 0, 1, 1, 1, 1, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 2, 0, 0, 1, 0, 0, 1, 0, 1, 0, 0, 0, + 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 0, 1, 1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 1, 1, 1, 0, 0, 2, 1, 0, 1, 0, 0, 0, 1, 0, 1, + 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 0, 1, 0, 1, 1, 0, 1, 1, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 1, 0, 0, + 0, 0, 1, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 1, 1, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 1, 1, 1, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0, 0, 1, 1, 0, 1, 0, 1, 1, 0, + 1, 1, 1, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 0, 0, 1, 0, 0, 1, 0, 1, 0, 1, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 0, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }; -const SequenceModel Latin2HungarianModel = { - Latin2_HungarianCharToOrderMap, - HungarianLangModel, - (float)0.947368, - true, - "ISO-8859-2" -}; +const SequenceModel Latin2HungarianModel = {Latin2_HungarianCharToOrderMap, HungarianLangModel, (float)0.947368, true, "ISO-8859-2"}; -const SequenceModel Win1250HungarianModel = { - win1250HungarianCharToOrderMap, - HungarianLangModel, - (float)0.947368, - true, - "windows-1250" -}; +const SequenceModel Win1250HungarianModel = {win1250HungarianCharToOrderMap, HungarianLangModel, (float)0.947368, true, "windows-1250"}; } - diff -Nru kcodecs-5.79.0/src/probers/LangThaiModel.cpp kcodecs-5.80.0/src/probers/LangThaiModel.cpp --- kcodecs-5.79.0/src/probers/LangThaiModel.cpp 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/src/probers/LangThaiModel.cpp 2021-03-06 16:19:34.000000000 +0000 @@ -16,171 +16,112 @@ namespace kencodingprober { -//The following result for thai was collected from a limited sample (1M). +// The following result for thai was collected from a limited sample (1M). -//Character Mapping Table: +// Character Mapping Table: const unsigned char TIS620CharToOrderMap[] = { - 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 254, 255, 255, 254, 255, 255, //00 - 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, //10 - +253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, //20 - 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 253, 253, 253, 253, 253, 253, //30 - 253, 182, 106, 107, 100, 183, 184, 185, 101, 94, 186, 187, 108, 109, 110, 111, //40 - 188, 189, 190, 89, 95, 112, 113, 191, 192, 193, 194, 253, 253, 253, 253, 253, //50 - 253, 64, 72, 73, 114, 74, 115, 116, 102, 81, 201, 117, 90, 103, 78, 82, //60 - 96, 202, 91, 79, 84, 104, 105, 97, 98, 92, 203, 253, 253, 253, 253, 253, //70 - 209, 210, 211, 212, 213, 88, 214, 215, 216, 217, 218, 219, 220, 118, 221, 222, - 223, 224, 99, 85, 83, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, - 236, 5, 30, 237, 24, 238, 75, 8, 26, 52, 34, 51, 119, 47, 58, 57, - 49, 53, 55, 43, 20, 19, 44, 14, 48, 3, 17, 25, 39, 62, 31, 54, - 45, 9, 16, 2, 61, 15, 239, 12, 42, 46, 18, 21, 76, 4, 66, 63, - 22, 10, 1, 36, 23, 13, 40, 27, 32, 35, 86, 240, 241, 242, 243, 244, - 11, 28, 41, 29, 33, 245, 50, 37, 6, 7, 67, 77, 38, 93, 246, 247, - 68, 56, 59, 65, 69, 60, 70, 80, 71, 87, 248, 249, 250, 251, 252, 253, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 254, 255, 255, 254, 255, 255, // 00 + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, // 10 + +253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, // 20 + 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 253, 253, 253, 253, 253, 253, // 30 + 253, 182, 106, 107, 100, 183, 184, 185, 101, 94, 186, 187, 108, 109, 110, 111, // 40 + 188, 189, 190, 89, 95, 112, 113, 191, 192, 193, 194, 253, 253, 253, 253, 253, // 50 + 253, 64, 72, 73, 114, 74, 115, 116, 102, 81, 201, 117, 90, 103, 78, 82, // 60 + 96, 202, 91, 79, 84, 104, 105, 97, 98, 92, 203, 253, 253, 253, 253, 253, // 70 + 209, 210, 211, 212, 213, 88, 214, 215, 216, 217, 218, 219, 220, 118, 221, 222, 223, 224, 99, 85, 83, 225, 226, 227, 228, 229, + 230, 231, 232, 233, 234, 235, 236, 5, 30, 237, 24, 238, 75, 8, 26, 52, 34, 51, 119, 47, 58, 57, 49, 53, 55, 43, + 20, 19, 44, 14, 48, 3, 17, 25, 39, 62, 31, 54, 45, 9, 16, 2, 61, 15, 239, 12, 42, 46, 18, 21, 76, 4, + 66, 63, 22, 10, 1, 36, 23, 13, 40, 27, 32, 35, 86, 240, 241, 242, 243, 244, 11, 28, 41, 29, 33, 245, 50, 37, + 6, 7, 67, 77, 38, 93, 246, 247, 68, 56, 59, 65, 69, 60, 70, 80, 71, 87, 248, 249, 250, 251, 252, 253, }; -//Model Table: -//total sequences: 100% -//first 512 sequences: 92.6386% -//first 1024 sequences:7.3177% -//rest sequences: 1.0230% -//negative sequences: 0.0436% +// Model Table: +// total sequences: 100% +// first 512 sequences: 92.6386% +// first 1024 sequences:7.3177% +// rest sequences: 1.0230% +// negative sequences: 0.0436% const char ThaiLangModel[] = { - 0, 1, 3, 3, 3, 3, 0, 0, 3, 3, 0, 3, 3, 0, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 3, 3, 3, 0, 3, 3, 3, 3, - 0, 3, 3, 0, 0, 0, 1, 3, 0, 3, 3, 2, 3, 3, 0, 1, 2, 3, 3, 3, 3, 0, 2, 0, 2, 0, 0, 3, 2, 1, 2, 2, - 3, 0, 3, 3, 2, 3, 0, 0, 3, 3, 0, 3, 3, 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 3, 2, 3, 0, 2, 2, 2, 3, - 0, 2, 3, 0, 0, 0, 0, 1, 0, 1, 2, 3, 1, 1, 3, 2, 2, 0, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, - 3, 3, 3, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 2, 2, 2, 2, 2, 2, 3, 3, 2, 3, 2, 3, 3, 2, 2, 2, - 3, 1, 2, 3, 0, 3, 3, 2, 2, 1, 2, 3, 3, 1, 2, 0, 1, 3, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, - 3, 3, 2, 2, 3, 3, 3, 3, 1, 2, 3, 3, 3, 3, 3, 2, 2, 2, 2, 3, 3, 2, 2, 3, 3, 2, 2, 3, 2, 3, 2, 2, - 3, 3, 1, 2, 3, 1, 2, 2, 3, 3, 1, 0, 2, 1, 0, 0, 3, 1, 2, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 1, - 3, 3, 3, 3, 3, 3, 2, 2, 3, 3, 3, 3, 2, 3, 2, 2, 3, 3, 2, 2, 3, 2, 2, 2, 2, 1, 1, 3, 1, 2, 1, 1, - 3, 2, 1, 0, 2, 1, 0, 1, 0, 1, 1, 0, 1, 1, 0, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 3, 3, 3, 2, 3, 2, 3, 3, 2, 2, 3, 2, 3, 3, 2, 3, 1, 1, 2, 3, 2, 2, 2, 3, 2, 2, 2, 2, 2, 1, 2, 1, - 2, 2, 1, 1, 3, 3, 2, 1, 0, 1, 2, 2, 0, 1, 3, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 2, 3, 0, 0, 2, 1, 1, - 3, 3, 2, 3, 3, 2, 0, 0, 3, 3, 0, 3, 3, 0, 2, 2, 3, 1, 2, 2, 1, 1, 1, 0, 2, 2, 2, 0, 2, 2, 1, 1, - 0, 2, 1, 0, 2, 0, 0, 2, 0, 1, 0, 0, 1, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, - 3, 3, 2, 3, 3, 2, 0, 0, 3, 3, 0, 2, 3, 0, 2, 1, 2, 2, 2, 2, 1, 2, 0, 0, 2, 2, 2, 0, 2, 2, 1, 1, - 0, 2, 1, 0, 2, 0, 0, 2, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 3, 3, 2, 3, 2, 3, 2, 0, 2, 2, 1, 3, 2, 1, 3, 2, 1, 2, 3, 2, 2, 3, 0, 2, 3, 2, 2, 1, 2, 2, 2, 2, - 1, 2, 2, 0, 0, 0, 0, 2, 0, 1, 2, 0, 1, 1, 1, 0, 1, 0, 3, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, - 3, 3, 2, 3, 3, 2, 3, 2, 2, 2, 3, 2, 2, 3, 2, 2, 1, 2, 3, 2, 2, 3, 1, 3, 2, 2, 2, 3, 2, 2, 2, 3, - 3, 2, 1, 3, 0, 1, 1, 1, 0, 2, 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, - 1, 0, 0, 3, 0, 3, 3, 3, 3, 3, 0, 0, 3, 0, 2, 2, 3, 3, 3, 3, 3, 0, 0, 0, 1, 1, 3, 0, 0, 0, 0, 2, - 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 2, 3, 0, 0, 0, 3, 0, 2, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, - 2, 0, 3, 3, 3, 3, 0, 0, 2, 3, 0, 0, 3, 0, 3, 3, 2, 3, 3, 3, 3, 3, 0, 0, 3, 3, 3, 0, 0, 0, 3, 3, - 0, 0, 3, 0, 0, 0, 0, 2, 0, 0, 2, 1, 1, 3, 0, 0, 1, 0, 0, 2, 3, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, - 3, 3, 3, 3, 2, 3, 3, 3, 3, 3, 3, 3, 1, 2, 1, 3, 3, 2, 2, 1, 2, 2, 2, 3, 1, 1, 2, 0, 2, 1, 2, 1, - 2, 2, 1, 0, 0, 0, 1, 1, 0, 1, 0, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 3, 0, 2, 1, 2, 3, 3, 3, 0, 2, 0, 2, 2, 0, 2, 1, 3, 2, 2, 1, 2, 1, 0, 0, 2, 2, 1, 0, 2, 1, 2, 2, - 0, 1, 1, 0, 0, 0, 0, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 3, 3, 3, 3, 2, 1, 3, 3, 1, 1, 3, 0, 2, 3, 1, 1, 3, 2, 1, 1, 2, 0, 2, 2, 3, 2, 1, 1, 1, 1, 1, 2, - 3, 0, 0, 1, 3, 1, 2, 1, 2, 0, 3, 0, 0, 0, 1, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, - 3, 3, 1, 1, 3, 2, 3, 3, 3, 1, 3, 2, 1, 3, 2, 1, 3, 2, 2, 2, 2, 1, 3, 3, 1, 2, 1, 3, 1, 2, 3, 0, - 2, 1, 1, 3, 2, 2, 2, 1, 2, 1, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, - 3, 3, 2, 3, 2, 3, 3, 2, 3, 2, 3, 2, 3, 3, 2, 1, 0, 3, 2, 2, 2, 1, 2, 2, 2, 1, 2, 2, 1, 2, 1, 1, - 2, 2, 2, 3, 0, 1, 3, 1, 1, 1, 1, 0, 1, 1, 0, 2, 1, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 3, 3, 3, 3, 2, 3, 2, 2, 1, 1, 3, 2, 3, 2, 3, 2, 0, 3, 2, 2, 1, 2, 0, 2, 2, 2, 1, 2, 2, 2, 2, 1, - 3, 2, 1, 2, 2, 1, 0, 2, 0, 1, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, - 3, 3, 3, 3, 3, 2, 3, 1, 2, 3, 3, 2, 2, 3, 0, 1, 1, 2, 0, 3, 3, 2, 2, 3, 0, 1, 1, 3, 0, 0, 0, 0, - 3, 1, 0, 3, 3, 0, 2, 0, 2, 1, 0, 0, 3, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 3, 3, 3, 2, 3, 2, 3, 3, 0, 1, 3, 1, 1, 2, 1, 2, 1, 1, 3, 1, 1, 0, 2, 3, 1, 1, 1, 1, 1, 1, 1, 1, - 3, 1, 1, 2, 2, 2, 2, 1, 1, 1, 0, 0, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, - 3, 2, 2, 1, 1, 2, 1, 3, 3, 2, 3, 2, 2, 3, 2, 2, 3, 1, 2, 2, 1, 2, 0, 3, 2, 1, 2, 2, 2, 2, 2, 1, - 3, 2, 1, 2, 2, 2, 1, 1, 1, 1, 0, 0, 1, 1, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 3, 3, 3, 3, 3, 3, 3, 3, 1, 3, 3, 0, 2, 1, 0, 3, 2, 0, 0, 3, 1, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 1, - 1, 0, 0, 1, 0, 3, 2, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 3, 0, 2, 2, 2, 3, 0, 0, 1, 3, 0, 3, 2, 0, 3, 2, 2, 3, 3, 3, 3, 3, 1, 0, 2, 2, 2, 0, 2, 2, 1, 2, - 0, 2, 3, 0, 0, 0, 0, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, - 3, 0, 2, 3, 1, 3, 3, 2, 3, 3, 0, 3, 3, 0, 3, 2, 2, 3, 2, 3, 3, 3, 0, 0, 2, 2, 3, 0, 1, 1, 1, 3, - 0, 0, 3, 0, 0, 0, 2, 2, 0, 1, 3, 0, 1, 2, 2, 2, 3, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, - 3, 2, 3, 3, 2, 0, 3, 3, 2, 2, 3, 1, 3, 2, 1, 3, 2, 0, 1, 2, 2, 0, 2, 3, 2, 1, 0, 3, 0, 0, 0, 0, - 3, 0, 0, 2, 3, 1, 3, 0, 0, 3, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 3, 1, 3, 2, 2, 2, 1, 2, 0, 1, 3, 1, 1, 3, 1, 3, 0, 0, 2, 1, 1, 1, 1, 2, 1, 1, 1, 0, 2, 1, 0, 1, - 1, 2, 0, 0, 0, 3, 1, 1, 0, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 3, 1, 0, 0, 0, 1, 0, - 3, 3, 3, 3, 2, 2, 2, 2, 2, 1, 3, 1, 1, 1, 2, 0, 1, 1, 2, 1, 2, 1, 3, 2, 0, 0, 3, 1, 1, 1, 1, 1, - 3, 1, 0, 2, 3, 0, 0, 0, 3, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 2, 3, 0, 3, 3, 0, 2, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 2, 3, 1, 3, 0, 0, 1, 2, 0, 0, 2, 0, 3, 3, 2, 3, 3, 3, 2, 3, 0, 0, 2, 2, 2, 0, 0, 0, 2, 2, - 0, 0, 1, 0, 0, 0, 0, 3, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 3, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 1, 3, 3, 0, 0, 1, 0, 3, 0, 0, 0, 0, 0, - 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 3, 3, 1, 2, 3, 1, 2, 3, 1, 0, 3, 0, 2, 2, 1, 0, 2, 1, 1, 2, 0, 1, 0, 0, 1, 1, 1, 1, 0, 1, 0, 0, - 1, 0, 0, 0, 0, 1, 1, 0, 3, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 3, 3, 3, 3, 2, 1, 0, 1, 1, 1, 3, 1, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 0, 3, 1, 0, 1, 3, 1, 1, 1, 1, - 1, 1, 0, 2, 0, 1, 3, 1, 1, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 1, - 3, 0, 2, 2, 1, 3, 3, 2, 3, 3, 0, 1, 1, 0, 2, 2, 1, 2, 1, 3, 3, 1, 0, 0, 3, 2, 0, 0, 0, 0, 2, 1, - 0, 1, 0, 0, 0, 0, 1, 2, 0, 1, 1, 3, 1, 1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 3, 0, 0, 1, 0, 0, 0, 3, 0, 0, 3, 0, 3, 1, 0, 1, 1, 1, 3, 2, 0, 0, 0, 3, 0, 0, 0, 0, 2, 0, - 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 3, 3, 1, 3, 2, 1, 3, 3, 1, 2, 2, 0, 1, 2, 1, 0, 1, 2, 0, 0, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 0, - 3, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 3, 0, 1, 2, 0, 3, 3, 3, 2, 2, 0, 1, 1, 0, 1, 3, 0, 0, 0, 2, 2, 0, 0, 0, 0, 3, 1, 0, 1, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 3, 0, 2, 3, 1, 2, 0, 0, 2, 1, 0, 3, 1, 0, 1, 2, 0, 1, 1, 1, 1, 3, 0, 0, 3, 1, 1, 0, 2, 2, 1, 1, - 0, 2, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 3, 0, 0, 3, 1, 2, 0, 0, 2, 2, 0, 1, 2, 0, 1, 0, 1, 3, 1, 2, 1, 0, 0, 0, 2, 0, 3, 0, 0, 0, 1, 0, - 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 3, 0, 1, 1, 2, 2, 0, 0, 0, 2, 0, 2, 1, 0, 1, 1, 0, 1, 1, 1, 2, 1, 0, 0, 1, 1, 1, 0, 2, 1, 1, 1, - 0, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 1, - 0, 0, 0, 2, 0, 1, 3, 1, 1, 1, 1, 0, 0, 0, 0, 3, 2, 0, 1, 0, 0, 0, 1, 2, 0, 0, 0, 1, 0, 0, 0, 0, - 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 3, 3, 3, 3, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 1, 0, 2, 3, 2, 2, 0, 0, 0, 1, 0, 0, 0, 0, 2, 3, 2, 1, 2, 2, 3, 0, 0, 0, 2, 3, 1, 0, 0, 0, 1, 1, - 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 3, 3, 2, 2, 0, 1, 0, 0, 0, 0, 2, 0, 2, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0, 2, 1, 0, 1, 0, 1, 1, 0, 0, - 0, 1, 0, 2, 0, 0, 1, 0, 3, 0, 1, 0, 0, 0, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 3, 3, 1, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 2, 0, 0, 0, 0, 1, 0, 0, 1, 3, 1, 0, 0, 0, 0, 1, 1, 0, 0, - 0, 1, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 3, 3, 1, 1, 1, 1, 2, 3, 0, 0, 2, 1, 1, 1, 1, 1, 0, 2, 1, 1, 0, 0, 0, 2, 1, 0, 1, 2, 1, 1, 0, 1, - 2, 1, 0, 3, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 1, 3, 1, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 1, - 0, 0, 0, 2, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 3, 3, 2, 0, 0, 0, 0, 0, 0, 1, 2, 1, 0, 1, 1, 0, 2, 0, 0, 1, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 1, 3, 0, 1, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 1, 2, 0, 0, 0, 0, 0, - 3, 3, 0, 0, 1, 1, 2, 0, 0, 1, 2, 1, 0, 1, 1, 1, 0, 1, 1, 0, 0, 2, 1, 1, 0, 1, 0, 0, 1, 1, 1, 0, - 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 2, 2, 2, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, - 2, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 2, 3, 0, 0, 1, 1, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 1, 1, 0, 1, 2, 0, 1, 2, 0, 0, 1, 1, 0, 2, 0, 1, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 2, 0, 0, 0, 0, - 1, 0, 0, 1, 0, 1, 1, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 0, 2, 1, 3, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 3, - 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 2, 0, 1, 0, 1, 0, 0, 2, 0, 0, 2, 0, 0, 1, 1, 2, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0, - 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 1, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 1, 1, 0, 0, 0, - 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 2, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 3, 0, 0, 0, - 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 1, 0, 0, 0, 0, - 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 2, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 1, 1, 0, 0, 2, 1, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 1, 3, 3, 3, 3, 0, 0, 3, 3, 0, 3, 3, 0, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 3, 3, 3, 0, 3, 3, 3, 3, 0, 3, 3, 0, 0, 0, 1, 3, 0, 3, 3, 2, 3, 3, 0, 1, 2, 3, 3, 3, + 3, 0, 2, 0, 2, 0, 0, 3, 2, 1, 2, 2, 3, 0, 3, 3, 2, 3, 0, 0, 3, 3, 0, 3, 3, 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 3, 2, 3, 0, 2, 2, 2, 3, 0, 2, 3, 0, 0, 0, 0, 1, + 0, 1, 2, 3, 1, 1, 3, 2, 2, 0, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 3, 3, 3, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 2, 2, 2, 2, 2, 2, 3, 3, 2, 3, 2, 3, + 3, 2, 2, 2, 3, 1, 2, 3, 0, 3, 3, 2, 2, 1, 2, 3, 3, 1, 2, 0, 1, 3, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 3, 3, 2, 2, 3, 3, 3, 3, 1, 2, 3, 3, 3, 3, 3, 2, + 2, 2, 2, 3, 3, 2, 2, 3, 3, 2, 2, 3, 2, 3, 2, 2, 3, 3, 1, 2, 3, 1, 2, 2, 3, 3, 1, 0, 2, 1, 0, 0, 3, 1, 2, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 1, 3, 3, 3, 3, + 3, 3, 2, 2, 3, 3, 3, 3, 2, 3, 2, 2, 3, 3, 2, 2, 3, 2, 2, 2, 2, 1, 1, 3, 1, 2, 1, 1, 3, 2, 1, 0, 2, 1, 0, 1, 0, 1, 1, 0, 1, 1, 0, 0, 1, 0, 1, 0, 0, 0, 1, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 2, 3, 2, 3, 3, 2, 2, 3, 2, 3, 3, 2, 3, 1, 1, 2, 3, 2, 2, 2, 3, 2, 2, 2, 2, 2, 1, 2, 1, 2, 2, 1, 1, 3, 3, 2, 1, 0, 1, 2, 2, + 0, 1, 3, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 2, 3, 0, 0, 2, 1, 1, 3, 3, 2, 3, 3, 2, 0, 0, 3, 3, 0, 3, 3, 0, 2, 2, 3, 1, 2, 2, 1, 1, 1, 0, 2, 2, 2, 0, 2, 2, 1, 1, + 0, 2, 1, 0, 2, 0, 0, 2, 0, 1, 0, 0, 1, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 3, 3, 2, 3, 3, 2, 0, 0, 3, 3, 0, 2, 3, 0, 2, 1, 2, 2, 2, 2, + 1, 2, 0, 0, 2, 2, 2, 0, 2, 2, 1, 1, 0, 2, 1, 0, 2, 0, 0, 2, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 2, 3, 2, 3, 2, 0, + 2, 2, 1, 3, 2, 1, 3, 2, 1, 2, 3, 2, 2, 3, 0, 2, 3, 2, 2, 1, 2, 2, 2, 2, 1, 2, 2, 0, 0, 0, 0, 2, 0, 1, 2, 0, 1, 1, 1, 0, 1, 0, 3, 1, 1, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 1, 0, 3, 3, 2, 3, 3, 2, 3, 2, 2, 2, 3, 2, 2, 3, 2, 2, 1, 2, 3, 2, 2, 3, 1, 3, 2, 2, 2, 3, 2, 2, 2, 3, 3, 2, 1, 3, 0, 1, 1, 1, 0, 2, 1, 1, 1, 1, 1, 0, + 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 1, 0, 0, 3, 0, 3, 3, 3, 3, 3, 0, 0, 3, 0, 2, 2, 3, 3, 3, 3, 3, 0, 0, 0, 1, 1, 3, 0, 0, 0, 0, 2, 0, 0, 1, 0, + 0, 0, 0, 0, 0, 0, 2, 3, 0, 0, 0, 3, 0, 2, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 3, 3, 3, 3, 0, 0, 2, 3, 0, 0, 3, 0, 3, 3, 2, 3, 3, 3, 3, 3, 0, 0, + 3, 3, 3, 0, 0, 0, 3, 3, 0, 0, 3, 0, 0, 0, 0, 2, 0, 0, 2, 1, 1, 3, 0, 0, 1, 0, 0, 2, 3, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 3, 3, 3, 3, 2, 3, 3, 3, 3, 3, 3, 3, + 1, 2, 1, 3, 3, 2, 2, 1, 2, 2, 2, 3, 1, 1, 2, 0, 2, 1, 2, 1, 2, 2, 1, 0, 0, 0, 1, 1, 0, 1, 0, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 3, 0, 2, 1, 2, 3, 3, 3, 0, 2, 0, 2, 2, 0, 2, 1, 3, 2, 2, 1, 2, 1, 0, 0, 2, 2, 1, 0, 2, 1, 2, 2, 0, 1, 1, 0, 0, 0, 0, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 3, 2, 1, 3, 3, 1, 1, 3, 0, 2, 3, 1, 1, 3, 2, 1, 1, 2, 0, 2, 2, 3, 2, 1, 1, 1, 1, 1, 2, 3, 0, 0, 1, 3, 1, 2, 1, + 2, 0, 3, 0, 0, 0, 1, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 3, 3, 1, 1, 3, 2, 3, 3, 3, 1, 3, 2, 1, 3, 2, 1, 3, 2, 2, 2, 2, 1, 3, 3, 1, 2, 1, 3, + 1, 2, 3, 0, 2, 1, 1, 3, 2, 2, 2, 1, 2, 1, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 3, 3, 2, 3, 2, 3, 3, 2, 3, 2, 3, 2, 3, 3, 2, 1, + 0, 3, 2, 2, 2, 1, 2, 2, 2, 1, 2, 2, 1, 2, 1, 1, 2, 2, 2, 3, 0, 1, 3, 1, 1, 1, 1, 0, 1, 1, 0, 2, 1, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 3, + 2, 3, 2, 2, 1, 1, 3, 2, 3, 2, 3, 2, 0, 3, 2, 2, 1, 2, 0, 2, 2, 2, 1, 2, 2, 2, 2, 1, 3, 2, 1, 2, 2, 1, 0, 2, 0, 1, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, + 0, 0, 0, 0, 0, 0, 0, 1, 3, 3, 3, 3, 3, 2, 3, 1, 2, 3, 3, 2, 2, 3, 0, 1, 1, 2, 0, 3, 3, 2, 2, 3, 0, 1, 1, 3, 0, 0, 0, 0, 3, 1, 0, 3, 3, 0, 2, 0, 2, 1, 0, 0, + 3, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 2, 3, 2, 3, 3, 0, 1, 3, 1, 1, 2, 1, 2, 1, 1, 3, 1, 1, 0, 2, 3, 1, 1, 1, 1, 1, 1, 1, 1, + 3, 1, 1, 2, 2, 2, 2, 1, 1, 1, 0, 0, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 3, 2, 2, 1, 1, 2, 1, 3, 3, 2, 3, 2, 2, 3, 2, 2, 3, 1, 2, 2, + 1, 2, 0, 3, 2, 1, 2, 2, 2, 2, 2, 1, 3, 2, 1, 2, 2, 2, 1, 1, 1, 1, 0, 0, 1, 1, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 3, 3, 3, 3, 3, + 1, 3, 3, 0, 2, 1, 0, 3, 2, 0, 0, 3, 1, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 3, 2, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 3, 0, 2, 2, 2, 3, 0, 0, 1, 3, 0, 3, 2, 0, 3, 2, 2, 3, 3, 3, 3, 3, 1, 0, 2, 2, 2, 0, 2, 2, 1, 2, 0, 2, 3, 0, 0, 0, 0, 1, 0, 1, 0, 0, 1, 1, 0, 0, + 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 3, 0, 2, 3, 1, 3, 3, 2, 3, 3, 0, 3, 3, 0, 3, 2, 2, 3, 2, 3, 3, 3, 0, 0, 2, 2, 3, 0, 1, 1, 1, 3, 0, 0, 3, 0, + 0, 0, 2, 2, 0, 1, 3, 0, 1, 2, 2, 2, 3, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 3, 2, 3, 3, 2, 0, 3, 3, 2, 2, 3, 1, 3, 2, 1, 3, 2, 0, 1, 2, 2, 0, 2, 3, + 2, 1, 0, 3, 0, 0, 0, 0, 3, 0, 0, 2, 3, 1, 3, 0, 0, 3, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 3, 2, 2, 2, 1, 2, 0, 1, 3, 1, + 1, 3, 1, 3, 0, 0, 2, 1, 1, 1, 1, 2, 1, 1, 1, 0, 2, 1, 0, 1, 1, 2, 0, 0, 0, 3, 1, 1, 0, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 3, 1, 0, 0, 0, 1, 0, + 3, 3, 3, 3, 2, 2, 2, 2, 2, 1, 3, 1, 1, 1, 2, 0, 1, 1, 2, 1, 2, 1, 3, 2, 0, 0, 3, 1, 1, 1, 1, 1, 3, 1, 0, 2, 3, 0, 0, 0, 3, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 3, 0, 3, 3, 0, 2, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 3, 1, 3, 0, 0, 1, 2, 0, 0, 2, 0, 3, 3, 2, 3, 3, 3, 2, 3, 0, 0, 2, 2, 2, 0, + 0, 0, 2, 2, 0, 0, 1, 0, 0, 0, 0, 3, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 1, 2, 3, 1, 3, 3, 0, 0, 1, 0, 3, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 1, 2, + 3, 1, 2, 3, 1, 0, 3, 0, 2, 2, 1, 0, 2, 1, 1, 2, 0, 1, 0, 0, 1, 1, 1, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 1, 1, 0, 3, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 3, 2, 1, 0, 1, 1, 1, 3, 1, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 0, 3, 1, 0, 1, 3, 1, 1, 1, 1, 1, 1, 0, 2, 0, 1, 3, 1, 1, 0, 0, 1, + 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 1, 3, 0, 2, 2, 1, 3, 3, 2, 3, 3, 0, 1, 1, 0, 2, 2, 1, 2, 1, 3, 3, 1, 0, 0, 3, 2, 0, 0, 0, 0, 2, 1, + 0, 1, 0, 0, 0, 0, 1, 2, 0, 1, 1, 3, 1, 1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 1, 0, 0, 0, 3, 0, 0, 3, 0, 3, 1, 0, 1, 1, 1, + 3, 2, 0, 0, 0, 3, 0, 0, 0, 0, 2, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 1, 3, 2, 1, 3, 3, + 1, 2, 2, 0, 1, 2, 1, 0, 1, 2, 0, 0, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 0, 3, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 3, 0, 1, 2, 0, 3, 3, 3, 2, 2, 0, 1, 1, 0, 1, 3, 0, 0, 0, 2, 2, 0, 0, 0, 0, 3, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 2, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 2, 3, 1, 2, 0, 0, 2, 1, 0, 3, 1, 0, 1, 2, 0, 1, 1, 1, 1, 3, 0, 0, 3, 1, 1, 0, 2, 2, 1, 1, 0, 2, 0, 0, + 0, 0, 0, 1, 0, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 3, 1, 2, 0, 0, 2, 2, 0, 1, 2, 0, 1, 0, 1, 3, 1, 2, 1, 0, 0, 0, + 2, 0, 3, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 1, 1, 2, 2, 0, 0, 0, 2, 0, 2, + 1, 0, 1, 1, 0, 1, 1, 1, 2, 1, 0, 0, 1, 1, 1, 0, 2, 1, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 1, + 0, 0, 0, 2, 0, 1, 3, 1, 1, 1, 1, 0, 0, 0, 0, 3, 2, 0, 1, 0, 0, 0, 1, 2, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 3, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 2, 3, 2, 2, 0, 0, 0, 1, 0, 0, 0, 0, 2, 3, 2, 1, 2, 2, 3, 0, 0, 0, 2, 3, 1, 0, + 0, 0, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 2, 2, 0, 1, 0, 0, 0, 0, 2, 0, 2, 0, 1, 0, + 0, 0, 1, 1, 0, 0, 0, 2, 1, 0, 1, 0, 1, 1, 0, 0, 0, 1, 0, 2, 0, 0, 1, 0, 3, 0, 1, 0, 0, 0, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 1, 0, + 0, 1, 0, 0, 0, 0, 0, 1, 1, 2, 0, 0, 0, 0, 1, 0, 0, 1, 3, 1, 0, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 1, 1, 1, 1, 2, 3, 0, 0, 2, 1, 1, 1, 1, 1, 0, 2, 1, 1, 0, 0, 0, 2, 1, 0, 1, 2, 1, 1, 0, 1, 2, 1, 0, 3, 0, 0, 0, 0, 3, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 3, 1, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 1, + 0, 0, 0, 2, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 2, 0, 0, 0, 0, 0, 0, 1, 2, 1, 0, 1, 1, 0, 2, 0, 0, 1, + 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 1, 3, 0, 1, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 1, 2, 0, 0, 0, 0, 0, 3, 3, 0, 0, 1, 1, 2, 0, + 0, 1, 2, 1, 0, 1, 1, 1, 0, 1, 1, 0, 0, 2, 1, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 2, 2, 2, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 3, 0, 0, 1, 1, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 2, 0, 1, 2, 0, 0, 1, 1, + 0, 2, 0, 1, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 2, 0, 0, 0, 0, 1, 0, 0, 1, 0, 1, 1, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 0, 2, 1, 3, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 1, 0, 1, 0, 0, 2, 0, 0, 2, 0, 0, 1, 1, 2, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 1, + 1, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 2, 0, 0, 1, 1, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 3, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 1, + 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 2, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 2, 1, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }; -const SequenceModel TIS620ThaiModel = { - TIS620CharToOrderMap, - ThaiLangModel, - (float)0.926386, - false, - "TIS-620" -}; +const SequenceModel TIS620ThaiModel = {TIS620CharToOrderMap, ThaiLangModel, (float)0.926386, false, "TIS-620"}; } - diff -Nru kcodecs-5.79.0/src/probers/nsBig5Prober.cpp kcodecs-5.80.0/src/probers/nsBig5Prober.cpp --- kcodecs-5.79.0/src/probers/nsBig5Prober.cpp 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/src/probers/nsBig5Prober.cpp 2021-03-06 16:19:34.000000000 +0000 @@ -8,7 +8,7 @@ namespace kencodingprober { -void nsBig5Prober::Reset(void) +void nsBig5Prober::Reset(void) { mCodingSM->Reset(); mState = eDetecting; @@ -61,4 +61,3 @@ return (float)distribCf; } } - diff -Nru kcodecs-5.79.0/src/probers/nsBig5Prober.h kcodecs-5.80.0/src/probers/nsBig5Prober.h --- kcodecs-5.79.0/src/probers/nsBig5Prober.h 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/src/probers/nsBig5Prober.h 2021-03-06 16:19:34.000000000 +0000 @@ -7,12 +7,12 @@ #ifndef nsBig5Prober_h__ #define nsBig5Prober_h__ +#include "CharDistribution.h" #include "nsCharSetProber.h" #include "nsCodingStateMachine.h" -#include "CharDistribution.h" namespace kencodingprober { -class KCODECS_NO_EXPORT nsBig5Prober: public nsCharSetProber +class KCODECS_NO_EXPORT nsBig5Prober : public nsCharSetProber { public: nsBig5Prober(void) @@ -33,22 +33,22 @@ { return mState; } - void Reset(void) override; - float GetConfidence(void) override; - void SetOpion() override {} + void Reset(void) override; + float GetConfidence(void) override; + void SetOpion() override + { + } protected: - void GetDistribution(unsigned int aCharLen, const char *aStr); + void GetDistribution(unsigned int aCharLen, const char *aStr); nsCodingStateMachine *mCodingSM; nsProbingState mState; - //Big5ContextAnalysis mContextAnalyser; + // Big5ContextAnalysis mContextAnalyser; Big5DistributionAnalysis mDistributionAnalyser; char mLastChar[2]; - }; } #endif /* nsBig5Prober_h__ */ - diff -Nru kcodecs-5.79.0/src/probers/nsCharSetProber.cpp kcodecs-5.80.0/src/probers/nsCharSetProber.cpp --- kcodecs-5.79.0/src/probers/nsCharSetProber.cpp 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/src/probers/nsCharSetProber.cpp 2021-03-06 16:19:34.000000000 +0000 @@ -10,7 +10,7 @@ namespace kencodingprober { -//This filter applies to all scripts which do not use English characters +// This filter applies to all scripts which do not use English characters bool nsCharSetProber::FilterWithoutEnglishLetters(const char *aBuf, unsigned int aLen, char **newBuf, unsigned int &newLen) { char *newptr; @@ -26,9 +26,9 @@ if (*curPtr & 0x80) { meetMSB = true; } else if (*curPtr < 'A' || (*curPtr > 'Z' && *curPtr < 'a') || *curPtr > 'z') { - //current char is a symbol, most likely a punctuation. we treat it as segment delimiter + // current char is a symbol, most likely a punctuation. we treat it as segment delimiter if (meetMSB && curPtr > prevPtr) - //this segment contains more than single symbol, and it has upper ASCII, we need to keep it + // this segment contains more than single symbol, and it has upper ASCII, we need to keep it { while (prevPtr < curPtr) { *newptr++ = *prevPtr++; @@ -36,7 +36,7 @@ prevPtr++; *newptr++ = ' '; meetMSB = false; - } else { //ignore current segment. (either because it is just a symbol or just an English word) + } else { // ignore current segment. (either because it is just a symbol or just an English word) prevPtr = curPtr + 1; } } @@ -51,10 +51,10 @@ return true; } -//This filter applies to all scripts which contain both English characters and upper ASCII characters. +// This filter applies to all scripts which contain both English characters and upper ASCII characters. bool nsCharSetProber::FilterWithEnglishLetters(const char *aBuf, unsigned int aLen, char **newBuf, unsigned int &newLen) { - //do filtering to reduce load to probers + // do filtering to reduce load to probers char *newptr; char *prevPtr, *curPtr; bool isInTag = false; @@ -71,10 +71,10 @@ isInTag = true; } - if (!(*curPtr & 0x80) && - (*curPtr < 'A' || (*curPtr > 'Z' && *curPtr < 'a') || *curPtr > 'z')) { + if (!(*curPtr & 0x80) // + && (*curPtr < 'A' || (*curPtr > 'Z' && *curPtr < 'a') || *curPtr > 'z')) { if (curPtr > prevPtr && !isInTag) // Current segment contains more than just a symbol - // and it is not inside a tag, keep it. + // and it is not inside a tag, keep it. { while (prevPtr < curPtr) { *newptr++ = *prevPtr++; @@ -99,4 +99,3 @@ return true; } } - diff -Nru kcodecs-5.79.0/src/probers/nsCharSetProber.h kcodecs-5.80.0/src/probers/nsCharSetProber.h --- kcodecs-5.79.0/src/probers/nsCharSetProber.h 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/src/probers/nsCharSetProber.h 2021-03-06 16:19:34.000000000 +0000 @@ -12,26 +12,30 @@ namespace kencodingprober { typedef enum { - eDetecting = 0, //We are still detecting, no sure answer yet, but caller can ask for confidence. - eFoundIt = 1, //That's a positive answer - eNotMe = 2 //Negative answer + eDetecting = 0, // We are still detecting, no sure answer yet, but caller can ask for confidence. + eFoundIt = 1, // That's a positive answer + eNotMe = 2, // Negative answer } nsProbingState; -#define SHORTCUT_THRESHOLD (float)0.95 +#define SHORTCUT_THRESHOLD (float)0.95 class KCODECS_NO_EXPORT nsCharSetProber { public: - virtual ~nsCharSetProber() {} + virtual ~nsCharSetProber() + { + } virtual const char *GetCharSetName() = 0; virtual nsProbingState HandleData(const char *aBuf, unsigned int aLen) = 0; virtual nsProbingState GetState(void) = 0; - virtual void Reset(void) = 0; - virtual float GetConfidence(void) = 0; - virtual void SetOpion() = 0; + virtual void Reset(void) = 0; + virtual float GetConfidence(void) = 0; + virtual void SetOpion() = 0; #ifdef DEBUG_PROBE - void DumpStatus() override {} + void DumpStatus() override + { + } #endif // Helper functions used in the Latin1 and Group probers. @@ -40,7 +44,6 @@ // Both functions return false in case of memory allocation failure. static bool FilterWithoutEnglishLetters(const char *aBuf, unsigned int aLen, char **newBuf, unsigned int &newLen); static bool FilterWithEnglishLetters(const char *aBuf, unsigned int aLen, char **newBuf, unsigned int &newLen); - }; } #endif /* nsCharSetProber_h__ */ diff -Nru kcodecs-5.79.0/src/probers/nsCodingStateMachine.h kcodecs-5.80.0/src/probers/nsCodingStateMachine.h --- kcodecs-5.79.0/src/probers/nsCodingStateMachine.h 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/src/probers/nsCodingStateMachine.h 2021-03-06 16:19:34.000000000 +0000 @@ -17,13 +17,13 @@ enum { eStart = 0, eError = 1, - eItsMe = 2 + eItsMe = 2, }; using nsSMState = int; #define GETCLASS(c) GETFROMPCK(((unsigned char)(c)), mModel->classTable) -//state machine model +// state machine model typedef struct { nsPkgInt classTable; unsigned int classFactor; @@ -42,23 +42,22 @@ } nsSMState NextState(char c) { - //for each byte we get its class KCODECS_NO_EXPORT , if it is first byte, we also get byte length + // for each byte we get its class KCODECS_NO_EXPORT , if it is first byte, we also get byte length unsigned int byteCls = GETCLASS(c); if (mCurrentState == eStart) { mCurrentBytePos = 0; mCurrentCharLen = mModel->charLenTable[byteCls]; } - //from byte's class KCODECS_NO_EXPORT and stateTable, we get its next state - mCurrentState = GETFROMPCK(mCurrentState * (mModel->classFactor) + byteCls, - mModel->stateTable); + // from byte's class KCODECS_NO_EXPORT and stateTable, we get its next state + mCurrentState = GETFROMPCK(mCurrentState * (mModel->classFactor) + byteCls, mModel->stateTable); mCurrentBytePos++; return mCurrentState; } - unsigned int GetCurrentCharLen(void) + unsigned int GetCurrentCharLen(void) { return mCurrentCharLen; } - void Reset(void) + void Reset(void) { mCurrentState = eStart; } @@ -105,4 +104,3 @@ extern KCODECS_NO_EXPORT const SMModel ISO2022KRSMModel; } #endif /* nsCodingStateMachine_h__ */ - diff -Nru kcodecs-5.79.0/src/probers/nsEscCharsetProber.cpp kcodecs-5.80.0/src/probers/nsEscCharsetProber.cpp --- kcodecs-5.79.0/src/probers/nsEscCharsetProber.cpp 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/src/probers/nsEscCharsetProber.cpp 2021-03-06 16:19:34.000000000 +0000 @@ -44,10 +44,10 @@ for (i = 0; i < aLen && mState == eDetecting; i++) { for (j = mActiveSM - 1; j >= 0; j--) { - //byte is feed to all active state machine + // byte is feed to all active state machine codingState = mCodingSM[j]->NextState(aBuf[i]); if (codingState == eError) { - //got negative answer for this state machine, make it inactive + // got negative answer for this state machine, make it inactive mActiveSM--; if (mActiveSM == 0) { mState = eNotMe; @@ -69,4 +69,3 @@ return mState; } } - diff -Nru kcodecs-5.79.0/src/probers/nsEscCharsetProber.h kcodecs-5.80.0/src/probers/nsEscCharsetProber.h --- kcodecs-5.79.0/src/probers/nsEscCharsetProber.h 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/src/probers/nsEscCharsetProber.h 2021-03-06 16:19:34.000000000 +0000 @@ -10,10 +10,10 @@ #include "nsCharSetProber.h" #include "nsCodingStateMachine.h" -#define NUM_OF_ESC_CHARSETS 4 +#define NUM_OF_ESC_CHARSETS 4 namespace kencodingprober { -class KCODECS_NO_EXPORT nsEscCharSetProber: public nsCharSetProber +class KCODECS_NO_EXPORT nsEscCharSetProber : public nsCharSetProber { public: nsEscCharSetProber(void); @@ -27,21 +27,22 @@ { return mState; } - void Reset(void) override; - float GetConfidence(void) override + void Reset(void) override; + float GetConfidence(void) override { return (float)0.99; } - void SetOpion() override {} + void SetOpion() override + { + } protected: - void GetDistribution(unsigned int aCharLen, const char *aStr); + void GetDistribution(unsigned int aCharLen, const char *aStr); nsCodingStateMachine *mCodingSM[NUM_OF_ESC_CHARSETS]; - unsigned int mActiveSM; + unsigned int mActiveSM; nsProbingState mState; - const char *mDetectedCharset; + const char *mDetectedCharset; }; } #endif /* nsEscCharSetProber_h__ */ - diff -Nru kcodecs-5.79.0/src/probers/nsEscSM.cpp kcodecs-5.80.0/src/probers/nsEscSM.cpp --- kcodecs-5.79.0/src/probers/nsEscSM.cpp 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/src/probers/nsEscSM.cpp 2021-03-06 16:19:34.000000000 +0000 @@ -8,7 +8,7 @@ namespace kencodingprober { -static const unsigned int HZ_cls[ 256 / 8 ] = { +static const unsigned int HZ_cls[256 / 8] = { PCK4BITS(1, 0, 0, 0, 0, 0, 0, 0), // 00 - 07 PCK4BITS(0, 0, 0, 0, 0, 0, 0, 0), // 08 - 0f PCK4BITS(0, 0, 0, 0, 0, 0, 0, 0), // 10 - 17 @@ -43,26 +43,26 @@ PCK4BITS(1, 1, 1, 1, 1, 1, 1, 1) // f8 - ff }; -static const unsigned int HZ_st [ 6] = { - PCK4BITS(eStart, eError, 3, eStart, eStart, eStart, eError, eError), //00-07 - PCK4BITS(eError, eError, eError, eError, eItsMe, eItsMe, eItsMe, eItsMe), //08-0f - PCK4BITS(eItsMe, eItsMe, eError, eError, eStart, eStart, 4, eError), //10-17 - PCK4BITS(5, eError, 6, eError, 5, 5, 4, eError), //18-1f - PCK4BITS(4, eError, 4, 4, 4, eError, 4, eError), //20-27 - PCK4BITS(4, eItsMe, eStart, eStart, eStart, eStart, eStart, eStart) //28-2f +static const unsigned int HZ_st[6] = { + PCK4BITS(eStart, eError, 3, eStart, eStart, eStart, eError, eError), // 00-07 + PCK4BITS(eError, eError, eError, eError, eItsMe, eItsMe, eItsMe, eItsMe), // 08-0f + PCK4BITS(eItsMe, eItsMe, eError, eError, eStart, eStart, 4, eError), // 10-17 + PCK4BITS(5, eError, 6, eError, 5, 5, 4, eError), // 18-1f + PCK4BITS(4, eError, 4, 4, 4, eError, 4, eError), // 20-27 + PCK4BITS(4, eItsMe, eStart, eStart, eStart, eStart, eStart, eStart) // 28-2f }; static const unsigned int HZCharLenTable[] = {0, 0, 0, 0, 0, 0}; const SMModel HZSMModel = { - {eIdxSft4bits, eSftMsk4bits, eBitSft4bits, eUnitMsk4bits, HZ_cls }, + {eIdxSft4bits, eSftMsk4bits, eBitSft4bits, eUnitMsk4bits, HZ_cls}, 6, - {eIdxSft4bits, eSftMsk4bits, eBitSft4bits, eUnitMsk4bits, HZ_st }, + {eIdxSft4bits, eSftMsk4bits, eBitSft4bits, eUnitMsk4bits, HZ_st}, HZCharLenTable, "HZ-GB-2312", }; -static const unsigned int ISO2022CN_cls [ 256 / 8 ] = { +static const unsigned int ISO2022CN_cls[256 / 8] = { PCK4BITS(2, 0, 0, 0, 0, 0, 0, 0), // 00 - 07 PCK4BITS(0, 0, 0, 0, 0, 0, 0, 0), // 08 - 0f PCK4BITS(0, 0, 0, 0, 0, 0, 0, 0), // 10 - 17 @@ -97,28 +97,28 @@ PCK4BITS(2, 2, 2, 2, 2, 2, 2, 2) // f8 - ff }; -static const unsigned int ISO2022CN_st [ 8] = { - PCK4BITS(eStart, 3, eError, eStart, eStart, eStart, eStart, eStart), //00-07 - PCK4BITS(eStart, eError, eError, eError, eError, eError, eError, eError), //08-0f - PCK4BITS(eError, eError, eItsMe, eItsMe, eItsMe, eItsMe, eItsMe, eItsMe), //10-17 - PCK4BITS(eItsMe, eItsMe, eItsMe, eError, eError, eError, 4, eError), //18-1f - PCK4BITS(eError, eError, eError, eItsMe, eError, eError, eError, eError), //20-27 - PCK4BITS(5, 6, eError, eError, eError, eError, eError, eError), //28-2f - PCK4BITS(eError, eError, eError, eItsMe, eError, eError, eError, eError), //30-37 - PCK4BITS(eError, eError, eError, eError, eError, eItsMe, eError, eStart) //38-3f +static const unsigned int ISO2022CN_st[8] = { + PCK4BITS(eStart, 3, eError, eStart, eStart, eStart, eStart, eStart), // 00-07 + PCK4BITS(eStart, eError, eError, eError, eError, eError, eError, eError), // 08-0f + PCK4BITS(eError, eError, eItsMe, eItsMe, eItsMe, eItsMe, eItsMe, eItsMe), // 10-17 + PCK4BITS(eItsMe, eItsMe, eItsMe, eError, eError, eError, 4, eError), // 18-1f + PCK4BITS(eError, eError, eError, eItsMe, eError, eError, eError, eError), // 20-27 + PCK4BITS(5, 6, eError, eError, eError, eError, eError, eError), // 28-2f + PCK4BITS(eError, eError, eError, eItsMe, eError, eError, eError, eError), // 30-37 + PCK4BITS(eError, eError, eError, eError, eError, eItsMe, eError, eStart) // 38-3f }; static const unsigned int ISO2022CNCharLenTable[] = {0, 0, 0, 0, 0, 0, 0, 0, 0}; const SMModel ISO2022CNSMModel = { - {eIdxSft4bits, eSftMsk4bits, eBitSft4bits, eUnitMsk4bits, ISO2022CN_cls }, + {eIdxSft4bits, eSftMsk4bits, eBitSft4bits, eUnitMsk4bits, ISO2022CN_cls}, 9, - {eIdxSft4bits, eSftMsk4bits, eBitSft4bits, eUnitMsk4bits, ISO2022CN_st }, + {eIdxSft4bits, eSftMsk4bits, eBitSft4bits, eUnitMsk4bits, ISO2022CN_st}, ISO2022CNCharLenTable, "ISO-2022-CN", }; -static const unsigned int ISO2022JP_cls [ 256 / 8 ] = { +static const unsigned int ISO2022JP_cls[256 / 8] = { PCK4BITS(2, 0, 0, 0, 0, 0, 0, 0), // 00 - 07 PCK4BITS(0, 0, 0, 0, 0, 0, 2, 2), // 08 - 0f PCK4BITS(0, 0, 0, 0, 0, 0, 0, 0), // 10 - 17 @@ -153,29 +153,29 @@ PCK4BITS(2, 2, 2, 2, 2, 2, 2, 2) // f8 - ff }; -static const unsigned int ISO2022JP_st [ 9] = { - PCK4BITS(eStart, 3, eError, eStart, eStart, eStart, eStart, eStart), //00-07 - PCK4BITS(eStart, eStart, eError, eError, eError, eError, eError, eError), //08-0f - PCK4BITS(eError, eError, eError, eError, eItsMe, eItsMe, eItsMe, eItsMe), //10-17 - PCK4BITS(eItsMe, eItsMe, eItsMe, eItsMe, eItsMe, eItsMe, eError, eError), //18-1f - PCK4BITS(eError, 5, eError, eError, eError, 4, eError, eError), //20-27 - PCK4BITS(eError, eError, eError, 6, eItsMe, eError, eItsMe, eError), //28-2f - PCK4BITS(eError, eError, eError, eError, eError, eError, eItsMe, eItsMe), //30-37 - PCK4BITS(eError, eError, eError, eItsMe, eError, eError, eError, eError), //38-3f - PCK4BITS(eError, eError, eError, eError, eItsMe, eError, eStart, eStart) //40-47 +static const unsigned int ISO2022JP_st[9] = { + PCK4BITS(eStart, 3, eError, eStart, eStart, eStart, eStart, eStart), // 00-07 + PCK4BITS(eStart, eStart, eError, eError, eError, eError, eError, eError), // 08-0f + PCK4BITS(eError, eError, eError, eError, eItsMe, eItsMe, eItsMe, eItsMe), // 10-17 + PCK4BITS(eItsMe, eItsMe, eItsMe, eItsMe, eItsMe, eItsMe, eError, eError), // 18-1f + PCK4BITS(eError, 5, eError, eError, eError, 4, eError, eError), // 20-27 + PCK4BITS(eError, eError, eError, 6, eItsMe, eError, eItsMe, eError), // 28-2f + PCK4BITS(eError, eError, eError, eError, eError, eError, eItsMe, eItsMe), // 30-37 + PCK4BITS(eError, eError, eError, eItsMe, eError, eError, eError, eError), // 38-3f + PCK4BITS(eError, eError, eError, eError, eItsMe, eError, eStart, eStart) // 40-47 }; static const unsigned int ISO2022JPCharLenTable[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; const SMModel ISO2022JPSMModel = { - {eIdxSft4bits, eSftMsk4bits, eBitSft4bits, eUnitMsk4bits, ISO2022JP_cls }, + {eIdxSft4bits, eSftMsk4bits, eBitSft4bits, eUnitMsk4bits, ISO2022JP_cls}, 10, - {eIdxSft4bits, eSftMsk4bits, eBitSft4bits, eUnitMsk4bits, ISO2022JP_st }, + {eIdxSft4bits, eSftMsk4bits, eBitSft4bits, eUnitMsk4bits, ISO2022JP_st}, ISO2022JPCharLenTable, "ISO-2022-JP", }; -static const unsigned int ISO2022KR_cls [ 256 / 8 ] = { +static const unsigned int ISO2022KR_cls[256 / 8] = { PCK4BITS(2, 0, 0, 0, 0, 0, 0, 0), // 00 - 07 PCK4BITS(0, 0, 0, 0, 0, 0, 0, 0), // 08 - 0f PCK4BITS(0, 0, 0, 0, 0, 0, 0, 0), // 10 - 17 @@ -210,22 +210,21 @@ PCK4BITS(2, 2, 2, 2, 2, 2, 2, 2) // f8 - ff }; -static const unsigned int ISO2022KR_st [ 5] = { - PCK4BITS(eStart, 3, eError, eStart, eStart, eStart, eError, eError), //00-07 - PCK4BITS(eError, eError, eError, eError, eItsMe, eItsMe, eItsMe, eItsMe), //08-0f - PCK4BITS(eItsMe, eItsMe, eError, eError, eError, 4, eError, eError), //10-17 - PCK4BITS(eError, eError, eError, eError, 5, eError, eError, eError), //18-1f - PCK4BITS(eError, eError, eError, eItsMe, eStart, eStart, eStart, eStart) //20-27 +static const unsigned int ISO2022KR_st[5] = { + PCK4BITS(eStart, 3, eError, eStart, eStart, eStart, eError, eError), // 00-07 + PCK4BITS(eError, eError, eError, eError, eItsMe, eItsMe, eItsMe, eItsMe), // 08-0f + PCK4BITS(eItsMe, eItsMe, eError, eError, eError, 4, eError, eError), // 10-17 + PCK4BITS(eError, eError, eError, eError, 5, eError, eError, eError), // 18-1f + PCK4BITS(eError, eError, eError, eItsMe, eStart, eStart, eStart, eStart) // 20-27 }; static const unsigned int ISO2022KRCharLenTable[] = {0, 0, 0, 0, 0, 0}; const SMModel ISO2022KRSMModel = { - {eIdxSft4bits, eSftMsk4bits, eBitSft4bits, eUnitMsk4bits, ISO2022KR_cls }, + {eIdxSft4bits, eSftMsk4bits, eBitSft4bits, eUnitMsk4bits, ISO2022KR_cls}, 6, - {eIdxSft4bits, eSftMsk4bits, eBitSft4bits, eUnitMsk4bits, ISO2022KR_st }, + {eIdxSft4bits, eSftMsk4bits, eBitSft4bits, eUnitMsk4bits, ISO2022KR_st}, ISO2022KRCharLenTable, "ISO-2022-KR", }; } - diff -Nru kcodecs-5.79.0/src/probers/nsEUCJPProber.cpp kcodecs-5.80.0/src/probers/nsEUCJPProber.cpp --- kcodecs-5.79.0/src/probers/nsEUCJPProber.cpp 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/src/probers/nsEUCJPProber.cpp 2021-03-06 16:19:34.000000000 +0000 @@ -13,7 +13,7 @@ namespace kencodingprober { -void nsEUCJPProber::Reset(void) +void nsEUCJPProber::Reset(void) { mCodingSM->Reset(); mState = eDetecting; @@ -70,4 +70,3 @@ return (contxtCf > distribCf ? contxtCf : distribCf); } } - diff -Nru kcodecs-5.79.0/src/probers/nsEUCJPProber.h kcodecs-5.80.0/src/probers/nsEUCJPProber.h --- kcodecs-5.79.0/src/probers/nsEUCJPProber.h 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/src/probers/nsEUCJPProber.h 2021-03-06 16:19:34.000000000 +0000 @@ -12,13 +12,13 @@ #ifndef nsEUCJPProber_h__ #define nsEUCJPProber_h__ +#include "CharDistribution.h" +#include "JpCntx.h" #include "nsCharSetProber.h" #include "nsCodingStateMachine.h" -#include "JpCntx.h" -#include "CharDistribution.h" namespace kencodingprober { -class KCODECS_NO_EXPORT nsEUCJPProber: public nsCharSetProber +class KCODECS_NO_EXPORT nsEUCJPProber : public nsCharSetProber { public: nsEUCJPProber(void) @@ -39,9 +39,11 @@ { return mState; } - void Reset(void) override; - float GetConfidence(void) override; - void SetOpion() override {} + void Reset(void) override; + float GetConfidence(void) override; + void SetOpion() override + { + } protected: nsCodingStateMachine *mCodingSM; @@ -55,4 +57,3 @@ } #endif /* nsEUCJPProber_h__ */ - diff -Nru kcodecs-5.79.0/src/probers/nsEUCKRProber.cpp kcodecs-5.80.0/src/probers/nsEUCKRProber.cpp --- kcodecs-5.79.0/src/probers/nsEUCKRProber.cpp 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/src/probers/nsEUCKRProber.cpp 2021-03-06 16:19:34.000000000 +0000 @@ -8,12 +8,12 @@ namespace kencodingprober { -void nsEUCKRProber::Reset(void) +void nsEUCKRProber::Reset(void) { mCodingSM->Reset(); mState = eDetecting; mDistributionAnalyser.Reset(); - //mContextAnalyser.Reset(); + // mContextAnalyser.Reset(); } nsProbingState nsEUCKRProber::HandleData(const char *aBuf, unsigned int aLen) @@ -51,8 +51,8 @@ if (mDistributionAnalyser.GotEnoughData() && GetConfidence() > SHORTCUT_THRESHOLD) { mState = eFoundIt; } -// else -// mDistributionAnalyser.HandleData(aBuf, aLen); + // else + // mDistributionAnalyser.HandleData(aBuf, aLen); return mState; } @@ -64,4 +64,3 @@ return (float)distribCf; } } - diff -Nru kcodecs-5.79.0/src/probers/nsEUCKRProber.h kcodecs-5.80.0/src/probers/nsEUCKRProber.h --- kcodecs-5.79.0/src/probers/nsEUCKRProber.h 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/src/probers/nsEUCKRProber.h 2021-03-06 16:19:34.000000000 +0000 @@ -7,12 +7,12 @@ #ifndef nsEUCKRProber_h__ #define nsEUCKRProber_h__ +#include "CharDistribution.h" #include "nsCharSetProber.h" #include "nsCodingStateMachine.h" -#include "CharDistribution.h" namespace kencodingprober { -class KCODECS_NO_EXPORT nsEUCKRProber: public nsCharSetProber +class KCODECS_NO_EXPORT nsEUCKRProber : public nsCharSetProber { public: nsEUCKRProber(void) @@ -33,22 +33,22 @@ { return mState; } - void Reset(void) override; - float GetConfidence(void) override; - void SetOpion() override {} + void Reset(void) override; + float GetConfidence(void) override; + void SetOpion() override + { + } protected: - void GetDistribution(unsigned int aCharLen, const char *aStr); + void GetDistribution(unsigned int aCharLen, const char *aStr); nsCodingStateMachine *mCodingSM; nsProbingState mState; - //EUCKRContextAnalysis mContextAnalyser; + // EUCKRContextAnalysis mContextAnalyser; EUCKRDistributionAnalysis mDistributionAnalyser; char mLastChar[2]; - }; } #endif /* nsEUCKRProber_h__ */ - diff -Nru kcodecs-5.79.0/src/probers/nsGB2312Prober.cpp kcodecs-5.80.0/src/probers/nsGB2312Prober.cpp --- kcodecs-5.79.0/src/probers/nsGB2312Prober.cpp 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/src/probers/nsGB2312Prober.cpp 2021-03-06 16:19:34.000000000 +0000 @@ -13,12 +13,12 @@ namespace kencodingprober { -void nsGB18030Prober::Reset(void) +void nsGB18030Prober::Reset(void) { mCodingSM->Reset(); mState = eDetecting; mDistributionAnalyser.Reset(); - //mContextAnalyser.Reset(); + // mContextAnalyser.Reset(); } nsProbingState nsGB18030Prober::HandleData(const char *aBuf, unsigned int aLen) @@ -56,8 +56,8 @@ if (mDistributionAnalyser.GotEnoughData() && GetConfidence() > SHORTCUT_THRESHOLD) { mState = eFoundIt; } -// else -// mDistributionAnalyser.HandleData(aBuf, aLen); + // else + // mDistributionAnalyser.HandleData(aBuf, aLen); return mState; } @@ -69,4 +69,3 @@ return (float)distribCf; } } - diff -Nru kcodecs-5.79.0/src/probers/nsGB2312Prober.h kcodecs-5.80.0/src/probers/nsGB2312Prober.h --- kcodecs-5.79.0/src/probers/nsGB2312Prober.h 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/src/probers/nsGB2312Prober.h 2021-03-06 16:19:34.000000000 +0000 @@ -7,14 +7,14 @@ #ifndef nsGB2312Prober_h__ #define nsGB2312Prober_h__ +#include "CharDistribution.h" #include "nsCharSetProber.h" #include "nsCodingStateMachine.h" -#include "CharDistribution.h" // We use gb18030 to replace gb2312, because 18030 is a superset. namespace kencodingprober { -class KCODECS_NO_EXPORT nsGB18030Prober: public nsCharSetProber +class KCODECS_NO_EXPORT nsGB18030Prober : public nsCharSetProber { public: nsGB18030Prober(void) @@ -35,22 +35,22 @@ { return mState; } - void Reset(void) override; - float GetConfidence(void) override; - void SetOpion() override {} + void Reset(void) override; + float GetConfidence(void) override; + void SetOpion() override + { + } protected: - void GetDistribution(unsigned int aCharLen, const char *aStr); + void GetDistribution(unsigned int aCharLen, const char *aStr); nsCodingStateMachine *mCodingSM; nsProbingState mState; - //GB2312ContextAnalysis mContextAnalyser; + // GB2312ContextAnalysis mContextAnalyser; GB2312DistributionAnalysis mDistributionAnalyser; char mLastChar[2]; - }; } #endif /* nsGB2312Prober_h__ */ - diff -Nru kcodecs-5.79.0/src/probers/nsHebrewProber.cpp kcodecs-5.80.0/src/probers/nsHebrewProber.cpp --- kcodecs-5.79.0/src/probers/nsHebrewProber.cpp 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/src/probers/nsHebrewProber.cpp 2021-03-06 16:19:34.000000000 +0000 @@ -161,10 +161,9 @@ } #ifdef DEBUG_PROBE -void nsHebrewProber::DumpStatus() +void nsHebrewProber::DumpStatus() { printf(" HEB: %d - %d [Logical-Visual score]\r\n", mFinalCharLogicalScore, mFinalCharVisualScore); } #endif } - diff -Nru kcodecs-5.79.0/src/probers/nsHebrewProber.h kcodecs-5.80.0/src/probers/nsHebrewProber.h --- kcodecs-5.79.0/src/probers/nsHebrewProber.h 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/src/probers/nsHebrewProber.h 2021-03-06 16:19:34.000000000 +0000 @@ -12,26 +12,32 @@ { // This prober doesn't actually recognize a language or a charset. // It is a helper prober for the use of the Hebrew model probers -class KCODECS_NO_EXPORT nsHebrewProber: public nsCharSetProber +class KCODECS_NO_EXPORT nsHebrewProber : public nsCharSetProber { public: - nsHebrewProber(void) : mLogicalProb(nullptr), mVisualProb(nullptr) + nsHebrewProber(void) + : mLogicalProb(nullptr) + , mVisualProb(nullptr) { Reset(); } - ~nsHebrewProber(void) override {} + ~nsHebrewProber(void) override + { + } nsProbingState HandleData(const char *aBuf, unsigned int aLen) override; const char *GetCharSetName() override; void Reset(void) override; nsProbingState GetState(void) override; - float GetConfidence(void) override + float GetConfidence(void) override { return (float)0.0; } - void SetOpion() override {} + void SetOpion() override + { + } void SetModelProbers(nsCharSetProber *logicalPrb, nsCharSetProber *visualPrb) { @@ -40,7 +46,7 @@ } #ifdef DEBUG_PROBE - void DumpStatus() override; + void DumpStatus() override; #endif protected: diff -Nru kcodecs-5.79.0/src/probers/nsLatin1Prober.cpp kcodecs-5.80.0/src/probers/nsLatin1Prober.cpp --- kcodecs-5.79.0/src/probers/nsLatin1Prober.cpp 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/src/probers/nsLatin1Prober.cpp 2021-03-06 16:19:34.000000000 +0000 @@ -8,51 +8,51 @@ #include #include -#define UDF 0 // undefined -#define OTH 1 //other -#define ASC 2 // ascii capital letter -#define ASS 3 // ascii small letter -#define ACV 4 // accent capital vowel -#define ACO 5 // accent capital other -#define ASV 6 // accent small vowel -#define ASO 7 // accent small other -#define CLASS_NUM 8 // total classes +#define UDF 0 // undefined +#define OTH 1 // other +#define ASC 2 // ascii capital letter +#define ASS 3 // ascii small letter +#define ACV 4 // accent capital vowel +#define ACO 5 // accent capital other +#define ASV 6 // accent small vowel +#define ASO 7 // accent small other +#define CLASS_NUM 8 // total classes namespace kencodingprober { static const unsigned char Latin1_CharToClass[] = { - OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH, // 00 - 07 - OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH, // 08 - 0F - OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH, // 10 - 17 - OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH, // 18 - 1F - OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH, // 20 - 27 - OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH, // 28 - 2F - OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH, // 30 - 37 - OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH, // 38 - 3F - OTH, ASC, ASC, ASC, ASC, ASC, ASC, ASC, // 40 - 47 - ASC, ASC, ASC, ASC, ASC, ASC, ASC, ASC, // 48 - 4F - ASC, ASC, ASC, ASC, ASC, ASC, ASC, ASC, // 50 - 57 - ASC, ASC, ASC, OTH, OTH, OTH, OTH, OTH, // 58 - 5F - OTH, ASS, ASS, ASS, ASS, ASS, ASS, ASS, // 60 - 67 - ASS, ASS, ASS, ASS, ASS, ASS, ASS, ASS, // 68 - 6F - ASS, ASS, ASS, ASS, ASS, ASS, ASS, ASS, // 70 - 77 - ASS, ASS, ASS, OTH, OTH, OTH, OTH, OTH, // 78 - 7F - OTH, UDF, OTH, ASO, OTH, OTH, OTH, OTH, // 80 - 87 - OTH, OTH, ACO, OTH, ACO, UDF, ACO, UDF, // 88 - 8F - UDF, OTH, OTH, OTH, OTH, OTH, OTH, OTH, // 90 - 97 - OTH, OTH, ASO, OTH, ASO, UDF, ASO, ACO, // 98 - 9F - OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH, // A0 - A7 - OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH, // A8 - AF - OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH, // B0 - B7 - OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH, // B8 - BF - ACV, ACV, ACV, ACV, ACV, ACV, ACO, ACO, // C0 - C7 - ACV, ACV, ACV, ACV, ACV, ACV, ACV, ACV, // C8 - CF - ACO, ACO, ACV, ACV, ACV, ACV, ACV, OTH, // D0 - D7 - ACV, ACV, ACV, ACV, ACV, ACO, ACO, ACO, // D8 - DF - ASV, ASV, ASV, ASV, ASV, ASV, ASO, ASO, // E0 - E7 - ASV, ASV, ASV, ASV, ASV, ASV, ASV, ASV, // E8 - EF - ASO, ASO, ASV, ASV, ASV, ASV, ASV, OTH, // F0 - F7 - ASV, ASV, ASV, ASV, ASV, ASO, ASO, ASO, // F8 - FF + OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH, // 00 - 07 + OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH, // 08 - 0F + OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH, // 10 - 17 + OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH, // 18 - 1F + OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH, // 20 - 27 + OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH, // 28 - 2F + OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH, // 30 - 37 + OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH, // 38 - 3F + OTH, ASC, ASC, ASC, ASC, ASC, ASC, ASC, // 40 - 47 + ASC, ASC, ASC, ASC, ASC, ASC, ASC, ASC, // 48 - 4F + ASC, ASC, ASC, ASC, ASC, ASC, ASC, ASC, // 50 - 57 + ASC, ASC, ASC, OTH, OTH, OTH, OTH, OTH, // 58 - 5F + OTH, ASS, ASS, ASS, ASS, ASS, ASS, ASS, // 60 - 67 + ASS, ASS, ASS, ASS, ASS, ASS, ASS, ASS, // 68 - 6F + ASS, ASS, ASS, ASS, ASS, ASS, ASS, ASS, // 70 - 77 + ASS, ASS, ASS, OTH, OTH, OTH, OTH, OTH, // 78 - 7F + OTH, UDF, OTH, ASO, OTH, OTH, OTH, OTH, // 80 - 87 + OTH, OTH, ACO, OTH, ACO, UDF, ACO, UDF, // 88 - 8F + UDF, OTH, OTH, OTH, OTH, OTH, OTH, OTH, // 90 - 97 + OTH, OTH, ASO, OTH, ASO, UDF, ASO, ACO, // 98 - 9F + OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH, // A0 - A7 + OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH, // A8 - AF + OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH, // B0 - B7 + OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH, // B8 - BF + ACV, ACV, ACV, ACV, ACV, ACV, ACO, ACO, // C0 - C7 + ACV, ACV, ACV, ACV, ACV, ACV, ACV, ACV, // C8 - CF + ACO, ACO, ACV, ACV, ACV, ACV, ACV, OTH, // D0 - D7 + ACV, ACV, ACV, ACV, ACV, ACO, ACO, ACO, // D8 - DF + ASV, ASV, ASV, ASV, ASV, ASV, ASO, ASO, // E0 - E7 + ASV, ASV, ASV, ASV, ASV, ASV, ASV, ASV, // E8 - EF + ASO, ASO, ASV, ASV, ASV, ASV, ASV, OTH, // F0 - F7 + ASV, ASV, ASV, ASV, ASV, ASO, ASO, ASO, // F8 - FF }; /* 0 : illegal @@ -62,17 +62,17 @@ */ static const unsigned char Latin1ClassModel[] = { /* UDF OTH ASC ASS ACV ACO ASV ASO */ - /*UDF*/ 0, 0, 0, 0, 0, 0, 0, 0, - /*OTH*/ 0, 3, 3, 3, 3, 3, 3, 3, - /*ASC*/ 0, 3, 3, 3, 3, 3, 3, 3, - /*ASS*/ 0, 3, 3, 3, 1, 1, 3, 3, - /*ACV*/ 0, 3, 3, 3, 1, 2, 1, 2, - /*ACO*/ 0, 3, 3, 3, 3, 3, 3, 3, - /*ASV*/ 0, 3, 1, 3, 1, 1, 1, 3, - /*ASO*/ 0, 3, 1, 3, 1, 1, 3, 3, + /*UDF*/ 0, 0, 0, 0, 0, 0, 0, 0, + /*OTH*/ 0, 3, 3, 3, 3, 3, 3, 3, + /*ASC*/ 0, 3, 3, 3, 3, 3, 3, 3, + /*ASS*/ 0, 3, 3, 3, 1, 1, 3, 3, + /*ACV*/ 0, 3, 3, 3, 1, 2, 1, 2, + /*ACO*/ 0, 3, 3, 3, 3, 3, 3, 3, + /*ASV*/ 0, 3, 1, 3, 1, 1, 1, 3, + /*ASO*/ 0, 3, 1, 3, 1, 1, 3, 3, }; -void nsLatin1Prober::Reset(void) +void nsLatin1Prober::Reset(void) { mState = eDetecting; mLastCharClass = OTH; @@ -142,10 +142,9 @@ } #ifdef DEBUG_PROBE -void nsLatin1Prober::DumpStatus() +void nsLatin1Prober::DumpStatus() { printf(" Latin1Prober: %1.3f [%s]\r\n", GetConfidence(), GetCharSetName()); } #endif } - diff -Nru kcodecs-5.79.0/src/probers/nsLatin1Prober.h kcodecs-5.80.0/src/probers/nsLatin1Prober.h --- kcodecs-5.79.0/src/probers/nsLatin1Prober.h 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/src/probers/nsLatin1Prober.h 2021-03-06 16:19:34.000000000 +0000 @@ -9,17 +9,19 @@ #include "nsCharSetProber.h" -#define FREQ_CAT_NUM 4 +#define FREQ_CAT_NUM 4 namespace kencodingprober { -class KCODECS_NO_EXPORT nsLatin1Prober: public nsCharSetProber +class KCODECS_NO_EXPORT nsLatin1Prober : public nsCharSetProber { public: nsLatin1Prober(void) { Reset(); } - ~nsLatin1Prober(void) override {} + ~nsLatin1Prober(void) override + { + } nsProbingState HandleData(const char *aBuf, unsigned int aLen) override; const char *GetCharSetName() override { @@ -29,16 +31,17 @@ { return mState; } - void Reset(void) override; - float GetConfidence(void) override; - void SetOpion() override {} + void Reset(void) override; + float GetConfidence(void) override; + void SetOpion() override + { + } #ifdef DEBUG_PROBE - void DumpStatus() override; + void DumpStatus() override; #endif protected: - nsProbingState mState; char mLastCharClass; unsigned int mFreqCounter[FREQ_CAT_NUM]; @@ -46,4 +49,3 @@ } #endif /* nsLatin1Prober_h__ */ - diff -Nru kcodecs-5.79.0/src/probers/nsMBCSGroupProber.cpp kcodecs-5.80.0/src/probers/nsMBCSGroupProber.cpp --- kcodecs-5.79.0/src/probers/nsMBCSGroupProber.cpp 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/src/probers/nsMBCSGroupProber.cpp 2021-03-06 16:19:34.000000000 +0000 @@ -52,7 +52,7 @@ return mProbers[mBestGuess]->GetCharSetName(); } -void nsMBCSGroupProber::Reset(void) +void nsMBCSGroupProber::Reset(void) { mActiveNum = 0; for (unsigned int i = 0; i < NUM_OF_PROBERS; i++) { @@ -73,10 +73,10 @@ nsProbingState st; unsigned int i; - //do filtering to reduce load to probers + // do filtering to reduce load to probers char *highbyteBuf; char *hptr; - bool keepNext = true; //assume previous is not ascii, it will do no harm except add some noise + bool keepNext = true; // assume previous is not ascii, it will do no harm except add some noise hptr = highbyteBuf = (char *)malloc(aLen); if (!hptr) { return mState; @@ -86,7 +86,7 @@ *hptr++ = aBuf[i]; keepNext = true; } else { - //if previous is highbyte, keep this even it is a ASCII + // if previous is highbyte, keep this even it is a ASCII if (keepNext) { *hptr++ = aBuf[i]; keepNext = false; @@ -161,4 +161,3 @@ } #endif } - diff -Nru kcodecs-5.79.0/src/probers/nsMBCSGroupProber.h kcodecs-5.80.0/src/probers/nsMBCSGroupProber.h --- kcodecs-5.79.0/src/probers/nsMBCSGroupProber.h 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/src/probers/nsMBCSGroupProber.h 2021-03-06 16:19:34.000000000 +0000 @@ -7,17 +7,17 @@ #ifndef nsMBCSGroupProber_h__ #define nsMBCSGroupProber_h__ -#include "nsSJISProber.h" #include "UnicodeGroupProber.h" +#include "nsBig5Prober.h" #include "nsEUCJPProber.h" -#include "nsGB2312Prober.h" #include "nsEUCKRProber.h" -#include "nsBig5Prober.h" +#include "nsGB2312Prober.h" +#include "nsSJISProber.h" -#define NUM_OF_PROBERS 6 +#define NUM_OF_PROBERS 6 namespace kencodingprober { -class KCODECS_NO_EXPORT nsMBCSGroupProber: public nsCharSetProber +class KCODECS_NO_EXPORT nsMBCSGroupProber : public nsCharSetProber { public: nsMBCSGroupProber(); @@ -28,22 +28,23 @@ { return mState; } - void Reset(void) override; - float GetConfidence(void) override; - void SetOpion() override {} + void Reset(void) override; + float GetConfidence(void) override; + void SetOpion() override + { + } #ifdef DEBUG_PROBE - void DumpStatus() override; + void DumpStatus() override; #endif protected: nsProbingState mState; nsCharSetProber *mProbers[NUM_OF_PROBERS]; - bool mIsActive[NUM_OF_PROBERS]; + bool mIsActive[NUM_OF_PROBERS]; int mBestGuess; unsigned int mActiveNum; }; } #endif /* nsMBCSGroupProber_h__ */ - diff -Nru kcodecs-5.79.0/src/probers/nsMBCSSM.cpp kcodecs-5.80.0/src/probers/nsMBCSSM.cpp --- kcodecs-5.79.0/src/probers/nsMBCSSM.cpp 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/src/probers/nsMBCSSM.cpp 2021-03-06 16:19:34.000000000 +0000 @@ -16,8 +16,8 @@ namespace kencodingprober { -static const unsigned int BIG5_cls [ 256 / 8 ] = { -//PCK4BITS(0,1,1,1,1,1,1,1), // 00 - 07 +static const unsigned int BIG5_cls[256 / 8] = { + // PCK4BITS(0,1,1,1,1,1,1,1), // 00 - 07 PCK4BITS(1, 1, 1, 1, 1, 1, 1, 1), // 00 - 07 //allow 0x00 as legal value PCK4BITS(1, 1, 1, 1, 1, 1, 0, 0), // 08 - 0f PCK4BITS(1, 1, 1, 1, 1, 1, 1, 1), // 10 - 17 @@ -52,24 +52,24 @@ PCK4BITS(3, 3, 3, 3, 3, 3, 3, 0) // f8 - ff }; -static const unsigned int BIG5_st [ 3] = { - PCK4BITS(eError, eStart, eStart, 3, eError, eError, eError, eError), //00-07 - PCK4BITS(eError, eError, eItsMe, eItsMe, eItsMe, eItsMe, eItsMe, eError), //08-0f - PCK4BITS(eError, eStart, eStart, eStart, eStart, eStart, eStart, eStart) //10-17 +static const unsigned int BIG5_st[3] = { + PCK4BITS(eError, eStart, eStart, 3, eError, eError, eError, eError), // 00-07 + PCK4BITS(eError, eError, eItsMe, eItsMe, eItsMe, eItsMe, eItsMe, eError), // 08-0f + PCK4BITS(eError, eStart, eStart, eStart, eStart, eStart, eStart, eStart) // 10-17 }; static const unsigned int Big5CharLenTable[] = {0, 1, 1, 2, 0}; const SMModel Big5SMModel = { - {eIdxSft4bits, eSftMsk4bits, eBitSft4bits, eUnitMsk4bits, BIG5_cls }, + {eIdxSft4bits, eSftMsk4bits, eBitSft4bits, eUnitMsk4bits, BIG5_cls}, 5, - {eIdxSft4bits, eSftMsk4bits, eBitSft4bits, eUnitMsk4bits, BIG5_st }, + {eIdxSft4bits, eSftMsk4bits, eBitSft4bits, eUnitMsk4bits, BIG5_st}, Big5CharLenTable, "Big5", }; -static const unsigned int EUCJP_cls [ 256 / 8 ] = { -//PCK4BITS(5,4,4,4,4,4,4,4), // 00 - 07 +static const unsigned int EUCJP_cls[256 / 8] = { + // PCK4BITS(5,4,4,4,4,4,4,4), // 00 - 07 PCK4BITS(4, 4, 4, 4, 4, 4, 4, 4), // 00 - 07 PCK4BITS(4, 4, 4, 4, 4, 4, 5, 5), // 08 - 0f PCK4BITS(4, 4, 4, 4, 4, 4, 4, 4), // 10 - 17 @@ -104,26 +104,26 @@ PCK4BITS(0, 0, 0, 0, 0, 0, 0, 5) // f8 - ff }; -static const unsigned int EUCJP_st [ 5] = { - PCK4BITS(3, 4, 3, 5, eStart, eError, eError, eError), //00-07 - PCK4BITS(eError, eError, eError, eError, eItsMe, eItsMe, eItsMe, eItsMe), //08-0f - PCK4BITS(eItsMe, eItsMe, eStart, eError, eStart, eError, eError, eError), //10-17 - PCK4BITS(eError, eError, eStart, eError, eError, eError, 3, eError), //18-1f - PCK4BITS(3, eError, eError, eError, eStart, eStart, eStart, eStart) //20-27 +static const unsigned int EUCJP_st[5] = { + PCK4BITS(3, 4, 3, 5, eStart, eError, eError, eError), // 00-07 + PCK4BITS(eError, eError, eError, eError, eItsMe, eItsMe, eItsMe, eItsMe), // 08-0f + PCK4BITS(eItsMe, eItsMe, eStart, eError, eStart, eError, eError, eError), // 10-17 + PCK4BITS(eError, eError, eStart, eError, eError, eError, 3, eError), // 18-1f + PCK4BITS(3, eError, eError, eError, eStart, eStart, eStart, eStart) // 20-27 }; static const unsigned int EUCJPCharLenTable[] = {2, 2, 2, 3, 1, 0}; const SMModel EUCJPSMModel = { - {eIdxSft4bits, eSftMsk4bits, eBitSft4bits, eUnitMsk4bits, EUCJP_cls }, + {eIdxSft4bits, eSftMsk4bits, eBitSft4bits, eUnitMsk4bits, EUCJP_cls}, 6, - {eIdxSft4bits, eSftMsk4bits, eBitSft4bits, eUnitMsk4bits, EUCJP_st }, + {eIdxSft4bits, eSftMsk4bits, eBitSft4bits, eUnitMsk4bits, EUCJP_st}, EUCJPCharLenTable, "EUC-JP", }; -static const unsigned int EUCKR_cls [ 256 / 8 ] = { -//PCK4BITS(0,1,1,1,1,1,1,1), // 00 - 07 +static const unsigned int EUCKR_cls[256 / 8] = { + // PCK4BITS(0,1,1,1,1,1,1,1), // 00 - 07 PCK4BITS(1, 1, 1, 1, 1, 1, 1, 1), // 00 - 07 PCK4BITS(1, 1, 1, 1, 1, 1, 0, 0), // 08 - 0f PCK4BITS(1, 1, 1, 1, 1, 1, 1, 1), // 10 - 17 @@ -158,17 +158,17 @@ PCK4BITS(2, 2, 2, 2, 2, 2, 2, 0) // f8 - ff }; -static const unsigned int EUCKR_st [ 2] = { - PCK4BITS(eError, eStart, 3, eError, eError, eError, eError, eError), //00-07 - PCK4BITS(eItsMe, eItsMe, eItsMe, eItsMe, eError, eError, eStart, eStart) //08-0f +static const unsigned int EUCKR_st[2] = { + PCK4BITS(eError, eStart, 3, eError, eError, eError, eError, eError), // 00-07 + PCK4BITS(eItsMe, eItsMe, eItsMe, eItsMe, eError, eError, eStart, eStart) // 08-0f }; static const unsigned int EUCKRCharLenTable[] = {0, 1, 2, 0}; const SMModel EUCKRSMModel = { - {eIdxSft4bits, eSftMsk4bits, eBitSft4bits, eUnitMsk4bits, EUCKR_cls }, + {eIdxSft4bits, eSftMsk4bits, eBitSft4bits, eUnitMsk4bits, EUCKR_cls}, 4, - {eIdxSft4bits, eSftMsk4bits, eBitSft4bits, eUnitMsk4bits, EUCKR_st }, + {eIdxSft4bits, eSftMsk4bits, eBitSft4bits, eUnitMsk4bits, EUCKR_st}, EUCKRCharLenTable, "EUC-KR", }; @@ -228,7 +228,7 @@ // the following state machine data was created by perl script in // intl/chardet/tools. It should be the same as in PSM detector. -static const unsigned int GB18030_cls [ 256 / 8 ] = { +static const unsigned int GB18030_cls[256 / 8] = { PCK4BITS(1, 1, 1, 1, 1, 1, 1, 1), // 00 - 07 PCK4BITS(1, 1, 1, 1, 1, 1, 0, 0), // 08 - 0f PCK4BITS(1, 1, 1, 1, 1, 1, 1, 1), // 10 - 17 @@ -263,13 +263,13 @@ PCK4BITS(6, 6, 6, 6, 6, 6, 6, 0) // f8 - ff }; -static const unsigned int GB18030_st [ 6] = { - PCK4BITS(eError, eStart, eStart, eStart, eStart, eStart, 3, eError), //00-07 - PCK4BITS(eError, eError, eError, eError, eError, eError, eItsMe, eItsMe), //08-0f - PCK4BITS(eItsMe, eItsMe, eItsMe, eItsMe, eItsMe, eError, eError, eStart), //10-17 - PCK4BITS(4, eError, eStart, eStart, eError, eError, eError, eError), //18-1f - PCK4BITS(eError, eError, 5, eError, eError, eError, eItsMe, eError), //20-27 - PCK4BITS(eError, eError, eStart, eStart, eStart, eStart, eStart, eStart) //28-2f +static const unsigned int GB18030_st[6] = { + PCK4BITS(eError, eStart, eStart, eStart, eStart, eStart, 3, eError), // 00-07 + PCK4BITS(eError, eError, eError, eError, eError, eError, eItsMe, eItsMe), // 08-0f + PCK4BITS(eItsMe, eItsMe, eItsMe, eItsMe, eItsMe, eError, eError, eStart), // 10-17 + PCK4BITS(4, eError, eStart, eStart, eError, eError, eError, eError), // 18-1f + PCK4BITS(eError, eError, 5, eError, eError, eError, eItsMe, eError), // 20-27 + PCK4BITS(eError, eError, eStart, eStart, eStart, eStart, eStart, eStart) // 28-2f }; // To be accurate, the length of class 6 can be either 2 or 4. @@ -280,17 +280,17 @@ static const unsigned int GB18030CharLenTable[] = {0, 1, 1, 1, 1, 1, 2}; const SMModel GB18030SMModel = { - {eIdxSft4bits, eSftMsk4bits, eBitSft4bits, eUnitMsk4bits, GB18030_cls }, + {eIdxSft4bits, eSftMsk4bits, eBitSft4bits, eUnitMsk4bits, GB18030_cls}, 7, - {eIdxSft4bits, eSftMsk4bits, eBitSft4bits, eUnitMsk4bits, GB18030_st }, + {eIdxSft4bits, eSftMsk4bits, eBitSft4bits, eUnitMsk4bits, GB18030_st}, GB18030CharLenTable, "GB18030", }; // sjis -static const unsigned int SJIS_cls [ 256 / 8 ] = { -//PCK4BITS(0,1,1,1,1,1,1,1), // 00 - 07 +static const unsigned int SJIS_cls[256 / 8] = { + // PCK4BITS(0,1,1,1,1,1,1,1), // 00 - 07 PCK4BITS(1, 1, 1, 1, 1, 1, 1, 1), // 00 - 07 PCK4BITS(1, 1, 1, 1, 1, 1, 0, 0), // 08 - 0f PCK4BITS(1, 1, 1, 1, 1, 1, 1, 1), // 10 - 17 @@ -311,8 +311,8 @@ PCK4BITS(3, 3, 3, 3, 3, 3, 3, 3), // 88 - 8f PCK4BITS(3, 3, 3, 3, 3, 3, 3, 3), // 90 - 97 PCK4BITS(3, 3, 3, 3, 3, 3, 3, 3), // 98 - 9f -//0xa0 is illegal in sjis encoding, but some pages does -//contain such byte. We need to be more error forgiven. + // 0xa0 is illegal in sjis encoding, but some pages does + // contain such byte. We need to be more error forgiven. PCK4BITS(2, 2, 2, 2, 2, 2, 2, 2), // a0 - a7 PCK4BITS(2, 2, 2, 2, 2, 2, 2, 2), // a8 - af PCK4BITS(2, 2, 2, 2, 2, 2, 2, 2), // b0 - b7 @@ -327,23 +327,23 @@ PCK4BITS(4, 4, 4, 4, 4, 0, 0, 0) // f8 - ff }; -static const unsigned int SJIS_st [ 3] = { - PCK4BITS(eError, eStart, eStart, 3, eError, eError, eError, eError), //00-07 - PCK4BITS(eError, eError, eError, eError, eItsMe, eItsMe, eItsMe, eItsMe), //08-0f - PCK4BITS(eItsMe, eItsMe, eError, eError, eStart, eStart, eStart, eStart) //10-17 +static const unsigned int SJIS_st[3] = { + PCK4BITS(eError, eStart, eStart, 3, eError, eError, eError, eError), // 00-07 + PCK4BITS(eError, eError, eError, eError, eItsMe, eItsMe, eItsMe, eItsMe), // 08-0f + PCK4BITS(eItsMe, eItsMe, eError, eError, eStart, eStart, eStart, eStart) // 10-17 }; static const unsigned int SJISCharLenTable[] = {0, 1, 1, 2, 0, 0}; const SMModel SJISSMModel = { - {eIdxSft4bits, eSftMsk4bits, eBitSft4bits, eUnitMsk4bits, SJIS_cls }, + {eIdxSft4bits, eSftMsk4bits, eBitSft4bits, eUnitMsk4bits, SJIS_cls}, 6, - {eIdxSft4bits, eSftMsk4bits, eBitSft4bits, eUnitMsk4bits, SJIS_st }, + {eIdxSft4bits, eSftMsk4bits, eBitSft4bits, eUnitMsk4bits, SJIS_st}, SJISCharLenTable, "Shift_JIS", }; -static const unsigned int UCS2BE_cls [ 256 / 8 ] = { +static const unsigned int UCS2BE_cls[256 / 8] = { PCK4BITS(0, 0, 0, 0, 0, 0, 0, 0), // 00 - 07 PCK4BITS(0, 0, 1, 0, 0, 2, 0, 0), // 08 - 0f PCK4BITS(0, 0, 0, 0, 0, 0, 0, 0), // 10 - 17 @@ -378,27 +378,27 @@ PCK4BITS(0, 0, 0, 0, 0, 0, 4, 5) // f8 - ff }; -static const unsigned int UCS2BE_st [ 7] = { - PCK4BITS(5, 7, 7, eError, 4, 3, eError, eError), //00-07 - PCK4BITS(eError, eError, eError, eError, eItsMe, eItsMe, eItsMe, eItsMe), //08-0f - PCK4BITS(eItsMe, eItsMe, 6, 6, 6, 6, eError, eError), //10-17 - PCK4BITS(6, 6, 6, 6, 6, eItsMe, 6, 6), //18-1f - PCK4BITS(6, 6, 6, 6, 5, 7, 7, eError), //20-27 - PCK4BITS(5, 8, 6, 6, eError, 6, 6, 6), //28-2f - PCK4BITS(6, 6, 6, 6, eError, eError, eStart, eStart) //30-37 +static const unsigned int UCS2BE_st[7] = { + PCK4BITS(5, 7, 7, eError, 4, 3, eError, eError), // 00-07 + PCK4BITS(eError, eError, eError, eError, eItsMe, eItsMe, eItsMe, eItsMe), // 08-0f + PCK4BITS(eItsMe, eItsMe, 6, 6, 6, 6, eError, eError), // 10-17 + PCK4BITS(6, 6, 6, 6, 6, eItsMe, 6, 6), // 18-1f + PCK4BITS(6, 6, 6, 6, 5, 7, 7, eError), // 20-27 + PCK4BITS(5, 8, 6, 6, eError, 6, 6, 6), // 28-2f + PCK4BITS(6, 6, 6, 6, eError, eError, eStart, eStart) // 30-37 }; static const unsigned int UCS2BECharLenTable[] = {2, 2, 2, 0, 2, 2}; const SMModel UCS2BESMModel = { - {eIdxSft4bits, eSftMsk4bits, eBitSft4bits, eUnitMsk4bits, UCS2BE_cls }, + {eIdxSft4bits, eSftMsk4bits, eBitSft4bits, eUnitMsk4bits, UCS2BE_cls}, 6, - {eIdxSft4bits, eSftMsk4bits, eBitSft4bits, eUnitMsk4bits, UCS2BE_st }, + {eIdxSft4bits, eSftMsk4bits, eBitSft4bits, eUnitMsk4bits, UCS2BE_st}, UCS2BECharLenTable, "UTF-16BE", }; -static const unsigned int UCS2LE_cls [ 256 / 8 ] = { +static const unsigned int UCS2LE_cls[256 / 8] = { PCK4BITS(0, 0, 0, 0, 0, 0, 0, 0), // 00 - 07 PCK4BITS(0, 0, 1, 0, 0, 2, 0, 0), // 08 - 0f PCK4BITS(0, 0, 0, 0, 0, 0, 0, 0), // 10 - 17 @@ -433,28 +433,28 @@ PCK4BITS(0, 0, 0, 0, 0, 0, 4, 5) // f8 - ff }; -static const unsigned int UCS2LE_st [ 7] = { - PCK4BITS(6, 6, 7, 6, 4, 3, eError, eError), //00-07 - PCK4BITS(eError, eError, eError, eError, eItsMe, eItsMe, eItsMe, eItsMe), //08-0f - PCK4BITS(eItsMe, eItsMe, 5, 5, 5, eError, eItsMe, eError), //10-17 - PCK4BITS(5, 5, 5, eError, 5, eError, 6, 6), //18-1f - PCK4BITS(7, 6, 8, 8, 5, 5, 5, eError), //20-27 - PCK4BITS(5, 5, 5, eError, eError, eError, 5, 5), //28-2f - PCK4BITS(5, 5, 5, eError, 5, eError, eStart, eStart) //30-37 +static const unsigned int UCS2LE_st[7] = { + PCK4BITS(6, 6, 7, 6, 4, 3, eError, eError), // 00-07 + PCK4BITS(eError, eError, eError, eError, eItsMe, eItsMe, eItsMe, eItsMe), // 08-0f + PCK4BITS(eItsMe, eItsMe, 5, 5, 5, eError, eItsMe, eError), // 10-17 + PCK4BITS(5, 5, 5, eError, 5, eError, 6, 6), // 18-1f + PCK4BITS(7, 6, 8, 8, 5, 5, 5, eError), // 20-27 + PCK4BITS(5, 5, 5, eError, eError, eError, 5, 5), // 28-2f + PCK4BITS(5, 5, 5, eError, 5, eError, eStart, eStart) // 30-37 }; static const unsigned int UCS2LECharLenTable[] = {2, 2, 2, 2, 2, 2}; const SMModel UCS2LESMModel = { - {eIdxSft4bits, eSftMsk4bits, eBitSft4bits, eUnitMsk4bits, UCS2LE_cls }, + {eIdxSft4bits, eSftMsk4bits, eBitSft4bits, eUnitMsk4bits, UCS2LE_cls}, 6, - {eIdxSft4bits, eSftMsk4bits, eBitSft4bits, eUnitMsk4bits, UCS2LE_st }, + {eIdxSft4bits, eSftMsk4bits, eBitSft4bits, eUnitMsk4bits, UCS2LE_st}, UCS2LECharLenTable, "UTF-16LE", }; -static const unsigned int UTF8_cls [ 256 / 8 ] = { -//PCK4BITS(0,1,1,1,1,1,1,1), // 00 - 07 +static const unsigned int UTF8_cls[256 / 8] = { + // PCK4BITS(0,1,1,1,1,1,1,1), // 00 - 07 PCK4BITS(1, 1, 1, 1, 1, 1, 1, 1), // 00 - 07 //allow 0x00 as a legal value PCK4BITS(1, 1, 1, 1, 1, 1, 0, 0), // 08 - 0f PCK4BITS(1, 1, 1, 1, 1, 1, 1, 1), // 10 - 17 @@ -489,45 +489,42 @@ PCK4BITS(12, 13, 13, 13, 14, 15, 0, 0) // f8 - ff }; -static const unsigned int UTF8_st [ 26] = { - PCK4BITS(eError, eStart, eError, eError, eError, eError, 12, 10), //00-07 - PCK4BITS(9, 11, 8, 7, 6, 5, 4, 3), //08-0f - PCK4BITS(eError, eError, eError, eError, eError, eError, eError, eError), //10-17 - PCK4BITS(eError, eError, eError, eError, eError, eError, eError, eError), //18-1f - PCK4BITS(eItsMe, eItsMe, eItsMe, eItsMe, eItsMe, eItsMe, eItsMe, eItsMe), //20-27 - PCK4BITS(eItsMe, eItsMe, eItsMe, eItsMe, eItsMe, eItsMe, eItsMe, eItsMe), //28-2f - PCK4BITS(eError, eError, 5, 5, 5, 5, eError, eError), //30-37 - PCK4BITS(eError, eError, eError, eError, eError, eError, eError, eError), //38-3f - PCK4BITS(eError, eError, eError, 5, 5, 5, eError, eError), //40-47 - PCK4BITS(eError, eError, eError, eError, eError, eError, eError, eError), //48-4f - PCK4BITS(eError, eError, 7, 7, 7, 7, eError, eError), //50-57 - PCK4BITS(eError, eError, eError, eError, eError, eError, eError, eError), //58-5f - PCK4BITS(eError, eError, eError, eError, 7, 7, eError, eError), //60-67 - PCK4BITS(eError, eError, eError, eError, eError, eError, eError, eError), //68-6f - PCK4BITS(eError, eError, 9, 9, 9, 9, eError, eError), //70-77 - PCK4BITS(eError, eError, eError, eError, eError, eError, eError, eError), //78-7f - PCK4BITS(eError, eError, eError, eError, eError, 9, eError, eError), //80-87 - PCK4BITS(eError, eError, eError, eError, eError, eError, eError, eError), //88-8f - PCK4BITS(eError, eError, 12, 12, 12, 12, eError, eError), //90-97 - PCK4BITS(eError, eError, eError, eError, eError, eError, eError, eError), //98-9f - PCK4BITS(eError, eError, eError, eError, eError, 12, eError, eError), //a0-a7 - PCK4BITS(eError, eError, eError, eError, eError, eError, eError, eError), //a8-af - PCK4BITS(eError, eError, 12, 12, 12, eError, eError, eError), //b0-b7 - PCK4BITS(eError, eError, eError, eError, eError, eError, eError, eError), //b8-bf - PCK4BITS(eError, eError, eStart, eStart, eStart, eStart, eError, eError), //c0-c7 - PCK4BITS(eError, eError, eError, eError, eError, eError, eError, eError) //c8-cf -}; - -static const unsigned int UTF8CharLenTable[] = {0, 1, 0, 0, 0, 0, 2, 3, - 3, 3, 4, 4, 5, 5, 6, 6 - }; +static const unsigned int UTF8_st[26] = { + PCK4BITS(eError, eStart, eError, eError, eError, eError, 12, 10), // 00-07 + PCK4BITS(9, 11, 8, 7, 6, 5, 4, 3), // 08-0f + PCK4BITS(eError, eError, eError, eError, eError, eError, eError, eError), // 10-17 + PCK4BITS(eError, eError, eError, eError, eError, eError, eError, eError), // 18-1f + PCK4BITS(eItsMe, eItsMe, eItsMe, eItsMe, eItsMe, eItsMe, eItsMe, eItsMe), // 20-27 + PCK4BITS(eItsMe, eItsMe, eItsMe, eItsMe, eItsMe, eItsMe, eItsMe, eItsMe), // 28-2f + PCK4BITS(eError, eError, 5, 5, 5, 5, eError, eError), // 30-37 + PCK4BITS(eError, eError, eError, eError, eError, eError, eError, eError), // 38-3f + PCK4BITS(eError, eError, eError, 5, 5, 5, eError, eError), // 40-47 + PCK4BITS(eError, eError, eError, eError, eError, eError, eError, eError), // 48-4f + PCK4BITS(eError, eError, 7, 7, 7, 7, eError, eError), // 50-57 + PCK4BITS(eError, eError, eError, eError, eError, eError, eError, eError), // 58-5f + PCK4BITS(eError, eError, eError, eError, 7, 7, eError, eError), // 60-67 + PCK4BITS(eError, eError, eError, eError, eError, eError, eError, eError), // 68-6f + PCK4BITS(eError, eError, 9, 9, 9, 9, eError, eError), // 70-77 + PCK4BITS(eError, eError, eError, eError, eError, eError, eError, eError), // 78-7f + PCK4BITS(eError, eError, eError, eError, eError, 9, eError, eError), // 80-87 + PCK4BITS(eError, eError, eError, eError, eError, eError, eError, eError), // 88-8f + PCK4BITS(eError, eError, 12, 12, 12, 12, eError, eError), // 90-97 + PCK4BITS(eError, eError, eError, eError, eError, eError, eError, eError), // 98-9f + PCK4BITS(eError, eError, eError, eError, eError, 12, eError, eError), // a0-a7 + PCK4BITS(eError, eError, eError, eError, eError, eError, eError, eError), // a8-af + PCK4BITS(eError, eError, 12, 12, 12, eError, eError, eError), // b0-b7 + PCK4BITS(eError, eError, eError, eError, eError, eError, eError, eError), // b8-bf + PCK4BITS(eError, eError, eStart, eStart, eStart, eStart, eError, eError), // c0-c7 + PCK4BITS(eError, eError, eError, eError, eError, eError, eError, eError) // c8-cf +}; + +static const unsigned int UTF8CharLenTable[] = {0, 1, 0, 0, 0, 0, 2, 3, 3, 3, 4, 4, 5, 5, 6, 6}; const SMModel UTF8SMModel = { - {eIdxSft4bits, eSftMsk4bits, eBitSft4bits, eUnitMsk4bits, UTF8_cls }, + {eIdxSft4bits, eSftMsk4bits, eBitSft4bits, eUnitMsk4bits, UTF8_cls}, 16, - {eIdxSft4bits, eSftMsk4bits, eBitSft4bits, eUnitMsk4bits, UTF8_st }, + {eIdxSft4bits, eSftMsk4bits, eBitSft4bits, eUnitMsk4bits, UTF8_st}, UTF8CharLenTable, "UTF-8", }; } - diff -Nru kcodecs-5.79.0/src/probers/nsPkgInt.h kcodecs-5.80.0/src/probers/nsPkgInt.h --- kcodecs-5.79.0/src/probers/nsPkgInt.h 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/src/probers/nsPkgInt.h 2021-03-06 16:19:34.000000000 +0000 @@ -10,50 +10,45 @@ namespace kencodingprober { typedef enum { - eIdxSft4bits = 3, - eIdxSft8bits = 2, - eIdxSft16bits = 1 + eIdxSft4bits = 3, + eIdxSft8bits = 2, + eIdxSft16bits = 1, } nsIdxSft; typedef enum { - eSftMsk4bits = 7, - eSftMsk8bits = 3, - eSftMsk16bits = 1 + eSftMsk4bits = 7, + eSftMsk8bits = 3, + eSftMsk16bits = 1, } nsSftMsk; typedef enum { - eBitSft4bits = 2, - eBitSft8bits = 3, - eBitSft16bits = 4 + eBitSft4bits = 2, + eBitSft8bits = 3, + eBitSft16bits = 4, } nsBitSft; typedef enum { - eUnitMsk4bits = 0x0000000FL, - eUnitMsk8bits = 0x000000FFL, - eUnitMsk16bits = 0x0000FFFFL + eUnitMsk4bits = 0x0000000FL, + eUnitMsk8bits = 0x000000FFL, + eUnitMsk16bits = 0x0000FFFFL, } nsUnitMsk; typedef struct nsPkgInt { - nsIdxSft idxsft; - nsSftMsk sftmsk; - nsBitSft bitsft; + nsIdxSft idxsft; + nsSftMsk sftmsk; + nsBitSft bitsft; nsUnitMsk unitmsk; - const unsigned int *data; + const unsigned int *data; } nsPkgInt; } -#define PCK16BITS(a,b) ((unsigned int)(((b) << 16) | (a))) +#define PCK16BITS(a, b) ((unsigned int)(((b) << 16) | (a))) -#define PCK8BITS(a,b,c,d) PCK16BITS( ((unsigned int)(((b) << 8) | (a))), \ - ((unsigned int)(((d) << 8) | (c)))) +#define PCK8BITS(a, b, c, d) PCK16BITS(((unsigned int)(((b) << 8) | (a))), ((unsigned int)(((d) << 8) | (c)))) -#define PCK4BITS(a,b,c,d,e,f,g,h) PCK8BITS( ((unsigned int)(((b) << 4) | (a))), \ - ((unsigned int)(((d) << 4) | (c))), \ - ((unsigned int)(((f) << 4) | (e))), \ - ((unsigned int)(((h) << 4) | (g))) ) +#define PCK4BITS(a, b, c, d, e, f, g, h) \ + PCK8BITS(((unsigned int)(((b) << 4) | (a))), ((unsigned int)(((d) << 4) | (c))), ((unsigned int)(((f) << 4) | (e))), ((unsigned int)(((h) << 4) | (g)))) -#define GETFROMPCK(i, c) \ - (((((c).data)[(i)>>(c).idxsft])>>(((i)&(c).sftmsk)<<(c).bitsft))&(c).unitmsk) +#define GETFROMPCK(i, c) (((((c).data)[(i) >> (c).idxsft]) >> (((i) & (c).sftmsk) << (c).bitsft)) & (c).unitmsk) #endif /* nsPkgInt_h__ */ - diff -Nru kcodecs-5.79.0/src/probers/nsSBCharSetProber.cpp kcodecs-5.80.0/src/probers/nsSBCharSetProber.cpp --- kcodecs-5.79.0/src/probers/nsSBCharSetProber.cpp 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/src/probers/nsSBCharSetProber.cpp 2021-03-06 16:19:34.000000000 +0000 @@ -48,7 +48,7 @@ return mState; } -void nsSingleByteCharSetProber::Reset(void) +void nsSingleByteCharSetProber::Reset(void) { mState = eDetecting; mLastOrder = 255; @@ -70,7 +70,7 @@ return ((float)(mTotalSeqs - mSeqCounters[NEGATIVE_CAT] * 10)) / mTotalSeqs * mFreqChar / mTotalChar; } return (float)0.01; -#else //POSITIVE_APPROACH +#else // POSITIVE_APPROACH float r; if (mTotalSeqs > 0) { @@ -100,4 +100,3 @@ } #endif } - diff -Nru kcodecs-5.79.0/src/probers/nsSBCharSetProber.h kcodecs-5.80.0/src/probers/nsSBCharSetProber.h --- kcodecs-5.79.0/src/probers/nsSBCharSetProber.h 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/src/probers/nsSBCharSetProber.h 2021-03-06 16:19:34.000000000 +0000 @@ -10,21 +10,21 @@ #include "nsCharSetProber.h" #define SAMPLE_SIZE 64 -#define SB_ENOUGH_REL_THRESHOLD 1024 -#define POSITIVE_SHORTCUT_THRESHOLD (float)0.95 -#define NEGATIVE_SHORTCUT_THRESHOLD (float)0.05 -#define SYMBOL_CAT_ORDER 250 +#define SB_ENOUGH_REL_THRESHOLD 1024 +#define POSITIVE_SHORTCUT_THRESHOLD (float)0.95 +#define NEGATIVE_SHORTCUT_THRESHOLD (float)0.05 +#define SYMBOL_CAT_ORDER 250 #define NUMBER_OF_SEQ_CAT 4 -#define POSITIVE_CAT (NUMBER_OF_SEQ_CAT-1) -#define NEGATIVE_CAT 0 +#define POSITIVE_CAT (NUMBER_OF_SEQ_CAT - 1) +#define NEGATIVE_CAT 0 namespace kencodingprober { typedef struct { - const unsigned char *charToOrderMap; // [256] table use to find a char's order - const char *precedenceMatrix; // [SAMPLE_SIZE][SAMPLE_SIZE]; table to find a 2-char sequence's frequency - float mTypicalPositiveRatio; // = freqSeqs / totalSeqs - bool keepEnglishLetter; // says if this script contains English characters (not implemented) + const unsigned char *charToOrderMap; // [256] table use to find a char's order + const char *precedenceMatrix; // [SAMPLE_SIZE][SAMPLE_SIZE]; table to find a 2-char sequence's frequency + float mTypicalPositiveRatio; // = freqSeqs / totalSeqs + bool keepEnglishLetter; // says if this script contains English characters (not implemented) const char *charsetName; } SequenceModel; @@ -32,12 +32,16 @@ { public: nsSingleByteCharSetProber(const SequenceModel *model) - : mModel(model), mReversed(false), mNameProber(nullptr) + : mModel(model) + , mReversed(false) + , mNameProber(nullptr) { Reset(); } nsSingleByteCharSetProber(const SequenceModel *model, bool reversed, nsCharSetProber *nameProber) - : mModel(model), mReversed(reversed), mNameProber(nameProber) + : mModel(model) + , mReversed(reversed) + , mNameProber(nameProber) { Reset(); } @@ -48,9 +52,11 @@ { return mState; } - void Reset(void) override; - float GetConfidence(void) override; - void SetOpion() override {} + void Reset(void) override; + float GetConfidence(void) override; + void SetOpion() override + { + } // This feature is not implemented yet. any current language model // contain this parameter as false. No one is looking at this @@ -64,7 +70,7 @@ } // (not implemented) #ifdef DEBUG_PROBE - void DumpStatus() override; + void DumpStatus() override; #endif protected: @@ -72,19 +78,18 @@ const SequenceModel *mModel; const bool mReversed; // true if we need to reverse every pair in the model lookup - //char order of last character + // char order of last character unsigned char mLastOrder; unsigned int mTotalSeqs; unsigned int mSeqCounters[NUMBER_OF_SEQ_CAT]; unsigned int mTotalChar; - //characters that fall in our sampling range + // characters that fall in our sampling range unsigned int mFreqChar; // Optional auxiliary prober for name decision. created and destroyed by the GroupProber nsCharSetProber *mNameProber; - }; extern const SequenceModel Koi8rModel; @@ -102,4 +107,3 @@ extern const SequenceModel Win1255Model; } #endif /* NSSBCHARSETPROBER_H */ - diff -Nru kcodecs-5.79.0/src/probers/nsSBCSGroupProber.cpp kcodecs-5.80.0/src/probers/nsSBCSGroupProber.cpp --- kcodecs-5.79.0/src/probers/nsSBCSGroupProber.cpp 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/src/probers/nsSBCSGroupProber.cpp 2021-03-06 16:19:34.000000000 +0000 @@ -6,9 +6,9 @@ #include "nsSBCSGroupProber.h" -#include "nsSBCharSetProber.h" -#include "nsHebrewProber.h" #include "UnicodeGroupProber.h" +#include "nsHebrewProber.h" +#include "nsSBCharSetProber.h" #include #include @@ -48,8 +48,8 @@ // disable latin2 before latin1 is available, otherwise all latin1 // will be detected as latin2 because of their similarity. - //mProbers[10] = new nsSingleByteCharSetProber(&Latin2HungarianModel); - //mProbers[11] = new nsSingleByteCharSetProber(&Win1250HungarianModel); + // mProbers[10] = new nsSingleByteCharSetProber(&Latin2HungarianModel); + // mProbers[11] = new nsSingleByteCharSetProber(&Win1250HungarianModel); Reset(); } @@ -63,12 +63,12 @@ const char *nsSBCSGroupProber::GetCharSetName() { - //if we have no answer yet + // if we have no answer yet if (mBestGuess == -1) { GetConfidence(); - //no charset seems positive + // no charset seems positive if (mBestGuess == -1) - //we will use default. + // we will use default. { mBestGuess = 0; } @@ -76,7 +76,7 @@ return mProbers[mBestGuess]->GetCharSetName(); } -void nsSBCSGroupProber::Reset(void) +void nsSBCSGroupProber::Reset(void) { mActiveNum = 0; for (unsigned int i = 0; i < NUM_OF_SBCS_PROBERS; i++) { @@ -99,18 +99,18 @@ char *newBuf1 = nullptr; unsigned int newLen1 = 0; - //apply filter to original buffer, and we got new buffer back - //depend on what script it is, we will feed them the new buffer - //we got after applying proper filter - //this is done without any consideration to KeepEnglishLetters - //of each prober since as of now, there are no probers here which - //recognize languages with English characters. + // apply filter to original buffer, and we got new buffer back + // depend on what script it is, we will feed them the new buffer + // we got after applying proper filter + // this is done without any consideration to KeepEnglishLetters + // of each prober since as of now, there are no probers here which + // recognize languages with English characters. if (!FilterWithoutEnglishLetters(aBuf, aLen, &newBuf1, newLen1)) { goto done; } if (newLen1 == 0) { - goto done; // Nothing to see here, move on. + goto done; // Nothing to see here, move on. } for (i = 0; i < NUM_OF_SBCS_PROBERS; ++i) { @@ -145,9 +145,9 @@ switch (mState) { case eFoundIt: - return (float)0.99; //sure yes + return (float)0.99; // sure yes case eNotMe: - return (float)0.01; //sure no + return (float)0.01; // sure no default: for (i = 0; i < NUM_OF_SBCS_PROBERS; ++i) { if (!mIsActive[i]) { @@ -178,9 +178,7 @@ mProbers[i]->DumpStatus(); } } - printf(" SBCS Group found best match [%s] confidence %f.\r\n", - mProbers[mBestGuess]->GetCharSetName(), cf); + printf(" SBCS Group found best match [%s] confidence %f.\r\n", mProbers[mBestGuess]->GetCharSetName(), cf); } #endif } - diff -Nru kcodecs-5.79.0/src/probers/nsSBCSGroupProber.h kcodecs-5.80.0/src/probers/nsSBCSGroupProber.h --- kcodecs-5.79.0/src/probers/nsSBCSGroupProber.h 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/src/probers/nsSBCSGroupProber.h 2021-03-06 16:19:34.000000000 +0000 @@ -12,11 +12,11 @@ #include "nsCharSetProber.h" -#define NUM_OF_SBCS_PROBERS 14 +#define NUM_OF_SBCS_PROBERS 14 namespace kencodingprober { -class KCODECS_NO_EXPORT nsSBCSGroupProber: public nsCharSetProber +class KCODECS_NO_EXPORT nsSBCSGroupProber : public nsCharSetProber { public: nsSBCSGroupProber(); @@ -27,22 +27,23 @@ { return mState; } - void Reset(void) override; - float GetConfidence(void) override; - void SetOpion() override {} + void Reset(void) override; + float GetConfidence(void) override; + void SetOpion() override + { + } #ifdef DEBUG_PROBE - void DumpStatus() override; + void DumpStatus() override; #endif protected: nsProbingState mState; nsCharSetProber *mProbers[NUM_OF_SBCS_PROBERS]; - bool mIsActive[NUM_OF_SBCS_PROBERS]; + bool mIsActive[NUM_OF_SBCS_PROBERS]; int mBestGuess; unsigned int mActiveNum; }; } #endif /* nsSBCSGroupProber_h__ */ - diff -Nru kcodecs-5.79.0/src/probers/nsSJISProber.cpp kcodecs-5.80.0/src/probers/nsSJISProber.cpp --- kcodecs-5.79.0/src/probers/nsSJISProber.cpp 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/src/probers/nsSJISProber.cpp 2021-03-06 16:19:34.000000000 +0000 @@ -13,7 +13,7 @@ namespace kencodingprober { -void nsSJISProber::Reset(void) +void nsSJISProber::Reset(void) { mCodingSM->Reset(); mState = eDetecting; @@ -69,4 +69,3 @@ return (contxtCf > distribCf ? contxtCf : distribCf); } } - diff -Nru kcodecs-5.79.0/src/probers/nsSJISProber.h kcodecs-5.80.0/src/probers/nsSJISProber.h --- kcodecs-5.79.0/src/probers/nsSJISProber.h 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/src/probers/nsSJISProber.h 2021-03-06 16:19:34.000000000 +0000 @@ -14,14 +14,14 @@ #ifndef nsSJISProber_h__ #define nsSJISProber_h__ +#include "CharDistribution.h" +#include "JpCntx.h" #include "nsCharSetProber.h" #include "nsCodingStateMachine.h" -#include "JpCntx.h" -#include "CharDistribution.h" namespace kencodingprober { -class KCODECS_NO_EXPORT nsSJISProber: public nsCharSetProber +class KCODECS_NO_EXPORT nsSJISProber : public nsCharSetProber { public: nsSJISProber(void) @@ -42,9 +42,11 @@ { return mState; } - void Reset(void) override; - float GetConfidence(void) override; - void SetOpion() override {} + void Reset(void) override; + float GetConfidence(void) override; + void SetOpion() override + { + } protected: nsCodingStateMachine *mCodingSM; @@ -54,9 +56,7 @@ SJISDistributionAnalysis mDistributionAnalyser; char mLastChar[2]; - }; } #endif /* nsSJISProber_h__ */ - diff -Nru kcodecs-5.79.0/src/probers/nsUniversalDetector.cpp kcodecs-5.80.0/src/probers/nsUniversalDetector.cpp --- kcodecs-5.79.0/src/probers/nsUniversalDetector.cpp 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/src/probers/nsUniversalDetector.cpp 2021-03-06 16:19:34.000000000 +0000 @@ -7,17 +7,17 @@ #include "nsUniversalDetector.h" -#include "nsMBCSGroupProber.h" -#include "nsSBCSGroupProber.h" #include "nsEscCharsetProber.h" #include "nsLatin1Prober.h" +#include "nsMBCSGroupProber.h" +#include "nsSBCSGroupProber.h" namespace kencodingprober { nsUniversalDetector::nsUniversalDetector() { mDone = false; - mBestGuess = -1; //illegal value as signal + mBestGuess = -1; // illegal value as signal mInTag = false; mEscCharSetProber = nullptr; @@ -41,11 +41,10 @@ delete mEscCharSetProber; } -void -nsUniversalDetector::Reset() +void nsUniversalDetector::Reset() { mDone = false; - mBestGuess = -1; //illegal value as signal + mBestGuess = -1; // illegal value as signal mInTag = false; mStart = true; @@ -66,8 +65,8 @@ } //--------------------------------------------------------------------- -#define SHORTCUT_THRESHOLD (float)0.95 -#define MINIMUM_THRESHOLD (float)0.20 +#define SHORTCUT_THRESHOLD (float)0.95 +#define MINIMUM_THRESHOLD (float)0.20 nsProbingState nsUniversalDetector::HandleData(const char *aBuf, unsigned int aLen) { @@ -81,18 +80,18 @@ unsigned int i; for (i = 0; i < aLen; i++) { - //other than 0xa0, if every othe character is ascii, the page is ascii - if (aBuf[i] & '\x80' && aBuf[i] != '\xA0') { //Since many Ascii only page contains NBSP - //we got a non-ascii byte (high-byte) + // other than 0xa0, if every othe character is ascii, the page is ascii + if (aBuf[i] & '\x80' && aBuf[i] != '\xA0') { // Since many Ascii only page contains NBSP + // we got a non-ascii byte (high-byte) if (mInputState != eHighbyte) { - //adjust state + // adjust state mInputState = eHighbyte; - //kill mEscCharSetProber if it is active + // kill mEscCharSetProber if it is active delete mEscCharSetProber; mEscCharSetProber = nullptr; - //start multibyte and singlebyte charset prober + // start multibyte and singlebyte charset prober if (nullptr == mCharSetProbers[0]) { mCharSetProbers[0] = new nsMBCSGroupProber; } @@ -104,10 +103,9 @@ } } } else { - //ok, just pure ascii so far - if (ePureAscii == mInputState && - (aBuf[i] == '\033' || (aBuf[i] == '{' && mLastChar == '~'))) { - //found escape character or HZ "~{" + // ok, just pure ascii so far + if (ePureAscii == mInputState && (aBuf[i] == '\033' || (aBuf[i] == '{' && mLastChar == '~'))) { + // found escape character or HZ "~{" mInputState = eEscAscii; } @@ -137,7 +135,7 @@ } break; - default: //pure ascii + default: // pure ascii mDetectedCharset = "UTF-8"; } return st; @@ -162,18 +160,17 @@ maxProber = i; } } - //do not report anything because we are not confident of it, that's in fact a negative answer + // do not report anything because we are not confident of it, that's in fact a negative answer if (maxProberConfidence > MINIMUM_THRESHOLD) { return mCharSetProbers[maxProber]->GetCharSetName(); } } case eEscAscii: break; - default: // pure ascii - ; + default: // pure ascii + ; } return "UTF-8"; - } //--------------------------------------------------------------------- @@ -200,15 +197,15 @@ maxProber = i; } } - //do not report anything because we are not confident of it, that's in fact a negative answer + // do not report anything because we are not confident of it, that's in fact a negative answer if (maxProberConfidence > MINIMUM_THRESHOLD) { return mCharSetProbers[maxProber]->GetConfidence(); } } case eEscAscii: break; - default: // pure ascii - ; + default: // pure ascii + ; } return MINIMUM_THRESHOLD; } @@ -222,4 +219,3 @@ } } } - diff -Nru kcodecs-5.79.0/src/probers/nsUniversalDetector.h kcodecs-5.80.0/src/probers/nsUniversalDetector.h --- kcodecs-5.79.0/src/probers/nsUniversalDetector.h 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/src/probers/nsUniversalDetector.h 2021-03-06 16:19:34.000000000 +0000 @@ -10,42 +10,43 @@ #include "nsCharSetProber.h" -#define NUM_OF_CHARSET_PROBERS 3 +#define NUM_OF_CHARSET_PROBERS 3 namespace kencodingprober { typedef enum { ePureAscii = 0, - eEscAscii = 1, - eHighbyte = 2 + eEscAscii = 1, + eHighbyte = 2, } nsInputState; -class KCODECS_NO_EXPORT nsUniversalDetector: public nsCharSetProber +class KCODECS_NO_EXPORT nsUniversalDetector : public nsCharSetProber { public: nsUniversalDetector(); ~nsUniversalDetector() override; nsProbingState HandleData(const char *aBuf, unsigned int aLen) override; const char *GetCharSetName() override; - void Reset(void) override; - float GetConfidence(void) override; + void Reset(void) override; + float GetConfidence(void) override; nsProbingState GetState() override; - void SetOpion() override {} + void SetOpion() override + { + } protected: - nsInputState mInputState; - bool mDone; - bool mInTag; - bool mStart; - bool mGotData; - char mLastChar; - const char *mDetectedCharset; + nsInputState mInputState; + bool mDone; + bool mInTag; + bool mStart; + bool mGotData; + char mLastChar; + const char *mDetectedCharset; int mBestGuess; - nsCharSetProber *mCharSetProbers[NUM_OF_CHARSET_PROBERS]; - nsCharSetProber *mEscCharSetProber; + nsCharSetProber *mCharSetProbers[NUM_OF_CHARSET_PROBERS]; + nsCharSetProber *mEscCharSetProber; }; } #endif - diff -Nru kcodecs-5.79.0/src/probers/UnicodeGroupProber.cpp kcodecs-5.80.0/src/probers/UnicodeGroupProber.cpp --- kcodecs-5.79.0/src/probers/UnicodeGroupProber.cpp 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/src/probers/UnicodeGroupProber.cpp 2021-03-06 16:19:34.000000000 +0000 @@ -84,10 +84,10 @@ for (uint i = 0; i < aLen; ++i) { for (int j = mActiveSM - 1; j >= 0; --j) { - //byte is feed to all active state machine + // byte is feed to all active state machine codingState = mCodingSM[j]->NextState(aBuf[i]); if (codingState == eError) { - //got negative answer for this state machine, make it inactive + // got negative answer for this state machine, make it inactive mActiveSM--; if (mActiveSM == 0) { mState = eNotMe; @@ -130,4 +130,3 @@ #endif } - diff -Nru kcodecs-5.79.0/src/probers/UnicodeGroupProber.h kcodecs-5.80.0/src/probers/UnicodeGroupProber.h --- kcodecs-5.79.0/src/probers/UnicodeGroupProber.h 2021-02-06 18:11:10.000000000 +0000 +++ kcodecs-5.80.0/src/probers/UnicodeGroupProber.h 2021-03-06 16:19:34.000000000 +0000 @@ -10,10 +10,10 @@ #include "nsCharSetProber.h" #include "nsCodingStateMachine.h" -#define NUM_OF_UNICODE_CHARSETS 3 +#define NUM_OF_UNICODE_CHARSETS 3 namespace kencodingprober { -class KCODECS_NO_EXPORT UnicodeGroupProber: public nsCharSetProber +class KCODECS_NO_EXPORT UnicodeGroupProber : public nsCharSetProber { public: UnicodeGroupProber(void); @@ -27,21 +27,22 @@ { return mState; } - void Reset(void) override; - float GetConfidence() override; - void SetOpion() override {} + void Reset(void) override; + float GetConfidence() override; + void SetOpion() override + { + } #ifdef DEBUG_PROBE void DumpStatus() override; #endif protected: - void GetDistribution(unsigned int aCharLen, const char *aStr); + void GetDistribution(unsigned int aCharLen, const char *aStr); nsCodingStateMachine *mCodingSM[NUM_OF_UNICODE_CHARSETS]; - unsigned int mActiveSM; + unsigned int mActiveSM; nsProbingState mState; - const char *mDetectedCharset; + const char *mDetectedCharset; }; } #endif /* UNICODEGROUPPROBER_H */ -