diff -Nru ktextwidgets-5.61.0/autotests/krichtextedittest.cpp ktextwidgets-5.62.0/autotests/krichtextedittest.cpp
--- ktextwidgets-5.61.0/autotests/krichtextedittest.cpp 2019-08-03 19:58:46.000000000 +0000
+++ ktextwidgets-5.62.0/autotests/krichtextedittest.cpp 2019-09-07 14:49:53.000000000 +0000
@@ -22,7 +22,6 @@
#include
#include
-#include
#include
#include
#include
diff -Nru ktextwidgets-5.61.0/autotests/ktextedit_unittest.cpp ktextwidgets-5.62.0/autotests/ktextedit_unittest.cpp
--- ktextwidgets-5.61.0/autotests/ktextedit_unittest.cpp 2019-08-03 19:58:46.000000000 +0000
+++ ktextwidgets-5.62.0/autotests/ktextedit_unittest.cpp 2019-09-07 14:49:53.000000000 +0000
@@ -21,7 +21,6 @@
#include
#include
-#include
#include
diff -Nru ktextwidgets-5.61.0/CMakeLists.txt ktextwidgets-5.62.0/CMakeLists.txt
--- ktextwidgets-5.61.0/CMakeLists.txt 2019-08-03 19:58:46.000000000 +0000
+++ ktextwidgets-5.62.0/CMakeLists.txt 2019-09-07 14:49:53.000000000 +0000
@@ -1,12 +1,12 @@
cmake_minimum_required(VERSION 3.5)
-set(KF5_VERSION "5.61.0") # handled by release scripts
-set(KF5_DEP_VERSION "5.61.0") # handled by release scripts
+set(KF5_VERSION "5.62.0") # handled by release scripts
+set(KF5_DEP_VERSION "5.62.0") # handled by release scripts
project(KTextWidgets VERSION ${KF5_VERSION})
# ECM setup
include(FeatureSummary)
-find_package(ECM 5.61.0 NO_MODULE)
+find_package(ECM 5.62.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,9 @@
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)")
+option(BUILD_DESIGNERPLUGIN "Build plugin for Qt Designer" ON)
+add_feature_info(DESIGNERPLUGIN ${BUILD_DESIGNERPLUGIN} "Build plugin for Qt Designer")
+
add_definitions(-DTRANSLATION_DOMAIN=\"ktextwidgets5\")
add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050d00)
if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po")
diff -Nru ktextwidgets-5.61.0/debian/changelog ktextwidgets-5.62.0/debian/changelog
--- ktextwidgets-5.61.0/debian/changelog 2019-08-12 09:44:23.000000000 +0000
+++ ktextwidgets-5.62.0/debian/changelog 2019-09-14 07:08:42.000000000 +0000
@@ -1,3 +1,11 @@
+ktextwidgets (5.62.0-0ubuntu1) eoan; urgency=medium
+
+ * Build depend on qttools5-dev for Qt5UiPlugin.
+ * Install Qt designer plugin in -dev package.
+ * New upstream release (5.62.0)
+
+ -- Rik Mills Sat, 14 Sep 2019 08:08:42 +0100
+
ktextwidgets (5.61.0-0ubuntu1) eoan; urgency=medium
* New upstream release (5.61.0)
diff -Nru ktextwidgets-5.61.0/debian/control ktextwidgets-5.62.0/debian/control
--- ktextwidgets-5.61.0/debian/control 2019-08-12 09:44:23.000000000 +0000
+++ ktextwidgets-5.62.0/debian/control 2019-09-14 07:08:42.000000000 +0000
@@ -6,22 +6,23 @@
Build-Depends: cmake (>= 3.0~),
debhelper (>= 11~),
doxygen,
- extra-cmake-modules (>= 5.61.0~),
+ extra-cmake-modules (>= 5.62.0~),
graphviz,
- libkf5completion-dev (>= 5.61.0~),
- libkf5config-dev (>= 5.61.0~),
- libkf5configwidgets-dev (>= 5.61.0~),
- libkf5i18n-dev (>= 5.61.0~),
- libkf5iconthemes-dev (>= 5.61.0~),
- libkf5itemviews-dev (>= 5.61.0~),
- libkf5service-dev (>= 5.61.0~),
- libkf5sonnet-dev (>= 5.61.0~),
- libkf5widgetsaddons-dev (>= 5.61.0~),
- libkf5windowsystem-dev (>= 5.61.0~),
+ libkf5completion-dev (>= 5.62.0~),
+ libkf5config-dev (>= 5.62.0~),
+ libkf5configwidgets-dev (>= 5.62.0~),
+ libkf5i18n-dev (>= 5.62.0~),
+ libkf5iconthemes-dev (>= 5.62.0~),
+ libkf5itemviews-dev (>= 5.62.0~),
+ libkf5service-dev (>= 5.62.0~),
+ libkf5sonnet-dev (>= 5.62.0~),
+ libkf5widgetsaddons-dev (>= 5.62.0~),
+ libkf5windowsystem-dev (>= 5.62.0~),
libqt5sql5-sqlite,
libqt5texttospeech5-dev,
pkg-kde-tools (>= 0.15.15ubuntu1~),
qtbase5-dev (>= 5.8.0~),
+ qttools5-dev,
qttools5-dev-tools (>= 5.4),
xauth,
xvfb,
@@ -44,15 +45,16 @@
Package: libkf5textwidgets-dev
Architecture: any
Section: libdevel
-Depends: libkf5completion-dev (>= 5.61.0~),
- libkf5configwidgets-dev (>= 5.61.0~),
- libkf5iconthemes-dev (>= 5.61.0~),
- libkf5service-dev (>= 5.61.0~),
- libkf5sonnet-dev (>= 5.61.0~),
+Depends: libkf5completion-dev (>= 5.62.0~),
+ libkf5configwidgets-dev (>= 5.62.0~),
+ libkf5iconthemes-dev (>= 5.62.0~),
+ libkf5service-dev (>= 5.62.0~),
+ libkf5sonnet-dev (>= 5.62.0~),
libkf5textwidgets5 (= ${binary:Version}),
- libkf5windowsystem-dev (>= 5.61.0~),
+ libkf5windowsystem-dev (>= 5.62.0~),
qtbase5-dev (>= 5.8.0~),
${misc:Depends},
+ ${shlibs:Depends},
Recommends: libkf5textwidgets-doc (= ${source:Version})
Description: development files for ktextwidgets
An assortment of text-related widgets.
diff -Nru ktextwidgets-5.61.0/debian/libkf5textwidgets-dev.install ktextwidgets-5.62.0/debian/libkf5textwidgets-dev.install
--- ktextwidgets-5.61.0/debian/libkf5textwidgets-dev.install 2019-08-12 09:44:23.000000000 +0000
+++ ktextwidgets-5.62.0/debian/libkf5textwidgets-dev.install 2019-09-14 07:08:42.000000000 +0000
@@ -3,3 +3,5 @@
usr/lib/*/cmake/KF5TextWidgets/
usr/lib/*/libKF5TextWidgets.so
usr/lib/*/qt5/mkspecs/modules/qt_KTextWidgets.pri
+usr/lib/*/qt5/plugins/designer/ktextwidgets5widgets.so
+usr/lib/*/qt5/plugins/designer/ktextwidgets5widgets.so
diff -Nru ktextwidgets-5.61.0/po/br/ktextwidgets5.po ktextwidgets-5.62.0/po/br/ktextwidgets5.po
--- ktextwidgets-5.61.0/po/br/ktextwidgets5.po 2019-08-03 19:58:46.000000000 +0000
+++ ktextwidgets-5.62.0/po/br/ktextwidgets5.po 2019-09-07 14:49:53.000000000 +0000
@@ -16,7 +16,7 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#: dialogs/klinkdialog.cpp:52
#, fuzzy, kde-format
@@ -51,6 +51,7 @@
msgid "1 match found."
msgid_plural "%1 matches found."
msgstr[0] ""
+msgstr[1] ""
#: findreplace/kfind.cpp:624
#, kde-format
@@ -384,6 +385,7 @@
msgid "1 replacement done."
msgid_plural "%1 replacements done."
msgstr[0] ""
+msgstr[1] ""
#: findreplace/kreplace.cpp:397
#, kde-format
@@ -419,6 +421,7 @@
msgid "but your pattern only defines 1 capture."
msgid_plural "but your pattern only defines %1 captures."
msgstr[0] ""
+msgstr[1] ""
#: findreplace/kreplacedialog.cpp:153
#, kde-format
diff -Nru ktextwidgets-5.61.0/po/id/ktextwidgets5.po ktextwidgets-5.62.0/po/id/ktextwidgets5.po
--- ktextwidgets-5.61.0/po/id/ktextwidgets5.po 2019-08-03 19:58:46.000000000 +0000
+++ ktextwidgets-5.62.0/po/id/ktextwidgets5.po 2019-09-07 14:49:53.000000000 +0000
@@ -9,7 +9,7 @@
"Project-Id-Version: kdelibs4\n"
"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
"POT-Creation-Date: 2019-05-20 02:58+0200\n"
-"PO-Revision-Date: 2019-07-29 10:41+0700\n"
+"PO-Revision-Date: 2019-08-24 17:54+0700\n"
"Last-Translator: Wantoyo \n"
"Language-Team: Indonesian \n"
"Language: id\n"
@@ -37,12 +37,12 @@
#: findreplace/kfind.cpp:60
#, kde-format
msgid "Find Next"
-msgstr "Temukan Berikutnya"
+msgstr "Temukan Selanjutnya"
#: findreplace/kfind.cpp:64
#, kde-format
msgid "Find next occurrence of '%1'?"
-msgstr "Temukan kecocokan berikutnya dari '%1'?"
+msgstr "Temukan kecocokan selanjutnya dari '%1'?"
#: findreplace/kfind.cpp:622 findreplace/kfind.cpp:641
#, kde-format
diff -Nru ktextwidgets-5.61.0/po/ml/ktextwidgets5.po ktextwidgets-5.62.0/po/ml/ktextwidgets5.po
--- ktextwidgets-5.61.0/po/ml/ktextwidgets5.po 2019-08-03 19:58:46.000000000 +0000
+++ ktextwidgets-5.62.0/po/ml/ktextwidgets5.po 2019-09-07 14:49:53.000000000 +0000
@@ -681,7 +681,6 @@
#: widgets/ktextedit.cpp:568
#, fuzzy, kde-format
-#| msgid "Spell Checking"
msgid "Spell Checking Language"
msgstr "അക്ഷരവിന്യാസം പരിശോധിക്കുന്നു"
diff -Nru ktextwidgets-5.61.0/po/tg/ktextwidgets5.po ktextwidgets-5.62.0/po/tg/ktextwidgets5.po
--- ktextwidgets-5.61.0/po/tg/ktextwidgets5.po 2019-08-03 19:58:46.000000000 +0000
+++ ktextwidgets-5.62.0/po/tg/ktextwidgets5.po 2019-09-07 14:49:53.000000000 +0000
@@ -1,31 +1,30 @@
# translation of kdelibs4.po to Tajik Language
+# Copyright (C) 2004, 2002, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# 2004, 2005, 2006, 2007 infoDev, a World Bank organization.
# 2004, 2005, 2006, 2007 Khujand Computer Technologies, Inc.
# 2004, 2005, 2006, 2007 Youth Opportunities, NGO, 2005.
# Roger Kovacs , 2003.
# Thomas Diehl , 2003.
-# Akmal Vatanshoev , 2004.
-# Victor Ibragimov , 2003, 2004, 2005, 2006, 2007, 2008.
-# Copyright (C) 2004, 2002, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# Victor Ibragimov , 2003, 2004, 2005, 2006, 2007, 2008, 2019.
msgid ""
msgstr ""
"Project-Id-Version: kdelibs4\n"
"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
"POT-Creation-Date: 2019-05-20 02:58+0200\n"
-"PO-Revision-Date: 2013-06-04 17:36+0500\n"
+"PO-Revision-Date: 2019-08-21 20:46+0500\n"
"Last-Translator: Victor Ibragimov \n"
-"Language-Team: Tajik Language\n"
+"Language-Team: English \n"
"Language: tg\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Lokalize 19.04.3\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
#: dialogs/klinkdialog.cpp:52
#, kde-format
msgid "Manage Link"
-msgstr "Идораи алоқа"
+msgstr "Идора кардани пайванд"
#: dialogs/klinkdialog.cpp:60
#, kde-format
@@ -35,34 +34,34 @@
#: dialogs/klinkdialog.cpp:63
#, kde-format
msgid "Link URL:"
-msgstr "Пайванди суроға:"
+msgstr "Пайванди нишонии URL:"
#: findreplace/kfind.cpp:60
#, kde-format
msgid "Find Next"
-msgstr "Ҷустуҷӯи дигар"
+msgstr "Ёфтани навбатӣ"
#: findreplace/kfind.cpp:64
#, kde-format
msgid "Find next occurrence of '%1'?"
-msgstr "Найти следующее вхождение «%1»?"
+msgstr "Мавриди навбатии '%1'-ро ёфт мекунед?"
#: findreplace/kfind.cpp:622 findreplace/kfind.cpp:641
#, kde-format
msgid "1 match found."
msgid_plural "%1 matches found."
-msgstr[0] "1 мувофиқот ёфт шуд."
-msgstr[1] "%1 мувофиқот ёфт шуд."
+msgstr[0] "1 мувофиқат ёфт шуд."
+msgstr[1] "%1 мувофиқат ёфт шуд."
#: findreplace/kfind.cpp:624
#, kde-format
msgid "No matches found for '%1'."
-msgstr "Не найдено совпадений для «%1»."
+msgstr "Ягон мувофиқат барои '%1' ёфт нашуд."
#: findreplace/kfind.cpp:643
#, kde-format
msgid "No matches found for '%1'."
-msgstr "Нет совпадений для «%1»."
+msgstr "Ягон мувофиқат барои '%1' ёфт нашуд."
#: findreplace/kfind.cpp:647 findreplace/kreplace.cpp:387
#, kde-format
@@ -72,33 +71,33 @@
#: findreplace/kfind.cpp:649 findreplace/kreplace.cpp:389
#, kde-format
msgid "End of document reached."
-msgstr "То охири ҳуҷҷат расид."
+msgstr "Ба поёни ҳуҷҷат расид."
#: findreplace/kfind.cpp:657
#, kde-format
msgid "Continue from the end?"
-msgstr "Аз охири ҳуҷҷат идома медиҳед?"
+msgstr "Аз поёни ҳуҷҷат идома медиҳед?"
#: findreplace/kfind.cpp:658
#, kde-format
msgid "Continue from the beginning?"
-msgstr "Аз аввалини ҳуҷҷат идома медиҳед?"
+msgstr "Аз аввали ҳуҷҷат идома медиҳед?"
#: findreplace/kfinddialog.cpp:49
#, kde-format
msgid "Find Text"
-msgstr "Ҷустуҷӯи матн"
+msgstr "Матнро ёфтан"
#: findreplace/kfinddialog.cpp:84
#, kde-format
msgctxt "@title:group"
msgid "Find"
-msgstr "Ҷустуҷӯ"
+msgstr "Ёфтан"
#: findreplace/kfinddialog.cpp:87
#, kde-format
msgid "&Text to find:"
-msgstr "&Матн барои ҷустуҷӯ:"
+msgstr "&Матн барои ёфтан:"
#: findreplace/kfinddialog.cpp:91
#, kde-format
@@ -113,47 +112,47 @@
#: findreplace/kfinddialog.cpp:101
#, kde-format
msgid "Replace With"
-msgstr "Ҷойгузорӣ бо"
+msgstr "Ҷойгузин кардан бо"
#: findreplace/kfinddialog.cpp:104
#, kde-format
msgid "Replace&ment text:"
-msgstr "&Ҷойгузории матн:"
+msgstr "&Ҷойгузин кардани матн:"
#: findreplace/kfinddialog.cpp:108
#, kde-format
msgid "Use p&laceholders"
-msgstr "&Истифодаи ҷойгоҳ"
+msgstr "Истифодаи &пуркунандаҳои фазо"
#: findreplace/kfinddialog.cpp:109
#, kde-format
msgid "Insert Place&holder"
-msgstr "Вориди ҷой&гоҳ"
+msgstr "&Дар кардани пуркунандаи фазо"
#: findreplace/kfinddialog.cpp:118
#, kde-format
msgid "Options"
-msgstr "Параметрҳо"
+msgstr "Имконот"
#: findreplace/kfinddialog.cpp:121
#, kde-format
msgid "C&ase sensitive"
-msgstr "С &учётом регистра"
+msgstr "&Бо дарназардошти ҳарфҳои хурду калон"
#: findreplace/kfinddialog.cpp:122
#, kde-format
msgid "&Whole words only"
-msgstr "&Танҳо калимаҳои пур"
+msgstr "&Танҳо калимаҳои пурhf"
#: findreplace/kfinddialog.cpp:123
#, kde-format
msgid "From c&ursor"
-msgstr "&Аз рӯйи курсор"
+msgstr "&Аз рӯйи нишондиҳандаи муш"
#: findreplace/kfinddialog.cpp:124
#, kde-format
msgid "Find &backwards"
-msgstr "Ҷустуҷӯи &ақиб"
+msgstr "Ҷустуҷӯ &ба ақиб"
#: findreplace/kfinddialog.cpp:125
#, kde-format
@@ -163,17 +162,17 @@
#: findreplace/kfinddialog.cpp:132
#, kde-format
msgid "&Prompt on replace"
-msgstr "&Пурсиш барои ҷойгузорӣ"
+msgstr "&Ба ёд овардан ҳангоми ҷойгузинӣ"
#: findreplace/kfinddialog.cpp:199
#, kde-format
msgid "&Replace"
-msgstr "&Ҷойгузорӣ"
+msgstr "&Ҷойгузин кардан"
#: findreplace/kfinddialog.cpp:200
#, kde-format
msgid "Start replace"
-msgstr "Ҷойгузорӣ кунед"
+msgstr "Оғози ҷойгузинӣ"
#: findreplace/kfinddialog.cpp:201
#, kde-format
@@ -182,19 +181,19 @@
"searched for within the document and any occurrence is replaced with the "
"replacement text."
msgstr ""
-"Если вы нажмёте копку Заменить, будет произведён поиск введённого "
-"вами выражения, а затем замена каждого из найденных совпадений на текст "
-"замены "
+"Агар шумо тугмаи Ҷойгузин кардан-ро пахш кунед, матни воридшудаи "
+"мазкур дар дохили ҳуҷҷат ҷустуҷӯ карда мешавад ва ягон мутобиқати ёфтшуда бо "
+"матни пешниҳодшуда ҷойгузин карда мешавад."
#: findreplace/kfinddialog.cpp:205
#, kde-format
msgid "&Find"
-msgstr "&Ҷустуҷӯ"
+msgstr "&Ёфтан"
#: findreplace/kfinddialog.cpp:206
#, kde-format
msgid "Start searching"
-msgstr "Ҷустуҷӯӣ кунед"
+msgstr "Оғози ҷустуҷӯ"
#: findreplace/kfinddialog.cpp:207
#, kde-format
@@ -202,31 +201,33 @@
"If you press the Find button, the text you entered above is "
"searched for within the document."
msgstr ""
-"Если вы нажмёте кнопку Найти, будет выполнен поиск введённого "
-"вами текста по всему документу."
+"Агар шумо тугмаи Ёфтан-ро пахш кунед, матни воридшудаи мазкур дар "
+"дохили ҳуҷҷат ҷустуҷӯ карда мешавад."
#: findreplace/kfinddialog.cpp:213
#, kde-format
msgid ""
"Enter a pattern to search for, or select a previous pattern from the list."
-msgstr "Введите шаблон для поиска, или выберите предыдущий шаблон из списка."
+msgstr ""
+"Намунаеро барои ҷустуҷӯ ворид кунед ё ин ки намунаи пешакиро аз рӯйхат "
+"интихоб намоед."
#: findreplace/kfinddialog.cpp:216
#, kde-format
msgid "If enabled, search for a regular expression."
-msgstr "Агар фаъол аст, ибораҳои оддӣ ҷустуҷӯ шавед."
+msgstr "Агар фаъол бошад, ибораҳои оддӣ ҷустуҷӯ мешаванд."
#: findreplace/kfinddialog.cpp:218
#, kde-format
msgid "Click here to edit your regular expression using a graphical editor."
msgstr ""
-"Нажмите, чтобы изменить ваше регулярное выражение при помощи графического "
-"редактора."
+"Барои таҳрир кардани ибораҳои оддии худ ба воситаи муҳаррири тасвирӣ, инҷо "
+"зер кунед."
#: findreplace/kfinddialog.cpp:220
#, kde-format
msgid "Enter a replacement string, or select a previous one from the list."
-msgstr "Введите строку для замены, или выберите предыдущую из списка."
+msgstr "Сатри ҷойгузиниро ворид кунед ё ин ки якеро аз рӯйхат интихоб намоед."
#: findreplace/kfinddialog.cpp:222
#, kde-format
@@ -237,33 +238,33 @@
"literal \\N
in your replacement, put an extra backslash "
"in front of it, like \\\\N
.
"
msgstr ""
-"Если установлен флажок, любое вхождение вида \\N
, "
-"где N
— целое число, будет заменено N-ым захватом "
-"(компонентом найденной строки; компоненты обозначаются в регулярном "
-"выражении круглыми скобками).Для того, чтобы последовательность "
-"\\N
не интерпретировалась (включалась в замены буквально), "
-"поместите перед ней экранированную обратную косую черту: \\\\N"
-"code>.
"
+"Агар фаъол бошад, ягон мувофиқати \\N
, дар ҳар "
+"куҷое, ки N
адади бутун бошад, бо фарогирии марбут "
+"(\"зерсатри туфайлӣ\") аз рӯи намуна ҷойгузин карда мешавад. Барои илова "
+"кардани \\N
-и ҳарфӣ ба ҷойгузинии худ, аломати хати каҷи "
+"баръаксро пеш аз он гузоред, масалан, \\\\N
.
"
#: findreplace/kfinddialog.cpp:229
#, kde-format
msgid "Click for a menu of available captures."
-msgstr "Барои тасвирҳои менюи дастрас дар ин ҷо зер кунед."
+msgstr "Барои феҳристи асксҳои дастрас дар ин ҷо зер кунед."
#: findreplace/kfinddialog.cpp:231
#, kde-format
msgid "Require word boundaries in both ends of a match to succeed."
-msgstr "Соответствие должно быть отдельным словом."
+msgstr ""
+"Барои ба мақсад расонидани мувофиқат хатҳои марзии калима аз ҳар як тараф "
+"лозиманд."
#: findreplace/kfinddialog.cpp:233
#, kde-format
msgid "Start searching at the current cursor location rather than at the top."
-msgstr "Начать поиск от позиции курсора, а не с начала документа."
+msgstr "Оғоз кардани ҷустуҷӯ аз нуқтаи нишондиҳандаи муш, назар ба сатри боло."
#: findreplace/kfinddialog.cpp:235
#, kde-format
msgid "Only search within the current selection."
-msgstr "Искать только в выделенном фрагменте."
+msgstr "Ҷустуҷӯ танҳо дар дохили интихоби ҷорӣ."
#: findreplace/kfinddialog.cpp:237
#, kde-format
@@ -271,28 +272,29 @@
"Perform a case sensitive search: entering the pattern 'Joe' will not match "
"'joe' or 'JOE', only 'Joe'."
msgstr ""
-"Искать с учётом регистра. В этом случае при поиске строки «Все» не будут "
-"найдены слова «все» или «ВСЕ», только «Все»."
+"Иҷрокунии ҷустуҷӯ бо дарназардошти ҳарфҳои хурду калон: аз рӯи намунаи "
+"'Ҷамшед' калимаи 'ҷамшед' ё 'ҶАМШЕД', ба ғайр аз 'Ҷамшед' ҷустуҷӯ карда "
+"намешавад."
#: findreplace/kfinddialog.cpp:240
#, kde-format
msgid "Search backwards."
-msgstr "Ҷустуҷӯи ақиб"
+msgstr "Ҷустуҷӯ ба ақиб."
#: findreplace/kfinddialog.cpp:242
#, kde-format
msgid "Ask before replacing each match found."
-msgstr "Спрашивать при каждой замене."
+msgstr "Пурсидан пеш аз ҷойгузин кардани ҳар як мувофиқати ёфтшуда."
#: findreplace/kfinddialog.cpp:456
#, kde-format
msgid "Any Character"
-msgstr "Ягон ҳарф"
+msgstr "Аломати дилхоҳ"
#: findreplace/kfinddialog.cpp:457
#, kde-format
msgid "Start of Line"
-msgstr "Сари сатр"
+msgstr "Оғози сатр"
#: findreplace/kfinddialog.cpp:458
#, kde-format
@@ -302,17 +304,17 @@
#: findreplace/kfinddialog.cpp:459
#, kde-format
msgid "Set of Characters"
-msgstr "Маҷмӯъи ҳарфҳо"
+msgstr "Маҷмӯи аломатҳо"
#: findreplace/kfinddialog.cpp:460
#, kde-format
msgid "Repeats, Zero or More Times"
-msgstr "Повторы, ноль или более раз"
+msgstr "Такрорҳо, сифр ё якчанд маротиба"
#: findreplace/kfinddialog.cpp:461
#, kde-format
msgid "Repeats, One or More Times"
-msgstr "Повторы, один или более раз"
+msgstr "Такрорҳо, як ё якчанд маротиба"
#: findreplace/kfinddialog.cpp:462
#, kde-format
@@ -337,7 +339,7 @@
#: findreplace/kfinddialog.cpp:466
#, kde-format
msgid "Carriage Return"
-msgstr "Возврат каретки"
+msgstr "Бозгашти навард"
#: findreplace/kfinddialog.cpp:467
#, kde-format
@@ -352,7 +354,7 @@
#: findreplace/kfinddialog.cpp:569
#, kde-format
msgid "Complete Match"
-msgstr "Полное соответствие"
+msgstr "Мувофиқати пурра"
#: findreplace/kfinddialog.cpp:574
#, kde-format
@@ -362,17 +364,17 @@
#: findreplace/kfinddialog.cpp:582
#, kde-format
msgid "You must enter some text to search for."
-msgstr "Необходимо ввести текст для поиска."
+msgstr "Барои ҷустуҷӯ шумо бояд ягон матнеро ворид намоед."
#: findreplace/kfinddialog.cpp:591
#, kde-format
msgid "Invalid regular expression."
-msgstr "Ибораҳои оддӣ нодуруст ҳастанд."
+msgstr "Ибораҳои оддӣ нодурустанд."
#: findreplace/kreplace.cpp:60 findreplace/kreplace.cpp:72
#, kde-format
msgid "Replace"
-msgstr "Ҷойгузорӣ"
+msgstr "Ҷойгузин кардан"
#: findreplace/kreplace.cpp:68
#, kde-format
@@ -383,63 +385,63 @@
#: findreplace/kreplace.cpp:70
#, kde-format
msgid "&Skip"
-msgstr "&Гузаштан"
+msgstr "&Гузарондан"
#: findreplace/kreplace.cpp:89
#, kde-format
msgid "Replace '%1' with '%2'?"
-msgstr "'%1'-ро бо '%2' ҷойгузорӣ мекунед?"
+msgstr "'%1'-ро бо '%2' ҷойгузин мекунед?"
#: findreplace/kreplace.cpp:177 findreplace/kreplace.cpp:381
#, kde-format
msgid "No text was replaced."
-msgstr "Ягон матн ҷойгузорӣ нашуд."
+msgstr "Ягон матн ҷойгузин карда нашуд."
#: findreplace/kreplace.cpp:179 findreplace/kreplace.cpp:383
#, kde-format
msgid "1 replacement done."
msgid_plural "%1 replacements done."
-msgstr[0] "1 ҷойгузорӣ қарор гирифт."
-msgstr[1] "%1 ҷобаҷогузориҳо сохта шуданд."
+msgstr[0] "1 ҷойгузинӣ иҷро шуд."
+msgstr[1] "%1 ҷойгузинӣ иҷро шуд."
#: findreplace/kreplace.cpp:397
#, kde-format
msgid "Do you want to restart search from the end?"
-msgstr "Шумо мехоҳед аз охири ҳуҷҷат ҷустуҷӯӣ кунед?"
+msgstr "Шумо мехоҳед, ки аз охири ҳуҷҷат дубора ҷустуҷӯ кунед?"
#: findreplace/kreplace.cpp:398
#, kde-format
msgid "Do you want to restart search at the beginning?"
-msgstr "Шумо мехоҳед аз аввалини ҳуҷҷат ҷустуҷӯӣ кунед?"
+msgstr "Шумо мехоҳед, ки аз аввали ҳуҷҷат дубора ҷустуҷӯ кунед?"
#: findreplace/kreplace.cpp:401
#, kde-format
msgctxt "@action:button Restart find & replace"
msgid "Restart"
-msgstr "Бозоғозӣ"
+msgstr "Аз нав оғоз кардан"
#: findreplace/kreplace.cpp:402
#, kde-format
msgctxt "@action:button Stop find & replace"
msgid "Stop"
-msgstr "Манъ"
+msgstr "Истодан"
#: findreplace/kreplacedialog.cpp:149
#, kde-format
msgid "Your replacement string is referencing a capture greater than '\\%1', "
-msgstr "Строка замены ссылается на захват, больший чем \\%1, "
+msgstr "Сатри ҷойгузинии шумо ба фарогирии зиёда аз '\\%1' истинод мекунад, "
#: findreplace/kreplacedialog.cpp:151
#, kde-format
msgid "but your pattern only defines 1 capture."
msgid_plural "but your pattern only defines %1 captures."
-msgstr[0] ", лекин намунаи шумо танҳо 1 асорат муайян мекунад"
-msgstr[1] ", лекин намунаи шумо танҳо %1 асорат муайян мекунад"
+msgstr[0] "вале намунаи шумо танҳо 1 фарогириро муайян менамояд."
+msgstr[1] "вале намунаи шумо танҳо %1 фарогириро муайян менамояд."
#: findreplace/kreplacedialog.cpp:153
#, kde-format
msgid "but your pattern defines no captures."
-msgstr "но шаблон не определяет захватов."
+msgstr "вале намунаи шумо ягон фарогириро муайян наменамояд."
#: findreplace/kreplacedialog.cpp:154
#, kde-format
@@ -448,7 +450,7 @@
"Please correct."
msgstr ""
"\n"
-"Ислоҳ кунед."
+"Лутфан, ислоҳ кунед."
#: widgets/krichtextwidget.cpp:204
#, kde-format
@@ -472,13 +474,13 @@
#, kde-format
msgctxt "@action"
msgid "&Font"
-msgstr "&Ҳарф"
+msgstr "&Ҳуруф"
#: widgets/krichtextwidget.cpp:236
#, kde-format
msgctxt "@action"
msgid "Font &Size"
-msgstr "&Андозаи ҳарф"
+msgstr "&Андозаи ҳуруф"
#: widgets/krichtextwidget.cpp:246
#, kde-format
@@ -502,13 +504,13 @@
#, kde-format
msgctxt "@action"
msgid "&Strike Out"
-msgstr "П&еречёркнутый"
+msgstr "&Хатзадашуда"
#: widgets/krichtextwidget.cpp:306
#, kde-format
msgctxt "@action"
msgid "Align &Left"
-msgstr "Росткунӣ аз &Чап"
+msgstr "Москунӣ аз тарафи &чап"
#: widgets/krichtextwidget.cpp:307
#, kde-format
@@ -520,19 +522,19 @@
#, kde-format
msgctxt "@action"
msgid "Align &Center"
-msgstr "Росткунӣ дар &марказ"
+msgstr "Москунӣ дар &марказ"
#: widgets/krichtextwidget.cpp:315
#, kde-format
msgctxt "@label center justify"
msgid "Center"
-msgstr "Миёна"
+msgstr "Марказ"
#: widgets/krichtextwidget.cpp:322
#, kde-format
msgctxt "@action"
msgid "Align &Right"
-msgstr "Росткунӣ аз &рост"
+msgstr "Москунӣ аз тарафи &рост"
#: widgets/krichtextwidget.cpp:323
#, kde-format
@@ -544,43 +546,43 @@
#, kde-format
msgctxt "@action"
msgid "&Justify"
-msgstr "&Таъин кунед"
+msgstr "&Москунӣ"
#: widgets/krichtextwidget.cpp:331
#, kde-format
msgctxt "@label justify fill"
msgid "Justify"
-msgstr "Таъин кунед"
+msgstr "Москунӣ"
#: widgets/krichtextwidget.cpp:351
#, kde-format
msgctxt "@action"
msgid "Left-to-Right"
-msgstr ""
+msgstr "Аз тарафи чап ба рост"
#: widgets/krichtextwidget.cpp:352
#, kde-format
msgctxt "@label left-to-right"
msgid "Left-to-Right"
-msgstr ""
+msgstr "Аз тарафи чап ба рост"
#: widgets/krichtextwidget.cpp:359
#, kde-format
msgctxt "@action"
msgid "Right-to-Left"
-msgstr ""
+msgstr "Аз тарафи рост ба чап"
#: widgets/krichtextwidget.cpp:360
#, kde-format
msgctxt "@label right-to-left"
msgid "Right-to-Left"
-msgstr ""
+msgstr "Аз тарафи рост ба чап"
#: widgets/krichtextwidget.cpp:376
#, kde-format
msgctxt "@title:menu"
msgid "List Style"
-msgstr "Навъи рӯйхат"
+msgstr "Услуби рӯйхат"
#: widgets/krichtextwidget.cpp:378
#, kde-format
@@ -616,55 +618,55 @@
#, kde-format
msgctxt "@item:inmenu lowercase abc lists"
msgid "abc"
-msgstr "abc"
+msgstr "абв"
#: widgets/krichtextwidget.cpp:384
#, kde-format
msgctxt "@item:inmenu uppercase abc lists"
msgid "ABC"
-msgstr "ABC"
+msgstr "АБВ"
#: widgets/krichtextwidget.cpp:385
#, kde-format
msgctxt "@item:inmenu lower case roman numerals"
msgid "i ii iii"
-msgstr ""
+msgstr "i ii iii"
#: widgets/krichtextwidget.cpp:386
#, kde-format
msgctxt "@item:inmenu upper case roman numerals"
msgid "I II III"
-msgstr ""
+msgstr "I II III"
#: widgets/krichtextwidget.cpp:403
#, kde-format
msgctxt "@action"
msgid "Increase Indent"
-msgstr "Увеличить отступ"
+msgstr "Афзудани фосила"
#: widgets/krichtextwidget.cpp:416
#, kde-format
msgctxt "@action"
msgid "Decrease Indent"
-msgstr "Уменьшить отступ"
+msgstr "Камкунии фосила"
#: widgets/krichtextwidget.cpp:429
#, kde-format
msgctxt "@action"
msgid "Insert Rule Line"
-msgstr "За &номерами строк"
+msgstr "Дарҷ кардани хати ҷадвал"
#: widgets/krichtextwidget.cpp:440
#, kde-format
msgctxt "@action"
msgid "Link"
-msgstr "Алоқа"
+msgstr "Пайванд"
#: widgets/krichtextwidget.cpp:451
#, kde-format
msgctxt "@action"
msgid "Format Painter"
-msgstr "Формати файл"
+msgstr "Рассоми қолибӣ"
#: widgets/krichtextwidget.cpp:461
#, kde-format
@@ -676,18 +678,18 @@
#, kde-format
msgctxt "@action"
msgid "Subscript"
-msgstr "Зерискрипт"
+msgstr "Зернигошт"
#: widgets/krichtextwidget.cpp:479
#, kde-format
msgctxt "@action"
msgid "Superscript"
-msgstr "Верхний индекс"
+msgstr "Абарнигошт"
#: widgets/ktextedit.cpp:163
#, kde-format
msgid "Nothing to spell check."
-msgstr "Нечего проверять."
+msgstr "Барои санҷиши имло ягон калима нест."
#: widgets/ktextedit.cpp:563
#, kde-format
@@ -695,22 +697,21 @@
msgstr "Санҷиши имло..."
#: widgets/ktextedit.cpp:568
-#, fuzzy, kde-format
-#| msgid "Spell Checking"
+#, kde-format
msgid "Spell Checking Language"
-msgstr "Баррасии имлоӣ"
+msgstr "Забони санҷиши имло"
#: widgets/ktextedit.cpp:591
#, kde-format
msgid "Auto Spell Check"
-msgstr "Санҷиши имло бо худкор"
+msgstr "Санҷиши имлои худкор"
#: widgets/ktextedit.cpp:597
#, kde-format
msgid "Allow Tabulations"
-msgstr "Разрешить табуляцию"
+msgstr "Иҷозати ҷадвалбандӣ"
#: widgets/ktextedit.cpp:630
#, kde-format
msgid "Speak Text"
-msgstr "Матнро ҳарф занед"
+msgstr "Матнро ҳарф задан"
diff -Nru ktextwidgets-5.61.0/po/zh_CN/ktextwidgets5.po ktextwidgets-5.62.0/po/zh_CN/ktextwidgets5.po
--- ktextwidgets-5.61.0/po/zh_CN/ktextwidgets5.po 2019-08-03 19:58:46.000000000 +0000
+++ ktextwidgets-5.62.0/po/zh_CN/ktextwidgets5.po 2019-09-07 14:49:53.000000000 +0000
@@ -15,7 +15,7 @@
"Project-Id-Version: kdeorg\n"
"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
"POT-Creation-Date: 2019-05-20 02:58+0200\n"
-"PO-Revision-Date: 2019-07-18 14:57\n"
+"PO-Revision-Date: 2019-09-05 09:24\n"
"Last-Translator: Guo Yunhe (guoyunhe)\n"
"Language-Team: Chinese Simplified\n"
"Language: zh_CN\n"
diff -Nru ktextwidgets-5.61.0/src/CMakeLists.txt ktextwidgets-5.62.0/src/CMakeLists.txt
--- ktextwidgets-5.61.0/src/CMakeLists.txt 2019-08-03 19:58:46.000000000 +0000
+++ ktextwidgets-5.62.0/src/CMakeLists.txt 2019-09-07 14:49:53.000000000 +0000
@@ -90,6 +90,10 @@
)
install( FILES kregexpeditor/kregexpeditor.desktop DESTINATION ${KDE_INSTALL_KSERVICETYPES5DIR} )
+if (BUILD_DESIGNERPLUGIN)
+ add_subdirectory(designer)
+endif()
+
if (BUILD_QCH)
ecm_add_qch(
KF5TextWidgets_QCH
diff -Nru ktextwidgets-5.61.0/src/designer/CMakeLists.txt ktextwidgets-5.62.0/src/designer/CMakeLists.txt
--- ktextwidgets-5.61.0/src/designer/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000
+++ ktextwidgets-5.62.0/src/designer/CMakeLists.txt 2019-09-07 14:49:53.000000000 +0000
@@ -0,0 +1,34 @@
+include(ECMAddQtDesignerPlugin)
+
+ecm_qtdesignerplugin_widget(KRichTextEdit
+ TOOLTIP "Rich Text Editor (KF5)"
+ GROUP "Input (KF5)"
+)
+ecm_qtdesignerplugin_widget(KRichTextWidget
+ TOOLTIP "Rich Text Widget (KF5)"
+ GROUP "Input (KF5)"
+)
+ecm_qtdesignerplugin_widget(KTextEdit
+ TOOLTIP "Improved QTextEdit (KF5)"
+ WHATSTHIS "An improved version of the QTextEdit with mail or system browser invocation support"
+ GROUP "Input (KF5)"
+)
+ecm_qtdesignerplugin_widget(KPluralHandlingSpinBox
+ TOOLTIP "A QSpinBox with plural handling for the suffix (KF5)"
+ WHATSTHIS "A QSpinBox with plural handling for the suffix"
+ GROUP "Input (KF5)"
+)
+
+ecm_add_qtdesignerplugin(ktextwidgetswidgets
+ NAME KTextWidgetsWidgets
+ OUTPUT_NAME ktextwidgets5widgets
+ WIDGETS
+ KRichTextEdit
+ KRichTextWidget
+ KTextEdit
+ KPluralHandlingSpinBox
+ LINK_LIBRARIES
+ KF5::TextWidgets
+ INSTALL_DESTINATION "${KDE_INSTALL_QTPLUGINDIR}/designer"
+ COMPONENT Devel
+)
Binary files /tmp/tmpjayDFN/2X1zdzm3ek/ktextwidgets-5.61.0/src/designer/pics/ktextedit.png and /tmp/tmpjayDFN/UulHqI5Xr7/ktextwidgets-5.62.0/src/designer/pics/ktextedit.png differ
diff -Nru ktextwidgets-5.61.0/src/findreplace/kfind.h ktextwidgets-5.62.0/src/findreplace/kfind.h
--- ktextwidgets-5.61.0/src/findreplace/kfind.h 2019-08-03 19:58:46.000000000 +0000
+++ ktextwidgets-5.62.0/src/findreplace/kfind.h 2019-09-07 14:49:53.000000000 +0000
@@ -23,7 +23,6 @@
#include "ktextwidgets_export.h"
-#include
#include
class QDialog;
diff -Nru ktextwidgets-5.61.0/src/kregexpeditor/kregexpeditorinterface.h ktextwidgets-5.62.0/src/kregexpeditor/kregexpeditorinterface.h
--- ktextwidgets-5.61.0/src/kregexpeditor/kregexpeditorinterface.h 2019-08-03 19:58:46.000000000 +0000
+++ ktextwidgets-5.62.0/src/kregexpeditor/kregexpeditorinterface.h 2019-09-07 14:49:53.000000000 +0000
@@ -24,7 +24,6 @@
#define __kregexpeditorinterface_h__
#include
-#include
/**
* @class KRegExpEditorInterface kregexpeditorinterface.h