Hello community,
here is the log from the commit of package kcodecs for openSUSE:Factory checked in at 2015-06-23 12:06:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kcodecs (Old)
and /work/SRC/openSUSE:Factory/.kcodecs.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kcodecs"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kcodecs/kcodecs.changes 2015-05-11 19:47:33.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.kcodecs.new/kcodecs.changes 2015-06-23 12:06:28.000000000 +0200
@@ -1,0 +2,9 @@
+Sun Jun 7 19:07:13 UTC 2015 - hrvoje.senjan@gmail.com
+
+- Update to 5.11.0
+ * KEmailAddress: Add overload for extractEmailAddress and
+ firstEmailAddress which returns an error message.
+ * For more details please see:
+ https://www.kde.org/announcements/kde-frameworks-5.11.0.php
+
+-------------------------------------------------------------------
Old:
----
kcodecs-5.10.0.tar.xz
New:
----
kcodecs-5.11.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kcodecs.spec ++++++
--- /var/tmp/diff_new_pack.6cDBRk/_old 2015-06-23 12:06:28.000000000 +0200
+++ /var/tmp/diff_new_pack.6cDBRk/_new 2015-06-23 12:06:28.000000000 +0200
@@ -18,9 +18,9 @@
%bcond_without lang
%define lname libKF5Codecs5
-%define _tar_path 5.10
+%define _tar_path 5.11
Name: kcodecs
-Version: 5.10.0
+Version: 5.11.0
Release: 0
BuildRequires: cmake >= 2.8.12
BuildRequires: extra-cmake-modules >= %{_tar_path}
++++++ kcodecs-5.10.0.tar.xz -> kcodecs-5.11.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcodecs-5.10.0/CMakeLists.txt new/kcodecs-5.11.0/CMakeLists.txt
--- old/kcodecs-5.10.0/CMakeLists.txt 2015-05-03 17:05:14.000000000 +0200
+++ new/kcodecs-5.11.0/CMakeLists.txt 2015-06-06 23:09:22.000000000 +0200
@@ -2,7 +2,11 @@
project(KCodecs)
-find_package(ECM 5.10.0 REQUIRED NO_MODULE)
+include(FeatureSummary)
+find_package(ECM 5.11.0 NO_MODULE)
+set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules")
+feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES)
+
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} )
@@ -13,7 +17,7 @@
set(REQUIRED_QT_VERSION 5.2.0)
find_package(Qt5Core ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE)
-include(FeatureSummary)
+
include(GenerateExportHeader)
include(ECMPackageConfigHelpers)
include(ECMSetupVersion)
@@ -21,7 +25,7 @@
include(ECMPoQmTools)
-set(KF5_VERSION "5.10.0") # handled by release scripts
+set(KF5_VERSION "5.11.0") # handled by release scripts
ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KCODECS
VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kcodecs_version.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcodecs-5.10.0/autotests/base64benchmark.cpp new/kcodecs-5.11.0/autotests/base64benchmark.cpp
--- old/kcodecs-5.10.0/autotests/base64benchmark.cpp 2015-05-03 17:05:14.000000000 +0200
+++ new/kcodecs-5.11.0/autotests/base64benchmark.cpp 2015-06-06 23:09:22.000000000 +0200
@@ -45,9 +45,9 @@
QTest::addColumn<QByteArray>("output");
QTest::addColumn<QByteArray>("input");
QTest::newRow("empty") << QByteArray() << QByteArray();
- QTest::newRow("128") << fillByteArray(128) << KCodecs::base64Encode(fillByteArray(128), true);;
- QTest::newRow("1k") << fillByteArray(1 << 10) << KCodecs::base64Encode(fillByteArray(1 << 10), true);;
- QTest::newRow("1M") << fillByteArray(1 << 20) << KCodecs::base64Encode(fillByteArray(1 << 20), true);;
+ QTest::newRow("128") << fillByteArray(128) << KCodecs::base64Encode(fillByteArray(128), true);
+ QTest::newRow("1k") << fillByteArray(1 << 10) << KCodecs::base64Encode(fillByteArray(1 << 10), true);
+ QTest::newRow("1M") << fillByteArray(1 << 20) << KCodecs::base64Encode(fillByteArray(1 << 20), true);
}
private Q_SLOTS:
void benchmarkKCodecDecode_data()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcodecs-5.10.0/po/ca/kcodecs5_qt.po new/kcodecs-5.11.0/po/ca/kcodecs5_qt.po
--- old/kcodecs-5.10.0/po/ca/kcodecs5_qt.po 2015-05-03 17:05:14.000000000 +0200
+++ new/kcodecs-5.11.0/po/ca/kcodecs5_qt.po 2015-06-06 23:09:22.000000000 +0200
@@ -14,14 +14,14 @@
"Project-Id-Version: kcodecs5_qt\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2014-03-23 01:50+0000\n"
-"PO-Revision-Date: 2015-03-18 23:39+0100\n"
+"PO-Revision-Date: 2015-05-27 20:02+0200\n"
"Last-Translator: Josep Ma. Ferrer \n"
"Language-Team: Catalan \n"
"Language: ca\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.4\n"
+"X-Generator: Lokalize 1.5\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Accelerator-Marker: &\n"
"X-Qt-Contexts: true\n"
@@ -218,7 +218,7 @@
"This probably means you have used an escaping type character like a '\\' as "
"the last character in your email address."
msgstr ""
-"L'adreça de correu que heu introduït no és vàlida ja que ha acabat "
+"L'adreça de correu que heu introduït no és vàlida perquè ha acabat "
"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."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcodecs-5.10.0/po/nb/kcodecs5_qt.po new/kcodecs-5.11.0/po/nb/kcodecs5_qt.po
--- old/kcodecs-5.10.0/po/nb/kcodecs5_qt.po 2015-05-03 17:05:14.000000000 +0200
+++ new/kcodecs-5.11.0/po/nb/kcodecs5_qt.po 2015-06-06 23:09:22.000000000 +0200
@@ -1,10 +1,10 @@
# Translation of kcodecs5_qt to Norwegian Bokmål
#
-# Knut Yrvin , 2002, 2003, 2004, 2005.
+# Knut Yrvin , 2002, 2003, 2004, 2005.
# Bjørn Steensrud , 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015.
# Eskild Hustvedt , 2004, 2005.
# Gaute Hvoslef Kvalnes , 2004, 2005.
-# Axel Bojer , 2005, 2006.
+# Axel Bojer , 2005, 2006.
# Nils Kristian Tomren , 2005, 2007.
# Øyvind A. Holm , 2009.
msgid ""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcodecs-5.10.0/po/nn/kcodecs5_qt.po new/kcodecs-5.11.0/po/nn/kcodecs5_qt.po
--- old/kcodecs-5.10.0/po/nn/kcodecs5_qt.po 2015-05-03 17:05:14.000000000 +0200
+++ new/kcodecs-5.11.0/po/nn/kcodecs5_qt.po 2015-06-06 23:09:22.000000000 +0200
@@ -2,21 +2,21 @@
#
# Gaute Hvoslef Kvalnes , 2003, 2004, 2005, 2006.
# Håvard Korsvoll , 2003, 2005.
-# Karl Ove Hufthammer , 2004, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014.
+# Karl Ove Hufthammer , 2004, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015.
# Eirik U. Birkeland , 2008, 2009, 2010.
msgid ""
msgstr ""
"Project-Id-Version: kdelibs4\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2014-02-28 03:44+0000\n"
-"PO-Revision-Date: 2013-05-12 14:38+0200\n"
+"PO-Revision-Date: 2015-06-02 19:20+0100\n"
"Last-Translator: Karl Ove Hufthammer \n"
"Language-Team: Norwegian Nynorsk \n"
"Language: nn\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.5\n"
+"X-Generator: Lokalize 2.0\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Environment: kde\n"
"X-Accelerator-Marker: &\n"
@@ -26,102 +26,102 @@
#: kcharsets.cpp:168
msgctxt "KCharsets|@item Text character set"
msgid "Western European"
-msgstr ""
+msgstr "Vesteuropeisk"
#: kcharsets.cpp:174
msgctxt "KCharsets|@item Text character set"
msgid "Central European"
-msgstr ""
+msgstr "Sentraleuropeisk"
#: kcharsets.cpp:177
msgctxt "KCharsets|@item Text character set"
msgid "Baltic"
-msgstr ""
+msgstr "Baltisk"
#: kcharsets.cpp:180
msgctxt "KCharsets|@item Text character set"
msgid "South-Eastern Europe"
-msgstr ""
+msgstr "Søraust-Europa"
#: kcharsets.cpp:183
msgctxt "KCharsets|@item Text character set"
msgid "Turkish"
-msgstr ""
+msgstr "Tyrkisk"
#: kcharsets.cpp:186
msgctxt "KCharsets|@item Text character set"
msgid "Cyrillic"
-msgstr ""
+msgstr "Kyrillisk"
#: kcharsets.cpp:192
msgctxt "KCharsets|@item Text character set"
msgid "Chinese Traditional"
-msgstr ""
+msgstr "Kinesisk – tradisjonell"
#: kcharsets.cpp:195
msgctxt "KCharsets|@item Text character set"
msgid "Chinese Simplified"
-msgstr ""
+msgstr "Kinesisk – forenkla"
#: kcharsets.cpp:199
msgctxt "KCharsets|@item Text character set"
msgid "Korean"
-msgstr ""
+msgstr "Koreansk"
#: kcharsets.cpp:202
msgctxt "KCharsets|@item Text character set"
msgid "Japanese"
-msgstr ""
+msgstr "Japansk"
#: kcharsets.cpp:206
msgctxt "KCharsets|@item Text character set"
msgid "Greek"
-msgstr ""
+msgstr "Gresk"
#: kcharsets.cpp:209
msgctxt "KCharsets|@item Text character set"
msgid "Arabic"
-msgstr ""
+msgstr "Arabisk"
#: kcharsets.cpp:212
msgctxt "KCharsets|@item Text character set"
msgid "Hebrew"
-msgstr ""
+msgstr "Hebraisk"
#: kcharsets.cpp:217
msgctxt "KCharsets|@item Text character set"
msgid "Thai"
-msgstr ""
+msgstr "Thai"
#: kcharsets.cpp:220
msgctxt "KCharsets|@item Text character set"
msgid "Unicode"
-msgstr ""
+msgstr "Unicode"
#: kcharsets.cpp:226
msgctxt "KCharsets|@item Text character set"
msgid "Northern Saami"
-msgstr ""
+msgstr "Nordsamisk"
#: kcharsets.cpp:228
msgctxt "KCharsets|@item Text character set"
msgid "Other"
-msgstr ""
+msgstr "Anna"
#: kcharsets.cpp:671
-#, fuzzy, qt-format
+#, qt-format
msgctxt "KCharsets|@item %1 character set, %2 encoding"
msgid "%1 ( %2 )"
msgstr "%1 (%2)"
#: kcharsets.cpp:674
-#, fuzzy, qt-format
+#, qt-format
msgctxt "KCharsets|@item"
msgid "Other encoding (%1)"
msgstr "Anna teiknkoding (%1)"
#: kcharsets.cpp:703
-#, fuzzy, qt-format
+#, qt-format
msgctxt "KCharsets|@item Text encoding: %1 character set, %2 encoding"
msgid "%1 ( %2 )"
msgstr "%1 (%2)"
@@ -132,6 +132,9 @@
"The email address you entered is not valid because it contains more than one "
"@. You will not create valid messages if you do not change your address."
msgstr ""
+"E-postadressa du oppgav er ikkje gyldig, då ho inneheld fleire enn éin "
+"krøllalfa (@). Du vil ikkje kunna senda gyldig e-post dersom du ikkje endrar "
+"adressa."
#: kemailaddress.cpp:535
msgctxt "QObject|"
@@ -139,11 +142,14 @@
"The email address you entered is not valid because it does not contain a @. "
"You will not create valid messages if you do not change your address."
msgstr ""
+"E-postadressa du oppgav er ikkje gyldig, då ho ikkje inneheld nokon "
+"krøllalfa (@). Du vil ikkje kunna senda gyldig e-post dersom du ikkje endrar "
+"adressa."
#: kemailaddress.cpp:540
msgctxt "QObject|"
msgid "You have to enter something in the email address field."
-msgstr ""
+msgstr "Du må skriva noko i e-postadressefeltet."
#: kemailaddress.cpp:542
msgctxt "QObject|"
@@ -151,6 +157,8 @@
"The email address you entered is not valid because it does not contain a "
"local part."
msgstr ""
+"E-postadressa du oppgav er ikkje gyldig, då ho ikkje inneheld nokon lokal "
+"del (teksten før @)."
#: kemailaddress.cpp:545
msgctxt "QObject|"
@@ -158,6 +166,8 @@
"The email address you entered is not valid because it does not contain a "
"domain part."
msgstr ""
+"E-postadressa du oppgav er ikkje gyldig, då ho ikkje inneheld noko domene "
+"(teksten etter @)."
#: kemailaddress.cpp:548
msgctxt "QObject|"
@@ -165,11 +175,13 @@
"The email address you entered is not valid because it contains unclosed "
"comments/brackets."
msgstr ""
+"E-postadressa du oppgav er ikkje gyldig, då ho inneheld kommentarar/"
+"parentesar som ikkje er lukka."
#: kemailaddress.cpp:551
msgctxt "QObject|"
msgid "The email address you entered is valid."
-msgstr ""
+msgstr "E-postadressa du oppgav er gyldig."
#: kemailaddress.cpp:553
msgctxt "QObject|"
@@ -177,6 +189,8 @@
"The email address you entered is not valid because it contains an unclosed "
"angle bracket."
msgstr ""
+"E-postadressa du oppgav er ikkje gyldig, då ho inneheld ein vinkelparentes "
+"som ikkje er lukka."
#: kemailaddress.cpp:556
msgctxt "QObject|"
@@ -184,6 +198,8 @@
"The email address you entered is not valid because it contains too many "
"closing angle brackets."
msgstr ""
+"E-postadressa du oppgav er ikkje gyldig, då ho inneheld for mange lukkande "
+"vinkelparentesar."
#: kemailaddress.cpp:559
msgctxt "QObject|"
@@ -191,6 +207,7 @@
"The email address you have entered is not valid because it contains an "
"unexpected comma."
msgstr ""
+"E-postadressa du oppgav er ikkje gyldig, då ho inneheld eit uventa komma."
#: kemailaddress.cpp:562
msgctxt "QObject|"
@@ -199,6 +216,8 @@
"This probably means you have used an escaping type character like a '\\' as "
"the last character in your email address."
msgstr ""
+"E-postadressa du oppgav er ikkje gyldig, då ho sluttar for tidleg. Dette "
+"kjem truleg av at du har brukt eit verneteikn som \\ heilt sist i adressa."
#: kemailaddress.cpp:567
msgctxt "QObject|"
@@ -206,6 +225,8 @@
"The email address you entered is not valid because it contains quoted text "
"which does not end."
msgstr ""
+"E-postadressa du oppgav er ikkje gyldig, då ho inneheld sitert tekst som "
+"ikkje sluttar."
#: kemailaddress.cpp:570 kemailaddress.cpp:649
msgctxt "QObject|"
@@ -213,6 +234,8 @@
"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."
msgstr ""
+"E-postadressa du oppgav er ikkje gyldig, då ho ikkje har form som ei ekte e-"
+"postadresse, eksempelvis kari@kde.org."
#: kemailaddress.cpp:574
msgctxt "QObject|"
@@ -220,6 +243,7 @@
"The email address you entered is not valid because it contains an illegal "
"character."
msgstr ""
+"E-postadressa du oppgav er ikkje gyldig, då ho inneheld eit ugyldig teikn."
#: kemailaddress.cpp:577
msgctxt "QObject|"
@@ -227,6 +251,8 @@
"The email address you have entered is not valid because it contains an "
"invalid display name."
msgstr ""
+"E-postadressa du oppgav er ikkje gyldig, då ho inneheld eit ugyldig "
+"visingsnamn."
#: kemailaddress.cpp:580
msgctxt "QObject|"
@@ -234,104 +260,90 @@
"The email address you entered is not valid because it does not contain a "
"'.'. You will not create valid messages if you do not change your address."
msgstr ""
+"E-postadressa du oppgav er ikkje gyldig, då ho ikkje inneheld noko punktum. "
+"Du vil ikkje kunna senda gyldig e-post dersom du ikkje endrar adressa."
#: kemailaddress.cpp:586
msgctxt "QObject|"
msgid "Unknown problem with email address"
-msgstr ""
+msgstr "Ukjend problem med e-postadressa"
#: kencodingprober.cpp:238 kencodingprober.cpp:279
-#, fuzzy
msgctxt "KEncodingProber|@item Text character set"
msgid "Disabled"
msgstr "Av"
#: kencodingprober.cpp:240 kencodingprober.cpp:282
-#, fuzzy
msgctxt "KEncodingProber|@item Text character set"
msgid "Universal"
msgstr "Universell"
#: kencodingprober.cpp:242 kencodingprober.cpp:324
-#, fuzzy
msgctxt "KEncodingProber|@item Text character set"
msgid "Unicode"
msgstr "Unicode"
#: kencodingprober.cpp:244 kencodingprober.cpp:294
-#, fuzzy
msgctxt "KEncodingProber|@item Text character set"
msgid "Cyrillic"
msgstr "Kyrillisk"
#: kencodingprober.cpp:246 kencodingprober.cpp:309
-#, fuzzy
msgctxt "KEncodingProber|@item Text character set"
msgid "Western European"
msgstr "Vesteuropeisk"
#: kencodingprober.cpp:248 kencodingprober.cpp:291
-#, fuzzy
msgctxt "KEncodingProber|@item Text character set"
msgid "Central European"
msgstr "Sentraleuropeisk"
#: kencodingprober.cpp:250 kencodingprober.cpp:297
-#, fuzzy
msgctxt "KEncodingProber|@item Text character set"
msgid "Greek"
msgstr "Gresk"
#: kencodingprober.cpp:252 kencodingprober.cpp:300
-#, fuzzy
msgctxt "KEncodingProber|@item Text character set"
msgid "Hebrew"
msgstr "Hebraisk"
#: kencodingprober.cpp:254 kencodingprober.cpp:306
-#, fuzzy
msgctxt "KEncodingProber|@item Text character set"
msgid "Turkish"
msgstr "Tyrkisk"
#: kencodingprober.cpp:256 kencodingprober.cpp:303
-#, fuzzy
msgctxt "KEncodingProber|@item Text character set"
msgid "Japanese"
msgstr "Japansk"
#: kencodingprober.cpp:258 kencodingprober.cpp:288
-#, fuzzy
msgctxt "KEncodingProber|@item Text character set"
msgid "Baltic"
msgstr "Baltisk"
#: kencodingprober.cpp:260 kencodingprober.cpp:312
-#, fuzzy
msgctxt "KEncodingProber|@item Text character set"
msgid "Chinese Traditional"
msgstr "Kinesisk – tradisjonell"
#: kencodingprober.cpp:262 kencodingprober.cpp:315
-#, fuzzy
msgctxt "KEncodingProber|@item Text character set"
msgid "Chinese Simplified"
msgstr "Kinesisk – forenkla"
#: kencodingprober.cpp:264 kencodingprober.cpp:318
-#, fuzzy
msgctxt "KEncodingProber|@item Text character set"
msgid "Korean"
msgstr "Koreansk"
#: kencodingprober.cpp:266 kencodingprober.cpp:321
-#, fuzzy
msgctxt "KEncodingProber|@item Text character set"
msgid "Thai"
msgstr "Thai"
#: kencodingprober.cpp:268 kencodingprober.cpp:285
-#, fuzzy
msgctxt "KEncodingProber|@item Text character set"
msgid "Arabic"
msgstr "Arabisk"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcodecs-5.10.0/po/tr/kcodecs5_qt.po new/kcodecs-5.11.0/po/tr/kcodecs5_qt.po
--- old/kcodecs-5.10.0/po/tr/kcodecs5_qt.po 2015-05-03 17:05:14.000000000 +0200
+++ new/kcodecs-5.11.0/po/tr/kcodecs5_qt.po 2015-06-06 23:09:22.000000000 +0200
@@ -22,7 +22,7 @@
"Project-Id-Version: kdelibs4\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2014-03-23 01:50+0000\n"
-"PO-Revision-Date: 2014-12-26 00:11+0000\n"
+"PO-Revision-Date: 2015-05-19 10:01+0000\n"
"Last-Translator: Necdet \n"
"Language-Team: Turkish \n"
"Language: tr\n"
@@ -34,137 +34,86 @@
"X-Qt-Contexts: true\n"
#: kcharsets.cpp:168
-#, fuzzy
-#| msgctxt "@item Text character set"
-#| msgid "Western European"
msgctxt "KCharsets|@item Text character set"
msgid "Western European"
msgstr "Batı Avrupa"
#: kcharsets.cpp:174
-#, fuzzy
-#| msgctxt "@item Text character set"
-#| msgid "Central European"
msgctxt "KCharsets|@item Text character set"
msgid "Central European"
msgstr "Orta Avrupa"
#: kcharsets.cpp:177
-#, fuzzy
-#| msgctxt "@item Text character set"
-#| msgid "Baltic"
msgctxt "KCharsets|@item Text character set"
msgid "Baltic"
msgstr "Baltık"
#: kcharsets.cpp:180
-#, fuzzy
-#| msgctxt "@item Text character set"
-#| msgid "South-Eastern Europe"
msgctxt "KCharsets|@item Text character set"
msgid "South-Eastern Europe"
msgstr "Güney-Doğu Avrupa"
#: kcharsets.cpp:183
-#, fuzzy
-#| msgctxt "@item Text character set"
-#| msgid "Turkish"
msgctxt "KCharsets|@item Text character set"
msgid "Turkish"
msgstr "Türkçe"
#: kcharsets.cpp:186
-#, fuzzy
-#| msgctxt "@item Text character set"
-#| msgid "Cyrillic"
msgctxt "KCharsets|@item Text character set"
msgid "Cyrillic"
-msgstr "Kiril Alfabesi"
+msgstr "Kiril"
#: kcharsets.cpp:192
-#, fuzzy
-#| msgctxt "@item Text character set"
-#| msgid "Chinese Traditional"
msgctxt "KCharsets|@item Text character set"
msgid "Chinese Traditional"
msgstr "Geleneksel Çince"
#: kcharsets.cpp:195
-#, fuzzy
-#| msgctxt "@item Text character set"
-#| msgid "Chinese Simplified"
msgctxt "KCharsets|@item Text character set"
msgid "Chinese Simplified"
msgstr "Basitleştirilmiş Çince"
#: kcharsets.cpp:199
-#, fuzzy
-#| msgctxt "@item Text character set"
-#| msgid "Korean"
msgctxt "KCharsets|@item Text character set"
msgid "Korean"
msgstr "Korece"
#: kcharsets.cpp:202
-#, fuzzy
-#| msgctxt "@item Text character set"
-#| msgid "Japanese"
msgctxt "KCharsets|@item Text character set"
msgid "Japanese"
msgstr "Japonca"
#: kcharsets.cpp:206
-#, fuzzy
-#| msgctxt "@item Text character set"
-#| msgid "Greek"
msgctxt "KCharsets|@item Text character set"
msgid "Greek"
msgstr "Yunanca"
#: kcharsets.cpp:209
-#, fuzzy
-#| msgctxt "@item Text character set"
-#| msgid "Arabic"
msgctxt "KCharsets|@item Text character set"
msgid "Arabic"
msgstr "Arapça"
#: kcharsets.cpp:212
-#, fuzzy
-#| msgctxt "@item Text character set"
-#| msgid "Hebrew"
msgctxt "KCharsets|@item Text character set"
msgid "Hebrew"
msgstr "İbranice"
#: kcharsets.cpp:217
-#, fuzzy
-#| msgctxt "@item Text character set"
-#| msgid "Thai"
msgctxt "KCharsets|@item Text character set"
msgid "Thai"
msgstr "Tay Dili"
#: kcharsets.cpp:220
-#, fuzzy
-#| msgctxt "@item Text character set"
-#| msgid "Unicode"
msgctxt "KCharsets|@item Text character set"
msgid "Unicode"
-msgstr "Unicode"
+msgstr "Unikod"
#: kcharsets.cpp:226
-#, fuzzy
-#| msgctxt "@item Text character set"
-#| msgid "Northern Saami"
msgctxt "KCharsets|@item Text character set"
msgid "Northern Saami"
msgstr "Kuzey Sami"
#: kcharsets.cpp:228
-#, fuzzy
-#| msgctxt "@item Text character set"
-#| msgid "Other"
msgctxt "KCharsets|@item Text character set"
msgid "Other"
msgstr "Diğer"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcodecs-5.10.0/po/zh_TW/kcodecs5_qt.po new/kcodecs-5.11.0/po/zh_TW/kcodecs5_qt.po
--- old/kcodecs-5.10.0/po/zh_TW/kcodecs5_qt.po 2015-05-03 17:05:14.000000000 +0200
+++ new/kcodecs-5.11.0/po/zh_TW/kcodecs5_qt.po 2015-06-06 23:09:22.000000000 +0200
@@ -16,8 +16,8 @@
"Project-Id-Version: kdelibs4\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2014-03-23 01:50+0000\n"
-"PO-Revision-Date: 2015-02-15 20:36+0800\n"
-"Last-Translator: Franklin Weng \n"
+"PO-Revision-Date: 2015-05-13 16:47+0800\n"
+"Last-Translator: Franklin\n"
"Language-Team: Chinese Traditional \n"
"Language: zh_TW\n"
"MIME-Version: 1.0\n"
@@ -28,137 +28,86 @@
"X-Qt-Contexts: true\n"
#: kcharsets.cpp:168
-#, fuzzy
-#| msgctxt "@item Text character set"
-#| msgid "Western European"
msgctxt "KCharsets|@item Text character set"
msgid "Western European"
msgstr "西歐語系"
#: kcharsets.cpp:174
-#, fuzzy
-#| msgctxt "@item Text character set"
-#| msgid "Central European"
msgctxt "KCharsets|@item Text character set"
msgid "Central European"
msgstr "中歐語系"
#: kcharsets.cpp:177
-#, fuzzy
-#| msgctxt "@item Text character set"
-#| msgid "Baltic"
msgctxt "KCharsets|@item Text character set"
msgid "Baltic"
msgstr "波羅的海語系"
#: kcharsets.cpp:180
-#, fuzzy
-#| msgctxt "@item Text character set"
-#| msgid "South-Eastern Europe"
msgctxt "KCharsets|@item Text character set"
msgid "South-Eastern Europe"
msgstr "東南歐語系"
#: kcharsets.cpp:183
-#, fuzzy
-#| msgctxt "@item Text character set"
-#| msgid "Turkish"
msgctxt "KCharsets|@item Text character set"
msgid "Turkish"
-msgstr "土耳其文"
+msgstr "土耳其語"
#: kcharsets.cpp:186
-#, fuzzy
-#| msgctxt "@item Text character set"
-#| msgid "Cyrillic"
msgctxt "KCharsets|@item Text character set"
msgid "Cyrillic"
msgstr "斯拉夫文"
#: kcharsets.cpp:192
-#, fuzzy
-#| msgctxt "@item Text character set"
-#| msgid "Chinese Traditional"
msgctxt "KCharsets|@item Text character set"
msgid "Chinese Traditional"
-msgstr "繁體中文"
+msgstr "正體中文"
#: kcharsets.cpp:195
-#, fuzzy
-#| msgctxt "@item Text character set"
-#| msgid "Chinese Simplified"
msgctxt "KCharsets|@item Text character set"
msgid "Chinese Simplified"
msgstr "簡體中文"
#: kcharsets.cpp:199
-#, fuzzy
-#| msgctxt "@item Text character set"
-#| msgid "Korean"
msgctxt "KCharsets|@item Text character set"
msgid "Korean"
msgstr "韓文"
#: kcharsets.cpp:202
-#, fuzzy
-#| msgctxt "@item Text character set"
-#| msgid "Japanese"
msgctxt "KCharsets|@item Text character set"
msgid "Japanese"
msgstr "日文"
#: kcharsets.cpp:206
-#, fuzzy
-#| msgctxt "@item Text character set"
-#| msgid "Greek"
msgctxt "KCharsets|@item Text character set"
msgid "Greek"
msgstr "希臘文"
#: kcharsets.cpp:209
-#, fuzzy
-#| msgctxt "@item Text character set"
-#| msgid "Arabic"
msgctxt "KCharsets|@item Text character set"
msgid "Arabic"
msgstr "阿拉伯文"
#: kcharsets.cpp:212
-#, fuzzy
-#| msgctxt "@item Text character set"
-#| msgid "Hebrew"
msgctxt "KCharsets|@item Text character set"
msgid "Hebrew"
msgstr "希伯來文"
#: kcharsets.cpp:217
-#, fuzzy
-#| msgctxt "@item Text character set"
-#| msgid "Thai"
msgctxt "KCharsets|@item Text character set"
msgid "Thai"
-msgstr "泰文"
+msgstr "泰語"
#: kcharsets.cpp:220
-#, fuzzy
-#| msgctxt "@item Text character set"
-#| msgid "Unicode"
msgctxt "KCharsets|@item Text character set"
msgid "Unicode"
msgstr "萬國碼"
#: kcharsets.cpp:226
-#, fuzzy
-#| msgctxt "@item Text character set"
-#| msgid "Northern Saami"
msgctxt "KCharsets|@item Text character set"
msgid "Northern Saami"
msgstr "北部沙米文"
#: kcharsets.cpp:228
-#, fuzzy
-#| msgctxt "@item Text character set"
-#| msgid "Other"
msgctxt "KCharsets|@item Text character set"
msgid "Other"
msgstr "其他"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcodecs-5.10.0/src/kemailaddress.cpp new/kcodecs-5.11.0/src/kemailaddress.cpp
--- old/kcodecs-5.10.0/src/kemailaddress.cpp 2015-05-03 17:05:14.000000000 +0200
+++ new/kcodecs-5.11.0/src/kemailaddress.cpp 2015-06-06 23:09:22.000000000 +0200
@@ -654,16 +654,25 @@
//-----------------------------------------------------------------------------
QByteArray KEmailAddress::extractEmailAddress(const QByteArray &address)
{
+ QString errorMessage;
+ return extractEmailAddress(address, errorMessage);
+}
+
+QByteArray KEmailAddress::extractEmailAddress(const QByteArray &address, QString &errorMessage)
+{
QByteArray dummy1, dummy2, addrSpec;
- EmailParseResult result =
+ 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);
qDebug() << "Input:" << address << "\nError:"
- << emailParseResultToString(result);
+ << errorMessage;
}
+ } else {
+ errorMessage.clear();
}
return addrSpec;
@@ -672,22 +681,38 @@
//-----------------------------------------------------------------------------
QString KEmailAddress::extractEmailAddress(const QString &address)
{
- return QString::fromUtf8(extractEmailAddress(address.toUtf8()));
+ QString errorMessage;
+ return extractEmailAddress(address, errorMessage);
+}
+
+QString KEmailAddress::extractEmailAddress(const QString &address, QString &errorMessage)
+{
+ return QString::fromUtf8(extractEmailAddress(address.toUtf8(), errorMessage));
}
//-----------------------------------------------------------------------------
QByteArray KEmailAddress::firstEmailAddress(const QByteArray &addresses)
{
+ QString errorMessage;
+ return firstEmailAddress(addresses, errorMessage);
+}
+
+QByteArray KEmailAddress::firstEmailAddress(const QByteArray &addresses, QString &errorMessage)
+{
QByteArray dummy1, dummy2, addrSpec;
- EmailParseResult result =
+ const EmailParseResult result =
splitAddressInternal(addresses, dummy1, addrSpec, dummy2,
true/* allow multiple addresses */);
if (result != AddressOk) {
addrSpec = QByteArray();
if (result != AddressEmpty) {
+
+ errorMessage = emailParseResultToString(result);
qDebug() << "Input: aStr\nError:"
- << emailParseResultToString(result);
+ << errorMessage;
}
+ } else {
+ errorMessage.clear();
}
return addrSpec;
@@ -696,7 +721,13 @@
//-----------------------------------------------------------------------------
QString KEmailAddress::firstEmailAddress(const QString &addresses)
{
- return QString::fromUtf8(firstEmailAddress(addresses.toUtf8()));
+ QString errorMessage;
+ return firstEmailAddress(addresses, errorMessage);
+}
+
+QString KEmailAddress::firstEmailAddress(const QString &addresses, QString &errorMessage)
+{
+ return QString::fromUtf8(firstEmailAddress(addresses.toUtf8(), errorMessage));
}
//-----------------------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcodecs-5.10.0/src/kemailaddress.h new/kcodecs-5.11.0/src/kemailaddress.h
--- old/kcodecs-5.10.0/src/kemailaddress.h 2015-05-03 17:05:14.000000000 +0200
+++ new/kcodecs-5.11.0/src/kemailaddress.h 2015-06-06 23:09:22.000000000 +0200
@@ -232,6 +232,22 @@
KCODECS_EXPORT
QByteArray extractEmailAddress(const QByteArray &address);
+/*KF6 merge with above*/
+
+/**
+ Returns the pure email address (addr-spec in RFC2822) of the given address
+ (mailbox in RFC2822).
+
+ @param address an email address, e.g. "Joe User "
+ @param errorMessage return error message when we can't parse email
+ @return the addr-spec of @a address, i.e. joe.user@example.org
+ in the example
+ @since 5.11.0
+
+*/
+KCODECS_EXPORT
+QByteArray extractEmailAddress(const QByteArray &address, QString &errorMessage);
+
/**
This is an overloaded member function, provided for convenience.
It behaves essentially like the above function.
@@ -251,13 +267,43 @@
email address of a list of addresses.
@param addresses an email address, e.g. "Joe User "
+ @param errorMessage return error message when we can't parse email
+ @return the addr-spec of @a addresses, i.e. joe.user@example.org
+ in the example
+ @since 5.11
+*/
+
+KCODECS_EXPORT
+QString extractEmailAddress(const QString &address, QString &errorMessage);
+
+/**
+ Returns the pure email address (addr-spec in RFC2822) of the first
+ email address of a list of addresses.
+
+ @param addresses an email address, e.g. "Joe User "
@return the addr-spec of @a addresses, i.e. joe.user@example.org
in the example
*/
+
+/*KF6 merge with above*/
KCODECS_EXPORT
QByteArray firstEmailAddress(const QByteArray &addresses);
/**
+ Returns the pure email address (addr-spec in RFC2822) of the first
+ email address of a list of addresses.
+
+ @param addresses an email address, e.g. "Joe User "
+ @param errorMessage return error message when we can't parse email
+ @return the addr-spec of @a addresses, i.e. joe.user@example.org
+ in the example
+ @since 5.11.0
+*/
+
+KCODECS_EXPORT
+QByteArray firstEmailAddress(const QByteArray &addresses, QString &errorMessage);
+
+/**
This is an overloaded member function, provided for convenience.
It behaves essentially like the above function.
@@ -272,6 +318,23 @@
QString firstEmailAddress(const QString &addresses);
/**
+ This is an overloaded member function, provided for convenience.
+ It behaves essentially like the above function.
+
+ Returns the pure email address (addr-spec in RFC2822) of the first
+ email address of a list of addresses.
+
+ @param addresses an email address, e.g. "Joe User "
+ @param errorMessage return error message when we can't parse email
+ @return the addr-spec of @a addresses, i.e. joe.user@example.org
+ in the example
+ @since 5.11.0
+*/
+KCODECS_EXPORT
+QString firstEmailAddress(const QString &addresses, QString &errorMessage);
+
+
+/**
Return email address and name from string.
Examples:
"Stefan Taferner " returns "taferner@example.org"