diff -Nru ktp-send-file-17.12.3/CMakeLists.txt ktp-send-file-18.04.1/CMakeLists.txt --- ktp-send-file-17.12.3/CMakeLists.txt 2018-03-06 00:26:26.000000000 +0000 +++ ktp-send-file-18.04.1/CMakeLists.txt 2018-05-08 00:20:23.000000000 +0000 @@ -3,9 +3,9 @@ cmake_minimum_required(VERSION 2.8.12) # KDE Application Version, managed by release script -set (KDE_APPLICATIONS_VERSION_MAJOR "17") -set (KDE_APPLICATIONS_VERSION_MINOR "12") -set (KDE_APPLICATIONS_VERSION_MICRO "3") +set (KDE_APPLICATIONS_VERSION_MAJOR "18") +set (KDE_APPLICATIONS_VERSION_MINOR "04") +set (KDE_APPLICATIONS_VERSION_MICRO "1") set (KTP_SEND_FILE_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}") set(IS_KTP_INTERNAL_MODULE TRUE) @@ -19,7 +19,7 @@ include(KDEInstallDirs) include(KDECMakeSettings) -include(KDECompilerSettings) +include(KDECompilerSettings NO_POLICY_SCOPE) include(FeatureSummary) configure_file(version.h.in ${CMAKE_CURRENT_BINARY_DIR}/version.h) diff -Nru ktp-send-file-17.12.3/debian/changelog ktp-send-file-18.04.1/debian/changelog --- ktp-send-file-17.12.3/debian/changelog 2018-03-12 21:32:13.000000000 +0000 +++ ktp-send-file-18.04.1/debian/changelog 2018-05-08 12:31:13.000000000 +0000 @@ -1,8 +1,16 @@ -ktp-send-file (4:17.12.3-0ubuntu1~ubuntu18.04~ppa1) bionic; urgency=medium +ktp-send-file (4:18.04.1-0ubuntu1~ubuntu18.04~ppa1) bionic; urgency=medium + + * New upstream release (18.03.80) + * New upstream release (18.04.0) + * New upstream release (18.04.1) + + -- Rik Mills Tue, 08 May 2018 13:31:13 +0100 + +ktp-send-file (4:17.12.3-0ubuntu1) bionic; urgency=medium * New upstream release (17.12.3) - -- Rik Mills Mon, 12 Mar 2018 21:32:13 +0000 + -- Rik Mills Fri, 16 Mar 2018 13:31:44 +0000 ktp-send-file (4:17.12.2-0ubuntu1) bionic; urgency=medium diff -Nru ktp-send-file-17.12.3/debian/control ktp-send-file-18.04.1/debian/control --- ktp-send-file-17.12.3/debian/control 2018-03-12 21:32:13.000000000 +0000 +++ ktp-send-file-18.04.1/debian/control 2018-05-08 12:31:13.000000000 +0000 @@ -13,7 +13,7 @@ libkf5kcmutils-dev (>= 5.31.0~), libkf5kio-dev (>= 5.31.0~), libkf5wallet-dev (>= 5.31.0~), - libktp-dev (>= 4:17.12.3~), + libktp-dev (>= 4:18.04.1~), libtelepathy-logger-qt-dev, libtelepathy-qt5-dev (>= 0.9.3), pkg-kde-tools (>= 0.9), diff -Nru ktp-send-file-17.12.3/po/ca/ktp-send-file.po ktp-send-file-18.04.1/po/ca/ktp-send-file.po --- ktp-send-file-17.12.3/po/ca/ktp-send-file.po 2018-03-06 00:26:25.000000000 +0000 +++ ktp-send-file-18.04.1/po/ca/ktp-send-file.po 2018-05-08 00:20:23.000000000 +0000 @@ -115,3 +115,6 @@ #, kde-format msgid "Select a recipient" msgstr "Seleccioneu un destinatari" + +#~ msgid "Send" +#~ msgstr "Envia" diff -Nru ktp-send-file-17.12.3/po/ca@valencia/ktp-send-file.po ktp-send-file-18.04.1/po/ca@valencia/ktp-send-file.po --- ktp-send-file-17.12.3/po/ca@valencia/ktp-send-file.po 2018-03-06 00:26:25.000000000 +0000 +++ ktp-send-file-18.04.1/po/ca@valencia/ktp-send-file.po 2018-05-08 00:20:23.000000000 +0000 @@ -74,7 +74,7 @@ #: mainwindow.cpp:66 #, kde-format msgid "You are about to send these files" -msgstr "Esteu a punt d'enviar estos fitxers" +msgstr "Esteu a punt d'enviar aquests fitxers" #: mainwindow.cpp:67 #, kde-format @@ -86,7 +86,7 @@ #: mainwindow.cpp:122 #, kde-format msgid "Search in Contacts..." -msgstr "Busca en els contactes..." +msgstr "Cerca en els contactes..." #: mainwindow.cpp:183 #, kde-format @@ -102,7 +102,7 @@ #: mainwindow.ui:33 #, kde-format msgid "You are about to send this file" -msgstr "Esteu a punt d'enviar este fitxer" +msgstr "Esteu a punt d'enviar aquest fitxer" #. i18n: ectx: property (text), widget (QLabel, filesInfoLabel) #: mainwindow.ui:84 @@ -115,3 +115,6 @@ #, kde-format msgid "Select a recipient" msgstr "Seleccioneu un destinatari" + +#~ msgid "Send" +#~ msgstr "Envia" diff -Nru ktp-send-file-17.12.3/po/zh_CN/ktp-send-file.po ktp-send-file-18.04.1/po/zh_CN/ktp-send-file.po --- ktp-send-file-17.12.3/po/zh_CN/ktp-send-file.po 2018-03-06 00:26:26.000000000 +0000 +++ ktp-send-file-18.04.1/po/zh_CN/ktp-send-file.po 2018-05-08 00:20:23.000000000 +0000 @@ -9,7 +9,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2016-11-19 20:16+0100\n" -"PO-Revision-Date: 2018-02-28 02:28-0500\n" +"PO-Revision-Date: 2018-04-26 06:08-0400\n" "Last-Translator: guoyunhebrave \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -Nru ktp-send-file-17.12.3/.reviewboardrc ktp-send-file-18.04.1/.reviewboardrc --- ktp-send-file-17.12.3/.reviewboardrc 2018-03-01 23:00:35.000000000 +0000 +++ ktp-send-file-18.04.1/.reviewboardrc 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -REVIEWBOARD_URL = "https://git.reviewboard.kde.org" -REPOSITORY = 'git://anongit.kde.org/ktp-send-file'