Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ki18n for openSUSE:Factory checked in at 2022-09-13 15:08:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ki18n (Old) and /work/SRC/openSUSE:Factory/.ki18n.new.2083 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ki18n" Tue Sep 13 15:08:38 2022 rev:111 rq:1002829 version:5.98.0 Changes: -------- --- /work/SRC/openSUSE:Factory/ki18n/ki18n.changes 2022-08-15 19:59:23.197255253 +0200 +++ /work/SRC/openSUSE:Factory/.ki18n.new.2083/ki18n.changes 2022-09-13 15:10:17.076793873 +0200 @@ -1,0 +2,11 @@ +Tue Sep 6 07:17:02 UTC 2022 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 5.98.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/5/5.98.0 +- Changes since 5.97.0: + * Fix typo ki18ndc -> kxi18ndc / ki18ndp -> kxi18ndp + * Add FreeBSD Qt6 CI support + +------------------------------------------------------------------- Old: ---- ki18n-5.97.0.tar.xz ki18n-5.97.0.tar.xz.sig New: ---- ki18n-5.98.0.tar.xz ki18n-5.98.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ki18n.spec ++++++ --- /var/tmp/diff_new_pack.TNZkQY/_old 2022-09-13 15:10:17.500795067 +0200 +++ /var/tmp/diff_new_pack.TNZkQY/_new 2022-09-13 15:10:17.504795078 +0200 @@ -17,14 +17,14 @@ %define lname libKF5I18n5 -%define _tar_path 5.97 +%define _tar_path 5.98 # 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 released Name: ki18n -Version: 5.97.0 +Version: 5.98.0 Release: 0 Summary: KDE Gettext-based UI text internationalization License: LGPL-2.1-or-later ++++++ ki18n-5.97.0.tar.xz -> ki18n-5.98.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-5.97.0/.gitlab-ci.yml new/ki18n-5.98.0/.gitlab-ci.yml --- old/ki18n-5.97.0/.gitlab-ci.yml 2022-08-07 15:25:02.000000000 +0200 +++ new/ki18n-5.98.0/.gitlab-ci.yml 2022-09-05 14:07:35.000000000 +0200 @@ -8,3 +8,4 @@ - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/windows.yml - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux-qt6.yml - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/android-qt6.yml + - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd-qt6.yml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-5.97.0/CMakeLists.txt new/ki18n-5.98.0/CMakeLists.txt --- old/ki18n-5.97.0/CMakeLists.txt 2022-08-07 15:25:02.000000000 +0200 +++ new/ki18n-5.98.0/CMakeLists.txt 2022-09-05 14:07:35.000000000 +0200 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "5.97.0") # handled by release scripts +set(KF_VERSION "5.98.0") # handled by release scripts project(KI18n VERSION ${KF_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 5.97.0 NO_MODULE) +find_package(ECM 5.98.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://commits.kde.org/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-5.97.0/po/be/ki18n5.po new/ki18n-5.98.0/po/be/ki18n5.po --- old/ki18n-5.97.0/po/be/ki18n5.po 2022-08-07 15:25:02.000000000 +0200 +++ new/ki18n-5.98.0/po/be/ki18n5.po 2022-09-05 14:07:35.000000000 +0200 @@ -23,8 +23,9 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Lokalize 1.0\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || n%10>=5 && n%10<=9 || n" +"%100>=11 && n%100<=14 ? 2 : 3);\n" #. i18n: Decide which string is used to delimit keys in a keyboard #. shortcut (e.g. + in Ctrl+Alt+Tab) in plain text. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-5.97.0/po/be@latin/ki18n5.po new/ki18n-5.98.0/po/be@latin/ki18n5.po --- old/ki18n-5.97.0/po/be@latin/ki18n5.po 2022-08-07 15:25:02.000000000 +0200 +++ new/ki18n-5.98.0/po/be@latin/ki18n5.po 2022-09-05 14:07:35.000000000 +0200 @@ -15,8 +15,9 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || n%10>=5 && n%10<=9 || n" +"%100>=11 && n%100<=14 ? 2 : 3);\n" "X-Generator: KBabel 1.11.4\n" #. i18n: Decide which string is used to delimit keys in a keyboard diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-5.97.0/po/ka/ki18n5.po new/ki18n-5.98.0/po/ka/ki18n5.po --- old/ki18n-5.97.0/po/ka/ki18n5.po 2022-08-07 15:25:02.000000000 +0200 +++ new/ki18n-5.98.0/po/ka/ki18n5.po 2022-09-05 14:07:35.000000000 +0200 @@ -1,26 +1,27 @@ -# KDE3 - Georgian translation of kdelibs4.po -# Gia Shervashidze <gias...@telenet.ge>, 2005. +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR This file is copyright: +# This file is distributed under the same license as the ki18n package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # msgid "" msgstr "" -"Project-Id-Version: kdelibs4\n" +"Project-Id-Version: ki18n\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2022-06-20 00:41+0000\n" -"PO-Revision-Date: 2009-12-17 02:11+0400\n" -"Last-Translator: George Machitidze <gio...@gmail.com>\n" -"Language-Team: Georgian <http://www.gia.ge>\n" +"PO-Revision-Date: 2022-08-13 05:20+0200\n" +"Last-Translator: Temuri Doghonadze <temuri.doghona...@gmail.com>\n" +"Language-Team: Georgian <kde-i18n-...@kde.org>\n" "Language: ka\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.9\n" "Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: Poedit 3.1.1\n" #. i18n: Decide which string is used to delimit keys in a keyboard #. shortcut (e.g. + in Ctrl+Alt+Tab) in plain text. #: kuitmarkup.cpp:316 -#, fuzzy, kde-format -#| msgid "+" +#, kde-format msgctxt "shortcut-key-delimiter/plain" msgid "+" msgstr "+" @@ -39,7 +40,7 @@ #, kde-format msgctxt "gui-path-delimiter/plain" msgid "???" -msgstr "" +msgstr "???" #. 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. @@ -47,348 +48,257 @@ #, kde-format msgctxt "gui-path-delimiter/rich" msgid "???" -msgstr "" +msgstr "???" #: kuitmarkup.cpp:332 -#, fuzzy -#| msgid "Alt" msgctxt "keyboard-key-name" msgid "Alt" msgstr "Alt" #: kuitmarkup.cpp:333 -#, fuzzy -#| msgid "Alt" msgctxt "keyboard-key-name" msgid "AltGr" -msgstr "Alt" +msgstr "AltGr" #: kuitmarkup.cpp:334 -#, fuzzy -#| msgid "Backspace" msgctxt "keyboard-key-name" msgid "Backspace" msgstr "Backspace" #: kuitmarkup.cpp:335 -#, fuzzy -#| msgid "CapsLock" msgctxt "keyboard-key-name" msgid "CapsLock" msgstr "CapsLock" #: kuitmarkup.cpp:336 -#, fuzzy -#| msgid "Ctrl" msgctxt "keyboard-key-name" msgid "Control" -msgstr "Ctrl" +msgstr "Control" #: kuitmarkup.cpp:337 -#, fuzzy -#| msgid "Ctrl" msgctxt "keyboard-key-name" msgid "Ctrl" msgstr "Ctrl" #: kuitmarkup.cpp:338 -#, fuzzy -#| msgid "Delete" msgctxt "keyboard-key-name" msgid "Del" -msgstr "???????????????" +msgstr "Del" #: kuitmarkup.cpp:339 -#, fuzzy -#| msgid "Delete" msgctxt "keyboard-key-name" msgid "Delete" -msgstr "???????????????" +msgstr "Delete" #: kuitmarkup.cpp:340 -#, fuzzy -#| msgid "PageDown" msgctxt "keyboard-key-name" msgid "Down" -msgstr "PageDown" +msgstr "Down" #: kuitmarkup.cpp:341 -#, fuzzy -#| msgid "End" msgctxt "keyboard-key-name" msgid "End" -msgstr "??????????????????" +msgstr "End" #: kuitmarkup.cpp:342 -#, fuzzy -#| msgid "Other" msgctxt "keyboard-key-name" msgid "Enter" -msgstr "????????????" +msgstr "Enter" #: kuitmarkup.cpp:343 -#, fuzzy -#| msgid "Escape" msgctxt "keyboard-key-name" msgid "Esc" -msgstr "Escape" +msgstr "Esc" #: kuitmarkup.cpp:344 -#, fuzzy -#| msgid "Escape" msgctxt "keyboard-key-name" msgid "Escape" msgstr "Escape" #: kuitmarkup.cpp:345 -#, fuzzy -#| msgctxt "Opposite to End" -#| msgid "Home" msgctxt "keyboard-key-name" msgid "Home" -msgstr "???????????????" +msgstr "Home" #: kuitmarkup.cpp:346 msgctxt "keyboard-key-name" msgid "Hyper" -msgstr "" +msgstr "Hyper" #: kuitmarkup.cpp:347 -#, fuzzy -#| msgid "Icons" msgctxt "keyboard-key-name" msgid "Ins" -msgstr "????????????????????????????????????" +msgstr "Ins" #: kuitmarkup.cpp:348 -#, fuzzy -#| msgid "Insert" msgctxt "keyboard-key-name" msgid "Insert" -msgstr "????????????????????????" +msgstr "Insert" #: kuitmarkup.cpp:349 -#, fuzzy -#| msgctxt "toolbar position string" -#| msgid "Left" msgctxt "keyboard-key-name" msgid "Left" -msgstr "????????????????????????" +msgstr "Left" #: kuitmarkup.cpp:350 -#, fuzzy -#| msgctxt "QAccel" -#| msgid "Menu" msgctxt "keyboard-key-name" msgid "Menu" -msgstr "???????????????" +msgstr "Menu" #: kuitmarkup.cpp:351 -#, fuzzy -#| msgid "Meta" msgctxt "keyboard-key-name" msgid "Meta" msgstr "Meta" #: kuitmarkup.cpp:352 -#, fuzzy -#| msgid "NumLock" msgctxt "keyboard-key-name" msgid "NumLock" msgstr "NumLock" #: kuitmarkup.cpp:353 -#, fuzzy -#| msgid "PageDown" msgctxt "keyboard-key-name" msgid "PageDown" msgstr "PageDown" #: kuitmarkup.cpp:354 -#, fuzzy -#| msgid "PageUp" msgctxt "keyboard-key-name" msgid "PageUp" msgstr "PageUp" #: kuitmarkup.cpp:355 -#, fuzzy -#| msgid "PageDown" msgctxt "keyboard-key-name" msgid "PgDown" -msgstr "PageDown" +msgstr "PgDown" #: kuitmarkup.cpp:356 -#, fuzzy -#| msgid "PageUp" msgctxt "keyboard-key-name" msgid "PgUp" -msgstr "PageUp" +msgstr "PgUp" #: kuitmarkup.cpp:357 -#, fuzzy msgctxt "keyboard-key-name" msgid "PauseBreak" -msgstr "Pause" +msgstr "PauseBreak" #: kuitmarkup.cpp:358 -#, fuzzy -#| msgid "Print Previe&w..." msgctxt "keyboard-key-name" msgid "PrintScreen" -msgstr "????????????????????? &??????????????????" +msgstr "PrintScreen" #: kuitmarkup.cpp:359 -#, fuzzy -#| msgid "Print Previe&w..." msgctxt "keyboard-key-name" msgid "PrtScr" -msgstr "????????????????????? &??????????????????" +msgstr "PrtScr" #: kuitmarkup.cpp:360 -#, fuzzy msgctxt "keyboard-key-name" msgid "Return" -msgstr "??????????????????" +msgstr "Enter" #: kuitmarkup.cpp:361 -#, fuzzy -#| msgctxt "toolbar position string" -#| msgid "Right" msgctxt "keyboard-key-name" msgid "Right" -msgstr "????????????????????????" +msgstr "Right" #: kuitmarkup.cpp:362 -#, fuzzy -#| msgid "ScrollLock" msgctxt "keyboard-key-name" msgid "ScrollLock" msgstr "ScrollLock" #: kuitmarkup.cpp:363 -#, fuzzy -#| msgid "Shift" msgctxt "keyboard-key-name" msgid "Shift" msgstr "Shift" #: kuitmarkup.cpp:364 -#, fuzzy -#| msgid "Replace" msgctxt "keyboard-key-name" msgid "Space" -msgstr "??????????????????" +msgstr "Space" #: kuitmarkup.cpp:365 -#, fuzzy msgctxt "keyboard-key-name" msgid "Super" -msgstr "?????????" +msgstr "Super" #: kuitmarkup.cpp:366 -#, fuzzy -#| msgid "SysReq" msgctxt "keyboard-key-name" msgid "SysReq" msgstr "SysReq" #: kuitmarkup.cpp:367 -#, fuzzy -#| msgid "Sab" msgctxt "keyboard-key-name" msgid "Tab" -msgstr "?????????" +msgstr "Tab" #: kuitmarkup.cpp:368 -#, fuzzy -#| msgid "Up" msgctxt "keyboard-key-name" msgid "Up" -msgstr "???????????????" +msgstr "Up" #: kuitmarkup.cpp:369 -#, fuzzy -#| msgid "Warning" msgctxt "keyboard-key-name" msgid "Win" -msgstr "?????????????????????????????????" +msgstr "Win" #: kuitmarkup.cpp:370 -#, fuzzy -#| msgid "%1%" msgctxt "keyboard-key-name" msgid "F1" -msgstr "%1%" +msgstr "F1" #: kuitmarkup.cpp:371 -#, fuzzy -#| msgid "2" msgctxt "keyboard-key-name" msgid "F2" -msgstr "2" +msgstr "F2" #: kuitmarkup.cpp:372 msgctxt "keyboard-key-name" msgid "F3" -msgstr "" +msgstr "F3" #: kuitmarkup.cpp:373 -#, fuzzy -#| msgid "4" msgctxt "keyboard-key-name" msgid "F4" -msgstr "4" +msgstr "F4" #: kuitmarkup.cpp:374 msgctxt "keyboard-key-name" msgid "F5" -msgstr "" +msgstr "F5" #: kuitmarkup.cpp:375 -#, fuzzy -#| msgid "6" msgctxt "keyboard-key-name" msgid "F6" -msgstr "6" +msgstr "F6" #: kuitmarkup.cpp:376 msgctxt "keyboard-key-name" msgid "F7" -msgstr "" +msgstr "F7" #: kuitmarkup.cpp:377 msgctxt "keyboard-key-name" msgid "F8" -msgstr "" +msgstr "F8" #: kuitmarkup.cpp:378 -#, fuzzy -#| msgid "9" msgctxt "keyboard-key-name" msgid "F9" -msgstr "9" +msgstr "F9" #: kuitmarkup.cpp:379 -#, fuzzy -#| msgid "%1%" msgctxt "keyboard-key-name" msgid "F10" -msgstr "%1%" +msgstr "F10" #: kuitmarkup.cpp:380 -#, fuzzy -#| msgid "%1%" msgctxt "keyboard-key-name" msgid "F11" -msgstr "%1%" +msgstr "F11" #: kuitmarkup.cpp:381 -#, fuzzy -#| msgid "%1%" msgctxt "keyboard-key-name" msgid "F12" -msgstr "%1%" +msgstr "F12" #. i18n: The messages with context "tag-format-pattern <tag ...> format" #. are KUIT patterns for formatting the text found inside KUIT tags. @@ -402,278 +312,254 @@ #, kde-format msgctxt "tag-format-pattern <title> plain" msgid "== %1 ==" -msgstr "" +msgstr "== %1 ==" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:735 -#, fuzzy, kde-format -#| msgid "<b>Error</b>: %1: %2" +#, kde-format msgctxt "tag-format-pattern <title> rich" msgid "<h2>%1</h2>" -msgstr "<b>?????????????????????</b>: %1: %2" +msgstr "<h2>%1</h2>" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:743 -#, 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:748 -#, fuzzy, kde-format -#| msgid "<b>Error</b>: %1: %2" +#, kde-format msgctxt "tag-format-pattern <subtitle> rich" msgid "<h3>%1</h3>" -msgstr "<b>?????????????????????</b>: %1: %2" +msgstr "<h3>%1</h3>" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:756 -#, fuzzy, kde-format -#| msgid "%1%" +#, kde-format msgctxt "tag-format-pattern <para> plain" msgid "%1" -msgstr "%1%" +msgstr "%1" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:761 -#, fuzzy, kde-format -#| msgid "<b>Error</b>: %1: %2" +#, kde-format msgctxt "tag-format-pattern <para> rich" msgid "<p>%1</p>" -msgstr "<b>?????????????????????</b>: %1: %2" +msgstr "<p>%1</p>" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:769 -#, fuzzy, kde-format -#| msgid "%1%" +#, kde-format msgctxt "tag-format-pattern <list> plain" msgid "%1" -msgstr "%1%" +msgstr "%1" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:774 -#, fuzzy, kde-format -#| msgid "<b>Error</b>: %1: %2" +#, kde-format msgctxt "tag-format-pattern <list> rich" msgid "<ul>%1</ul>" -msgstr "<b>?????????????????????</b>: %1: %2" +msgstr "<ul>%1</ul>" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:782 #, kde-format msgctxt "tag-format-pattern <item> plain" msgid " * %1" -msgstr "" +msgstr " * %1" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:787 -#, fuzzy, kde-format -#| msgid "<b>Error</b>: %1: %2" +#, kde-format msgctxt "tag-format-pattern <item> rich" msgid "<li>%1</li>" -msgstr "<b>?????????????????????</b>: %1: %2" +msgstr "<li>%1</li>" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:794 -#, fuzzy, kde-format -#| msgid "Note" +#, kde-format msgctxt "tag-format-pattern <note> plain" msgid "Note: %1" -msgstr "????????????????????????" +msgstr "????????????????????????: %1" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:799 -#, fuzzy, kde-format -#| msgid "Note" +#, kde-format msgctxt "tag-format-pattern <note> rich" msgid "<i>Note</i>: %1" -msgstr "????????????????????????" +msgstr "<i>????????????????????????</i>: %1" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:805 -#, fuzzy, kde-format -#| msgid "Redo: %1" +#, kde-format msgctxt "" "tag-format-pattern <note label=> plain\n" "%1 is the text, %2 is the note label" msgid "%2: %1" -msgstr "???????????????????????????: %1" +msgstr "%2: %1" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:811 -#, fuzzy, kde-format -#| msgid "<b>Error</b>: %1: %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 "<b>?????????????????????</b>: %1: %2" +msgstr "<i>%2</i>: %1" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:818 #, kde-format msgctxt "tag-format-pattern <warning> plain" msgid "WARNING: %1" -msgstr "" +msgstr "?????????????????????????????????: %1" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:823 -#, fuzzy, kde-format -#| msgid "<b>Error</b>: %1: %2" +#, kde-format msgctxt "tag-format-pattern <warning> rich" msgid "<b>Warning</b>: %1" -msgstr "<b>?????????????????????</b>: %1: %2" +msgstr "<b>?????????????????????????????????</b>: %1" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:829 -#, fuzzy, kde-format -#| msgid "Redo: %1" +#, kde-format msgctxt "" "tag-format-pattern <warning label=> plain\n" "%1 is the text, %2 is the warning label" msgid "%2: %1" -msgstr "???????????????????????????: %1" +msgstr "%2: %1" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:835 -#, fuzzy, kde-format -#| msgid "<b>Error</b>: %1: %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>?????????????????????</b>: %1: %2" +msgstr "<b>%2</b>: %1" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:842 -#, fuzzy, kde-format -#| msgid "%1%" +#, kde-format msgctxt "tag-format-pattern <link> plain" msgid "%1" -msgstr "%1%" +msgstr "%1" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:847 -#, fuzzy, kde-format -#| msgid " <a href=\"%1\">[Properties]</a>" +#, kde-format msgctxt "tag-format-pattern <link> rich" msgid "<a href=\"%1\">%1</a>" -msgstr " <a href=\"%1\">[?????????????????????????????????]</a>" +msgstr "<a href=\"%1\">%1</a>" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:853 -#, fuzzy, kde-format +#, kde-format msgctxt "" "tag-format-pattern <link url=> plain\n" "%1 is the descriptive text, %2 is the URL" msgid "%1 (%2)" -msgstr "%1 ( %2 )" +msgstr "%1 (%2)" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:859 -#, fuzzy, kde-format -#| msgid " <a href=\"%1\">[Properties]</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\">[?????????????????????????????????]</a>" +msgstr "<a href=\"%2\">%1</a>" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:866 #, kde-format msgctxt "tag-format-pattern <filename> plain" msgid "???%1???" -msgstr "" +msgstr "???%1???" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:871 -#, fuzzy, kde-format -#| msgid "<b>Error</b>: %1: %2" +#, kde-format msgctxt "tag-format-pattern <filename> rich" msgid "???<tt>%1</tt>???" -msgstr "<b>?????????????????????</b>: %1: %2" +msgstr "???<tt>%1</tt>???" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:878 -#, fuzzy, kde-format -#| msgid "%1%" +#, kde-format msgctxt "tag-format-pattern <application> plain" msgid "%1" -msgstr "%1%" +msgstr "%1" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:883 -#, fuzzy, kde-format -#| msgid "%1%" +#, kde-format msgctxt "tag-format-pattern <application> rich" msgid "%1" -msgstr "%1%" +msgstr "%1" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:890 -#, fuzzy, kde-format -#| msgid "%1%" +#, kde-format msgctxt "tag-format-pattern <command> plain" msgid "%1" -msgstr "%1%" +msgstr "%1" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:895 -#, fuzzy, kde-format -#| msgid "<b>Error</b>: %1: %2" +#, kde-format msgctxt "tag-format-pattern <command> rich" msgid "<tt>%1</tt>" -msgstr "<b>?????????????????????</b>: %1: %2" +msgstr "<tt>%1</tt>" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:901 -#, fuzzy, kde-format +#, kde-format msgctxt "" "tag-format-pattern <command section=> plain\n" "%1 is the command name, %2 is its man section" msgid "%1(%2)" -msgstr "%1 ( %2 )" +msgstr "%1(%2)" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:907 -#, fuzzy, kde-format -#| msgid "<b>Error</b>: %1: %2" +#, kde-format msgctxt "" "tag-format-pattern <command section=> rich\n" "%1 is the command name, %2 is its man section" msgid "<tt>%1(%2)</tt>" -msgstr "<b>?????????????????????</b>: %1: %2" +msgstr "<tt>%1(%2)</tt>" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:914 #, kde-format msgctxt "tag-format-pattern <resource> plain" msgid "???%1???" -msgstr "" +msgstr "???%1???" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:919 #, kde-format msgctxt "tag-format-pattern <resource> rich" msgid "???%1???" -msgstr "" +msgstr "???%1???" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:926 #, kde-format msgctxt "tag-format-pattern <icode> plain" msgid "???%1???" -msgstr "" +msgstr "???%1???" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:931 -#, fuzzy, kde-format -#| msgid "<b>Error</b>: %1: %2" +#, kde-format msgctxt "tag-format-pattern <icode> rich" msgid "<tt>%1</tt>" -msgstr "<b>?????????????????????</b>: %1: %2" +msgstr "<tt>%1</tt>" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:938 @@ -683,105 +569,99 @@ "\n" "%1\n" msgstr "" +"\n" +"%1\n" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:943 -#, fuzzy, kde-format -#| msgid "<b>Error</b>: %1: %2" +#, kde-format msgctxt "tag-format-pattern <bcode> rich" msgid "<pre>%1</pre>" -msgstr "<b>?????????????????????</b>: %1: %2" +msgstr "<pre>%1</pre>" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:950 -#, fuzzy, kde-format -#| msgid "%1%" +#, kde-format msgctxt "tag-format-pattern <shortcut> plain" msgid "%1" -msgstr "%1%" +msgstr "%1" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:955 -#, fuzzy, kde-format -#| msgid "<b>Error</b>: %1: %2" +#, kde-format msgctxt "tag-format-pattern <shortcut> rich" msgid "<b>%1</b>" -msgstr "<b>?????????????????????</b>: %1: %2" +msgstr "<b>%1</b>" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:962 #, kde-format msgctxt "tag-format-pattern <interface> plain" msgid "|%1|" -msgstr "" +msgstr "|%1|" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:967 -#, fuzzy, kde-format -#| msgid "<b>Error</b>: %1: %2" +#, kde-format msgctxt "tag-format-pattern <interface> rich" msgid "<i>%1</i>" -msgstr "<b>?????????????????????</b>: %1: %2" +msgstr "<i>%1</i>" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:974 #, kde-format msgctxt "tag-format-pattern <emphasis> plain" msgid "*%1*" -msgstr "" +msgstr "*%1*" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:979 -#, fuzzy, kde-format -#| msgid "<b>Error</b>: %1: %2" +#, kde-format msgctxt "tag-format-pattern <emphasis> rich" msgid "<i>%1</i>" -msgstr "<b>?????????????????????</b>: %1: %2" +msgstr "<i>%1</i>" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:984 #, kde-format msgctxt "tag-format-pattern <emphasis-strong> plain" msgid "**%1**" -msgstr "" +msgstr "**%1**" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:989 -#, fuzzy, kde-format -#| msgid "<b>Error</b>: %1: %2" +#, kde-format msgctxt "tag-format-pattern <emphasis-strong> rich" msgid "<b>%1</b>" -msgstr "<b>?????????????????????</b>: %1: %2" +msgstr "<b>%1</b>" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:996 #, kde-format msgctxt "tag-format-pattern <placeholder> plain" msgid "<%1>" -msgstr "" +msgstr "<%1>" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:1001 -#, fuzzy, kde-format -#| msgid "<b>Error</b>: %1: %2" +#, kde-format msgctxt "tag-format-pattern <placeholder> rich" msgid "<<i>%1</i>>" -msgstr "<b>?????????????????????</b>: %1: %2" +msgstr "<<i>%1</i>>" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:1008 #, kde-format msgctxt "tag-format-pattern <email> plain" msgid "<%1>" -msgstr "" +msgstr "<%1>" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:1013 -#, fuzzy, kde-format -#| msgid "Please report bugs to <a href=\"mailto:%1\";>%2</a>.\n" +#, kde-format msgctxt "tag-format-pattern <email> rich" msgid "<<a href=\"mailto:%1\";>%1</a>>" -msgstr "??????????????????????????? ?????????????????????????????????????????? ?????????????????????????????? <a href=\"mailto:%1\";>%2</a>.\n" +msgstr "<<a href=\"mailto:%1\";>%1</a>>" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:1019 @@ -790,60 +670,55 @@ "tag-format-pattern <email address=> plain\n" "%1 is name, %2 is address" msgid "%1 <%2>" -msgstr "" +msgstr "%1 <%2>" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:1025 -#, fuzzy, kde-format -#| msgid "Please report bugs to <a href=\"mailto:%1\";>%2</a>.\n" +#, kde-format msgctxt "" "tag-format-pattern <email address=> rich\n" "%1 is name, %2 is address" msgid "<a href=\"mailto:%2\";>%1</a>" -msgstr "??????????????????????????? ?????????????????????????????????????????? ?????????????????????????????? <a href=\"mailto:%1\";>%2</a>.\n" +msgstr "<a href=\"mailto:%2\";>%1</a>" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:1032 -#, fuzzy, kde-format -#| msgid "%1%" +#, kde-format msgctxt "tag-format-pattern <envar> plain" msgid "$%1" -msgstr "%1%" +msgstr "$%1" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:1037 -#, fuzzy, kde-format -#| msgid "<b>Error</b>: %1: %2" +#, kde-format msgctxt "tag-format-pattern <envar> rich" msgid "<tt>$%1</tt>" -msgstr "<b>?????????????????????</b>: %1: %2" +msgstr "<tt>$%1</tt>" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:1044 -#, fuzzy, kde-format +#, kde-format msgctxt "tag-format-pattern <message> plain" msgid "/%1/" -msgstr "(%1/??)" +msgstr "/%1/" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:1049 -#, fuzzy, kde-format -#| msgid "<b>Error</b>: %1: %2" +#, kde-format msgctxt "tag-format-pattern <message> rich" msgid "<i>%1</i>" -msgstr "<b>?????????????????????</b>: %1: %2" +msgstr "<i>%1</i>" #. i18n: KUIT pattern, see the comment to the first of these entries above. #: kuitmarkup.cpp:1056 -#, fuzzy, kde-format -#| 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:1061 #, 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.97.0/po/zh_CN/ki18n5.po new/ki18n-5.98.0/po/zh_CN/ki18n5.po --- old/ki18n-5.97.0/po/zh_CN/ki18n5.po 2022-08-07 15:25:02.000000000 +0200 +++ new/ki18n-5.98.0/po/zh_CN/ki18n5.po 2022-09-05 14:07:35.000000000 +0200 @@ -3,7 +3,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2022-06-20 00:41+0000\n" -"PO-Revision-Date: 2022-07-30 15:54\n" +"PO-Revision-Date: 2022-08-20 14:17\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-5.97.0/src/i18n/klocalizedcontext.cpp new/ki18n-5.98.0/src/i18n/klocalizedcontext.cpp --- old/ki18n-5.97.0/src/i18n/klocalizedcontext.cpp 2022-08-07 15:25:02.000000000 +0200 +++ new/ki18n-5.98.0/src/i18n/klocalizedcontext.cpp 2022-09-05 14:07:35.000000000 +0200 @@ -523,7 +523,7 @@ return QString(); } - KLocalizedString trMessage = ki18ndc(domain.toUtf8().constData(), context.toUtf8().constData(), message.toUtf8().constData()); + KLocalizedString trMessage = kxi18ndc(domain.toUtf8().constData(), context.toUtf8().constData(), message.toUtf8().constData()); resolveMessage(trMessage, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10); @@ -549,7 +549,7 @@ return QString(); } - KLocalizedString trMessage = ki18ndp(domain.toUtf8().constData(), singular.toUtf8().constData(), plural.toUtf8().constData()); + KLocalizedString trMessage = kxi18ndp(domain.toUtf8().constData(), singular.toUtf8().constData(), plural.toUtf8().constData()); resolvePlural(trMessage, param1); resolveMessage(trMessage, param2, param3, param4, param5, param6, param7, param8, param9, param10);
