Hello community, here is the log from the commit of package ki18n for openSUSE:Factory checked in at 2017-09-19 16:29:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ki18n (Old) and /work/SRC/openSUSE:Factory/.ki18n.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ki18n" Tue Sep 19 16:29:05 2017 rev:48 rq:526766 version:5.38.0 Changes: -------- --- /work/SRC/openSUSE:Factory/ki18n/ki18n.changes 2017-08-24 17:56:13.516088465 +0200 +++ /work/SRC/openSUSE:Factory/.ki18n.new/ki18n.changes 2017-09-19 16:30:35.210182499 +0200 @@ -1,0 +2,10 @@ +Tue Sep 12 07:11:17 CEST 2017 - lbeltr...@kde.org + +- Update to 5.38.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.38.0.php +- Changes since 5.37.0: + * autotests: fix when fr_FR is installed. semanticTags() needs English. + +------------------------------------------------------------------- Old: ---- ki18n-5.37.0.tar.xz New: ---- ki18n-5.38.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ki18n.spec ++++++ --- /var/tmp/diff_new_pack.CRBrey/_old 2017-09-19 16:30:36.050063516 +0200 +++ /var/tmp/diff_new_pack.CRBrey/_new 2017-09-19 16:30:36.054062948 +0200 @@ -18,12 +18,16 @@ %bcond_without lang %define lname libKF5I18n5 -%define _tar_path 5.37 +%define _tar_path 5.38 +# Full KF5 version (e.g. 5.33.0) +%{!?_kf5_version: %global _kf5_version %{version}} +# Last major and minor KF5 version (e.g. 5.33) +%{!?_kf5_bugfix_version: %global _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} Name: ki18n -Version: 5.37.0 +Version: 5.38.0 Release: 0 BuildRequires: cmake >= 3.0 -BuildRequires: extra-cmake-modules >= %{_tar_path} +BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version} BuildRequires: fdupes BuildRequires: gettext-runtime BuildRequires: kf5-filesystem ++++++ ki18n-5.37.0.tar.xz -> ki18n-5.38.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-5.37.0/CMakeLists.txt new/ki18n-5.38.0/CMakeLists.txt --- old/ki18n-5.37.0/CMakeLists.txt 2017-08-06 20:03:41.000000000 +0200 +++ new/ki18n-5.38.0/CMakeLists.txt 2017-09-03 10:07:15.000000000 +0200 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.37.0") # handled by release scripts +set(KF5_VERSION "5.38.0") # handled by release scripts project(KI18n VERSION ${KF5_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 5.37.0 NO_MODULE) +find_package(ECM 5.38.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) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-5.37.0/autotests/klocalizedstringtest.cpp new/ki18n-5.38.0/autotests/klocalizedstringtest.cpp --- old/ki18n-5.37.0/autotests/klocalizedstringtest.cpp 2017-08-06 20:03:41.000000000 +0200 +++ new/ki18n-5.38.0/autotests/klocalizedstringtest.cpp 2017-09-03 10:07:15.000000000 +0200 @@ -235,6 +235,8 @@ void KLocalizedStringTest::semanticTags() { + KLocalizedString::setLanguages({"en"}); + // <application/> QCOMPARE(xi18nc("@action:inmenu", "Open with <application>%1</application>", "Okteta"), QString("Open with Okteta")); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-5.37.0/autotests/klocalizedstringtest.h new/ki18n-5.38.0/autotests/klocalizedstringtest.h --- old/ki18n-5.37.0/autotests/klocalizedstringtest.h 2017-08-06 20:03:41.000000000 +0200 +++ new/ki18n-5.38.0/autotests/klocalizedstringtest.h 2017-09-03 10:07:15.000000000 +0200 @@ -29,7 +29,6 @@ void initTestCase(); void correctSubs(); void wrongSubs(); - void semanticTags(); void removeAcceleratorMarker(); void miscMethods(); void translateToFrenchLowlevel(); @@ -40,6 +39,7 @@ void testThreads(); void testLocalizedTranslator(); + void semanticTags(); private: bool m_hasFrench; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-5.37.0/po/eu/ki18n5.po new/ki18n-5.38.0/po/eu/ki18n5.po --- old/ki18n-5.37.0/po/eu/ki18n5.po 2017-08-06 20:03:41.000000000 +0200 +++ new/ki18n-5.38.0/po/eu/ki18n5.po 2017-09-03 10:07:15.000000000 +0200 @@ -1,25 +1,26 @@ -# translation of kdelibs4.po to Euskara/Basque (eu) -# KDE: EUSKERA TRANSLATION -# Copyright (C) 1999,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011, Free Software Foundation, Inc. +# Translation of ki18n5.po to Euskara/Basque (eu). +# Copyright (C) 1999-2017, Free Software Foundation, Inc. +# This file is distributed under the same license as the frameworks package. +# KDE Euskaratzeko proiektuaren arduraduna <xa...@euskalnet.net>. # -# Marcos <mar...@euskalgnu.org>, 2002,2003, 2004, 2005. +# Translators: +# Marcos <mar...@euskalgnu.org>, 2002,2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010. # Ion Gaztañaga <igaztan...@gmail.com>, 2005. -# marcos <mar...@euskalgnu.org>, 2006, 2007, 2008, 2009, 2010. # Iñaki Larrañaga Murgoitio <doo...@euskalgnu.org>, 2009. -# Iñigo Salvador Azurmendi <xa...@euskalnet.net>, 2010, 2011, 2012, 2013. +# Iñigo Salvador Azurmendi <xa...@euskalnet.net>, 2010, 2011, 2012, 2013, 2017. msgid "" msgstr "" -"Project-Id-Version: kdelibs4\n" +"Project-Id-Version: ki18n5\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2016-11-19 20:11+0100\n" -"PO-Revision-Date: 2013-01-04 01:42+0100\n" +"PO-Revision-Date: 2017-08-20 00:46+0100\n" "Last-Translator: Iñigo Salvador Azurmendi <xa...@euskalnet.net>\n" -"Language-Team: Basque <itzulp...@euskalgnu.org>\n" +"Language-Team: Basque <kde-i18n-...@kde.org>\n" "Language: eu\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 2.0\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. i18n: Decide which string is used to delimit keys in a keyboard @@ -76,7 +77,7 @@ #, kde-format msgctxt "keyboard-key-name" msgid "CapsLock" -msgstr "Blok.maius." +msgstr "BlokMaius" #: kuitmarkup.cpp:329 #, kde-format @@ -106,7 +107,7 @@ #, kde-format msgctxt "keyboard-key-name" msgid "Down" -msgstr "Orri behera" +msgstr "Behera" #: kuitmarkup.cpp:334 #, kde-format @@ -178,7 +179,7 @@ #, kde-format msgctxt "keyboard-key-name" msgid "NumLock" -msgstr "Blok.zenb." +msgstr "BlokZenb" #: kuitmarkup.cpp:346 #, kde-format @@ -196,13 +197,13 @@ #, kde-format msgctxt "keyboard-key-name" msgid "PgDown" -msgstr "Orbeh" +msgstr "OrBeh" #: kuitmarkup.cpp:349 #, kde-format msgctxt "keyboard-key-name" msgid "PgUp" -msgstr "Orgor" +msgstr "OrGor" #: kuitmarkup.cpp:350 #, kde-format @@ -226,19 +227,19 @@ #, kde-format msgctxt "keyboard-key-name" msgid "Return" -msgstr "Exekutatu" +msgstr "Itzuli" #: kuitmarkup.cpp:354 #, kde-format msgctxt "keyboard-key-name" msgid "Right" -msgstr "Eskuinea" +msgstr "Eskuina" #: kuitmarkup.cpp:355 #, kde-format msgctxt "keyboard-key-name" msgid "ScrollLock" -msgstr "Blok.Korr." +msgstr "BlokLabain" #: kuitmarkup.cpp:356 #, kde-format @@ -268,7 +269,7 @@ #, kde-format msgctxt "keyboard-key-name" msgid "Tab" -msgstr "Tabuladorea" +msgstr "Tab" #: kuitmarkup.cpp:361 #, kde-format @@ -283,92 +284,76 @@ msgstr "Win" #: kuitmarkup.cpp:363 -#, fuzzy, kde-format -#| msgctxt "keyboard-key-name" -#| msgid "F%1" +#, kde-format msgctxt "keyboard-key-name" msgid "F1" -msgstr "F%1" +msgstr "F1" #: kuitmarkup.cpp:364 -#, fuzzy, kde-format -#| msgid "2" +#, kde-format msgctxt "keyboard-key-name" msgid "F2" -msgstr "2" +msgstr "F2" #: kuitmarkup.cpp:365 -#, fuzzy, kde-format -#| msgid "3" +#, kde-format msgctxt "keyboard-key-name" msgid "F3" -msgstr "3" +msgstr "F3" #: kuitmarkup.cpp:366 -#, fuzzy, kde-format -#| msgid "4" +#, kde-format msgctxt "keyboard-key-name" msgid "F4" -msgstr "4" +msgstr "F4" #: kuitmarkup.cpp:367 -#, fuzzy, kde-format -#| msgid "5" +#, kde-format msgctxt "keyboard-key-name" msgid "F5" -msgstr "5" +msgstr "F5" #: kuitmarkup.cpp:368 -#, fuzzy, kde-format -#| msgid "6" +#, kde-format msgctxt "keyboard-key-name" msgid "F6" -msgstr "6" +msgstr "F6" #: kuitmarkup.cpp:369 -#, fuzzy, kde-format -#| msgid "7" +#, kde-format msgctxt "keyboard-key-name" msgid "F7" -msgstr "7" +msgstr "F7" #: kuitmarkup.cpp:370 -#, fuzzy, kde-format -#| msgid "8" +#, kde-format msgctxt "keyboard-key-name" msgid "F8" -msgstr "8" +msgstr "F8" #: kuitmarkup.cpp:371 -#, fuzzy, kde-format -#| msgid "9" +#, kde-format msgctxt "keyboard-key-name" msgid "F9" -msgstr "9" +msgstr "F9" #: kuitmarkup.cpp:372 -#, fuzzy, kde-format -#| msgctxt "keyboard-key-name" -#| msgid "F%1" +#, kde-format msgctxt "keyboard-key-name" msgid "F10" -msgstr "F%1" +msgstr "F10" #: kuitmarkup.cpp:373 -#, fuzzy, kde-format -#| msgctxt "keyboard-key-name" -#| msgid "F%1" +#, kde-format msgctxt "keyboard-key-name" msgid "F11" -msgstr "F%1" +msgstr "F11" #: kuitmarkup.cpp:374 -#, fuzzy, kde-format -#| msgctxt "keyboard-key-name" -#| msgid "F%1" +#, kde-format msgctxt "keyboard-key-name" msgid "F12" -msgstr "F%1" +msgstr "F12" #. i18n: The messages with context "tag-format-pattern <tag ...> format" #. are KUIT patterns for formatting the text found inside KUIT tags. @@ -379,201 +364,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:731 -#, fuzzy, kde-format -#| msgctxt "@title/plain" -#| msgid "== %1 ==" +#, kde-format msgctxt "tag-format-pattern <title> plain" msgid "== %1 ==" msgstr "== %1 ==" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:736 -#, fuzzy, kde-format -#| msgctxt "@title/rich" -#| msgid "<h2>%1</h2>" +#, 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:744 -#, fuzzy, kde-format -#| msgctxt "@subtitle/plain" -#| msgid "~ %1 ~" +#, kde-format msgctxt "tag-format-pattern <subtitle> plain" msgid "~ %1 ~" msgstr "~ %1 ~" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:749 -#, fuzzy, kde-format -#| msgctxt "@subtitle/rich" -#| msgid "<h3>%1</h3>" +#, 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:757 -#, fuzzy, kde-format -#| msgctxt "@application/plain" -#| msgid "%1" +#, 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:762 -#, fuzzy, kde-format -#| msgctxt "@shortcut/rich" -#| msgid "<b>%1</b>" +#, 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:770 -#, fuzzy, kde-format -#| msgctxt "@application/plain" -#| msgid "%1" +#, 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:775 -#, fuzzy, kde-format -#| msgctxt "@item/rich" -#| msgid "<li>%1</li>" +#, 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:783 -#, fuzzy, kde-format -#| msgctxt "@item/plain" -#| msgid " * %1" +#, 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:788 -#, fuzzy, kde-format -#| msgctxt "@item/rich" -#| msgid "<li>%1</li>" +#, 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:795 -#, fuzzy, kde-format -#| msgctxt "@note/plain" -#| msgid "Note: %1" +#, kde-format msgctxt "tag-format-pattern <note> plain" msgid "Note: %1" msgstr "Oharra: %1" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:800 -#, fuzzy, kde-format -#| msgctxt "@note/rich" -#| msgid "<i>Note</i>: %1" +#, kde-format msgctxt "tag-format-pattern <note> rich" msgid "<i>Note</i>: %1" msgstr "<i>Oharra</i>: %1" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:806 -#, fuzzy, kde-format -#| msgid "Re: %1" +#, kde-format msgctxt "" "tag-format-pattern <note label=> plain\n" "%1 is the text, %2 is the note label" msgid "%2: %1" -msgstr "Berregin: %1" +msgstr "%2: %1" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:812 -#, fuzzy, kde-format -#| msgctxt "" -#| "@note-with-label/rich\n" -#| "%1 is the note label, %2 is the text" -#| msgid "<i>%1</i>: %2" +#, 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:819 -#, fuzzy, kde-format -#| msgctxt "@warning/plain" -#| msgid "WARNING: %1" +#, kde-format msgctxt "tag-format-pattern <warning> plain" msgid "WARNING: %1" -msgstr "Kontuz: %1" +msgstr "ABISUA: %1" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:824 -#, fuzzy, kde-format -#| msgctxt "@warning/rich" -#| msgid "<b>Warning</b>: %1" +#, kde-format msgctxt "tag-format-pattern <warning> rich" msgid "<b>Warning</b>: %1" -msgstr "<b>Errorea</b>: %1" +msgstr "<b>Abisua</b>: %1" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:830 -#, fuzzy, kde-format -#| msgid "Re: %1" +#, kde-format msgctxt "" "tag-format-pattern <warning label=> plain\n" "%1 is the text, %2 is the warning label" msgid "%2: %1" -msgstr "Berregin: %1" +msgstr "%2: %1" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:836 -#, fuzzy, kde-format -#| msgctxt "" -#| "@warning-with-label/rich\n" -#| "%1 is the warning label, %2 is the text" -#| msgid "<b>%1</b>: %2" +#, 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:843 -#, fuzzy, kde-format -#| msgctxt "@application/plain" -#| msgid "%1" +#, 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:848 -#, fuzzy, kde-format -#| msgctxt "" -#| "@link-with-description/rich\n" -#| "%1 is the URL, %2 is the descriptive text" -#| msgid "<a href=\"%1\">%2</a>" +#, 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:854 -#, fuzzy, kde-format -#| msgctxt "name of digit set with digit string, e.g. 'Arabic (0123456789)'" -#| msgid "%1 (%2)" +#, kde-format msgctxt "" "tag-format-pattern <link url=> plain\n" "%1 is the descriptive text, %2 is the URL" @@ -582,78 +521,58 @@ #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:860 -#, fuzzy, kde-format -#| msgctxt "" -#| "@link-with-description/rich\n" -#| "%1 is the URL, %2 is the descriptive text" -#| msgid "<a href=\"%1\">%2</a>" +#, 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:867 -#, fuzzy, kde-format -#| msgctxt "@filename/plain" -#| msgid "‘%1’" +#, 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:872 -#, fuzzy, kde-format -#| msgctxt "@filename/rich" -#| msgid "<tt>%1</tt>" +#, 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:879 -#, fuzzy, kde-format -#| msgctxt "@application/plain" -#| msgid "%1" +#, 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:884 -#, fuzzy, kde-format -#| msgctxt "@application/plain" -#| msgid "%1" +#, 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:891 -#, fuzzy, kde-format -#| msgctxt "@application/plain" -#| msgid "%1" +#, 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:896 -#, fuzzy, kde-format -#| msgctxt "@filename/rich" -#| msgid "<tt>%1</tt>" +#, 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:902 -#, fuzzy, kde-format -#| msgctxt "" -#| "@command-with-section/plain\n" -#| "%1 is the command name, %2 is its man section" -#| msgid "%1(%2)" +#, kde-format msgctxt "" "tag-format-pattern <command section=> plain\n" "%1 is the command name, %2 is its man section" @@ -662,11 +581,7 @@ #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:908 -#, fuzzy, kde-format -#| msgctxt "" -#| "@command-with-section/rich\n" -#| "%1 is the command name, %2 is its man section" -#| msgid "<tt>%1(%2)</tt>" +#, kde-format msgctxt "" "tag-format-pattern <command section=> rich\n" "%1 is the command name, %2 is its man section" @@ -675,36 +590,28 @@ #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:915 -#, fuzzy, kde-format -#| msgctxt "@resource/plain" -#| msgid "“%1”" +#, 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:920 -#, fuzzy, kde-format -#| msgctxt "@resource/plain" -#| msgid "“%1”" +#, 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:927 -#, fuzzy, kde-format -#| msgctxt "@resource/plain" -#| msgid "“%1”" +#, 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:932 -#, fuzzy, kde-format -#| msgctxt "@filename/rich" -#| msgid "<tt>%1</tt>" +#, kde-format msgctxt "tag-format-pattern <icode> rich" msgid "<tt>%1</tt>" msgstr "<tt>%1</tt>" @@ -717,131 +624,103 @@ "\n" "%1\n" msgstr "" +"\n" +"%1\n" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:944 -#, fuzzy, kde-format -#| msgctxt "@shortcut/rich" -#| msgid "<b>%1</b>" +#, 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:951 -#, fuzzy, kde-format -#| msgctxt "@application/plain" -#| msgid "%1" +#, 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:956 -#, fuzzy, kde-format -#| msgctxt "@shortcut/rich" -#| msgid "<b>%1</b>" +#, 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:963 -#, fuzzy, kde-format -#| msgctxt "@interface/plain" -#| msgid "|%1|" +#, 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:968 -#, fuzzy, kde-format -#| msgctxt "@interface/rich" -#| msgid "<i>%1</i>" +#, 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:975 -#, fuzzy, kde-format -#| msgctxt "@emphasis/plain" -#| msgid "*%1*" +#, 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:980 -#, fuzzy, kde-format -#| msgctxt "@interface/rich" -#| msgid "<i>%1</i>" +#, 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:985 -#, fuzzy, kde-format -#| msgctxt "@emphasis-strong/plain" -#| msgid "**%1**" +#, 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:990 -#, fuzzy, kde-format -#| msgctxt "@shortcut/rich" -#| msgid "<b>%1</b>" +#, 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:997 -#, fuzzy, kde-format -#| msgctxt "@placeholder/plain" -#| msgid "<%1>" +#, 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:1002 -#, fuzzy, kde-format -#| msgctxt "@placeholder/rich" -#| msgid "<<i>%1</i>>" +#, 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:1009 -#, fuzzy, kde-format -#| msgctxt "@placeholder/plain" -#| msgid "<%1>" +#, 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:1014 -#, fuzzy, kde-format -#| msgctxt "@email/rich" -#| msgid "<<a href=\"mailto:%1\";>%1</a>>" +#, 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:1020 -#, fuzzy, kde-format -#| msgctxt "" -#| "@email-with-name/plain\n" -#| "%1 is name, %2 is address" -#| msgid "%1 <%2>" +#, kde-format msgctxt "" "tag-format-pattern <email address=> plain\n" "%1 is name, %2 is address" @@ -850,11 +729,7 @@ #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:1026 -#, fuzzy, kde-format -#| msgctxt "" -#| "@email-with-name/rich\n" -#| "%1 is name, %2 is address" -#| msgid "<a href=\"mailto:%2\";>%1</a>" +#, kde-format msgctxt "" "tag-format-pattern <email address=> rich\n" "%1 is name, %2 is address" @@ -863,52 +738,42 @@ #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:1033 -#, fuzzy, kde-format -#| msgctxt "@envar/plain" -#| msgid "$%1" +#, 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:1038 -#, fuzzy, kde-format -#| msgctxt "@envar/rich" -#| msgid "<tt>$%1</tt>" +#, 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:1045 -#, fuzzy, kde-format -#| msgctxt "@message/plain" -#| msgid "/%1/" +#, 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:1050 -#, fuzzy, kde-format -#| msgctxt "@interface/rich" -#| msgid "<i>%1</i>" +#, 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:1057 -#, fuzzy, kde-format -#| msgctxt "@application/plain" -#| msgid "%1" +#, 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:1062 #, 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.37.0/po/zh_CN/ki18n5.po new/ki18n-5.38.0/po/zh_CN/ki18n5.po --- old/ki18n-5.37.0/po/zh_CN/ki18n5.po 2017-08-06 20:03:41.000000000 +0200 +++ new/ki18n-5.38.0/po/zh_CN/ki18n5.po 2017-09-03 10:07:15.000000000 +0200 @@ -3,7 +3,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2016-11-19 20:11+0100\n" -"PO-Revision-Date: 2017-08-05 09:29-0400\n" +"PO-Revision-Date: 2017-08-31 05:10-0400\n" "Last-Translator: guoyunhebrave <guoyunhebr...@gmail.com>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n"
