Hello community, here is the log from the commit of package ki18n for openSUSE:Factory checked in at 2019-12-18 14:41:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ki18n (Old) and /work/SRC/openSUSE:Factory/.ki18n.new.4691 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ki18n" Wed Dec 18 14:41:01 2019 rev:77 rq:757037 version:5.65.0 Changes: -------- --- /work/SRC/openSUSE:Factory/ki18n/ki18n.changes 2019-11-12 11:47:34.590859143 +0100 +++ /work/SRC/openSUSE:Factory/.ki18n.new.4691/ki18n.changes 2019-12-18 14:42:48.933787598 +0100 @@ -1,0 +2,10 @@ +Sun Dec 8 11:18:36 UTC 2019 - Christophe Giboudeaux <[email protected]> + +- Update to 5.65.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.65.0.php +- Changes since 5.64.0: + * Undeprecate I18N_NOOP2 + +------------------------------------------------------------------- Old: ---- ki18n-5.64.0.tar.xz ki18n-5.64.0.tar.xz.sig New: ---- ki18n-5.65.0.tar.xz ki18n-5.65.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ki18n.spec ++++++ --- /var/tmp/diff_new_pack.l6WgzV/_old 2019-12-18 14:42:49.585787896 +0100 +++ /var/tmp/diff_new_pack.l6WgzV/_new 2019-12-18 14:42:49.589787898 +0100 @@ -1,7 +1,7 @@ # # spec file for package ki18n # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,14 +17,14 @@ %define lname libKF5I18n5 -%define _tar_path 5.64 +%define _tar_path 5.65 # 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: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} %bcond_without lang Name: ki18n -Version: 5.64.0 +Version: 5.65.0 Release: 0 Summary: KDE Gettext-based UI text internationalization License: LGPL-2.1-or-later ++++++ ki18n-5.64.0.tar.xz -> ki18n-5.65.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-5.64.0/CMakeLists.txt new/ki18n-5.65.0/CMakeLists.txt --- old/ki18n-5.64.0/CMakeLists.txt 2019-11-02 13:56:30.000000000 +0100 +++ new/ki18n-5.65.0/CMakeLists.txt 2019-12-07 22:43:45.000000000 +0100 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.5) -set(KF5_VERSION "5.64.0") # handled by release scripts +set(KF5_VERSION "5.65.0") # handled by release scripts project(KI18n VERSION ${KF5_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 5.64.0 NO_MODULE) +find_package(ECM 5.65.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) @@ -73,7 +73,6 @@ option(BUILD_QCH "Build API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)" OFF) add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)") add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050d00) -add_definitions(-DQT_DEPRECATED_WARNINGS_SINCE=0x060000) add_definitions(-DQT_NO_FOREACH) if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-5.64.0/po/se/ki18n5.po new/ki18n-5.65.0/po/se/ki18n5.po --- old/ki18n-5.64.0/po/se/ki18n5.po 2019-11-02 13:56:30.000000000 +0100 +++ new/ki18n-5.65.0/po/se/ki18n5.po 2019-12-07 22:43:45.000000000 +0100 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2019-05-20 02:56+0200\n" +"POT-Creation-Date: 2019-10-16 02:53+0200\n" "PO-Revision-Date: 2012-05-30 23:19+0200\n" "Last-Translator: Børre Gaup <[email protected]>\n" "Language-Team: Northern Sami <[email protected]>\n" @@ -21,7 +21,7 @@ #. i18n: Decide which string is used to delimit keys in a keyboard #. shortcut (e.g. + in Ctrl+Alt+Tab) in plain text. -#: kuitmarkup.cpp:312 +#: kuitmarkup.cpp:313 #, kde-format msgctxt "shortcut-key-delimiter/plain" msgid "+" @@ -29,7 +29,7 @@ #. i18n: Decide which string is used to delimit keys in a keyboard #. shortcut (e.g. + in Ctrl+Alt+Tab) in rich text. -#: kuitmarkup.cpp:316 +#: kuitmarkup.cpp:317 #, kde-format msgctxt "shortcut-key-delimiter/rich" msgid "+" @@ -37,7 +37,7 @@ #. i18n: Decide which string is used to delimit elements in a GUI path #. (e.g. -> in "Go to Settings->Advanced->Core tab.") in plain text. -#: kuitmarkup.cpp:320 +#: kuitmarkup.cpp:321 #, kde-format msgctxt "gui-path-delimiter/plain" msgid "→" @@ -45,311 +45,311 @@ #. i18n: Decide which string is used to delimit elements in a GUI path #. (e.g. -> in "Go to Settings->Advanced->Core tab.") in rich text. -#: kuitmarkup.cpp:324 +#: kuitmarkup.cpp:325 #, kde-format msgctxt "gui-path-delimiter/rich" msgid "→" msgstr " → " -#: kuitmarkup.cpp:337 +#: kuitmarkup.cpp:338 #, kde-format msgctxt "keyboard-key-name" msgid "Alt" msgstr "Alt" -#: kuitmarkup.cpp:338 +#: kuitmarkup.cpp:339 #, kde-format msgctxt "keyboard-key-name" msgid "AltGr" msgstr "AltGr" -#: kuitmarkup.cpp:339 +#: kuitmarkup.cpp:340 #, kde-format msgctxt "keyboard-key-name" msgid "Backspace" msgstr "Divvunboallu" -#: kuitmarkup.cpp:340 +#: kuitmarkup.cpp:341 #, kde-format msgctxt "keyboard-key-name" msgid "CapsLock" msgstr "Caps Lock" -#: kuitmarkup.cpp:341 +#: kuitmarkup.cpp:342 #, kde-format msgctxt "keyboard-key-name" msgid "Control" msgstr "Ctrl" -#: kuitmarkup.cpp:342 +#: kuitmarkup.cpp:343 #, kde-format msgctxt "keyboard-key-name" msgid "Ctrl" msgstr "Ctrl" -#: kuitmarkup.cpp:343 +#: kuitmarkup.cpp:344 #, kde-format msgctxt "keyboard-key-name" msgid "Del" msgstr "Sihko" -#: kuitmarkup.cpp:344 +#: kuitmarkup.cpp:345 #, kde-format msgctxt "keyboard-key-name" msgid "Delete" msgstr "Sihko" -#: kuitmarkup.cpp:345 +#: kuitmarkup.cpp:346 #, kde-format msgctxt "keyboard-key-name" msgid "Down" msgstr "Vulos" -#: kuitmarkup.cpp:346 +#: kuitmarkup.cpp:347 #, kde-format msgctxt "keyboard-key-name" msgid "End" msgstr "Loahppa" -#: kuitmarkup.cpp:347 +#: kuitmarkup.cpp:348 #, kde-format msgctxt "keyboard-key-name" msgid "Enter" msgstr "Enter" -#: kuitmarkup.cpp:348 +#: kuitmarkup.cpp:349 #, kde-format msgctxt "keyboard-key-name" msgid "Esc" msgstr "Escape" # unreviewed-context -#: kuitmarkup.cpp:349 +#: kuitmarkup.cpp:350 #, kde-format msgctxt "keyboard-key-name" msgid "Escape" msgstr "Escape" -#: kuitmarkup.cpp:350 +#: kuitmarkup.cpp:351 #, kde-format msgctxt "keyboard-key-name" msgid "Home" msgstr "Ruoktot" -#: kuitmarkup.cpp:351 +#: kuitmarkup.cpp:352 #, kde-format msgctxt "keyboard-key-name" msgid "Hyper" msgstr "Hyper" -#: kuitmarkup.cpp:352 +#: kuitmarkup.cpp:353 #, kde-format msgctxt "keyboard-key-name" msgid "Ins" msgstr "Buhtte" -#: kuitmarkup.cpp:353 +#: kuitmarkup.cpp:354 #, kde-format msgctxt "keyboard-key-name" msgid "Insert" msgstr "Bija sisa" # unreviewed-context -#: kuitmarkup.cpp:354 +#: kuitmarkup.cpp:355 #, kde-format msgctxt "keyboard-key-name" msgid "Left" msgstr "Gurutbealde" -#: kuitmarkup.cpp:355 +#: kuitmarkup.cpp:356 #, kde-format msgctxt "keyboard-key-name" msgid "Menu" msgstr "Fállu" -#: kuitmarkup.cpp:356 +#: kuitmarkup.cpp:357 #, kde-format msgctxt "keyboard-key-name" msgid "Meta" msgstr "Meta" -#: kuitmarkup.cpp:357 +#: kuitmarkup.cpp:358 #, kde-format msgctxt "keyboard-key-name" msgid "NumLock" msgstr "Num Lock" -#: kuitmarkup.cpp:358 +#: kuitmarkup.cpp:359 #, kde-format msgctxt "keyboard-key-name" msgid "PageDown" msgstr "Page Down" -#: kuitmarkup.cpp:359 +#: kuitmarkup.cpp:360 #, kde-format msgctxt "keyboard-key-name" msgid "PageUp" msgstr "Page Up" -#: kuitmarkup.cpp:360 +#: kuitmarkup.cpp:361 #, kde-format msgctxt "keyboard-key-name" msgid "PgDown" msgstr "Siidu vulos" -#: kuitmarkup.cpp:361 +#: kuitmarkup.cpp:362 #, kde-format msgctxt "keyboard-key-name" msgid "PgUp" msgstr "Siidu bajás" -#: kuitmarkup.cpp:362 +#: kuitmarkup.cpp:363 #, kde-format msgctxt "keyboard-key-name" msgid "PauseBreak" msgstr "Botke" -#: kuitmarkup.cpp:363 +#: kuitmarkup.cpp:364 #, kde-format msgctxt "keyboard-key-name" msgid "PrintScreen" msgstr "PrintScreen" -#: kuitmarkup.cpp:364 +#: kuitmarkup.cpp:365 #, kde-format msgctxt "keyboard-key-name" msgid "PrtScr" msgstr "PrtScr" -#: kuitmarkup.cpp:365 +#: kuitmarkup.cpp:366 #, kde-format msgctxt "keyboard-key-name" msgid "Return" msgstr "Return" # unreviewed-context -#: kuitmarkup.cpp:366 +#: kuitmarkup.cpp:367 #, kde-format msgctxt "keyboard-key-name" msgid "Right" msgstr "Olgešbealde" -#: kuitmarkup.cpp:367 +#: kuitmarkup.cpp:368 #, kde-format msgctxt "keyboard-key-name" msgid "ScrollLock" msgstr "Scroll Lock" -#: kuitmarkup.cpp:368 +#: kuitmarkup.cpp:369 #, kde-format msgctxt "keyboard-key-name" msgid "Shift" msgstr "Shift" -#: kuitmarkup.cpp:369 +#: kuitmarkup.cpp:370 #, kde-format msgctxt "keyboard-key-name" msgid "Space" msgstr "Gaskamearka" -#: kuitmarkup.cpp:370 +#: kuitmarkup.cpp:371 #, kde-format msgctxt "keyboard-key-name" msgid "Super" msgstr "Super" -#: kuitmarkup.cpp:371 +#: kuitmarkup.cpp:372 #, kde-format msgctxt "keyboard-key-name" msgid "SysReq" msgstr "SysReq" -#: kuitmarkup.cpp:372 +#: kuitmarkup.cpp:373 #, kde-format msgctxt "keyboard-key-name" msgid "Tab" msgstr "Tab" # unreviewed-context -#: kuitmarkup.cpp:373 +#: kuitmarkup.cpp:374 #, kde-format msgctxt "keyboard-key-name" msgid "Up" msgstr "Bajás" -#: kuitmarkup.cpp:374 +#: kuitmarkup.cpp:375 #, kde-format msgctxt "keyboard-key-name" msgid "Win" msgstr "Win" -#: kuitmarkup.cpp:375 +#: kuitmarkup.cpp:376 #, kde-format msgctxt "keyboard-key-name" msgid "F1" msgstr "" -#: kuitmarkup.cpp:376 +#: kuitmarkup.cpp:377 #, kde-format msgctxt "keyboard-key-name" msgid "F2" msgstr "" -#: kuitmarkup.cpp:377 +#: kuitmarkup.cpp:378 #, kde-format msgctxt "keyboard-key-name" msgid "F3" msgstr "" -#: kuitmarkup.cpp:378 +#: kuitmarkup.cpp:379 #, kde-format msgctxt "keyboard-key-name" msgid "F4" msgstr "" -#: kuitmarkup.cpp:379 +#: kuitmarkup.cpp:380 #, kde-format msgctxt "keyboard-key-name" msgid "F5" msgstr "" -#: kuitmarkup.cpp:380 +#: kuitmarkup.cpp:381 #, kde-format msgctxt "keyboard-key-name" msgid "F6" msgstr "" -#: kuitmarkup.cpp:381 +#: kuitmarkup.cpp:382 #, kde-format msgctxt "keyboard-key-name" msgid "F7" msgstr "" -#: kuitmarkup.cpp:382 +#: kuitmarkup.cpp:383 #, kde-format msgctxt "keyboard-key-name" msgid "F8" msgstr "" -#: kuitmarkup.cpp:383 +#: kuitmarkup.cpp:384 #, kde-format msgctxt "keyboard-key-name" msgid "F9" msgstr "" -#: kuitmarkup.cpp:384 +#: kuitmarkup.cpp:385 #, kde-format msgctxt "keyboard-key-name" msgid "F10" msgstr "" -#: kuitmarkup.cpp:385 +#: kuitmarkup.cpp:386 #, kde-format msgctxt "keyboard-key-name" msgid "F11" msgstr "" -#: kuitmarkup.cpp:386 +#: kuitmarkup.cpp:387 #, kde-format msgctxt "keyboard-key-name" msgid "F12" @@ -363,91 +363,91 @@ #. original. Some things you may consider changing: #. - 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:742 +#: kuitmarkup.cpp:743 #, fuzzy, 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:747 +#: kuitmarkup.cpp:748 #, fuzzy, 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:755 +#: kuitmarkup.cpp:756 #, fuzzy, 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:760 +#: kuitmarkup.cpp:761 #, fuzzy, 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:768 +#: kuitmarkup.cpp:769 #, fuzzy, 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:773 +#: kuitmarkup.cpp:774 #, fuzzy, kde-format msgctxt "tag-format-pattern <para> rich" msgid "<p>%1</p>" msgstr "<b>%1</b>" #. i18n: KUIT pattern, see the comment to the first of these entries above. -#: kuitmarkup.cpp:781 +#: kuitmarkup.cpp:782 #, fuzzy, 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:786 +#: kuitmarkup.cpp:787 #, fuzzy, kde-format msgctxt "tag-format-pattern <list> rich" msgid "<ul>%1</ul>" msgstr "<li>%1</li>" #. i18n: KUIT pattern, see the comment to the first of these entries above. -#: kuitmarkup.cpp:794 +#: kuitmarkup.cpp:795 #, fuzzy, 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:799 +#: kuitmarkup.cpp:800 #, fuzzy, 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:806 +#: kuitmarkup.cpp:807 #, fuzzy, kde-format msgctxt "tag-format-pattern <note> plain" msgid "Note: %1" msgstr "Fuomáš: %1" #. i18n: KUIT pattern, see the comment to the first of these entries above. -#: kuitmarkup.cpp:811 +#: kuitmarkup.cpp:812 #, fuzzy, kde-format msgctxt "tag-format-pattern <note> rich" msgid "<i>Note</i>: %1" msgstr "<i>Fuomáš</i>: %1" #. i18n: KUIT pattern, see the comment to the first of these entries above. -#: kuitmarkup.cpp:817 +#: kuitmarkup.cpp:818 #, fuzzy, kde-format msgctxt "" "tag-format-pattern <note label=> plain\n" @@ -456,7 +456,7 @@ msgstr "Daga ođđasit: %1" #. i18n: KUIT pattern, see the comment to the first of these entries above. -#: kuitmarkup.cpp:823 +#: kuitmarkup.cpp:824 #, fuzzy, kde-format msgctxt "" "tag-format-pattern <note label=> rich\n" @@ -465,21 +465,21 @@ msgstr "<i>%1</i>: %2" #. i18n: KUIT pattern, see the comment to the first of these entries above. -#: kuitmarkup.cpp:830 +#: kuitmarkup.cpp:831 #, fuzzy, kde-format msgctxt "tag-format-pattern <warning> plain" msgid "WARNING: %1" msgstr "VÁRUHUS: %1" #. i18n: KUIT pattern, see the comment to the first of these entries above. -#: kuitmarkup.cpp:835 +#: kuitmarkup.cpp:836 #, fuzzy, kde-format msgctxt "tag-format-pattern <warning> rich" msgid "<b>Warning</b>: %1" msgstr "<b>Váruhus</b>: %1" #. i18n: KUIT pattern, see the comment to the first of these entries above. -#: kuitmarkup.cpp:841 +#: kuitmarkup.cpp:842 #, fuzzy, kde-format msgctxt "" "tag-format-pattern <warning label=> plain\n" @@ -488,7 +488,7 @@ msgstr "Daga ođđasit: %1" #. i18n: KUIT pattern, see the comment to the first of these entries above. -#: kuitmarkup.cpp:847 +#: kuitmarkup.cpp:848 #, fuzzy, kde-format msgctxt "" "tag-format-pattern <warning label=> rich\n" @@ -497,21 +497,21 @@ msgstr "<b>%1</b>: %2" #. i18n: KUIT pattern, see the comment to the first of these entries above. -#: kuitmarkup.cpp:854 +#: kuitmarkup.cpp:855 #, fuzzy, 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:859 +#: kuitmarkup.cpp:860 #, fuzzy, kde-format msgctxt "tag-format-pattern <link> rich" msgid "<a href=\"%1\">%1</a>" msgstr "<a href=\"%1\"></a> %2" #. i18n: KUIT pattern, see the comment to the first of these entries above. -#: kuitmarkup.cpp:865 +#: kuitmarkup.cpp:866 #, fuzzy, kde-format msgctxt "" "tag-format-pattern <link url=> plain\n" @@ -520,7 +520,7 @@ msgstr "%1 (%2)" #. i18n: KUIT pattern, see the comment to the first of these entries above. -#: kuitmarkup.cpp:871 +#: kuitmarkup.cpp:872 #, fuzzy, kde-format msgctxt "" "tag-format-pattern <link url=> rich\n" @@ -529,49 +529,49 @@ msgstr "<a href=\"%1\"></a> %2" #. i18n: KUIT pattern, see the comment to the first of these entries above. -#: kuitmarkup.cpp:878 +#: kuitmarkup.cpp:879 #, fuzzy, 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:883 +#: kuitmarkup.cpp:884 #, fuzzy, 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:890 +#: kuitmarkup.cpp:891 #, fuzzy, 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:895 +#: kuitmarkup.cpp:896 #, fuzzy, 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:902 +#: kuitmarkup.cpp:903 #, fuzzy, 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:907 +#: kuitmarkup.cpp:908 #, fuzzy, 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:913 +#: kuitmarkup.cpp:914 #, fuzzy, kde-format msgctxt "" "tag-format-pattern <command section=> plain\n" @@ -580,7 +580,7 @@ msgstr "%1 ( %2 )" #. i18n: KUIT pattern, see the comment to the first of these entries above. -#: kuitmarkup.cpp:919 +#: kuitmarkup.cpp:920 #, fuzzy, kde-format msgctxt "" "tag-format-pattern <command section=> rich\n" @@ -589,35 +589,35 @@ msgstr "<tt>%1(%2)</tt>" #. i18n: KUIT pattern, see the comment to the first of these entries above. -#: kuitmarkup.cpp:926 +#: kuitmarkup.cpp:927 #, fuzzy, 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:931 +#: kuitmarkup.cpp:932 #, fuzzy, 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:938 +#: kuitmarkup.cpp:939 #, fuzzy, 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:943 +#: kuitmarkup.cpp:944 #, fuzzy, kde-format msgctxt "tag-format-pattern <icode> rich" msgid "<tt>%1</tt>" msgstr "<tt>%1</tt>" #. i18n: KUIT pattern, see the comment to the first of these entries above. -#: kuitmarkup.cpp:950 +#: kuitmarkup.cpp:951 #, kde-format msgctxt "tag-format-pattern <bcode> plain" msgid "" @@ -626,98 +626,98 @@ msgstr "" #. i18n: KUIT pattern, see the comment to the first of these entries above. -#: kuitmarkup.cpp:955 +#: kuitmarkup.cpp:956 #, fuzzy, kde-format msgctxt "tag-format-pattern <bcode> rich" msgid "<pre>%1</pre>" msgstr "<b>%1</b>" #. i18n: KUIT pattern, see the comment to the first of these entries above. -#: kuitmarkup.cpp:962 +#: kuitmarkup.cpp:963 #, fuzzy, 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:967 +#: kuitmarkup.cpp:968 #, fuzzy, 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:974 +#: kuitmarkup.cpp:975 #, fuzzy, 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:979 +#: kuitmarkup.cpp:980 #, fuzzy, 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:986 +#: kuitmarkup.cpp:987 #, fuzzy, 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:991 +#: kuitmarkup.cpp:992 #, fuzzy, 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:996 +#: kuitmarkup.cpp:997 #, fuzzy, 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:1001 +#: kuitmarkup.cpp:1002 #, fuzzy, 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:1008 +#: kuitmarkup.cpp:1009 #, fuzzy, 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:1013 +#: kuitmarkup.cpp:1014 #, fuzzy, 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:1020 +#: kuitmarkup.cpp:1021 #, fuzzy, 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:1025 +#: kuitmarkup.cpp:1026 #, fuzzy, 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:1031 +#: kuitmarkup.cpp:1032 #, fuzzy, kde-format msgctxt "" "tag-format-pattern <email address=> plain\n" @@ -726,7 +726,7 @@ msgstr "%1 <%2>" #. i18n: KUIT pattern, see the comment to the first of these entries above. -#: kuitmarkup.cpp:1037 +#: kuitmarkup.cpp:1038 #, fuzzy, kde-format msgctxt "" "tag-format-pattern <email address=> rich\n" @@ -735,42 +735,42 @@ msgstr "<a href=\"mailto:%2\";>%1</a>" #. i18n: KUIT pattern, see the comment to the first of these entries above. -#: kuitmarkup.cpp:1044 +#: kuitmarkup.cpp:1045 #, fuzzy, 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:1049 +#: kuitmarkup.cpp:1050 #, fuzzy, 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:1056 +#: kuitmarkup.cpp:1057 #, fuzzy, 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:1061 +#: kuitmarkup.cpp:1062 #, fuzzy, 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:1068 +#: kuitmarkup.cpp:1069 #, fuzzy, kde-format msgctxt "tag-format-pattern <nl> plain" msgid "%1\n" msgstr "%1" #. i18n: KUIT pattern, see the comment to the first of these entries above. -#: kuitmarkup.cpp:1073 +#: kuitmarkup.cpp:1074 #, kde-format msgctxt "tag-format-pattern <nl> rich" msgid "%1<br/>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-5.64.0/po/zh_CN/ki18n5.po new/ki18n-5.65.0/po/zh_CN/ki18n5.po --- old/ki18n-5.64.0/po/zh_CN/ki18n5.po 2019-11-02 13:56:30.000000000 +0100 +++ new/ki18n-5.65.0/po/zh_CN/ki18n5.po 2019-12-07 22:43:45.000000000 +0100 @@ -16,7 +16,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2019-10-16 02:53+0200\n" -"PO-Revision-Date: 2019-10-09 09:45\n" +"PO-Revision-Date: 2019-11-19 23:01\n" "Last-Translator: Guo Yunhe (guoyunhe)\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-5.64.0/src/klocalizedstring.h new/ki18n-5.65.0/src/klocalizedstring.h --- old/ki18n-5.64.0/src/klocalizedstring.h 2019-11-02 13:56:30.000000000 +0100 +++ new/ki18n-5.65.0/src/klocalizedstring.h 2019-12-07 22:43:45.000000000 +0100 @@ -53,16 +53,20 @@ #define I18NC_NOOP(context, text) context, text #endif -#if KI18N_ENABLE_DEPRECATED_SINCE(5, 0) #ifndef I18N_NOOP2 /** * Wrap string with context for extraction, discarding context. + * WARNING: this means you'll need to pass the exact same context when calling i18nc() later on. + * Do not make typos... + * The preferred solution is to use I18NC_NOOP and store both @p context and @p text. + * I18NC_NOOP2 exists for cases where storing the context is not possible. * - * \deprecated Since 5.0, use \c I18NC_NOOP. + * \deprecated between 5.0 and 5.64, re-enabled in 5.65 */ #define I18N_NOOP2(context, text) text #endif +#if KI18N_ENABLE_DEPRECATED_SINCE(5, 0) #ifndef I18N_NOOP2_NOSTRIP /** * Wrap string with context for extraction.
