Hello community, here is the log from the commit of package ki18n for openSUSE:Factory checked in at 2015-06-23 12:08:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ki18n (Old) and /work/SRC/openSUSE:Factory/.ki18n.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ki18n" Changes: -------- --- /work/SRC/openSUSE:Factory/ki18n/ki18n.changes 2015-05-11 19:47:46.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ki18n.new/ki18n.changes 2015-06-23 12:08:39.000000000 +0200 @@ -1,0 +2,14 @@ +Fri Jun 12 11:40:35 UTC 2015 - [email protected] + +- Adjust patch fallbackLang.diff to search through some openSUSE + specific locale paths. Search only these specific locations to + prevent searching too many locations. + +------------------------------------------------------------------- +Sun Jun 7 19:07:35 UTC 2015 - [email protected] + +- Update to 5.11.0 + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.11.0.php + +------------------------------------------------------------------- Old: ---- ki18n-5.10.0.tar.xz New: ---- ki18n-5.11.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ki18n.spec ++++++ --- /var/tmp/diff_new_pack.zWUIIp/_old 2015-06-23 12:08:39.000000000 +0200 +++ /var/tmp/diff_new_pack.zWUIIp/_new 2015-06-23 12:08:39.000000000 +0200 @@ -18,9 +18,9 @@ %bcond_without lang %define lname libKF5I18n5 -%define _tar_path 5.10 +%define _tar_path 5.11 Name: ki18n -Version: 5.10.0 +Version: 5.11.0 Release: 0 BuildRequires: cmake >= 2.8.12 BuildRequires: extra-cmake-modules >= %{_tar_path} ++++++ fallbackLang.diff ++++++ --- /var/tmp/diff_new_pack.zWUIIp/_old 2015-06-23 12:08:39.000000000 +0200 +++ /var/tmp/diff_new_pack.zWUIIp/_new 2015-06-23 12:08:39.000000000 +0200 @@ -1,42 +1,64 @@ -diff --git a/src/kcatalog.cpp b/src/kcatalog.cpp -index 7711e9b..8a4e12e 100644 ---- a/src/kcatalog.cpp -+++ b/src/kcatalog.cpp -@@ -113,14 +113,23 @@ QString KCatalog::catalogLocaleDir(const QByteArray &domain, +diff -urNB a/src/kcatalog.cpp b/src/kcatalog.cpp +--- a/src/kcatalog.cpp 2015-06-06 23:17:35.000000000 +0200 ++++ b/src/kcatalog.cpp 2015-06-12 11:18:12.263968360 +0200 +@@ -110,26 +110,52 @@ + QString KCatalog::catalogLocaleDir(const QByteArray &domain, + const QString &language) + { ++ QStringList localeDirs; ++ QString localeDir; QString relpath = QString::fromLatin1("%1/LC_MESSAGES/%2.mo") .arg(language, QFile::decodeName(domain)); ++ ++ // Specific SUSE kf5 location ; bundle-lang-bla ; update-translations ; generic ++ localeDirs << "/usr/share/locale/kf5" << "/usr/share/locale-bundle/kf5" << "/usr/share/locale-langpack"; ++ ++ foreach (const QString &locDir, localeDirs) { ++ QFile file(locDir + relpath); ++ if (file.exists()) { ++ localeDir = QFileInfo(locDir + relpath).absolutePath(); ++ return localeDir; ++ } ++ } ++ // Check the standard locations QString file = QStandardPaths::locate(QStandardPaths::GenericDataLocation, - QString::fromLatin1("locale/") + relpath); -+ QString::fromLatin1("locale/kf5/") + relpath); - QString localeDir; - if (file.isEmpty()) { +- QString localeDir; +- if (file.isEmpty()) { - localeDir = QString(); -+ QString file = QStandardPaths::locate(QStandardPaths::GenericDataLocation, +- } else { +- // Path of the locale/ directory must be returned. + QString::fromLatin1("locale/") + relpath); -+ if (file.isEmpty()) { -+ localeDir = QString(); -+ } else { -+ localeDir = QFileInfo(file.left(file.size() - relpath.size())).absolutePath(); -+ } -+ // qDebug() << "localeDir= " << localeDir; -+ return localeDir; - } else { - // Path of the locale/ directory must be returned. ++ if (!file.isEmpty()) { localeDir = QFileInfo(file.left(file.size() - relpath.size())).absolutePath(); ++ return localeDir; } -+ // qDebug() << "localeDir= " << localeDir; ++ // No translation around ++ localeDir = QString(); return localeDir; } -@@ -128,8 +137,12 @@ QSet<QString> KCatalog::availableCatalogLanguages(const QByteArray &domain_) + QSet<QString> KCatalog::availableCatalogLanguages(const QByteArray &domain_) { QString domain = QFile::decodeName(domain_); - QStringList localeDirPaths = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, -+ QString::fromLatin1("locale/kf5"), -+ QStandardPaths::LocateDirectory); +- QStringList localeDirPaths = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, +- QString::fromLatin1("locale"), +- QStandardPaths::LocateDirectory); ++ QStringList localeDirPaths; ++ QStringList localeDirs; ++ ++ // Specific SUSE kf5 location ; bundle-lang-bla ; update-translations ; generic ++ localeDirs << "/usr/share/locale/kf5" << "/usr/share/locale-bundle/kf5" << "/usr/share/locale-langpack"; ++ ++ foreach (const QString &localeDir, localeDirs) { ++ QDir locDir(localeDir); ++ if (locDir.exists()) { ++ localeDirPaths.append(localeDir); ++ } ++ } + QStringList localeFallbackDirPaths = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, - QString::fromLatin1("locale"), - QStandardPaths::LocateDirectory); ++ QString::fromLatin1("locale"), ++ QStandardPaths::LocateDirectory); + localeDirPaths.append(localeFallbackDirPaths); QSet<QString> availableLanguages; foreach (const QString &localDirPath, localeDirPaths) { ++++++ ki18n-5.10.0.tar.xz -> ki18n-5.11.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-5.10.0/CMakeLists.txt new/ki18n-5.11.0/CMakeLists.txt --- old/ki18n-5.10.0/CMakeLists.txt 2015-05-03 17:13:22.000000000 +0200 +++ new/ki18n-5.11.0/CMakeLists.txt 2015-06-06 23:17:35.000000000 +0200 @@ -3,16 +3,20 @@ project(KI18n) # ECM setup -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} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) -include(FeatureSummary) + include(GenerateExportHeader) include(ECMPackageConfigHelpers) include(ECMSetupVersion) include(ECMGenerateHeaders) -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} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-5.10.0/cmake/FindLibIntl.cmake new/ki18n-5.11.0/cmake/FindLibIntl.cmake --- old/ki18n-5.10.0/cmake/FindLibIntl.cmake 2015-05-03 17:13:22.000000000 +0200 +++ new/ki18n-5.11.0/cmake/FindLibIntl.cmake 2015-06-06 23:17:35.000000000 +0200 @@ -16,7 +16,29 @@ #============================================================================= # Copyright 2014 Alex Richardson <[email protected]> # -# Redistribution and use is allowed according to the terms of the BSD license. +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# 3. Neither the name of the University nor the names of its contributors +# may be used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. #============================================================================= find_path(LibIntl_INCLUDE_DIRS NAMES libintl.h) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-5.10.0/po/fi/scripts/ki18n5/general.pmap new/ki18n-5.11.0/po/fi/scripts/ki18n5/general.pmap --- old/ki18n-5.10.0/po/fi/scripts/ki18n5/general.pmap 2015-05-03 17:13:22.000000000 +0200 +++ new/ki18n-5.11.0/po/fi/scripts/ki18n5/general.pmap 2015-06-06 23:17:35.000000000 +0200 @@ -23,6 +23,7 @@ =:Application Launcher:Sovelluskäynnistin:elat=Sovelluskäynnistimestä:gen=Sovelluskäynnistimen:yleisnimi=kyllä:: =:Application Menu:Sovelluskäynnistin:elat=Sovelluskäynnistimestä:gen=Sovelluskäynnistimen:yleisnimi=kyllä:: =:Arabia:elat=Arabiasta:gen=Arabian:illat=Arabiaan:iness=Arabiassa:part=Arabiaa:: +=/Arch Linux Package Search/Arch Linuxin pakettihaku/hakumuoto=Arch Linuxin pakettihaulla// =/Ark/elat=Arkista/gen=Arkin// =:Artikulate Pronunciation Trainer:Artikulate ääntämisen harjoitteluohjelma:elat=Artikulate ääntämisen harjoitteluohjelmasta:gen=Artikulate ääntämisen harjoitteluohjelman:: =/Ask Jeeves/hakumuoto=Ask Jeeves -haulla// @@ -122,7 +123,6 @@ =/Flickr Creative Commons/hakumuoto=Flickr Creative Commons -haulla// =/Flickr/hakumuoto=Flickristä// =:Flow:elat=Flow’sta:gen=Flow’n:: -=:Folder:Kansio:elat=Kansiosta:gen=Kansion:yleisnimi=kyllä:: =:Folder:Kansio:gen=Kansion:yleisnimi=kyllä:: =:Folder View:Kansionäkymä:elat=Kansionäkymästä:gen=Kansionäkymän:yleisnimi=kyllä:: =/Font Viewer/Fonttikatselin/elat=Fonttikatselimesta/gen=Fonttikatselimen// @@ -185,8 +185,6 @@ =:India:Intia:elat=Intiasta:gen=Intian:illat=Intiaan:iness=Intiassa:part=Intiaa:: =:Indonesia:elat=Indonesiasta:gen=Indonesian:illat=Indonesiaan:iness=Indonesiassa:part=Indonesiaa:: =:Input Method Panel:Syötemenetelmäpaneeli:elat=Syötemenetelmäpaneelista:gen=Syötemenetelmäpaneelin:yleisnimi=kyllä:: -=:Instant Messaging Contact List:Pikaviestinnän yhteystietoluettelo:gen=Pikaviestinnän yhteystietoluettelon:yleisnimi=kyllä:: -=:Instant Messaging Presence:Pikaviestinnän läsnäolo:gen=Pikaviestinnän läsnäolon:yleisnimi=kyllä:: =/Internet Book List/hakumuoto=Internet Book Listista// =/Internet Movie Database/hakumuoto=Internet Movie Databasesta// =:Iran:elat=Iranista:gen=Iranin:illat=Iraniin:iness=Iranissa:part=Irania:: @@ -239,7 +237,7 @@ =/KDE Desktop Theme Module/KDE:n työpöytäteeman asetukset/elat=KDE:n työpöytäteeman asetuksista// =/KDE Forums/KDE:n foorumit/hakumuoto=KDE:n foorumeilta// =/KDE Hotkeys Configuration Module/KDE Hotkeys-asetusosio/elat=KDE Hotkeys-asetusosiosta// -=/KDE Info Center/KDE:n tietokeskus/elat=KDE:n tietokeskuksesta/gen=KDE:n tietokeskuksen// +=/KDE Info Center/KDE:n infokeskus/elat=KDE:n tietokeskuksesta/gen=KDE:n tietokeskuksen// =/KDE Joystick Control Module/Peliohjainten hallinta/elat=Peliohjainten hallinnasta// =/KDE Keyboard Control Module/KDE:n näppäimistöasetukset/elat=KDE:n näppäimistöasetuksista/gen=KDE:n näppäimistöasetusten// =/KDE Look/hakumuoto=KDE Lookista// @@ -513,6 +511,7 @@ =/Yahoo Local/Yahoon paikallishaku/hakumuoto=Yahoon paikallishaulla// =/Yahoo Shopping/Yahoon tuotehaku/hakumuoto=Yahoon tuotehaulla// =/Yahoo Video/Yahoon videohaku/hakumuoto=Yahoon videohaulla// +=:Yakuake:elat=Yakuakesta:gen=Yakuaken:: =/YouTube/hakumuoto=YouTubesta// =:Yukon:gen=Yukonin:: =:Zair:Zaire:elat=Zairesta:gen=Zairen:illat=Zaireen:iness=Zairessa:part=Zairea:: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-5.10.0/po/nb/ki18n5.po new/ki18n-5.11.0/po/nb/ki18n5.po --- old/ki18n-5.10.0/po/nb/ki18n5.po 2015-05-03 17:13:22.000000000 +0200 +++ new/ki18n-5.11.0/po/nb/ki18n5.po 2015-06-06 23:17:35.000000000 +0200 @@ -1,10 +1,10 @@ # Translation of ki18n5 to Norwegian Bokmål # -# Knut Yrvin <[email protected]>, 2002, 2003, 2004, 2005. +# Knut Yrvin <[email protected]>, 2002, 2003, 2004, 2005. # Bjørn Steensrud <[email protected]>, 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014. # Eskild Hustvedt <[email protected]>, 2004, 2005. # Gaute Hvoslef Kvalnes <[email protected]>, 2004, 2005. -# Axel Bojer <[email protected]>, 2005, 2006. +# Axel Bojer <[email protected]>, 2005, 2006. # Nils Kristian Tomren <[email protected]>, 2005, 2007. # Øyvind A. Holm <[email protected]>, 2009. msgid "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-5.10.0/po/nn/ki18n5.po new/ki18n-5.11.0/po/nn/ki18n5.po --- old/ki18n-5.10.0/po/nn/ki18n5.po 2015-05-03 17:13:22.000000000 +0200 +++ new/ki18n-5.11.0/po/nn/ki18n5.po 2015-06-06 23:17:35.000000000 +0200 @@ -2,21 +2,21 @@ # # Gaute Hvoslef Kvalnes <[email protected]>, 2003, 2004, 2005, 2006. # Håvard Korsvoll <[email protected]>, 2003, 2005. -# Karl Ove Hufthammer <[email protected]>, 2004, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014. +# Karl Ove Hufthammer <[email protected]>, 2004, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015. # Eirik U. Birkeland <[email protected]>, 2008, 2009, 2010. msgid "" msgstr "" "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2015-01-26 07:50+0000\n" -"PO-Revision-Date: 2013-05-12 14:38+0200\n" +"PO-Revision-Date: 2015-06-03 19:12+0100\n" "Last-Translator: Karl Ove Hufthammer <[email protected]>\n" "Language-Team: Norwegian Nynorsk <[email protected]>\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" @@ -243,62 +243,62 @@ #: kuitmarkup.cpp:362 msgctxt "keyboard-key-name" msgid "F1" -msgstr "" +msgstr "F1" #: kuitmarkup.cpp:363 msgctxt "keyboard-key-name" msgid "F2" -msgstr "" +msgstr "F2" #: kuitmarkup.cpp:364 msgctxt "keyboard-key-name" msgid "F3" -msgstr "" +msgstr "F3" #: kuitmarkup.cpp:365 msgctxt "keyboard-key-name" msgid "F4" -msgstr "" +msgstr "F4" #: kuitmarkup.cpp:366 msgctxt "keyboard-key-name" msgid "F5" -msgstr "" +msgstr "F5" #: kuitmarkup.cpp:367 msgctxt "keyboard-key-name" msgid "F6" -msgstr "" +msgstr "F6" #: kuitmarkup.cpp:368 msgctxt "keyboard-key-name" msgid "F7" -msgstr "" +msgstr "F7" #: kuitmarkup.cpp:369 msgctxt "keyboard-key-name" msgid "F8" -msgstr "" +msgstr "F8" #: kuitmarkup.cpp:370 msgctxt "keyboard-key-name" msgid "F9" -msgstr "" +msgstr "F9" #: kuitmarkup.cpp:371 msgctxt "keyboard-key-name" msgid "F10" -msgstr "" +msgstr "F10" #: kuitmarkup.cpp:372 msgctxt "keyboard-key-name" msgid "F11" -msgstr "" +msgstr "F11" #: kuitmarkup.cpp:373 msgctxt "keyboard-key-name" msgid "F12" -msgstr "" +msgstr "F12" #. i18n: The messages with context "tag-format-pattern <tag ...> format" #. are KUIT patterns for formatting the text found inside KUIT tags. @@ -309,155 +309,155 @@ #. - the proper quotes, those used in msgid are English-standard #. - the <i> and <b> tags, does your language script work well with them? #: kuitmarkup.cpp:727 -#, fuzzy, kde-format +#, kde-format msgctxt "tag-format-pattern <title> plain" msgid "== %1 ==" -msgstr "== %1 ==" +msgstr "══ %1 ══" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:732 -#, fuzzy, kde-format +#, kde-format msgctxt "tag-format-pattern <title> rich" msgid "<h2>%1</h2>" msgstr "<h2>%1</h2>" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:740 -#, fuzzy, kde-format +#, kde-format msgctxt "tag-format-pattern <subtitle> plain" msgid "~ %1 ~" -msgstr "~ %1 ~" +msgstr "∼ %1 ∼" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:745 -#, fuzzy, kde-format +#, kde-format msgctxt "tag-format-pattern <subtitle> rich" msgid "<h3>%1</h3>" msgstr "<h3>%1</h3>" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:753 -#, fuzzy, kde-format +#, kde-format msgctxt "tag-format-pattern <para> plain" msgid "%1" msgstr "%1" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:758 -#, fuzzy, kde-format +#, kde-format msgctxt "tag-format-pattern <para> rich" msgid "<p>%1</p>" -msgstr "<b>%1</b>" +msgstr "<p>%1</p>" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:766 -#, fuzzy, kde-format +#, kde-format msgctxt "tag-format-pattern <list> plain" msgid "%1" msgstr "%1" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:771 -#, fuzzy, kde-format +#, kde-format msgctxt "tag-format-pattern <list> rich" msgid "<ul>%1</ul>" -msgstr "<li>%1</li>" +msgstr "<ul>%1</ul>" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:779 -#, fuzzy, kde-format +#, kde-format msgctxt "tag-format-pattern <item> plain" msgid " * %1" msgstr " – %1" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:784 -#, fuzzy, kde-format +#, kde-format msgctxt "tag-format-pattern <item> rich" msgid "<li>%1</li>" msgstr "<li>%1</li>" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:791 -#, fuzzy, kde-format +#, kde-format msgctxt "tag-format-pattern <note> plain" msgid "Note: %1" msgstr "Merk: %1" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:796 -#, fuzzy, kde-format +#, kde-format msgctxt "tag-format-pattern <note> rich" msgid "<i>Note</i>: %1" msgstr "<i>Merk</i>: %1" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:802 -#, fuzzy, kde-format +#, kde-format msgctxt "" "tag-format-pattern <note label=> plain\n" "%1 is the text, %2 is the note label" msgid "%2: %1" -msgstr "Re: %1" +msgstr "%2: %1" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:808 -#, fuzzy, kde-format +#, kde-format msgctxt "" "tag-format-pattern <note label=> rich\n" "%1 is the text, %2 is the note label" msgid "<i>%2</i>: %1" -msgstr "<i>%1</i>: %2" +msgstr "<i>%2</i>: %1" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:815 -#, fuzzy, kde-format +#, kde-format msgctxt "tag-format-pattern <warning> plain" msgid "WARNING: %1" msgstr "ÅTVARING: %1" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:820 -#, fuzzy, kde-format +#, kde-format msgctxt "tag-format-pattern <warning> rich" msgid "<b>Warning</b>: %1" msgstr "<b>Åtvaring</b>: %1" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:826 -#, fuzzy, kde-format +#, kde-format msgctxt "" "tag-format-pattern <warning label=> plain\n" "%1 is the text, %2 is the warning label" msgid "%2: %1" -msgstr "Re: %1" +msgstr "%2: %1" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:832 -#, fuzzy, kde-format +#, kde-format msgctxt "" "tag-format-pattern <warning label=> rich\n" "%1 is the text, %2 is the warning label" msgid "<b>%2</b>: %1" -msgstr "<b>%1</b>: %2" +msgstr "<b>%2</b>: %1" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:839 -#, fuzzy, kde-format +#, kde-format msgctxt "tag-format-pattern <link> plain" msgid "%1" msgstr "%1" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:844 -#, fuzzy, kde-format +#, kde-format msgctxt "tag-format-pattern <link> rich" msgid "<a href=\"%1\">%1</a>" -msgstr "<a href=\"%1\">%2</a>" +msgstr "<a href=\"%1\">%1</a>" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:850 -#, fuzzy, kde-format +#, kde-format msgctxt "" "tag-format-pattern <link url=> plain\n" "%1 is the descriptive text, %2 is the URL" @@ -466,58 +466,58 @@ #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:856 -#, fuzzy, kde-format +#, kde-format msgctxt "" "tag-format-pattern <link url=> rich\n" "%1 is the descriptive text, %2 is the URL" msgid "<a href=\"%2\">%1</a>" -msgstr "<a href=\"%1\">%2</a>" +msgstr "<a href=\"%2\">%1</a>" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:863 -#, fuzzy, kde-format +#, kde-format msgctxt "tag-format-pattern <filename> plain" msgid "‘%1’" msgstr "«%1»" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:868 -#, fuzzy, kde-format +#, kde-format msgctxt "tag-format-pattern <filename> rich" msgid "<tt>%1</tt>" msgstr "<tt>%1</tt>" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:875 -#, fuzzy, kde-format +#, kde-format msgctxt "tag-format-pattern <application> plain" msgid "%1" msgstr "%1" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:880 -#, fuzzy, kde-format +#, kde-format msgctxt "tag-format-pattern <application> rich" msgid "%1" msgstr "%1" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:887 -#, fuzzy, kde-format +#, kde-format msgctxt "tag-format-pattern <command> plain" msgid "%1" msgstr "%1" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:892 -#, fuzzy, kde-format +#, kde-format msgctxt "tag-format-pattern <command> rich" msgid "<tt>%1</tt>" msgstr "<tt>%1</tt>" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:898 -#, fuzzy, kde-format +#, kde-format msgctxt "" "tag-format-pattern <command section=> plain\n" "%1 is the command name, %2 is its man section" @@ -526,7 +526,7 @@ #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:904 -#, fuzzy, kde-format +#, kde-format msgctxt "" "tag-format-pattern <command section=> rich\n" "%1 is the command name, %2 is its man section" @@ -535,28 +535,28 @@ #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:911 -#, fuzzy, kde-format +#, kde-format msgctxt "tag-format-pattern <resource> plain" msgid "“%1”" msgstr "«%1»" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:916 -#, fuzzy, kde-format +#, kde-format msgctxt "tag-format-pattern <resource> rich" msgid "“%1”" msgstr "«%1»" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:923 -#, fuzzy, kde-format +#, kde-format msgctxt "tag-format-pattern <icode> plain" msgid "“%1”" msgstr "«%1»" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:928 -#, fuzzy, kde-format +#, kde-format msgctxt "tag-format-pattern <icode> rich" msgid "<tt>%1</tt>" msgstr "<tt>%1</tt>" @@ -569,101 +569,103 @@ "\n" "%1\n" msgstr "" +"\n" +"%1\n" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:940 -#, fuzzy, kde-format +#, kde-format msgctxt "tag-format-pattern <bcode> rich" msgid "<pre>%1</pre>" -msgstr "<b>%1</b>" +msgstr "<pre>%1</pre>" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:947 -#, fuzzy, kde-format +#, kde-format msgctxt "tag-format-pattern <shortcut> plain" msgid "%1" msgstr "%1" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:952 -#, fuzzy, kde-format +#, kde-format msgctxt "tag-format-pattern <shortcut> rich" msgid "<b>%1</b>" msgstr "<b>%1</b>" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:959 -#, fuzzy, kde-format +#, kde-format msgctxt "tag-format-pattern <interface> plain" msgid "|%1|" msgstr "|%1|" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:964 -#, fuzzy, kde-format +#, kde-format msgctxt "tag-format-pattern <interface> rich" msgid "<i>%1</i>" msgstr "<i>%1</i>" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:971 -#, fuzzy, kde-format +#, kde-format msgctxt "tag-format-pattern <emphasis> plain" msgid "*%1*" msgstr "*%1*" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:976 -#, fuzzy, kde-format +#, kde-format msgctxt "tag-format-pattern <emphasis> rich" msgid "<i>%1</i>" msgstr "<i>%1</i>" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:981 -#, fuzzy, kde-format +#, kde-format msgctxt "tag-format-pattern <emphasis-strong> plain" msgid "**%1**" msgstr "**%1**" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:986 -#, fuzzy, kde-format +#, kde-format msgctxt "tag-format-pattern <emphasis-strong> rich" msgid "<b>%1</b>" msgstr "<b>%1</b>" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:993 -#, fuzzy, kde-format +#, kde-format msgctxt "tag-format-pattern <placeholder> plain" msgid "<%1>" msgstr "<%1>" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:998 -#, fuzzy, kde-format +#, kde-format msgctxt "tag-format-pattern <placeholder> rich" msgid "<<i>%1</i>>" msgstr "<<i>%1</i>>" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:1005 -#, fuzzy, kde-format +#, kde-format msgctxt "tag-format-pattern <email> plain" msgid "<%1>" msgstr "<%1>" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:1010 -#, fuzzy, kde-format +#, kde-format msgctxt "tag-format-pattern <email> rich" msgid "<<a href=\"mailto:%1\";>%1</a>>" msgstr "<<a href=\"mailto:%1\";>%1</a>>" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:1016 -#, fuzzy, kde-format +#, kde-format msgctxt "" "tag-format-pattern <email address=> plain\n" "%1 is name, %2 is address" @@ -672,7 +674,7 @@ #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:1022 -#, fuzzy, kde-format +#, kde-format msgctxt "" "tag-format-pattern <email address=> rich\n" "%1 is name, %2 is address" @@ -681,42 +683,42 @@ #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:1029 -#, fuzzy, kde-format +#, kde-format msgctxt "tag-format-pattern <envar> plain" msgid "$%1" msgstr "$%1" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:1034 -#, fuzzy, kde-format +#, kde-format msgctxt "tag-format-pattern <envar> rich" msgid "<tt>$%1</tt>" msgstr "<tt>$%1</tt>" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:1041 -#, fuzzy, kde-format +#, kde-format msgctxt "tag-format-pattern <message> plain" msgid "/%1/" msgstr "/%1/" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:1046 -#, fuzzy, kde-format +#, kde-format msgctxt "tag-format-pattern <message> rich" msgid "<i>%1</i>" msgstr "<i>%1</i>" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:1053 -#, fuzzy, kde-format +#, kde-format msgctxt "tag-format-pattern <nl> plain" msgid "%1\n" -msgstr "%1" +msgstr "%1\n" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:1058 #, kde-format msgctxt "tag-format-pattern <nl> rich" msgid "%1<br/>" -msgstr "" +msgstr "%1<br/>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-5.10.0/src/klocalizedstring.cpp new/ki18n-5.11.0/src/klocalizedstring.cpp --- old/ki18n-5.10.0/src/klocalizedstring.cpp 2015-05-03 17:13:22.000000000 +0200 +++ new/ki18n-5.11.0/src/klocalizedstring.cpp 2015-06-06 23:17:35.000000000 +0200 @@ -20,6 +20,8 @@ // We don't want i18n to be expanded to i18nd here #undef TRANSLATION_DOMAIN +#include <cstdlib> + #include <QDebug> #include <QMutexLocker> #include <QStringList> @@ -1095,7 +1097,7 @@ { KLocalizedString kls(*this); if (!kls.d->plural.isEmpty() && !kls.d->numberSet) { - kls.d->number = static_cast<pluraln>(abs(a)); + kls.d->number = static_cast<pluraln>(std::abs(a)); kls.d->numberSet = true; kls.d->numberOrdinal = d->arguments.size(); } @@ -1123,7 +1125,7 @@ { KLocalizedString kls(*this); if (!kls.d->plural.isEmpty() && !kls.d->numberSet) { - kls.d->number = static_cast<pluraln>(abs(a)); + kls.d->number = static_cast<pluraln>(std::abs(a)); kls.d->numberSet = true; kls.d->numberOrdinal = d->arguments.size(); }
