Hello community, here is the log from the commit of package ki18n for openSUSE:Factory checked in at 2018-07-21 10:13:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ki18n (Old) and /work/SRC/openSUSE:Factory/.ki18n.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ki18n" Sat Jul 21 10:13:07 2018 rev:59 rq:623285 version:5.48.0 Changes: -------- --- /work/SRC/openSUSE:Factory/ki18n/ki18n.changes 2018-06-22 13:20:25.031838228 +0200 +++ /work/SRC/openSUSE:Factory/.ki18n.new/ki18n.changes 2018-07-21 10:13:09.759129633 +0200 @@ -1,0 +2,13 @@ +Mon Jul 16 04:37:40 UTC 2018 - lbeltr...@kde.org + +- Update to 5.48.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.48.0.php +- Changes since 5.47.0: + * In cmake macro file use CMAKE_CURRENT_LIST_DIR consequently instead of mixed use with KF5I18n_DIR + * KF5I18NMacros: Don't install an empty dir when no po files exist + * Add missing override + * Use override + +------------------------------------------------------------------- Old: ---- ki18n-5.47.0.tar.xz New: ---- ki18n-5.48.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ki18n.spec ++++++ --- /var/tmp/diff_new_pack.6sNL81/_old 2018-07-21 10:13:10.347129496 +0200 +++ /var/tmp/diff_new_pack.6sNL81/_new 2018-07-21 10:13:10.351129495 +0200 @@ -18,13 +18,13 @@ %bcond_without lang %define lname libKF5I18n5 -%define _tar_path 5.47 +%define _tar_path 5.48 # 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}')} +%{!?_kf5_bugfix_version: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} Name: ki18n -Version: 5.47.0 +Version: 5.48.0 Release: 0 BuildRequires: cmake >= 3.0 BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version} ++++++ ki18n-5.47.0.tar.xz -> ki18n-5.48.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-5.47.0/CMakeLists.txt new/ki18n-5.48.0/CMakeLists.txt --- old/ki18n-5.47.0/CMakeLists.txt 2018-06-02 19:56:45.000000000 +0200 +++ new/ki18n-5.48.0/CMakeLists.txt 2018-07-08 00:31:00.000000000 +0200 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.47.0") # handled by release scripts +set(KF5_VERSION "5.48.0") # handled by release scripts project(KI18n VERSION ${KF5_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 5.47.0 NO_MODULE) +find_package(ECM 5.48.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) @@ -53,6 +53,8 @@ find_package(PythonInterp REQUIRED) configure_file(cmake/KF5I18NMacros.cmake.in ${KI18n_BINARY_DIR}/cmake/KF5I18NMacros.cmake @ONLY) # Needed to build the ki18n translations and run the autotests +file(COPY ${KI18n_SOURCE_DIR}/cmake/build-pofiles.cmake DESTINATION ${KI18n_BINARY_DIR}/cmake) +file(COPY ${KI18n_SOURCE_DIR}/cmake/build-tsfiles.cmake DESTINATION ${KI18n_BINARY_DIR}/cmake) file(COPY ${KI18n_SOURCE_DIR}/cmake/ts-pmap-compile.py DESTINATION ${KI18n_BINARY_DIR}/cmake) file(COPY ${KI18n_SOURCE_DIR}/cmake/kf5i18nuic.cmake DESTINATION ${KI18n_BINARY_DIR}/cmake) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-5.47.0/cmake/KF5I18NMacros.cmake.in new/ki18n-5.48.0/cmake/KF5I18NMacros.cmake.in --- old/ki18n-5.47.0/cmake/KF5I18NMacros.cmake.in 2018-06-02 19:56:45.000000000 +0200 +++ new/ki18n-5.48.0/cmake/KF5I18NMacros.cmake.in 2018-07-08 00:31:00.000000000 +0200 @@ -31,6 +31,8 @@ set(_ki18n_pmap_compile_script ${CMAKE_CURRENT_LIST_DIR}/ts-pmap-compile.py) set(_ki18n_uic_script ${CMAKE_CURRENT_LIST_DIR}/kf5i18nuic.cmake) +set(_ki18n_build_pofiles_script ${CMAKE_CURRENT_LIST_DIR}/build-pofiles.cmake) +set(_ki18n_build_tsfiles_script ${CMAKE_CURRENT_LIST_DIR}/build-tsfiles.cmake) #create the implementation files from the ui files and add them to the list of sources #usage: KI18N_WRAP_UI(foo_SRCS ${ui_files}) @@ -105,35 +107,39 @@ get_filename_component(absolute_podir ${podir} ABSOLUTE) string(MD5 pathmd5 ${absolute_podir}) - add_custom_target(pofiles-${pathmd5} ALL - COMMENT "Generating mo..." - COMMAND ${CMAKE_COMMAND} - -DGETTEXT_MSGFMT_EXECUTABLE=${GETTEXT_MSGFMT_EXECUTABLE} - -DCOPY_TO=${CMAKE_CURRENT_BINARY_DIR}/${dirname} - -DPO_DIR=${absolute_podir} - -P ${KF5I18n_DIR}/build-pofiles.cmake - ) - add_custom_target(tsfiles-${pathmd5} ALL - COMMENT "Generating ts..." - COMMAND ${CMAKE_COMMAND} - -DPYTHON_EXECUTABLE=${KI18N_PYTHON_EXECUTABLE} - -D_ki18n_pmap_compile_script=${_ki18n_pmap_compile_script} - -DCOPY_TO=${CMAKE_CURRENT_BINARY_DIR}/${dirname} - -DPO_DIR=${absolute_podir} - -P ${KF5I18n_DIR}/build-tsfiles.cmake - ) + # Nothing to do if there's no podir and it would create an empty + # LOCALE_INSTALL_DIR in that case. + if (EXISTS "${absolute_podir}" AND IS_DIRECTORY "${absolute_podir}") + add_custom_target(pofiles-${pathmd5} ALL + COMMENT "Generating mo..." + COMMAND ${CMAKE_COMMAND} + -DGETTEXT_MSGFMT_EXECUTABLE=${GETTEXT_MSGFMT_EXECUTABLE} + -DCOPY_TO=${CMAKE_CURRENT_BINARY_DIR}/${dirname} + -DPO_DIR=${absolute_podir} + -P ${_ki18n_build_pofiles_script} + ) + add_custom_target(tsfiles-${pathmd5} ALL + COMMENT "Generating ts..." + COMMAND ${CMAKE_COMMAND} + -DPYTHON_EXECUTABLE=${KI18N_PYTHON_EXECUTABLE} + -D_ki18n_pmap_compile_script=${_ki18n_pmap_compile_script} + -DCOPY_TO=${CMAKE_CURRENT_BINARY_DIR}/${dirname} + -DPO_DIR=${absolute_podir} + -P ${_ki18n_build_tsfiles_script} + ) + + if (NOT TARGET pofiles) + add_custom_target(pofiles) + endif() + if (NOT TARGET tsfiles) + add_custom_target(tsfiles) + endif() + add_dependencies(pofiles pofiles-${pathmd5}) + add_dependencies(tsfiles tsfiles-${pathmd5}) - if (NOT TARGET pofiles) - add_custom_target(pofiles) + file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${dirname}) + install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${dirname} DESTINATION ${destname}) endif() - if (NOT TARGET tsfiles) - add_custom_target(tsfiles) - endif() - add_dependencies(pofiles pofiles-${pathmd5}) - add_dependencies(tsfiles tsfiles-${pathmd5}) - - file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${dirname}) - install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${dirname} DESTINATION ${destname}) endfunction() #install the scripts for a given language in the target folder diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-5.47.0/po/nn/scripts/ki18n5/skjermelement.pmap new/ki18n-5.48.0/po/nn/scripts/ki18n5/skjermelement.pmap --- old/ki18n-5.47.0/po/nn/scripts/ki18n5/skjermelement.pmap 2018-06-02 19:56:45.000000000 +0200 +++ new/ki18n-5.48.0/po/nn/scripts/ki18n5/skjermelement.pmap 2018-07-08 00:31:00.000000000 +0200 @@ -206,3 +206,4 @@ =|Minimize all Windows|Minimer alle vindauge|pron=denne|bunden=skrivebordsvisaren|| =|Weather Forecast|Vêrmelding|pron=denne|bunden=vêrmeldinga|| =|Widgets gallery|Elementgalleri|pron=dette|bunden=elementgalleriet|| +=|Grouping Plasmoid|Grupperingselement|pron=dette|bunden=grupperingselementet|| diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-5.47.0/po/se/ki18n5.po new/ki18n-5.48.0/po/se/ki18n5.po --- old/ki18n-5.47.0/po/se/ki18n5.po 2018-06-02 19:56:45.000000000 +0200 +++ new/ki18n-5.48.0/po/se/ki18n5.po 2018-07-08 00:31:00.000000000 +0200 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2016-11-19 20:11+0100\n" +"POT-Creation-Date: 2018-04-29 03:26+0200\n" "PO-Revision-Date: 2012-05-30 23:19+0200\n" "Last-Translator: Børre Gaup <boe...@skolelinux.no>\n" "Language-Team: Northern Sami <i18n-...@lister.ping.uio.no>\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:300 +#: kuitmarkup.cpp:309 #, 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:304 +#: kuitmarkup.cpp:313 #, 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:308 +#: kuitmarkup.cpp:317 #, 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:312 +#: kuitmarkup.cpp:321 #, kde-format msgctxt "gui-path-delimiter/rich" msgid "→" msgstr " → " -#: kuitmarkup.cpp:325 +#: kuitmarkup.cpp:334 #, kde-format msgctxt "keyboard-key-name" msgid "Alt" msgstr "Alt" -#: kuitmarkup.cpp:326 +#: kuitmarkup.cpp:335 #, kde-format msgctxt "keyboard-key-name" msgid "AltGr" msgstr "AltGr" -#: kuitmarkup.cpp:327 +#: kuitmarkup.cpp:336 #, kde-format msgctxt "keyboard-key-name" msgid "Backspace" msgstr "Divvunboallu" -#: kuitmarkup.cpp:328 +#: kuitmarkup.cpp:337 #, kde-format msgctxt "keyboard-key-name" msgid "CapsLock" msgstr "Caps Lock" -#: kuitmarkup.cpp:329 +#: kuitmarkup.cpp:338 #, kde-format msgctxt "keyboard-key-name" msgid "Control" msgstr "Ctrl" -#: kuitmarkup.cpp:330 +#: kuitmarkup.cpp:339 #, kde-format msgctxt "keyboard-key-name" msgid "Ctrl" msgstr "Ctrl" -#: kuitmarkup.cpp:331 +#: kuitmarkup.cpp:340 #, kde-format msgctxt "keyboard-key-name" msgid "Del" msgstr "Sihko" -#: kuitmarkup.cpp:332 +#: kuitmarkup.cpp:341 #, kde-format msgctxt "keyboard-key-name" msgid "Delete" msgstr "Sihko" -#: kuitmarkup.cpp:333 +#: kuitmarkup.cpp:342 #, kde-format msgctxt "keyboard-key-name" msgid "Down" msgstr "Vulos" -#: kuitmarkup.cpp:334 +#: kuitmarkup.cpp:343 #, kde-format msgctxt "keyboard-key-name" msgid "End" msgstr "Loahppa" -#: kuitmarkup.cpp:335 +#: kuitmarkup.cpp:344 #, kde-format msgctxt "keyboard-key-name" msgid "Enter" msgstr "Enter" -#: kuitmarkup.cpp:336 +#: kuitmarkup.cpp:345 #, kde-format msgctxt "keyboard-key-name" msgid "Esc" msgstr "Escape" # unreviewed-context -#: kuitmarkup.cpp:337 +#: kuitmarkup.cpp:346 #, kde-format msgctxt "keyboard-key-name" msgid "Escape" msgstr "Escape" -#: kuitmarkup.cpp:338 +#: kuitmarkup.cpp:347 #, kde-format msgctxt "keyboard-key-name" msgid "Home" msgstr "Ruoktot" -#: kuitmarkup.cpp:339 +#: kuitmarkup.cpp:348 #, kde-format msgctxt "keyboard-key-name" msgid "Hyper" msgstr "Hyper" -#: kuitmarkup.cpp:340 +#: kuitmarkup.cpp:349 #, kde-format msgctxt "keyboard-key-name" msgid "Ins" msgstr "Buhtte" -#: kuitmarkup.cpp:341 +#: kuitmarkup.cpp:350 #, kde-format msgctxt "keyboard-key-name" msgid "Insert" msgstr "Bija sisa" # unreviewed-context -#: kuitmarkup.cpp:342 +#: kuitmarkup.cpp:351 #, kde-format msgctxt "keyboard-key-name" msgid "Left" msgstr "Gurutbealde" -#: kuitmarkup.cpp:343 +#: kuitmarkup.cpp:352 #, kde-format msgctxt "keyboard-key-name" msgid "Menu" msgstr "Fállu" -#: kuitmarkup.cpp:344 +#: kuitmarkup.cpp:353 #, kde-format msgctxt "keyboard-key-name" msgid "Meta" msgstr "Meta" -#: kuitmarkup.cpp:345 +#: kuitmarkup.cpp:354 #, kde-format msgctxt "keyboard-key-name" msgid "NumLock" msgstr "Num Lock" -#: kuitmarkup.cpp:346 +#: kuitmarkup.cpp:355 #, kde-format msgctxt "keyboard-key-name" msgid "PageDown" msgstr "Page Down" -#: kuitmarkup.cpp:347 +#: kuitmarkup.cpp:356 #, kde-format msgctxt "keyboard-key-name" msgid "PageUp" msgstr "Page Up" -#: kuitmarkup.cpp:348 +#: kuitmarkup.cpp:357 #, kde-format msgctxt "keyboard-key-name" msgid "PgDown" msgstr "Siidu vulos" -#: kuitmarkup.cpp:349 +#: kuitmarkup.cpp:358 #, kde-format msgctxt "keyboard-key-name" msgid "PgUp" msgstr "Siidu bajás" -#: kuitmarkup.cpp:350 +#: kuitmarkup.cpp:359 #, kde-format msgctxt "keyboard-key-name" msgid "PauseBreak" msgstr "Botke" -#: kuitmarkup.cpp:351 +#: kuitmarkup.cpp:360 #, kde-format msgctxt "keyboard-key-name" msgid "PrintScreen" msgstr "PrintScreen" -#: kuitmarkup.cpp:352 +#: kuitmarkup.cpp:361 #, kde-format msgctxt "keyboard-key-name" msgid "PrtScr" msgstr "PrtScr" -#: kuitmarkup.cpp:353 +#: kuitmarkup.cpp:362 #, kde-format msgctxt "keyboard-key-name" msgid "Return" msgstr "Return" # unreviewed-context -#: kuitmarkup.cpp:354 +#: kuitmarkup.cpp:363 #, kde-format msgctxt "keyboard-key-name" msgid "Right" msgstr "Olgešbealde" -#: kuitmarkup.cpp:355 +#: kuitmarkup.cpp:364 #, kde-format msgctxt "keyboard-key-name" msgid "ScrollLock" msgstr "Scroll Lock" -#: kuitmarkup.cpp:356 +#: kuitmarkup.cpp:365 #, kde-format msgctxt "keyboard-key-name" msgid "Shift" msgstr "Shift" -#: kuitmarkup.cpp:357 +#: kuitmarkup.cpp:366 #, kde-format msgctxt "keyboard-key-name" msgid "Space" msgstr "Gaskamearka" -#: kuitmarkup.cpp:358 +#: kuitmarkup.cpp:367 #, kde-format msgctxt "keyboard-key-name" msgid "Super" msgstr "Super" -#: kuitmarkup.cpp:359 +#: kuitmarkup.cpp:368 #, kde-format msgctxt "keyboard-key-name" msgid "SysReq" msgstr "SysReq" -#: kuitmarkup.cpp:360 +#: kuitmarkup.cpp:369 #, kde-format msgctxt "keyboard-key-name" msgid "Tab" msgstr "Tab" # unreviewed-context -#: kuitmarkup.cpp:361 +#: kuitmarkup.cpp:370 #, kde-format msgctxt "keyboard-key-name" msgid "Up" msgstr "Bajás" -#: kuitmarkup.cpp:362 +#: kuitmarkup.cpp:371 #, kde-format msgctxt "keyboard-key-name" msgid "Win" msgstr "Win" -#: kuitmarkup.cpp:363 +#: kuitmarkup.cpp:372 #, kde-format msgctxt "keyboard-key-name" msgid "F1" msgstr "" -#: kuitmarkup.cpp:364 +#: kuitmarkup.cpp:373 #, kde-format msgctxt "keyboard-key-name" msgid "F2" msgstr "" -#: kuitmarkup.cpp:365 +#: kuitmarkup.cpp:374 #, kde-format msgctxt "keyboard-key-name" msgid "F3" msgstr "" -#: kuitmarkup.cpp:366 +#: kuitmarkup.cpp:375 #, kde-format msgctxt "keyboard-key-name" msgid "F4" msgstr "" -#: kuitmarkup.cpp:367 +#: kuitmarkup.cpp:376 #, kde-format msgctxt "keyboard-key-name" msgid "F5" msgstr "" -#: kuitmarkup.cpp:368 +#: kuitmarkup.cpp:377 #, kde-format msgctxt "keyboard-key-name" msgid "F6" msgstr "" -#: kuitmarkup.cpp:369 +#: kuitmarkup.cpp:378 #, kde-format msgctxt "keyboard-key-name" msgid "F7" msgstr "" -#: kuitmarkup.cpp:370 +#: kuitmarkup.cpp:379 #, kde-format msgctxt "keyboard-key-name" msgid "F8" msgstr "" -#: kuitmarkup.cpp:371 +#: kuitmarkup.cpp:380 #, kde-format msgctxt "keyboard-key-name" msgid "F9" msgstr "" -#: kuitmarkup.cpp:372 +#: kuitmarkup.cpp:381 #, kde-format msgctxt "keyboard-key-name" msgid "F10" msgstr "" -#: kuitmarkup.cpp:373 +#: kuitmarkup.cpp:382 #, kde-format msgctxt "keyboard-key-name" msgid "F11" msgstr "" -#: kuitmarkup.cpp:374 +#: kuitmarkup.cpp:383 #, 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:731 +#: kuitmarkup.cpp:739 #, 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:736 +#: kuitmarkup.cpp:744 #, 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:744 +#: kuitmarkup.cpp:752 #, 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:749 +#: kuitmarkup.cpp:757 #, 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:757 +#: kuitmarkup.cpp:765 #, 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:762 +#: kuitmarkup.cpp:770 #, 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:770 +#: kuitmarkup.cpp:778 #, 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:775 +#: kuitmarkup.cpp:783 #, 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:783 +#: kuitmarkup.cpp:791 #, 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:788 +#: kuitmarkup.cpp:796 #, 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:795 +#: kuitmarkup.cpp:803 #, 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:800 +#: kuitmarkup.cpp:808 #, 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:806 +#: kuitmarkup.cpp:814 #, 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:812 +#: kuitmarkup.cpp:820 #, 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:819 +#: kuitmarkup.cpp:827 #, 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:824 +#: kuitmarkup.cpp:832 #, 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:830 +#: kuitmarkup.cpp:838 #, 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:836 +#: kuitmarkup.cpp:844 #, 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:843 +#: kuitmarkup.cpp:851 #, 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:848 +#: kuitmarkup.cpp:856 #, 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:854 +#: kuitmarkup.cpp:862 #, 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:860 +#: kuitmarkup.cpp:868 #, 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:867 +#: kuitmarkup.cpp:875 #, 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:872 +#: kuitmarkup.cpp:880 #, 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:879 +#: kuitmarkup.cpp:887 #, 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:884 +#: kuitmarkup.cpp:892 #, 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:891 +#: kuitmarkup.cpp:899 #, 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:896 +#: kuitmarkup.cpp:904 #, 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:902 +#: kuitmarkup.cpp:910 #, 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:908 +#: kuitmarkup.cpp:916 #, 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:915 +#: kuitmarkup.cpp:923 #, 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:920 +#: kuitmarkup.cpp:928 #, 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:927 +#: kuitmarkup.cpp:935 #, 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:932 +#: kuitmarkup.cpp:940 #, 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:939 +#: kuitmarkup.cpp:947 #, 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:944 +#: kuitmarkup.cpp:952 #, 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:951 +#: kuitmarkup.cpp:959 #, 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:956 +#: kuitmarkup.cpp:964 #, 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:963 +#: kuitmarkup.cpp:971 #, 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:968 +#: kuitmarkup.cpp:976 #, 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:975 +#: kuitmarkup.cpp:983 #, 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:980 +#: kuitmarkup.cpp:988 #, 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:985 +#: kuitmarkup.cpp:993 #, 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:990 +#: kuitmarkup.cpp:998 #, 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:997 +#: kuitmarkup.cpp:1005 #, 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:1002 +#: kuitmarkup.cpp:1010 #, 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:1009 +#: kuitmarkup.cpp:1017 #, 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:1014 +#: kuitmarkup.cpp:1022 #, 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:1020 +#: kuitmarkup.cpp:1028 #, 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:1026 +#: kuitmarkup.cpp:1034 #, 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:1033 +#: kuitmarkup.cpp:1041 #, 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:1038 +#: kuitmarkup.cpp:1046 #, 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:1045 +#: kuitmarkup.cpp:1053 #, 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:1050 +#: kuitmarkup.cpp:1058 #, 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:1057 +#: kuitmarkup.cpp:1065 #, 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:1062 +#: kuitmarkup.cpp:1070 #, kde-format msgctxt "tag-format-pattern <nl> rich" msgid "%1<br/>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-5.47.0/po/zh_CN/ki18n5.po new/ki18n-5.48.0/po/zh_CN/ki18n5.po --- old/ki18n-5.47.0/po/zh_CN/ki18n5.po 2018-06-02 19:56:45.000000000 +0200 +++ new/ki18n-5.48.0/po/zh_CN/ki18n5.po 2018-07-08 00:31:00.000000000 +0200 @@ -16,7 +16,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2018-04-29 03:26+0200\n" -"PO-Revision-Date: 2018-05-18 06:23-0400\n" +"PO-Revision-Date: 2018-07-03 17:35\n" "Last-Translator: guoyunhebrave <guoyunhebr...@gmail.com>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-5.47.0/src/ktranscript.cpp new/ki18n-5.48.0/src/ktranscript.cpp --- old/ki18n-5.47.0/src/ktranscript.cpp 2018-06-02 19:56:45.000000000 +0200 +++ new/ki18n-5.48.0/src/ktranscript.cpp 2018-07-08 00:31:00.000000000 +0200 @@ -55,7 +55,7 @@ public: KTranscriptImp(); - ~KTranscriptImp(); + ~KTranscriptImp() override; QString eval(const QList<QVariant> &argv, const QString &lang, @@ -68,9 +68,9 @@ const QString &ftrans, QList<QStringList> &mods, QString &error, - bool &fallback) Q_DECL_OVERRIDE; + bool &fallback) override; - QStringList postCalls(const QString &lang) Q_DECL_OVERRIDE; + QStringList postCalls(const QString &lang) override; // Lexical path of the module for the executing code. QString currentModulePath; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-5.47.0/src/kuitmarkup.cpp new/ki18n-5.48.0/src/kuitmarkup.cpp --- old/ki18n-5.47.0/src/kuitmarkup.cpp 2018-06-02 19:56:45.000000000 +0200 +++ new/ki18n-5.48.0/src/kuitmarkup.cpp 2018-07-08 00:31:00.000000000 +0200 @@ -121,7 +121,7 @@ entityMap = entities; } - QString resolveUndeclaredEntity(const QString &name) Q_DECL_OVERRIDE + QString resolveUndeclaredEntity(const QString &name) override { QString value = entityMap.value(name); // This will return empty string if the entity name is not known,
