[SCM] qapt packaging branch, experimental, updated. debian/1.4.0-1-8-gc137efa
José Manuel Santamaría Lema
santa-guest at alioth.debian.org
Wed Jan 23 13:19:18 UTC 2013
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/qapt.git;a=commitdiff;h=56d7967
The following commit has been merged in the experimental branch:
commit 56d79678a7b2a453672e24246e2e599f94107c7c
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date: Wed Jan 23 14:04:22 2013 +0100
Imported Upstream version 1.4.1
---
CMakeLists.txt | 4 +-
ChangeLog | 10 +++
po/CMakeLists.txt | 1 +
po/ga/qapt-deb-installer.po | 4 +-
po/ga/qapt-gst-helper.po | 2 +-
po/ga/qaptbatch.po | 2 +-
po/kk/CMakeLists.txt | 2 +
po/{zh_CN => kk}/plasma-runner-installer.po | 14 ++--
po/{zh_CN => kk}/qapt-deb-installer.po | 70 +++++++++++------------
po/{bs => kk}/qapt-gst-helper.po | 19 +++---
po/{zh_CN => kk}/qaptbatch.po | 83 ++++++++++++++-------------
src/backend.cpp | 1 +
src/globals.h | 6 +-
src/history.cpp | 2 +
src/package.cpp | 2 +-
src/worker/workerinstallprogress.cpp | 4 +-
16 files changed, 120 insertions(+), 106 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3bbf98c..9bd63ea 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,10 +3,10 @@ project(libqapt)
cmake_minimum_required(VERSION 2.6.0)
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
-set(qapt_VERSION 1.4.0)
+set(qapt_VERSION 1.4.1)
set(qapt_lib_SOVERSION 1)
-set(qapt_lib_VERSION ${qapt_lib_SOVERSION}.4.0)
+set(qapt_lib_VERSION ${qapt_lib_SOVERSION}.4.1)
configure_file(
"${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/cmake_uninstall.cmake.in"
diff --git a/ChangeLog b/ChangeLog
index 0415fee..516df00 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+1.4.1:
+======
+- Bugfixes:
+ * Fixed a small memory leak where invalid QApt::HistoryItems would never be deleted.
+ * Fixed a bug where apt-listchanges and apt-listbugs would freeze the QApt Worker.
+ * Fixed Package::priority() returning an empty QString
+ * Fixed Backend::xapianIndexNeedsUpdate() always returning true, even if an
+ update wasn't needed.
+ * Fixed API documentation formatting for QApt::MultiArchType
+
1.4.0
======
- Features:
diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
index 5e30be4..05d5e6d 100644
--- a/po/CMakeLists.txt
+++ b/po/CMakeLists.txt
@@ -49,5 +49,6 @@ add_subdirectory(pl)
add_subdirectory(hu)
add_subdirectory(cs)
add_subdirectory(mai)
+add_subdirectory(kk)
add_subdirectory(ro)
add_subdirectory(el)
diff --git a/po/ga/qapt-deb-installer.po b/po/ga/qapt-deb-installer.po
index cafb13c..e4295a7 100644
--- a/po/ga/qapt-deb-installer.po
+++ b/po/ga/qapt-deb-installer.po
@@ -155,12 +155,12 @@ msgstr ""
#: utils/qapt-deb-installer/DebViewer.cpp:118
msgctxt "@label Label preceding the package version"
msgid "Version:"
-msgstr ""
+msgstr "Leagan:"
#: utils/qapt-deb-installer/DebViewer.cpp:125
msgctxt "@label Label preceding the package size"
msgid "Installed Size:"
-msgstr ""
+msgstr "Méid Suiteáilte:"
#: utils/qapt-deb-installer/DebViewer.cpp:132
msgctxt "@label Label preceding the package maintainer"
diff --git a/po/ga/qapt-gst-helper.po b/po/ga/qapt-gst-helper.po
index aa1f0fe..807c1f1 100644
--- a/po/ga/qapt-gst-helper.po
+++ b/po/ga/qapt-gst-helper.po
@@ -284,7 +284,7 @@ msgstr ""
#: utils/qapt-gst-helper/PluginHelper.cpp:418
msgctxt "@title:window"
msgid "Installation Complete"
-msgstr ""
+msgstr "Suiteáil Críochnaithe"
#: utils/qapt-gst-helper/PluginHelper.cpp:422
msgctxt "@label"
diff --git a/po/ga/qaptbatch.po b/po/ga/qaptbatch.po
index aa9981e..6b0fd93 100644
--- a/po/ga/qaptbatch.po
+++ b/po/ga/qaptbatch.po
@@ -263,7 +263,7 @@ msgstr ""
#: utils/qapt-batch/qaptbatch.cpp:362
msgctxt "@title:window"
msgid "Installation Complete"
-msgstr ""
+msgstr "Suiteáil Críochnaithe"
#: utils/qapt-batch/qaptbatch.cpp:366
msgctxt "@label"
diff --git a/po/kk/CMakeLists.txt b/po/kk/CMakeLists.txt
new file mode 100644
index 0000000..6cc8044
--- /dev/null
+++ b/po/kk/CMakeLists.txt
@@ -0,0 +1,2 @@
+file(GLOB _po_files *.po)
+GETTEXT_PROCESS_PO_FILES(kk ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
diff --git a/po/zh_CN/plasma-runner-installer.po b/po/kk/plasma-runner-installer.po
similarity index 67%
copy from po/zh_CN/plasma-runner-installer.po
copy to po/kk/plasma-runner-installer.po
index e403b79..56dd97c 100644
--- a/po/zh_CN/plasma-runner-installer.po
+++ b/po/kk/plasma-runner-installer.po
@@ -1,15 +1,15 @@
# Copyright (C) YEAR This_file_is_part_of_KDE
# This file is distributed under the same license as the PACKAGE package.
#
-# Ni Hui <shuizhuyuanluo at 126.com>, 2011.
+# Sairan Kikkarin <sairan at computer.org>, 2012.
msgid ""
msgstr ""
"Project-Id-Version:
"
"Report-Msgid-Bugs-To: http://bugs.kde.org
"
"POT-Creation-Date: 2011-08-02 05:06+0200
"
-"PO-Revision-Date: 2011-12-04 15:34+0800
"
-"Last-Translator: Ni Hui <shuizhuyuanluo at 126.com>
"
-"Language-Team: Chinese Simplified <kde-china at kde.org>
"
+"PO-Revision-Date: 2012-09-05 06:55+0600
"
+"Last-Translator: Sairan Kikkarin <sairan at computer.org>
"
+"Language-Team: Kazakh <kde-i18n-doc at kde.org>
"
"Language:
"
"MIME-Version: 1.0
"
"Content-Type: text/plain; charset=UTF-8
"
@@ -19,14 +19,14 @@ msgstr ""
#: utils/plasma-runner-installer/installerrunner.cpp:41
msgid "Suggests the installation of applications if :q: is not found"
-msgstr ""
+msgstr ":q: табылмағанда қолданбаларды орнатуды ұсынады"
#: utils/plasma-runner-installer/installerrunner.cpp:113
#, kde-format
msgid "Install %1"
-msgstr "安装 %1"
+msgstr "%1 дегенді орнату"
#: utils/plasma-runner-installer/installerrunner.cpp:116
#, kde-format
msgid "The \"%1\" package contains %2"
-msgstr ""
\ No newline at end of file
+msgstr "\"%1\" дестеде %2 бар"
\ No newline at end of file
diff --git a/po/zh_CN/qapt-deb-installer.po b/po/kk/qapt-deb-installer.po
similarity index 82%
copy from po/zh_CN/qapt-deb-installer.po
copy to po/kk/qapt-deb-installer.po
index 904eae8..b90a956 100644
--- a/po/zh_CN/qapt-deb-installer.po
+++ b/po/kk/qapt-deb-installer.po
@@ -1,15 +1,15 @@
# Copyright (C) YEAR This_file_is_part_of_KDE
# This file is distributed under the same license as the PACKAGE package.
#
-# Ni Hui <shuizhuyuanluo at 126.com>, 2011.
+# Sairan Kikkarin <sairan at computer.org>, 2012.
msgid ""
msgstr ""
"Project-Id-Version:
"
"Report-Msgid-Bugs-To: http://bugs.kde.org
"
"POT-Creation-Date: 2012-02-21 18:19+0100
"
-"PO-Revision-Date: 2011-12-04 15:35+0800
"
-"Last-Translator: Ni Hui <shuizhuyuanluo at 126.com>
"
-"Language-Team: Chinese Simplified <kde-china at kde.org>
"
+"PO-Revision-Date: 2012-09-05 07:25+0600
"
+"Last-Translator: Sairan Kikkarin <sairan at computer.org>
"
+"Language-Team: Kazakh <kde-i18n-doc at kde.org>
"
"Language:
"
"MIME-Version: 1.0
"
"Content-Type: text/plain; charset=UTF-8
"
@@ -20,12 +20,12 @@ msgstr ""
#: utils/qapt-deb-installer/DebCommitWidget.cpp:42
msgctxt "@info The widget's header label"
msgid "<title>Installing</title>"
-msgstr ""
+msgstr "<title>Орнату</title>"
#: utils/qapt-deb-installer/DebInstaller.cpp:68
msgctxt "@label"
msgid "Install Package"
-msgstr "安装软件包"
+msgstr "Дестені орнату"
#: utils/qapt-deb-installer/DebInstaller.cpp:82
#, kde-format
@@ -34,66 +34,68 @@ msgid ""
"Could not open <filename>%1</filename>. It does not appear to be a valid "
"Debian package file."
msgstr ""
+"<filename>%1</filename> деген файл ашылмады. Ол жарамды Debian десте файлы "
+"емес секілді."
#: utils/qapt-deb-installer/DebInstaller.cpp:90
#, kde-format
msgctxt "@title:window"
msgid "Package Installer - %1"
-msgstr "软件包安装器 - %1"
+msgstr ""
#: utils/qapt-deb-installer/DebInstaller.cpp:113
msgctxt "@info Header label used when packages are downloading"
msgid "<title>Downloading Dependencies</title>"
-msgstr ""
+msgstr "<title>ілеспе жүктелетіндері</title>"
#: utils/qapt-deb-installer/DebInstaller.cpp:128
msgctxt "@info Header label used when packages are installing"
msgid "<title>Installing Dependencies</title>"
-msgstr ""
+msgstr "<title>Орнатылған ілеспелері</title>"
#: utils/qapt-deb-installer/DebInstaller.cpp:153
msgctxt "@label Message that the install is done"
msgid "Done"
-msgstr "完成"
+msgstr "Дайын"
#: utils/qapt-deb-installer/DebInstaller.cpp:155
msgctxt "@info Header label used when the install is done"
msgid "<title>Done</title>"
-msgstr "<title>完成</title>"
+msgstr "<title>Дайын</title>"
#: utils/qapt-deb-installer/DebInstaller.cpp:174
msgctxt "@label"
msgid ""
"The package system could not be initialized, your configuration may be "
"broken."
-msgstr ""
+msgstr "Десте жүйесі бастайтын күйіне келтірілмеді. Баптауыңыз бүлінген."
#: utils/qapt-deb-installer/DebInstaller.cpp:176
msgctxt "@title:window"
msgid "Initialization error"
-msgstr ""
+msgstr "Инициализациялау қатесі"
#: utils/qapt-deb-installer/DebInstaller.cpp:184
msgctxt "@label"
msgid "This package is incompatible with your computer."
-msgstr ""
+msgstr "Бұл десте компьютеріңізбен үйлеспейді."
#: utils/qapt-deb-installer/DebInstaller.cpp:230
#, kde-format
msgctxt "@info"
msgid "Error: Wrong architecture '%1'"
-msgstr ""
+msgstr "Қате: '%1' платформасы келіспейді"
#: utils/qapt-deb-installer/DebInstaller.cpp:246
#, kde-format
msgctxt "@info Error string when installing would break an existing package"
msgid "Error: Breaks the existing package \"%1\""
-msgstr ""
+msgstr "Қате: \"%1\" деген бар дестені бұзады"
#: utils/qapt-deb-installer/DebInstaller.cpp:255
msgctxt "@info"
msgid "Error: Cannot satisfy dependencies"
-msgstr ""
+msgstr "Қате: Ілеспелері қамтамасыз етілмеді"
#: utils/qapt-deb-installer/DebInstaller.cpp:264
#, kde-format
@@ -143,55 +145,49 @@ msgid ""
msgstr ""
#: utils/qapt-deb-installer/DebViewer.cpp:65
-#, fuzzy
-#| msgctxt "@label Label preceeding the package name"
-#| msgid "Package:"
msgctxt "@label Label preceding the package name"
msgid "Package:"
-msgstr "软件包："
+msgstr ""
#: utils/qapt-deb-installer/DebViewer.cpp:73
-#, fuzzy
-#| msgctxt "@label Label preceeding the package status"
-#| msgid "Status:"
msgctxt "@label Label preceding the package status"
msgid "Status:"
-msgstr "状态："
+msgstr ""
#: utils/qapt-deb-installer/DebViewer.cpp:118
msgctxt "@label Label preceding the package version"
msgid "Version:"
-msgstr "版本："
+msgstr ""
#: utils/qapt-deb-installer/DebViewer.cpp:125
msgctxt "@label Label preceding the package size"
msgid "Installed Size:"
-msgstr "安装大小："
+msgstr ""
#: utils/qapt-deb-installer/DebViewer.cpp:132
msgctxt "@label Label preceding the package maintainer"
msgid "Maintainer:"
-msgstr "维护者："
+msgstr ""
#: utils/qapt-deb-installer/DebViewer.cpp:139
msgctxt "@label Label preceding the package category"
msgid "Category:"
-msgstr "类别："
+msgstr ""
#: utils/qapt-deb-installer/DebViewer.cpp:146
msgctxt "@label Label preceding the package homepage"
msgid "Homepage:"
-msgstr "主页："
+msgstr ""
#: utils/qapt-deb-installer/DebViewer.cpp:158
msgctxt "@title:tab"
msgid "Description"
-msgstr "描述"
+msgstr ""
#: utils/qapt-deb-installer/DebViewer.cpp:159
msgctxt "@title:tab"
msgid "Details"
-msgstr "细节"
+msgstr ""
#: utils/qapt-deb-installer/DebViewer.cpp:160
msgctxt "@title:tab"
@@ -201,24 +197,24 @@ msgstr ""
#: utils/qapt-deb-installer/main.cpp:29
msgctxt "@info"
msgid "A Debian package installer"
-msgstr "Debian 软件包安装器"
+msgstr ""
#: utils/qapt-deb-installer/main.cpp:35
msgctxt "@title"
msgid "QApt Package Installer"
-msgstr "QApt 软件包安装器"
+msgstr ""
#: utils/qapt-deb-installer/main.cpp:36
msgctxt "@info:credit"
msgid "(C) 2011 Jonathan Thomas"
-msgstr "(C) 2011 Jonathan Thomas"
+msgstr ""
#: utils/qapt-deb-installer/main.cpp:37
msgctxt "@info:credit"
msgid "Jonathan Thomas"
-msgstr "Jonathan Thomas"
+msgstr ""
#: utils/qapt-deb-installer/main.cpp:42
msgctxt "@info:shell"
msgid ".deb file"
-msgstr ".deb 文件"
\ No newline at end of file
+msgstr ""
\ No newline at end of file
diff --git a/po/bs/qapt-gst-helper.po b/po/kk/qapt-gst-helper.po
similarity index 94%
copy from po/bs/qapt-gst-helper.po
copy to po/kk/qapt-gst-helper.po
index 0690bfd..d7cb4d0 100644
--- a/po/bs/qapt-gst-helper.po
+++ b/po/kk/qapt-gst-helper.po
@@ -1,32 +1,31 @@
-# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR This_file_is_part_of_KDE
# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <megaribi at epn.ba>, YEAR.
#
+# Sairan Kikkarin <sairan at computer.org>, 2012.
msgid ""
msgstr ""
-"Project-Id-Version: qapt-gst-helper.po
"
+"Project-Id-Version:
"
"Report-Msgid-Bugs-To: http://bugs.kde.org
"
"POT-Creation-Date: 2012-03-09 11:23+0100
"
-"PO-Revision-Date: 2011-05-13 22:35+0200
"
-"Last-Translator: Samir Ribic <megaribi at epn.ba>
"
-"Language-Team: bs <bs at kde.org>
"
+"PO-Revision-Date: 2012-09-05 07:42+0600
"
+"Last-Translator: Sairan Kikkarin <sairan at computer.org>
"
+"Language-Team: Kazakh <kde-i18n-doc at kde.org>
"
"Language:
"
"MIME-Version: 1.0
"
"Content-Type: text/plain; charset=UTF-8
"
"Content-Transfer-Encoding: 8bit
"
-"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;
"
+"Plural-Forms: nplurals=1; plural=0;
"
+"X-Generator: Lokalize 1.2
"
#: utils/qapt-gst-helper/main.cpp:31
msgctxt "@info"
msgid "A GStreamer codec installer using QApt"
-msgstr "GStreamer instaler kodeka koristeći QApt"
+msgstr "QApt пайдаланатын GStreamer кодек орнатқышы "
#: utils/qapt-gst-helper/main.cpp:37
msgctxt "@title"
msgid "QApt Codec Searcher"
-msgstr "QApt tragač za kodecima"
+msgstr "QApt кодек іздегіші"
#: utils/qapt-gst-helper/main.cpp:38
msgctxt "@info:credit"
diff --git a/po/zh_CN/qaptbatch.po b/po/kk/qaptbatch.po
similarity index 75%
copy from po/zh_CN/qaptbatch.po
copy to po/kk/qaptbatch.po
index 91704ee..e2cf74f 100644
--- a/po/zh_CN/qaptbatch.po
+++ b/po/kk/qaptbatch.po
@@ -1,15 +1,15 @@
# Copyright (C) YEAR This_file_is_part_of_KDE
# This file is distributed under the same license as the PACKAGE package.
#
-# Ni Hui <shuizhuyuanluo at 126.com>, 2011.
+# Sairan Kikkarin <sairan at computer.org>, 2012.
msgid ""
msgstr ""
"Project-Id-Version:
"
"Report-Msgid-Bugs-To: http://bugs.kde.org
"
"POT-Creation-Date: 2012-02-21 18:19+0100
"
-"PO-Revision-Date: 2011-12-04 15:37+0800
"
-"Last-Translator: Ni Hui <shuizhuyuanluo at 126.com>
"
-"Language-Team: Chinese Simplified <kde-china at kde.org>
"
+"PO-Revision-Date: 2012-09-24 07:00+0600
"
+"Last-Translator: Sairan Kikkarin <sairan at computer.org>
"
+"Language-Team: Kazakh <kde-i18n-doc at kde.org>
"
"Language:
"
"MIME-Version: 1.0
"
"Content-Type: text/plain; charset=UTF-8
"
@@ -20,22 +20,22 @@ msgstr ""
#: utils/qapt-batch/detailswidget.cpp:44
msgctxt "@label Remaining time"
msgid "Remaining Time:"
-msgstr "剩余时间："
+msgstr "Қалған уақыт:"
#: utils/qapt-batch/detailswidget.cpp:48
msgctxt "@label Download Rate"
msgid "Speed:"
-msgstr "速度："
+msgstr "Жылдамдығы:"
#: utils/qapt-batch/main.cpp:28
msgctxt "@info"
msgid "A batch installer using QApt"
-msgstr ""
+msgstr "QApt пайдаланатын бума орнатқышы"
#: utils/qapt-batch/main.cpp:34
msgctxt "@title"
msgid "QApt Batch Installer"
-msgstr "QApt 批量安装器"
+msgstr "QApt бума орнатқышы"
#: utils/qapt-batch/main.cpp:35
msgctxt "@info:credit"
@@ -55,17 +55,17 @@ msgstr ""
#: utils/qapt-batch/main.cpp:42
msgctxt "@info:shell"
msgid "Install a package"
-msgstr ""
+msgstr "Дестені орнату"
#: utils/qapt-batch/main.cpp:43
msgctxt "@info:shell"
msgid "Remove a package"
-msgstr ""
+msgstr "Дестені өшіру"
#: utils/qapt-batch/main.cpp:44
msgctxt "@info:shell"
msgid "Update the package cache"
-msgstr ""
+msgstr "Десте кэшін жаңарту"
#: utils/qapt-batch/main.cpp:45
msgctxt "@info:shell"
@@ -75,19 +75,19 @@ msgstr ""
#: utils/qapt-batch/qaptbatch.cpp:70
msgctxt "@label"
msgid "Waiting for authorization"
-msgstr ""
+msgstr "Құптауды күту"
#: utils/qapt-batch/qaptbatch.cpp:141
msgctxt "@label"
msgid ""
"The package system could not be initialized, your configuration may be "
"broken."
-msgstr ""
+msgstr "Десте жүйесі бастайтын күйіне келтірілмеді. Баптауыңыз бүлінген."
#: utils/qapt-batch/qaptbatch.cpp:143
msgctxt "@title:window"
msgid "Initialization error"
-msgstr ""
+msgstr "Инициализациялау қатесі"
#: utils/qapt-batch/qaptbatch.cpp:151
msgctxt "@label"
@@ -96,11 +96,13 @@ msgid ""
"must close all other package managers before you will be able to install or "
"remove any packages."
msgstr ""
+"Десте жүйесін басқа бір қолданба пайдалануда. Кез-келген дестелерді орнату "
+"не өшіру үшін басқа десте менеджерлерін жабу керек."
#: utils/qapt-batch/qaptbatch.cpp:155
msgctxt "@title:window"
msgid "Unable to obtain package system lock"
-msgstr ""
+msgstr "Десте жүйесі бұғатталмады"
#: utils/qapt-batch/qaptbatch.cpp:161
#, kde-format
@@ -108,17 +110,17 @@ msgctxt "@label"
msgid ""
"You do not have enough disk space in the directory at %1 to continue with "
"this operation."
-msgstr ""
+msgstr "Бұл амалды жалғастыру үшін %1 қапшығында дискі орыны жетіспейді."
#: utils/qapt-batch/qaptbatch.cpp:163
msgctxt "@title:window"
msgid "Low disk space"
-msgstr ""
+msgstr "Дискіде орын тапшылығы"
#: utils/qapt-batch/qaptbatch.cpp:168
msgctxt "@label"
msgid "Could not download packages"
-msgstr ""
+msgstr "Десте жүктеп алынбады"
#: utils/qapt-batch/qaptbatch.cpp:169
msgctxt "@title:window"
@@ -129,12 +131,12 @@ msgstr ""
msgctxt "@label"
msgid ""
"This operation cannot continue since proper authorization was not provided"
-msgstr ""
+msgstr "Бұл амал жалғастырылмайды, өйткені керек авторизацясы етілмегн"
#: utils/qapt-batch/qaptbatch.cpp:179
msgctxt "@title:window"
msgid "Authentication error"
-msgstr "验证错误"
+msgstr "Аутентификация қатесі"
#: utils/qapt-batch/qaptbatch.cpp:183 utils/qapt-batch/qaptbatch.cpp:414
msgctxt "@label"
@@ -142,11 +144,13 @@ msgid ""
"It appears that the QApt worker has either crashed or disappeared. Please "
"report a bug to the QApt maintainers"
msgstr ""
+"QApt жұмыс бағдарламасы қирады не жоқ болып кетті. QApt жетілдірушісіне "
+"қатені хабарлаңыз."
#: utils/qapt-batch/qaptbatch.cpp:185 utils/qapt-batch/qaptbatch.cpp:416
msgctxt "@title:window"
msgid "Unexpected Error"
-msgstr ""
+msgstr "Күтпеген қате"
#: utils/qapt-batch/qaptbatch.cpp:193
msgctxt "@label"
@@ -157,12 +161,13 @@ msgid_plural ""
"The following packages have not been verified by their authors. Downloading "
"untrusted packages has been disallowed by your current configuration."
msgstr[0] ""
-msgstr[1] ""
+"Келесі дестелерде авторлардың растауы жоқ, қолданыстағы баптауы бойынша "
+"сенімсіз дестелері жүктелмейді."
#: utils/qapt-batch/qaptbatch.cpp:202
msgctxt "@title:window"
msgid "Untrusted Packages"
-msgstr ""
+msgstr "Сенім артылмаған дестелер"
#: utils/qapt-batch/qaptbatch.cpp:210
#, kde-format
@@ -175,33 +180,33 @@ msgstr ""
#: utils/qapt-batch/qaptbatch.cpp:213
msgctxt "@title:window"
msgid "Package Not Found"
-msgstr ""
+msgstr "Десте табылмады"
#: utils/qapt-batch/qaptbatch.cpp:231
msgctxt "@label"
msgid "The size of the downloaded items did not equal the expected size."
-msgstr ""
+msgstr "Жүктеп алынғанның өлшемі күткеніне тең емес."
#: utils/qapt-batch/qaptbatch.cpp:233
msgctxt "@title:window"
msgid "Size Mismatch"
-msgstr ""
+msgstr "Өлшем қайышлығы"
#: utils/qapt-batch/qaptbatch.cpp:259
msgctxt "@title:window"
msgid "Media Change Required"
-msgstr ""
+msgstr "Тасушыны ауыстру керек"
#: utils/qapt-batch/qaptbatch.cpp:260
#, kde-format
msgctxt "@label"
msgid "Please insert %1 into <filename>%2</filename>"
-msgstr ""
+msgstr "<filename>%2</filename> дегенге %1 салыңыз"
#: utils/qapt-batch/qaptbatch.cpp:269
msgctxt "@title:window"
msgid "Warning - Unverified Software"
-msgstr ""
+msgstr "Ескерту - расталмаған бағдарламалар"
#: utils/qapt-batch/qaptbatch.cpp:271
msgctxt "@label"
@@ -216,7 +221,9 @@ msgid_plural ""
"presence of unverifiable software can be a sign of tampering.</warning> Do "
"you wish to continue?"
msgstr[0] ""
-msgstr[1] ""
+"Келесі бағдарлама бөлшектері аутентификациядан өте алмады. "
+"<warning>Расталмаған бағдарламаны қолданғаны жүйеңізді тәуекел етеді.</"
+"warning> Жалғастыра берейік пе?"
#: utils/qapt-batch/qaptbatch.cpp:306
msgctxt "@title:window"
@@ -246,14 +253,13 @@ msgstr ""
#: utils/qapt-batch/qaptbatch.cpp:334
msgctxt "@title:window"
msgid "Downloading"
-msgstr "正在下载"
+msgstr "Жүктелу"
#: utils/qapt-batch/qaptbatch.cpp:336
msgctxt "@info:status"
msgid "Downloading package file"
msgid_plural "Downloading package files"
msgstr[0] ""
-msgstr[1] ""
#: utils/qapt-batch/qaptbatch.cpp:348
msgctxt "@title:window"
@@ -275,7 +281,6 @@ msgctxt "@label"
msgid "Package successfully installed"
msgid_plural "Packages successfully installed"
msgstr[0] ""
-msgstr[1] ""
#: utils/qapt-batch/qaptbatch.cpp:373
msgctxt "@title:window"
@@ -292,23 +297,22 @@ msgctxt "@label"
msgid "Package successfully uninstalled"
msgid_plural "Packages successfully uninstalled"
msgstr[0] ""
-msgstr[1] ""
#: utils/qapt-batch/qaptbatch.cpp:431
msgctxt "@info:progress Remaining time"
msgid "Unknown"
-msgstr "未知"
+msgstr ""
#: utils/qapt-batch/qaptbatch.cpp:436
msgctxt "@info:progress Download rate"
msgid "Unknown"
-msgstr "未知"
+msgstr ""
#: utils/qapt-batch/qaptbatch.cpp:439
#, kde-format
msgctxt "@info:progress Download rate"
msgid "%1/s"
-msgstr "%1/秒 "
+msgstr ""
#: utils/qapt-batch/qaptbatch.cpp:462
msgctxt "@label"
@@ -334,19 +338,18 @@ msgctxt "@label"
msgid "An error occurred while applying changes:"
msgid_plural "The following errors occurred while applying changes:"
msgstr[0] ""
-msgstr[1] ""
#: utils/qapt-batch/qaptbatch.cpp:481
#, kde-format
msgctxt "@label Shows which package failed"
msgid "Package: %1"
-msgstr "软件包：%1"
+msgstr ""
#: utils/qapt-batch/qaptbatch.cpp:482
#, kde-format
msgctxt "@label Shows the error"
msgid "Error: %1"
-msgstr "错误：%1"
+msgstr ""
#: utils/qapt-batch/qaptbatch.cpp:486
msgctxt "@title:window"
diff --git a/src/backend.cpp b/src/backend.cpp
index fe4e625..87d9c82 100644
--- a/src/backend.cpp
+++ b/src/backend.cpp
@@ -708,6 +708,7 @@ bool Backend::openXapianIndex()
}
try {
d->xapianDatabase = new Xapian::Database("/var/lib/apt-xapian-index/index");
+ d->xapianIndexExists = true;
} catch (Xapian::DatabaseOpeningError) {
d->xapianIndexExists = false;
return false;
diff --git a/src/globals.h b/src/globals.h
index 4117f3a..ef48862 100644
--- a/src/globals.h
+++ b/src/globals.h
@@ -279,16 +279,16 @@ namespace QApt
enum MultiArchType {
/// Junk type
InvalidMultiArchType = 0,
- /* This package is co-installable with itself, but it must not be used to
+ /** This package is co-installable with itself, but it must not be used to
* satisfy the dependency of any package of a different architecture from itself.
* (Basically, not a multi-arch package)
*/
MultiArchSame,
- /* The package is @b not co-installable with itself, but should be allowed to
+ /** The package is @b not co-installable with itself, but should be allowed to
* satisfy the dependencies of a package of a different arch from itself.
*/
MultiArchForeign,
- /* This permits the reverse-dependencies of the package to annotate their Depends:
+ /** This permits the reverse-dependencies of the package to annotate their Depends:
* field to indicate that a foreign architecture version of the package satisfies
* the dependencies, but does not change the resolution of any existing dependencies.
*/
diff --git a/src/history.cpp b/src/history.cpp
index 187dac2..5aee32e 100644
--- a/src/history.cpp
+++ b/src/history.cpp
@@ -266,6 +266,8 @@ void HistoryPrivate::init()
HistoryItem *historyItem = new HistoryItem(stanza);
if (historyItem->isValid()) {
historyItemList << historyItem;
+ } else {
+ delete historyItem;
}
}
}
diff --git a/src/package.cpp b/src/package.cpp
index c68a9e1..6c500b6 100644
--- a/src/package.cpp
+++ b/src/package.cpp
@@ -438,7 +438,7 @@ QString Package::priority() const
{
const pkgCache::VerIterator &ver = (*d->backend->cache()->depCache()).GetCandidateVer(*d->packageIter);
if (!ver.end()) {
- QLatin1String(ver.PriorityType());
+ return QLatin1String(ver.PriorityType());
}
return QString();
diff --git a/src/worker/workerinstallprogress.cpp b/src/worker/workerinstallprogress.cpp
index 26a320c..fbe9844 100644
--- a/src/worker/workerinstallprogress.cpp
+++ b/src/worker/workerinstallprogress.cpp
@@ -49,8 +49,8 @@ WorkerInstallProgress::WorkerInstallProgress(QAptWorker* parent)
{
setenv("DEBIAN_FRONTEND", "passthrough", 1);
setenv("DEBCONF_PIPE", "/tmp/qapt-sock", 1);
- // TODO: apt-listchanges
- setenv("APT_LISTCHANGES_FRONTEND", "none", 1);
+ setenv("APT_LISTBUGS_FRONTEND", "none", 1);
+ setenv("APT_LISTCHANGES_FRONTEND", "debconf", 1);
}
WorkerInstallProgress::~WorkerInstallProgress()
--
qapt packaging
More information about the pkg-kde-commits
mailing list