Hello community,
here is the log from the commit of package kdeadmin4 for openSUSE:Factory
checked in at Wed Dec 16 17:34:27 CET 2009.
--------
--- KDE/kdeadmin4/kdeadmin4.changes 2009-11-02 21:58:08.000000000 +0100
+++ /mounts/work_src_done/STABLE/kdeadmin4/kdeadmin4.changes 2009-12-16 14:53:01.000000000 +0100
@@ -1,0 +2,6 @@
+Fri Dec 4 18:56:19 CET 2009 - dmueller@suse.de
+
+- update to 4.3.80:
+ * see http://techbase.kde.org/Schedules/KDE4/4.4_Feature_Plan
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
4_3_BRANCH.diff
kdeadmin-4.3.3.tar.bz2
New:
----
4_4_BRANCH.diff
kdeadmin-4.3.80.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdeadmin4.spec ++++++
--- /var/tmp/diff_new_pack.F1RZv7/_old 2009-12-16 17:33:00.000000000 +0100
+++ /var/tmp/diff_new_pack.F1RZv7/_new 2009-12-16 17:33:00.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kdeadmin4 (Version 4.3.3)
+# spec file for package kdeadmin4 (Version 4.3.80)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,15 +19,15 @@
Name: kdeadmin4
BuildRequires: libkdepimlibs4-devel oxygen-icon-theme rpm-devel
-License: GPL v2 or later
+License: GPLv2+
Group: System/GUI/KDE
Summary: kdeadmin base package
%define with_kpackage 0%{opensuse_bs}
Url: http://www.kde.org
-Version: 4.3.3
+Version: 4.3.80
Release: 1
Source0: kdeadmin-%version.tar.bz2
-Patch: 4_3_BRANCH.diff
+Patch: 4_4_BRANCH.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%kde4_runtime_requires
Suggests: kcron
@@ -92,7 +92,7 @@
rm -rf filelists
%package -n kcron
-License: GPL v2 or later
+License: GPLv2+
Group: System/Management
Summary: Cron job configuration tool
Provides: kde4-kcron = 4.3.0
@@ -118,7 +118,7 @@
%if %with_kpackage
%package -n kpackage
-License: GPL v2 or later
+License: GPLv2+
Group: System/Packages
Summary: RPM Handling Tool
Requires: smart
@@ -145,7 +145,7 @@
%endif
%package -n kuser
-License: GPL v2 or later
+License: GPLv2+
Group: System/Management
Summary: User Account Manager
Conflicts: yast2-theme-NLD
@@ -172,7 +172,7 @@
%doc COPYING COPYING.DOC README
%package -n ksystemlog
-License: GPL v2 or later
+License: GPLv2+
Group: System/Monitoring
Summary: System Log Viewer Tool
%kde4_runtime_requires
@@ -199,7 +199,7 @@
%_kde4_iconsdir/hicolor/*/apps/utilities-log-viewer.*
%package -n knetworkconf
-License: GPL v2 or later
+License: GPLv2+
Group: System/GUI/KDE
Summary: KDE Network Configuration Module
Provides: kde4-knetworkconf = 4.3.0
++++++ 4_3_BRANCH.diff -> 4_4_BRANCH.diff ++++++
++++++ kdeadmin-4.3.3.tar.bz2 -> kdeadmin-4.3.80.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeadmin-4.3.3/CTestConfig.cmake new/kdeadmin-4.3.80/CTestConfig.cmake
--- old/kdeadmin-4.3.3/CTestConfig.cmake 1970-01-01 01:00:00.000000000 +0100
+++ new/kdeadmin-4.3.80/CTestConfig.cmake 2009-11-21 10:45:09.000000000 +0100
@@ -0,0 +1,13 @@
+## This file should be placed in the root directory of your project.
+## Then modify the CMakeLists.txt file in the root directory of your
+## project to incorporate the testing dashboard.
+## # The following are required to uses Dart and the Cdash dashboard
+## ENABLE_TESTING()
+## INCLUDE(CTest)
+set(CTEST_PROJECT_NAME "kdeadmin")
+set(CTEST_NIGHTLY_START_TIME "20:00:00 CET")
+
+set(CTEST_DROP_METHOD "http")
+set(CTEST_DROP_SITE "my.cdash.org")
+set(CTEST_DROP_LOCATION "/submit.php?project=kdeadmin")
+set(CTEST_DROP_SITE_CDASH TRUE)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeadmin-4.3.3/doc/CMakeLists.txt new/kdeadmin-4.3.80/doc/CMakeLists.txt
--- old/kdeadmin-4.3.3/doc/CMakeLists.txt 2008-09-13 10:16:28.000000000 +0200
+++ new/kdeadmin-4.3.80/doc/CMakeLists.txt 2009-10-02 16:54:54.000000000 +0200
@@ -5,15 +5,25 @@
FIND_PROGRAM(LILO_EXECUTABLE NAMES lilo LILO PATHS /sbin /usr/sbin /usr/local/sbin /opt/lilo )
if ( UNIX )
- add_subdirectory(kuser)
- add_subdirectory(kcron)
- add_subdirectory(ksystemlog)
+ if(BUILD_kuser)
+ add_subdirectory(kuser)
+ endif()
+ if(BUILD_kcron)
+ add_subdirectory(kcron)
+ endif()
+ if(BUILD_ksystemlog)
+ add_subdirectory(ksystemlog)
+ endif()
endif( UNIX )
if(Q_WS_X11)
- add_subdirectory(kpackage)
+ if(BUILD_kpackage)
+ add_subdirectory(kpackage)
+ endif()
if(LILO_EXECUTABLE)
- add_subdirectory(lilo-config)
+ if(BUILD_lilo-config)
+ add_subdirectory(lilo-config)
+ endif()
endif(LILO_EXECUTABLE)
add_subdirectory(kcontrol)
endif(Q_WS_X11)
Files old/kdeadmin-4.3.3/doc/kcontrol/knetworkconf/index.cache.bz2 and new/kdeadmin-4.3.80/doc/kcontrol/knetworkconf/index.cache.bz2 differ
Files old/kdeadmin-4.3.3/doc/kcron/index.cache.bz2 and new/kdeadmin-4.3.80/doc/kcron/index.cache.bz2 differ
Files old/kdeadmin-4.3.3/doc/kdat/index.cache.bz2 and new/kdeadmin-4.3.80/doc/kdat/index.cache.bz2 differ
Files old/kdeadmin-4.3.3/doc/kpackage/index.cache.bz2 and new/kdeadmin-4.3.80/doc/kpackage/index.cache.bz2 differ
Files old/kdeadmin-4.3.3/doc/ksystemlog/index.cache.bz2 and new/kdeadmin-4.3.80/doc/ksystemlog/index.cache.bz2 differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeadmin-4.3.3/doc/ksystemlog/index.docbook new/kdeadmin-4.3.80/doc/ksystemlog/index.docbook
--- old/kdeadmin-4.3.3/doc/ksystemlog/index.docbook 2008-11-28 16:39:51.000000000 +0100
+++ new/kdeadmin-4.3.80/doc/ksystemlog/index.docbook 2009-11-13 11:58:44.000000000 +0100
@@ -238,7 +238,7 @@
<para>
&ksystemlog; provides an easy way to control the reading and the monitoring of log files. Indeed, sometimes you only need to analyze some existing log lines. In this case,
- you can't tolerate the appearance of a new line. You can deactivate the monitoring of log files by clicking on the <guibutton>Stop</guibutton>
+ you cannot tolerate the appearance of a new line. You can deactivate the monitoring of log files by clicking on the <guibutton>Stop</guibutton>
button. This stops the opened log files from being updated while still letting them get filled by other processes. Of course, you can reactivate the monitoring by
clicking on <guibutton>Resume</guibutton>, which will display the log lines added since the last pause.
</para>
Files old/kdeadmin-4.3.3/doc/ksysv/index.cache.bz2 and new/kdeadmin-4.3.80/doc/ksysv/index.cache.bz2 differ
Files old/kdeadmin-4.3.3/doc/kuser/index.cache.bz2 and new/kdeadmin-4.3.80/doc/kuser/index.cache.bz2 differ
Files old/kdeadmin-4.3.3/doc/lilo-config/index.cache.bz2 and new/kdeadmin-4.3.80/doc/lilo-config/index.cache.bz2 differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeadmin-4.3.3/kcron/src/kcm_cron.desktop new/kdeadmin-4.3.80/kcron/src/kcm_cron.desktop
--- old/kdeadmin-4.3.3/kcron/src/kcm_cron.desktop 2009-10-02 10:18:28.000000000 +0200
+++ new/kdeadmin-4.3.80/kcron/src/kcm_cron.desktop 2009-11-21 10:45:09.000000000 +0100
@@ -12,6 +12,7 @@
X-KDE-System-Settings-Parent-Category=system
Name=Task Scheduler
+Name[ast]=Organizador de xeres
Name[bg]=Диспечер на задачи
Name[ca]=Planificador de tasques
Name[cs]=Plánovač úloh
@@ -51,11 +52,11 @@
Name[th]=ตัวจัดการตารางงาน
Name[tr]=Görev Zamanlayıcı
Name[uk]=Планувальник завдань
-Name[wa]=Programeu d' bouyes
Name[x-test]=xxTask Schedulerxx
Name[zh_CN]=任务调度程序
Name[zh_TW]=工作排程器
Comment=Configure and schedule tasks
+Comment[ast]=Configuración y xeres planificaes
Comment[bg]=Задаване и настройване на задачи
Comment[ca]=Configura i planifica les tasques
Comment[cs]=Nastavení a plánování úloh
@@ -94,7 +95,6 @@
Comment[th]=ปรับแต่งและจัดตารางงาน
Comment[tr]=Görevleri zamanla ve yapılandır
Comment[uk]=Налаштування і планування завдання
-Comment[wa]=Apontyî eyet programer des bouyes
Comment[x-test]=xxConfigure and schedule tasksxx
Comment[zh_CN]=配置并调度计划任务
Comment[zh_TW]=設定與排程工作
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeadmin-4.3.3/kdat/kdat.desktop new/kdeadmin-4.3.80/kdat/kdat.desktop
--- old/kdeadmin-4.3.3/kdat/kdat.desktop 2009-10-02 10:18:28.000000000 +0200
+++ new/kdeadmin-4.3.80/kdat/kdat.desktop 2009-11-21 10:45:08.000000000 +0100
@@ -2,6 +2,7 @@
Name=KDat
Name[af]=Kdat
Name[ar]=KDat
+Name[ast]=KDat
Name[be]=KDat
Name[bg]=KDat
Name[bn]=কে-ড্যাট
@@ -67,6 +68,7 @@
Name[zh_TW]=KDat
GenericName=Tape Backup Tool
GenericName[af]=Kaset Rugsteun Program
+GenericName[ast]=Preséu de respaldu con cintes
GenericName[be]=Начынне для архівавання на магнітныя ленты
GenericName[bg]=Лентов архиватор
GenericName[bn]=টেপ ব্যাকআপ সরঞ্জাম
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeadmin-4.3.3/KDEAdminNightly.cmake new/kdeadmin-4.3.80/KDEAdminNightly.cmake
--- old/kdeadmin-4.3.3/KDEAdminNightly.cmake 1970-01-01 01:00:00.000000000 +0100
+++ new/kdeadmin-4.3.80/KDEAdminNightly.cmake 2009-11-21 10:45:09.000000000 +0100
@@ -0,0 +1,87 @@
+# This is a script for running a Nightly build of kdeutils
+# It is ready for testing.
+# To adapt it for other projects, basically only the KDE_CTEST_VCS_REPOSITORY variable
+# has to be changed.
+#
+# It uses the file KDECTestNightly.cmake, which is in KDE svn in kdesdk/cmake/modules/.
+# You need to have this file on some location on your system and then point the environment variable
+# KDECTESTNIGHTLY_DIR to the directory containing this file when running this script.
+#
+# At the bottom of this file you can find (commented out) a simple shell script which
+# I use to drive the Nightly builds on my machine. You have to adapt this to the
+# conditions on your system, then you can run it e.g. via cron.
+#
+# Alex <neundorf AT kde.org>
+
+# The VCS of KDE is "svn", also specify the repository
+set(KDE_CTEST_VCS svn)
+set(KDE_CTEST_VCS_REPOSITORY https://svn.kde.org/home/kde/trunk/KDE/kdeadmin)
+
+# for now hardcode the generator to "Unix Makefiles"
+set(CTEST_CMAKE_GENERATOR "Unix Makefiles" )
+
+
+# generic support code, provides the kde_ctest_setup() macro, which sets up everything required:
+file(TO_CMAKE_PATH $ENV{KDECTESTNIGHTLY_DIR} KDECTESTNIGHTLY_DIR)
+include( "${KDECTESTNIGHTLY_DIR}/KDECTestNightly.cmake" OPTIONAL RESULT_VARIABLE fileIncluded)
+
+if(NOT fileIncluded)
+ message(FATAL_ERROR "Did not find file ${KDECTESTNIGHTLY_DIR}/KDECTestNightly.cmake . Set the environment variable KDECTESTNIGHTLY_DIR to the directory where this file is located. In KDE svn it is in kdesdk/cmake/modules/ ")
+endif(NOT fileIncluded)
+
+# set up binary dir, source dir, etc.
+kde_ctest_setup("${CMAKE_CURRENT_LIST_FILE}")
+
+# now actually do the Nightly
+ctest_empty_binary_directory("${CTEST_BINARY_DIRECTORY}")
+ctest_start(Nightly)
+ctest_update(SOURCE "${CTEST_SOURCE_DIRECTORY}" )
+
+# read some settings
+include("${CTEST_SOURCE_DIRECTORY}/CTestConfig.cmake")
+include("${CTEST_SOURCE_DIRECTORY}/CTestCustom.cmake" OPTIONAL)
+
+# if CMAKE_INSTALL_PREFIX and BUILD_experimental were defined on the command line, put them
+# in the initial cache, so cmake gets them
+kde_ctest_write_initial_cache("${CTEST_BINARY_DIRECTORY}" CMAKE_INSTALL_PREFIX)
+
+# configure, build, test, submit
+ctest_configure(BUILD "${CTEST_BINARY_DIRECTORY}" )
+ctest_build(BUILD "${CTEST_BINARY_DIRECTORY}" )
+ctest_test(BUILD "${CTEST_BINARY_DIRECTORY}" )
+ctest_submit()
+
+# optionally install afterwards, so additional nightly builds can use this current install
+# (e.g. kdepimlibs could use this kdelibs install)
+if(DO_INSTALL)
+ kde_ctest_install("${CTEST_BINARY_DIRECTORY}" )
+endif(DO_INSTALL)
+
+
+############################################################################################
+#
+# ------------8<-----------------8<---------------------8<---------------------8<-----------
+# #!/bin/sh
+#
+# # point to the directory where KDECTestNightly.cmake is located (in svn: kdesvn/cmake/modules/ )
+# export KDECTESTNIGHTLY_DIR=/home/alex/src/kde4-svn/KDE\ dir/kdesdk/cmake/modules/
+#
+#
+# # Set which ctest will be used, where the results should be installed to, and which suffix the
+# CTEST=/opt/cmake-2.6.2-Linux-i386/bin/ctest
+# INSTALL_ROOT=/home/alex/Dashboards/installs/2.6.2
+# SUFFIX=cmake-2.6.2
+#
+# # set CMAKE_PREFIX_PATH so that everything necessary for building automoc4 will be found:
+# export CMAKE_PREFIX_PATH=/opt/qt-4.5/qt/
+#
+# $CTEST -V -VV -S ~/src/kde4-svn/kdesupport/automoc/Automoc4Nightly.cmake,KDE_CTEST_BUILD_SUFFIX=$SUFFIX,CMAKE_INSTALL_PREFIX=$INSTALL_ROOT/automoc4,DO_INSTALL=TRUE
+#
+# # For building kdelibs we need more stuff in CMAKE_PREFIX_PATH:
+# export CMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH:$INSTALL_ROOT/automoc4
+# export CMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH:/opt/shared-mime-info
+# export CMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH:/opt/kdesupport/
+#
+# $CTEST -V -VV -S ~/src/kde4-svn/KDE\ dir/kdelibs/KDELibsNightly.cmake,KDE_CTEST_BUILD_SUFFIX=$SUFFIX,CMAKE_INSTALL_PREFIX=$INSTALL_ROOT/kdelibs,DO_INSTALL=TRUE
+#
+# ------------8<-----------------8<---------------------8<---------------------8<-----------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeadmin-4.3.3/knetworkconf/knetworkconf/kcm_knetworkconfmodule.desktop new/kdeadmin-4.3.80/knetworkconf/knetworkconf/kcm_knetworkconfmodule.desktop
--- old/kdeadmin-4.3.3/knetworkconf/knetworkconf/kcm_knetworkconfmodule.desktop 2009-10-02 10:18:28.000000000 +0200
+++ new/kdeadmin-4.3.80/knetworkconf/knetworkconf/kcm_knetworkconfmodule.desktop 2009-11-21 10:45:09.000000000 +0100
@@ -17,6 +17,7 @@
Comment=Configure Network Settings
Comment[ar]=اضبط إعدادات الشبكة
+Comment[ast]=Configura los parámetros de rede
Comment[be]=Наставіць сетку
Comment[bg]=Настройване на мрежата
Comment[bn]=নেটওয়ার্ক মানসমূহ কনফিগার করে
@@ -27,7 +28,7 @@
Comment[de]=Netzwerkeinstellungen einrichten
Comment[el]=Διαμόρφωση ρυθμίσεων δικτύου
Comment[en_GB]=Configure Network Settings
-Comment[es]=Configurar los parámetros de red
+Comment[es]=Configure los parámetros de red
Comment[et]=Võrguseadistuste seadistamine
Comment[eu]=Konfiguratu sareko ezarpenak
Comment[fa]=پیکربندی تنظیمات شبکه
@@ -69,13 +70,13 @@
Comment[tr]=Ağ Ayarlarını Yapılandır
Comment[uk]=Налаштування мережних параметрів
Comment[vi]=Cấu hình thiết lập mạng
-Comment[wa]=Apontyî les tchuzes del rantoele
Comment[x-test]=xxConfigure Network Settingsxx
Comment[zh_CN]=配置网络设置
Comment[zh_HK]=設定網絡設置
Comment[zh_TW]=設定網路
Terminal=false
Name=Network Settings
+Name[ast]=Preferencies de rede
Name[be]=Наставіць сетку
Name[bg]=Мрежови настройки
Name[bn]=নেটওয়ার্ক মানসমূহ
@@ -87,6 +88,7 @@
Name[de]=Netzwerkeinstellungen
Name[el]=Ρυθμίσεις δικτύου
Name[en_GB]=Network Settings
+Name[eo]=Reta agordo
Name[es]=Parámetros de red
Name[et]=Võrguseadistused
Name[eu]=Sareko ezarpenak
@@ -108,7 +110,6 @@
Name[ko]=네트워크 설정
Name[lt]=Tinklo nustatymai
Name[lv]=Tīkla iestatījumi
-Name[mai]=नेटवर्क विन्यास
Name[mk]=Поставувања на мрежа
Name[ml]=ശ്രംഖലയുടെ സജ്ജീകരണങ്ങള്
Name[nb]=Nettverksoppsett
@@ -131,7 +132,6 @@
Name[tr]=Ağ Ayarları
Name[uk]=Мережні параметри
Name[vi]=Thiết lập mạng
-Name[wa]=Apontiaedjes rantoele
Name[x-test]=xxNetwork Settingsxx
Name[zh_CN]=网络设置
Name[zh_HK]=網絡設置
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeadmin-4.3.3/knetworkconf/knetworkconf/knetworkconf.desktop new/kdeadmin-4.3.80/knetworkconf/knetworkconf/knetworkconf.desktop
--- old/kdeadmin-4.3.3/knetworkconf/knetworkconf/knetworkconf.desktop 2009-10-02 10:18:28.000000000 +0200
+++ new/kdeadmin-4.3.80/knetworkconf/knetworkconf/knetworkconf.desktop 2009-11-21 10:45:09.000000000 +0100
@@ -6,6 +6,7 @@
X-DocPath=knetworkconf/index.html
Comment=Configure TCP/IP settings
Comment[ar]=اضبط إعدادات بروتوكول التحكم بالنقل/بروتوكول الإنترنت
+Comment[ast]=Configura los parámetros TCP/IP
Comment[be]=Наставіць TCP/IP
Comment[bg]=Настройване настройките на TCP/IP
Comment[bn]=টিসিপি/আইপি মানসমূহ কনফিগার করে
@@ -58,13 +59,13 @@
Comment[tr]=TCP/IP ayarlarını yapılandır
Comment[uk]=Налаштувати параметри TCP/IP
Comment[vi]=Cấu hình thiết lập TCP/IP
-Comment[wa]=Apontyî les tchuzes TCP/IP
Comment[x-test]=xxConfigure TCP/IP settingsxx
Comment[zh_CN]=配置 TCP/IP 设置
Comment[zh_HK]=設定 TCP/IP 設置
Comment[zh_TW]=設定 TCP/IP
Terminal=false
Name=KNetworkConf
+Name[ast]=KNetworkConf
Name[be]=KNetworkConf
Name[bg]=KNetworkConf
Name[bn]=কে-নেটওয়ার্ক-কন্ফ
@@ -116,12 +117,12 @@
Name[tr]=KNetworkConf
Name[uk]=KNetworkConf
Name[vi]=KNetworkConf
-Name[wa]=KNetworkConf
Name[x-test]=xxKNetworkConfxx
Name[zh_CN]=KNetworkConf
Name[zh_HK]=KNetworkConf
Name[zh_TW]=KNetworkConf
GenericName=Configure TCP/IP Settings
+GenericName[ast]=Configura los parámetros TCP/IP
GenericName[be]=Наставіць TCP/IP
GenericName[bg]=Настройване настройките на TCP/IP
GenericName[bn]=টিসিপি/আইপি মানসমূহ কনফিগারেশন
@@ -174,7 +175,6 @@
GenericName[tr]=LILO'yu Yapılandır
GenericName[uk]=Налаштувати параметри TCP/IP
GenericName[vi]=Cấu hình thiết lập TCP/IP
-GenericName[wa]=Apontyî les tchuzes TCP/IP
GenericName[x-test]=xxConfigure TCP/IP Settingsxx
GenericName[zh_CN]=配置 TCP/IP 设置
GenericName[zh_HK]=設定 TCP/IP 設置
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeadmin-4.3.3/kpackage/kpackage.desktop new/kdeadmin-4.3.80/kpackage/kpackage.desktop
--- old/kdeadmin-4.3.3/kpackage/kpackage.desktop 2009-10-02 10:18:28.000000000 +0200
+++ new/kdeadmin-4.3.80/kpackage/kpackage.desktop 2009-11-21 10:45:09.000000000 +0100
@@ -2,6 +2,7 @@
Name=KPackage
Name[af]=Kpackage
Name[ar]=KPackage
+Name[ast]=KPackage
Name[be]=KPackage
Name[bg]=KPackage
Name[bn]=কে-প্যাকেজ
@@ -66,6 +67,7 @@
Name[zh_TW]=KPackage
GenericName=Package Manager
GenericName[af]=Paket Bestuurder
+GenericName[ast]=Xestor de paquetes
GenericName[be]=Кіраванне пакетамі
GenericName[bg]=Мениджър на пакети
GenericName[bn]=প্যাকেজ ম্যানেজার
@@ -98,7 +100,6 @@
GenericName[ko]=꾸러미 관리자
GenericName[lt]=Paketų tvarkyklė
GenericName[lv]=Pakotņu pārvaldnieks
-GenericName[mai]=संकुल प्रबंधक
GenericName[mk]=Менаџер на пакети
GenericName[ml]=പാക്കേജുകളുടെ നടത്തിപ്പുകാരന്
GenericName[ms]=Pengurus Pakej
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeadmin-4.3.3/kpackage/kpkg.cpp new/kdeadmin-4.3.80/kpackage/kpkg.cpp
--- old/kdeadmin-4.3.3/kpackage/kpkg.cpp 2008-01-05 00:58:33.000000000 +0100
+++ new/kdeadmin-4.3.80/kpackage/kpkg.cpp 2009-09-23 21:23:18.000000000 +0200
@@ -122,7 +122,7 @@
pack_find = actionCollection()->addAction( "pack_find");
pack_find->setText(i18n("Find &Package..."));
pack_find->setIcon(KIcon("edit-find"));
- qobject_cast( pack_find )->setShortcut(KStandardShortcut::shortcut(KStandardShortcut::Find));
+ pack_find->setShortcut(KStandardShortcut::shortcut(KStandardShortcut::Find));
connect(pack_find, SIGNAL(triggered()), kpackage, SLOT(find()));
pack_findf = actionCollection()->addAction( "pack_findf");
@@ -133,7 +133,7 @@
kpack_reload = actionCollection()->addAction( "kpack_reload" );
kpack_reload->setText(i18n("&Reload"));
kpack_reload->setIcon(KIcon("view-refresh"));
- qobject_cast( kpack_reload )->setShortcut(KStandardShortcut::shortcut(KStandardShortcut::Reload));
+ kpack_reload->setShortcut(KStandardShortcut::shortcut(KStandardShortcut::Reload));
connect(kpack_reload, SIGNAL(triggered()), kpackage, SLOT(reload()));
(void) KStandardAction::quit(kpackage, SLOT(fileQuit()),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeadmin-4.3.3/kpackage/kpkg.h new/kdeadmin-4.3.80/kpackage/kpkg.h
--- old/kdeadmin-4.3.3/kpackage/kpkg.h 2008-01-05 00:58:33.000000000 +0100
+++ new/kdeadmin-4.3.80/kpackage/kpkg.h 2009-09-23 21:23:18.000000000 +0200
@@ -48,7 +48,7 @@
class KConfigGroup;
class kpSettings;
class kpConfig;
-
+class KAction;
//////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
@@ -116,9 +116,9 @@
QAction *pack_hopen;
QAction *pack_open;
- QAction *pack_find;
+ KAction *pack_find;
QAction *pack_findf;
- QAction *kpack_reload;
+ KAction *kpack_reload;
QAction *pack_prev;
QAction *pack_next;
QAction *pack_install;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeadmin-4.3.3/ksystemlog/src/generalConfigurationWidgetBase.ui new/kdeadmin-4.3.80/ksystemlog/src/generalConfigurationWidgetBase.ui
--- old/kdeadmin-4.3.3/ksystemlog/src/generalConfigurationWidgetBase.ui 2009-05-06 12:14:28.000000000 +0200
+++ new/kdeadmin-4.3.80/ksystemlog/src/generalConfigurationWidgetBase.ui 2009-07-06 13:06:55.000000000 +0200
@@ -59,7 +59,7 @@
</widget>
</item>
<item>
- <widget class="QSpinBox" name="maxLines" >
+ <widget class="KIntSpinBox" name="maxLines" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
<horstretch>0</horstretch>
@@ -191,6 +191,13 @@
</item>
</layout>
</widget>
+ <customwidgets>
+ <customwidget>
+ <class>KIntSpinBox</class>
+ <extends>QSpinBox</extends>
+ <header>knuminput.h</header>
+ </customwidget>
+ </customwidgets>
<resources/>
<connections/>
</ui>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeadmin-4.3.3/ksystemlog/src/ksystemlog.desktop new/kdeadmin-4.3.80/ksystemlog/src/ksystemlog.desktop
--- old/kdeadmin-4.3.3/ksystemlog/src/ksystemlog.desktop 2009-10-02 10:18:28.000000000 +0200
+++ new/kdeadmin-4.3.80/ksystemlog/src/ksystemlog.desktop 2009-11-21 10:45:08.000000000 +0100
@@ -1,5 +1,6 @@
[Desktop Entry]
Name=KSystemLog
+Name[ast]=KSystemLog
Name[bg]=Системни логове
Name[ca]=KSystemLog
Name[cs]=KSystemLog
@@ -38,7 +39,6 @@
Name[th]=ปูมบันทึกระบบ
Name[tr]=KSystemLog
Name[uk]=KSystemLog
-Name[wa]=KSystemLog
Name[x-test]=xxKSystemLogxx
Name[zh_CN]=KSystemLog
Name[zh_TW]=KSystemLog
@@ -49,6 +49,7 @@
Type=Application
X-DocPath=ksystemlog/index.html
Comment=System log viewer tool
+Comment[ast]=Ferramienta de visor de rexistru de sistema
Comment[bg]=Инструмент за преглеждане на системните логове
Comment[ca]=Eina de visualització dels registres del sistema
Comment[cs]=Nástroj na prohlížení záznamů systému
@@ -74,7 +75,7 @@
Comment[ml]=സിസ്റ്റം ലോഗ് കാണാന്നുള്ള ടൂള്
Comment[nb]=Verktøy for å vise systemlogger
Comment[nds]=Kieker för Systeem-Logböker
-Comment[nl]=Programma voor het bekijken van systeemlogs
+Comment[nl]=Systeemlogs bekijken
Comment[nn]=Verktøy for vising av systemloggar
Comment[pa]=ਸਿਸਟਲ ਲਾਗ ਦਰਸ਼ਕ ਟੂਲ
Comment[pl]=Narzędzie do przeglądania dziennika systemowego
@@ -87,12 +88,12 @@
Comment[th]=เครื่องมือแสดงปูมบันทึกของระบบ
Comment[tr]=Sistem günlük kayıtlarını gösterme aracı
Comment[uk]=Засіб перегляду системних журналів
-Comment[wa]=Usteye po vey les djournås do sistinme
Comment[x-test]=xxSystem log viewer toolxx
Comment[zh_CN]=系统日志查看工具
Comment[zh_TW]=系統紀錄檢視工具
Terminal=false
GenericName=System Logs Viewer
+GenericName[ast]=Visor de rexistros del sistema
GenericName[bg]=Преглед на системните логове
GenericName[ca]=Visor dels registres del sistema
GenericName[cs]=Prohlížeč záznamů systému
@@ -131,7 +132,6 @@
GenericName[th]=แสดงปูมบันทึกของระบบ
GenericName[tr]=Sistem Günlüğü İzleyici
GenericName[uk]=Переглядач системних журналів
-GenericName[wa]=Håyneu des djournås do sistinme
GenericName[x-test]=xxSystem Logs Viewerxx
GenericName[zh_CN]=系统日志查看器
GenericName[zh_TW]=系統紀錄檢視器
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeadmin-4.3.3/ksystemlog/src/lib/processOutputLogFileReader.cpp new/kdeadmin-4.3.80/ksystemlog/src/lib/processOutputLogFileReader.cpp
--- old/kdeadmin-4.3.3/ksystemlog/src/lib/processOutputLogFileReader.cpp 2009-05-06 12:14:26.000000000 +0200
+++ new/kdeadmin-4.3.80/ksystemlog/src/lib/processOutputLogFileReader.cpp 2009-12-01 01:28:02.000000000 +0100
@@ -135,9 +135,11 @@
d->availableStandardOutput.clear();
- d->process->close();
- delete d->process;
- d->process = NULL;
+ if(d->process) {
+ d->process->close();
+ delete d->process;
+ d->process = NULL;
+ }
logDebug() << "Process closed" << endl;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeadmin-4.3.3/ksysv/ksysv.desktop new/kdeadmin-4.3.80/ksysv/ksysv.desktop
--- old/kdeadmin-4.3.3/ksysv/ksysv.desktop 2009-10-02 10:18:28.000000000 +0200
+++ new/kdeadmin-4.3.80/ksysv/ksysv.desktop 2009-11-21 10:45:08.000000000 +0100
@@ -1,6 +1,7 @@
[Desktop Entry]
Name=KSysV
Name[ar]=KSysV
+Name[ast]=KSysV
Name[be]=KSysV
Name[bg]=KSysV
Name[bn]=কে-সিস-ভি
@@ -11,6 +12,7 @@
Name[de]=KSysV
Name[el]=KSysV
Name[en_GB]=KSysV
+Name[eo]=KSysV
Name[es]=KSysV
Name[et]=KSysV
Name[eu]=KSysV
@@ -54,13 +56,13 @@
Name[tr]=KSysV
Name[uk]=KSysV
Name[vi]=KSysV
-Name[wa]=KSysV
Name[x-test]=xxKSysVxx
Name[zh_CN]=KSysV
Name[zh_HK]=KSysV
Name[zh_TW]=KSysV
GenericName=SysV-Init Editor
GenericName[ar]=محرر SysV-Init
+GenericName[ast]=Editor SysV-Init
GenericName[be]=Рэдактар SysV-Init
GenericName[bg]=Редактор на SysV-Init
GenericName[bn]=সিস-ভি-আইনিট সম্পাদক
@@ -115,7 +117,6 @@
GenericName[tr]=SysV-Init Düzenleyici
GenericName[uk]=Редактор KSysV-Init
GenericName[vi]=SysV-Bộ sửa Init
-GenericName[wa]=Aspougneu SysV-Init
GenericName[x-test]=xxSysV-Init Editorxx
GenericName[zh_CN]=SysV-Init 编辑器
GenericName[zh_HK]=SysV-Init 編輯器
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeadmin-4.3.3/ksysv/Properties.h new/kdeadmin-4.3.80/ksysv/Properties.h
--- old/kdeadmin-4.3.3/ksysv/Properties.h 2008-01-05 00:58:27.000000000 +0100
+++ new/kdeadmin-4.3.80/ksysv/Properties.h 2009-07-06 13:06:55.000000000 +0200
@@ -26,7 +26,7 @@
class Q3HBox;
class Q3VBox;
class Q3TextView;
-class QSpinBox;
+class KIntSpinBox;
class KLineEdit;
@@ -103,7 +103,7 @@
KLineEdit* mServiceEdit;
KLineEdit* mLabelEdit;
- QSpinBox* mNumberEdit;
+ KIntSpinBox* mNumberEdit;
};
class KSVServicesPage : public KPropertiesDialogPlugin
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeadmin-4.3.3/ksysv/SpinBox.cpp new/kdeadmin-4.3.80/ksysv/SpinBox.cpp
--- old/kdeadmin-4.3.3/ksysv/SpinBox.cpp 2008-01-05 00:58:27.000000000 +0100
+++ new/kdeadmin-4.3.80/ksysv/SpinBox.cpp 2009-07-06 13:06:55.000000000 +0200
@@ -27,7 +27,7 @@
#include "SpinBox.h"
KSVSpinBox::KSVSpinBox (QWidget* parent, const char* name)
- : QSpinBox (0, 99, 1, parent, name),
+ : KIntSpinBox (0, 99, 1, parent, name),
KCompletionBase (),
mClearedSelection (false)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeadmin-4.3.3/ksysv/SpinBox.h new/kdeadmin-4.3.80/ksysv/SpinBox.h
--- old/kdeadmin-4.3.3/ksysv/SpinBox.h 2008-01-05 00:58:27.000000000 +0100
+++ new/kdeadmin-4.3.80/ksysv/SpinBox.h 2009-07-06 13:06:55.000000000 +0200
@@ -19,13 +19,13 @@
#ifndef KSV_SPINBOX_H
#define KSV_SPINBOX_H
-#include <QSpinBox>
//Added by qt3to4:
#include <QEvent>
#include
+#include <KNumInput>
-class KSVSpinBox : public QSpinBox, public KCompletionBase
+class KSVSpinBox : public KIntSpinBox, public KCompletionBase
{
Q_OBJECT
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeadmin-4.3.3/ksysv/x-ksysv.desktop new/kdeadmin-4.3.80/ksysv/x-ksysv.desktop
--- old/kdeadmin-4.3.3/ksysv/x-ksysv.desktop 2009-10-02 10:18:28.000000000 +0200
+++ new/kdeadmin-4.3.80/ksysv/x-ksysv.desktop 2009-11-21 10:45:08.000000000 +0100
@@ -2,6 +2,7 @@
Comment=Saved Init Configuration
Comment[af]=Gestoor Init Opstelling
Comment[ar]=تشكيل Init المحفوظة
+Comment[ast]=Configuración Init Salvada
Comment[be]=Запісаныя настаўленні ініцыялізацыі
Comment[bg]=Настройване на инициализиращите нива
Comment[bn]=সংরক্ষিত আইনিট কনফিগারেশন
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeadmin-4.3.3/ksysv/x-ksysv-log.desktop new/kdeadmin-4.3.80/ksysv/x-ksysv-log.desktop
--- old/kdeadmin-4.3.3/ksysv/x-ksysv-log.desktop 2009-10-02 10:18:28.000000000 +0200
+++ new/kdeadmin-4.3.80/ksysv/x-ksysv-log.desktop 2009-11-21 10:45:08.000000000 +0100
@@ -1,6 +1,7 @@
[Desktop Entry]
Comment=SysV-Init Editor Log File
Comment[ar]=ملف محرّر سجل الوقائع SysV-Init
+Comment[ast]=Ficheru de rexistru del Editor SysV-Init
Comment[be]=Часопіс рэдактара SysV-Init
Comment[bg]=Редактор на инициализиращите нива
Comment[bn]= সিস-ভি-আইনিট সম্পাদক কার্যবিবরণী ফাইল
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeadmin-4.3.3/kuser/ku_configdlg.cpp new/kdeadmin-4.3.80/kuser/ku_configdlg.cpp
--- old/kdeadmin-4.3.3/kuser/ku_configdlg.cpp 2008-03-06 10:21:48.000000000 +0100
+++ new/kdeadmin-4.3.80/kuser/ku_configdlg.cpp 2009-07-06 13:06:55.000000000 +0200
@@ -61,6 +61,10 @@
QFrame *frame = new QFrame ( page1 );
ui.setupUi( frame );
page1->addTab( frame, i18n("Password Policy") );
+ ui.kcfg_smax->setSuffix(ki18np(" day", " days"));
+ ui.kcfg_sinact->setSuffix(ki18np(" day", " days"));
+ ui.kcfg_swarn->setSuffix(ki18np(" day", " days"));
+ ui.kcfg_smin->setSuffix(ki18np(" day", " days"));
}
addPage( page1, i18n("General"), "kuser", i18n("General Settings") );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeadmin-4.3.3/kuser/ku_generalsettings.ui new/kdeadmin-4.3.80/kuser/ku_generalsettings.ui
--- old/kdeadmin-4.3.3/kuser/ku_generalsettings.ui 2009-04-28 15:47:13.000000000 +0200
+++ new/kdeadmin-4.3.80/kuser/ku_generalsettings.ui 2009-07-06 13:06:55.000000000 +0200
@@ -164,7 +164,7 @@
</widget>
</item>
<item>
- <widget class="QSpinBox" name="kcfg_defaultgroup" >
+ <widget class="KIntSpinBox" name="kcfg_defaultgroup" >
<property name="maximum" >
<number>65536</number>
</property>
@@ -205,6 +205,11 @@
<container>0</container>
<pixmap></pixmap>
</customwidget>
+ <customwidget>
+ <class>KIntSpinBox</class>
+ <extends>QSpinBox</extends>
+ <header>knuminput.h</header>
+ </customwidget>
</customwidgets>
<tabstops>
<tabstop>kcfg_source</tabstop>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeadmin-4.3.3/kuser/ku_passwordpolicy.ui new/kdeadmin-4.3.80/kuser/ku_passwordpolicy.ui
--- old/kdeadmin-4.3.3/kuser/ku_passwordpolicy.ui 2009-04-28 15:47:13.000000000 +0200
+++ new/kdeadmin-4.3.80/kuser/ku_passwordpolicy.ui 2009-07-06 13:06:55.000000000 +0200
@@ -72,13 +72,10 @@
</widget>
</item>
<item row="1" column="1" >
- <widget class="QSpinBox" name="kcfg_smax" >
+ <widget class="KIntSpinBox" name="kcfg_smax" >
<property name="specialValueText" >
<string>Never</string>
</property>
- <property name="suffix" >
- <string> days</string>
- </property>
<property name="maximum" >
<number>99999</number>
</property>
@@ -88,13 +85,10 @@
</widget>
</item>
<item row="3" column="1" >
- <widget class="QSpinBox" name="kcfg_sinact" >
+ <widget class="KIntSpinBox" name="kcfg_sinact" >
<property name="specialValueText" >
<string>Never</string>
</property>
- <property name="suffix" >
- <string> days</string>
- </property>
<property name="maximum" >
<number>99999</number>
</property>
@@ -117,13 +111,10 @@
</widget>
</item>
<item row="2" column="1" >
- <widget class="QSpinBox" name="kcfg_swarn" >
+ <widget class="KIntSpinBox" name="kcfg_swarn" >
<property name="specialValueText" >
<string>Never</string>
</property>
- <property name="suffix" >
- <string> days</string>
- </property>
<property name="maximum" >
<number>99999</number>
</property>
@@ -133,13 +124,10 @@
</widget>
</item>
<item row="0" column="1" >
- <widget class="QSpinBox" name="kcfg_smin" >
+ <widget class="KIntSpinBox" name="kcfg_smin" >
<property name="specialValueText" >
<string/>
</property>
- <property name="suffix" >
- <string> days</string>
- </property>
<property name="maximum" >
<number>99999</number>
</property>
@@ -200,6 +188,11 @@
<container>0</container>
<pixmap></pixmap>
</customwidget>
+ <customwidget>
+ <class>KIntSpinBox</class>
+ <extends>QSpinBox</extends>
+ <header>knuminput.h</header>
+ </customwidget>
</customwidgets>
<tabstops>
<tabstop>kcfg_smin</tabstop>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeadmin-4.3.3/kuser/kuser.desktop new/kdeadmin-4.3.80/kuser/kuser.desktop
--- old/kdeadmin-4.3.3/kuser/kuser.desktop 2009-10-02 10:18:28.000000000 +0200
+++ new/kdeadmin-4.3.80/kuser/kuser.desktop 2009-11-21 10:45:08.000000000 +0100
@@ -2,6 +2,7 @@
Name=KUser
Name[af]=Kuser
Name[ar]=ك.مستخدم
+Name[ast]=KUser
Name[be]=KUser
Name[bg]=KUser
Name[bn]=কে-ব্যবহারকারী
@@ -68,6 +69,7 @@
Name[zh_TW]=KUser
GenericName=User Manager
GenericName[af]=Gebruiker Bestuurder
+GenericName[ast]=Xestor d'Usuariu
GenericName[be]=Кіраванне карыстальнікамі
GenericName[bg]=Управление на потребителите
GenericName[bn]=ব্যবহারকারী ম্যানেজার
@@ -106,7 +108,7 @@
GenericName[nb]=Brukerbehandler
GenericName[nds]=Bruker-Pleger
GenericName[ne]=प्रयोगकर्ता प्रबन्धक
-GenericName[nl]=Gebruikersbeheerder
+GenericName[nl]=Gebruikersbeheer
GenericName[nn]=Brukarhandsamar
GenericName[pa]=ਯੂਜ਼ਰ ਮੈਨੇਜਰ
GenericName[pl]=Menedżer użytkowników
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeadmin-4.3.3/lilo-config/kde/Details.cpp new/kdeadmin-4.3.80/lilo-config/kde/Details.cpp
--- old/kdeadmin-4.3.3/lilo-config/kde/Details.cpp 2008-01-05 00:58:29.000000000 +0100
+++ new/kdeadmin-4.3.80/lilo-config/kde/Details.cpp 2009-11-23 15:55:31.000000000 +0100
@@ -76,7 +76,7 @@
vga->insertItem(_("VGA 1280x1024, 16.7M colors (795)"));
readonly=new QCheckBox(_("Mount root filesystem &read-only"), page);
- readonly->setWhatsThis( _("Mount the root filesystem for this kernel read-only. Since the init scripts normally take care of remounting the root filesystem in read-write mode after running some checks, this should always be turned on.<br>Don't turn this off unless you know what you're doing."));
+ readonly->setWhatsThis( _("Mount the root filesystem for this kernel read-only. Since the init scripts normally take care of remounting the root filesystem in read-write mode after running some checks, this should always be turned on.<br>Do not turn this off unless you know what you are doing."));
unsafe=new QCheckBox(_("Do not check &partition table"), page);
unsafe->setWhatsThis( _("This turns off some sanity checks while writing the configuration. This should not be used under \"normal\" circumstances, but it can be useful, for example, by providing the capability of booting from a floppy disk, without having a floppy in the drive every time you run lilo.<br>This sets the <i>unsafe</i> keyword in lilo.conf."));
@@ -94,7 +94,7 @@
password=new QLineEdit(pw);
password->setMaxLength(15);
password->setEchoMode(QLineEdit::Password);
- pw->setWhatsThis( _("Enter the password required for bootup (if any) here. If <i>restricted</i> above is checked, the password is required for additional parameters only.<br><b>WARNING:</b> The password is stored in clear text in /etc/lilo.conf. You'll want to make sure nobody untrusted can read this file. Also, you probably don't want to use your normal/root password here."));
+ pw->setWhatsThis( _("Enter the password required for bootup (if any) here. If <i>restricted</i> above is checked, the password is required for additional parameters only.<br><b>WARNING:</b> The password is stored in clear text in /etc/lilo.conf. Make sure that nobody untrusted can read this file. Also, you probably do not want to use your normal/root password here."));
if(l) {
QString mode=l->get("vga", "").cstr();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeadmin-4.3.3/lilo-config/kde/lilo.desktop new/kdeadmin-4.3.80/lilo-config/kde/lilo.desktop
--- old/kdeadmin-4.3.3/lilo-config/kde/lilo.desktop 2009-10-02 10:18:28.000000000 +0200
+++ new/kdeadmin-4.3.80/lilo-config/kde/lilo.desktop 2009-11-21 10:45:08.000000000 +0100
@@ -14,6 +14,7 @@
Name=Boot Manager (LILO)
Name[af]=Boot Bestuurder (Lilo)
Name[ar]=مدير إقلاع النظام (LILO)
+Name[ast]=Xestor d'arranque (LILO)
Name[be]=Кіраўнік загрузкі LILO
Name[bg]=Стартиране
Name[bn]=বুট ম্যানেজার (LILO)
@@ -52,7 +53,7 @@
Name[nb]=Oppstartsbehandler (LILO)
Name[nds]=Systeemstart-Pleger (LILO)
Name[ne]=बुट प्रबन्धक (LILO)
-Name[nl]=Opstartbeheerder (LILO)
+Name[nl]=Opstartbeheer (LILO)
Name[nn]=Oppstartshandsamar (LILO)
Name[pa]=ਬੂਟ ਮੈਨੇਜਰ (LILO)
Name[pl]=Uruchamianie systemu (LILO)
@@ -79,6 +80,7 @@
Comment=Configure LILO (the Linux boot manager)
Comment[af]=Konfigureer Lilo (die Linux boot bestuurder)
Comment[ar]=اضبط LILO (مدير إقلاع نظام لينِكس)
+Comment[ast]=Configurar LILO (el xestor d'arranque de Linux)
Comment[be]=Наставіць LILO (кіраўнік загрузкі Linux)
Comment[bg]=Графично настройване на първоначалното зареждането на Линукс
Comment[bn]=LILO (লিনাক্স বুট ম্যানেজার) কনফিগার করে
@@ -117,7 +119,7 @@
Comment[nb]=Her kan du sette opp LILO (Linux oppstartssystem)
Comment[nds]=LILO (Systeemstart-Pleger vun Linux) instellen
Comment[ne]=LILO कन्फिगर गर्नुहोस् (लिनक्स बुट प्रबन्धक)
-Comment[nl]=Lilo (Linux Opstartmanager) instellen
+Comment[nl]=Lilo (Linux Opstartbeheer) instellen
Comment[nn]=LILO-oppsett (Linux-oppstartssystemet)
Comment[pa]=LILO ਸੰਰਚਨਾ (ਲੀਨਕਸ ਬੂਟ ਮੈਨੇਜਰ)
Comment[pl]=Konfiguracja LILO (menedżera rozruchu systemu w Linuksie)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeadmin-4.3.3/lilo-config/kde-qt-common/general.cpp new/kdeadmin-4.3.80/lilo-config/kde-qt-common/general.cpp
--- old/kdeadmin-4.3.3/lilo-config/kde-qt-common/general.cpp 2008-08-28 18:13:35.000000000 +0200
+++ new/kdeadmin-4.3.80/lilo-config/kde-qt-common/general.cpp 2009-11-23 15:55:32.000000000 +0100
@@ -70,7 +70,7 @@
KHBox *modes=new KHBox(this);
linear=new QCheckBox(_("Use &linear mode"), modes);
connect(linear, SIGNAL(clicked()), SIGNAL(configChanged()));
- linear->setWhatsThis( _("Check this box if you want to use the linear mode.<br>Linear mode tells the boot loader the location of kernels in linear addressing rather than sector/head/cylinder.<br>linear mode is required for some SCSI drives, and shouldn't hurt unless you're planning to create a boot disk to be used with a different computer.<br>See the lilo.conf man page for details."));
+ linear->setWhatsThis( _("Check this box if you want to use the linear mode.<br>Linear mode tells the boot loader the location of kernels in linear addressing rather than sector/head/cylinder.<br>Linear mode is required for some SCSI drives, and should not cause problems unless you are planning to create a boot disk to be used with a different computer.<br>See the lilo.conf man page for details."));
compact=new QCheckBox(_("Use &compact mode"), modes);
connect(compact, SIGNAL(clicked()), SIGNAL(configChanged()));
compact->setWhatsThis( _("Check this box if you want to use the compact mode.<br>The compact mode tries to merge read requests for adjacent sectors into a single read request. This reduces load time and keeps the boot map smaller, but will not work on all systems."));
@@ -94,7 +94,7 @@
password->setMaxLength(15);
password->setEchoMode(QLineEdit::Password);
connect(password, SIGNAL(textChanged(const QString &)), SIGNAL(configChanged()));
- pw->setWhatsThis( _("Enter the password required for bootup (if any) here. If <i>restricted</i> above is checked, the password is required for additional parameters only.<br><b>WARNING:</b> The password is stored in clear text in /etc/lilo.conf. You'll want to make sure nobody untrusted can read this file. Also, you probably don't want to use your normal/root password here.<br>This sets a default for all Linux kernels you want to boot. If you need a per-kernel setting, go to the <i>Operating systems</i> tab and select <i>Details</i>."));
+ pw->setWhatsThis( _("Enter the password required for bootup (if any) here. If <i>restricted</i> is checked above, the password is only required for additional parameters.<br><b>WARNING:</b> The password is stored in clear text in /etc/lilo.conf. Make sure that nobody untrusted can read this file. Also, you probably do not want to use your normal/root password here.<br>This sets a default for all Linux kernels you want to boot. If you need a per-kernel setting, go to the <i>Operating systems</i> tab and select <i>Details</i>."));
layout->addWidget(pw);
KHBox *vgab=new KHBox(this);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeadmin-4.3.3/lilo-config/kde-qt-common/images.cpp new/kdeadmin-4.3.80/lilo-config/kde-qt-common/images.cpp
--- old/kdeadmin-4.3.3/lilo-config/kde-qt-common/images.cpp 2008-01-05 00:58:30.000000000 +0100
+++ new/kdeadmin-4.3.80/lilo-config/kde-qt-common/images.cpp 2009-11-23 15:55:32.000000000 +0100
@@ -70,7 +70,7 @@
root->setWhatsThis( _("Enter the root filesystem (i.e. the partition that will be mounted as / at boot time) for the kernel you want to boot here."));
connect(root, SIGNAL(textChanged(const QString &)), this, SIGNAL(configChanged()));
initrd=new EditWidget(_("&Initial ramdisk:"), "", true, parameters);
- initrd->setWhatsThis( _("If you want to use an initial ramdisk (initrd) for this kernel, enter its filename here. Leave this field blank if you don't intend to use an initial ramdisk for this kernel."));
+ initrd->setWhatsThis( _("If you want to use an initial ramdisk (initrd) for this kernel, enter its filename here. Leave this field blank if you do not intend to use an initial ramdisk for this kernel."));
connect(initrd, SIGNAL(textChanged(const QString &)), this, SIGNAL(configChanged()));
append=new EditWidget(_("E&xtra parameters:"), "", false, parameters);
append->setWhatsThis( _("Enter any extra parameters you wish to pass to the kernel here. Usually, this can be left blank.<br>This sets the <i>append</i> option in lilo.conf."));
@@ -81,7 +81,7 @@
actions->setSpacing(SPACE_INSIDE);
layout->addWidget(actions);
dflt=new QPushButton(_("Set &Default"), actions);
- dflt->setWhatsThis( _("Boot this kernel/OS if the user doesn't make a different choice"));
+ dflt->setWhatsThis( _("Boot this kernel/OS if the user does not make a different choice"));
connect(dflt, SIGNAL(clicked()), SLOT(dfltClicked()));
details=new QPushButton(_("De&tails"), actions);
details->setWhatsThis( _("This button brings up a dialog box with further, less commonly used, options."));
@@ -91,7 +91,7 @@
probe->setWhatsThis( _("Automatically generate a (hopefully) reasonable lilo.conf for your system"));
check=new QPushButton(_("&Check Configuration"), actions);
connect(check, SIGNAL(clicked()), SLOT(checkClicked()));
- check->setWhatsThis( _("Run LILO in test mode to see if the configuration is ok"));
+ check->setWhatsThis( _("Run LILO in test mode to see if the configuration is okay."));
addKrnl=new QPushButton(_("Add &Kernel..."), actions);
connect(addKrnl, SIGNAL(clicked()), SLOT(addKrnlClicked()));
addKrnl->setWhatsThis( _("Add a new Linux kernel to the boot menu"));
@@ -179,11 +179,11 @@
{
QString LiloOut=lilo->liloOut().cstr();
if(lilo->isOk()) {
- LiloOut=_("Configuration ok. LILO said:\n")+LiloOut;
- InformationOK(this, LiloOut, _("Configuration OK"), "lilo-config.confOK");
+ LiloOut=_("Configuration okay. LILO reported:\n")+LiloOut;
+ InformationOK(this, LiloOut, _("Configuration Okay"), "lilo-config.confOK");
} else {
- LiloOut=_("Configuration NOT ok. LILO said:\n")+LiloOut;
- ErrorOK(this, _("Configuration NOT ok"), LiloOut);
+ LiloOut=_("Configuration NOT okay. LILO reported:\n")+LiloOut;
+ ErrorOK(this, _("Configuration NOT Okay"), LiloOut);
}
}
void Images::addKrnlClicked() // SLOT
@@ -192,7 +192,7 @@
InputBox::entry l0={ _("&Kernel filename:"), "", true, _("Enter the filename of the kernel you want to boot here.") };
InputBox::entry l1={ _("&Label:"), "", false, _("Enter the label (name) of the kernel you want to boot here.") };
InputBox::entry l2={ _("&Root filesystem:"), "", true, _("Enter the root filesystem (i.e. the partition that will be mounted as / at boot time) for the kernel you want to boot here.") };
- InputBox::entry l3={ _("&Initial ramdisk:"), "", true, _("If you want to use an initial ramdisk (initrd) for this kernel, enter its filename here. Leave this field blank if you don't intend to use an initial ramdisk for this kernel.") };
+ InputBox::entry l3={ _("&Initial ramdisk:"), "", true, _("If you want to use an initial ramdisk (initrd) for this kernel, enter its filename here. Leave this field blank if you do not intend to use an initial ramdisk for this kernel.") };
e.insert(e.end(), l0);
e.insert(e.end(), l1);
e.insert(e.end(), l2);
@@ -217,8 +217,8 @@
void Images::addOSClicked() // SLOT
{
InputBox::entries e;
- InputBox::entry l0={_("Boot from dis&k:"), "", true, _("Enter the partition containing the operating system you'd like to boot here.") };
- InputBox::entry l1={_("&Label:"), "", false, _("Enter the label (name) of the operating system here.") };
+ InputBox::entry l0={_("Boot from dis&k:"), "", true, _("Enter here the partition containing the operating system you would like to boot.") };
+ InputBox::entry l1={_("&Label:"), "", false, _("Enter here the label (name) of the operating system.") };
e.insert(e.end(), l0);
e.insert(e.end(), l1);
InputBox *label=new InputBox(e, this);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeadmin-4.3.3/lilo-config/qt/Details.cpp new/kdeadmin-4.3.80/lilo-config/qt/Details.cpp
--- old/kdeadmin-4.3.3/lilo-config/qt/Details.cpp 2008-01-05 00:58:30.000000000 +0100
+++ new/kdeadmin-4.3.80/lilo-config/qt/Details.cpp 2009-11-23 15:55:31.000000000 +0100
@@ -74,11 +74,11 @@
layout->addWidget(vgab);
readonly=new QCheckBox(_("Mount root filesystem &read-only"), this);
- QWhatsThis::add(readonly, _("Mount the root filesystem for this kernel read-only. Since the init scripts normally take care of remounting the root filesystem in read-write mode after running some checks, this should always be turned on.<br>Don't turn this off unless you know what you're doing."));
+ QWhatsThis::add(readonly, _("Mount the root filesystem for this kernel read-only. Since the init scripts normally take care of remounting the root filesystem in read-write mode after running some checks, this should always be turned on.<br>Do not turn this off unless you know what you are doing."));
layout->addWidget(readonly);
unsafe=new QCheckBox(_("Do not check &partition table"), this);
- QWhatsThis::add(unsafe, _("This turns off some sanity checks while writing the configuration. This shouldn't be used under \"normal\" circumstances, but it's useful, for example, for installing the possibility to boot from a floppy disk without having a floppy in the drive every time you run lilo.<br>This sets the <i>unsafe</i> keyword in lilo.conf."));
+ QWhatsThis::add(unsafe, _("This turns off some sanity checks while writing the configuration. This should not be used under \"normal\" circumstances, but it is useful, for example, for installing the possibility to boot from a floppy disk without having a floppy in the drive every time you run lilo.<br>This sets the <i>unsafe</i> keyword in lilo.conf."));
layout->addWidget(unsafe);
QHBox *opts=new QHBox(this);
@@ -95,7 +95,7 @@
password=new QLineEdit(pw);
password->setMaxLength(15);
password->setEchoMode(QLineEdit::Password);
- QWhatsThis::add(pw, _("Enter the password required for bootup (if any) here. If <i>restricted</i> above is checked, the password is required for additional parameters only.<br><b>WARNING:</b> The password is stored in clear text in /etc/lilo.conf. You'll want to make sure nobody untrusted can read this file. Also, you probably don't want to use your normal/root password here."));
+ QWhatsThis::add(pw, _("Enter the password required for bootup (if any) here. If <i>restricted</i> above is checked, the password is required for additional parameters only.<br><b>WARNING:</b> The password is stored in clear text in /etc/lilo.conf. Make sure that nobody untrusted can read this file. Also, you probably do not want to use your normal/root password here."));
layout->addWidget(pw);
QHBox *btns=new QHBox(this);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeadmin-4.3.3/strigi-analyzer/rpm/kfile_rpm.desktop new/kdeadmin-4.3.80/strigi-analyzer/rpm/kfile_rpm.desktop
--- old/kdeadmin-4.3.3/strigi-analyzer/rpm/kfile_rpm.desktop 2009-10-02 10:18:28.000000000 +0200
+++ new/kdeadmin-4.3.80/strigi-analyzer/rpm/kfile_rpm.desktop 2009-11-21 10:45:08.000000000 +0100
@@ -3,6 +3,7 @@
Name=RPM Stats
Name[af]=Rpm Statistiek
Name[ar]=إحصائيَات RPM
+Name[ast]=Estadístiques RPM
Name[be]=Статыстыка RPM
Name[bg]=RPM Stats
Name[bn]=আরপিএম পরিসংখ্যান
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeadmin-4.3.3/system-config-printer-kde/options.py new/kdeadmin-4.3.80/system-config-printer-kde/options.py
--- old/kdeadmin-4.3.3/system-config-printer-kde/options.py 2009-04-15 12:26:27.000000000 +0200
+++ new/kdeadmin-4.3.80/system-config-printer-kde/options.py 2009-10-15 18:35:38.000000000 +0200
@@ -131,14 +131,20 @@
if (type(self.widget) == QComboBox and
self.ipp_type == str):
self.widget.clear()
- for each in supported:
- self.widget.addItem(each)
+ if type(supported) == list:
+ for each in supported:
+ self.widget.addItem(self.combobox_dict[each])
+ else:
+ self.widget.addItem(self.combobox_dict[supported])
elif (type(self.widget) == QComboBox and
self.ipp_type == int and
self.combobox_map != None):
self.widget.clear()
- for each in supported:
- self.widget.addItem(self.combobox_dict[each])
+ if type(supported) == list:
+ for each in supported:
+ self.widget.addItem(self.combobox_dict[each])
+ else:
+ self.widget.addItem(self.combobox_dict[supported])
if original_value != None:
self.original_value = self.ipp_type (original_value)
self.set_widget_value (self.original_value)
@@ -312,30 +318,29 @@
def __init__(self, name, value, supported, on_change):
Option.__init__(self, name, value, supported, on_change)
- self.selector = gtk.combo_box_new_text()
-
+ self.selector = QComboBox(self)
selected = None
for nr, choice in enumerate(supported):
- self.selector.append_text(str(choice))
+ self.selector.addItem(str(choice))
if str (value) == str (choice):
selected = nr
if selected is not None:
- self.selector.set_active(selected)
+ self.selector.setCurrentIndex(selected)
else:
print "Unknown value for %s: %s" % (name, value)
print "Choices:", supported
- self.selector.connect("changed", self.changed)
+ self.selector.connect(self.selector, SIGNAL("currentIndexChanged(int)"), self.changed)
def get_current_value(self):
- return self.selector.get_active_text()
+ return str(self.selector.currentText())
# ---------------------------------------------------------------------------
class OptionSelectOneNumber(OptionSelectOne):
def get_current_value(self):
- return int(self.selector.get_active_text())
+ return int(str(self.selector.currentText()))
# ---------------------------------------------------------------------------
@@ -344,19 +349,21 @@
def __init__(self, name, value, supported, on_change):
Option.__init__(self, name, value, supported, on_change)
self.checkboxes = []
- vbox = gtk.VBox()
+ widget = QWidget(self)
+ vbox = QVBoxLayout(widget)
+ widget.setLayout(vbox)
for s in supported:
- checkbox = gtk.CheckButton(label=s)
- checkbox.set_active(s in value)
- vbox.add(checkbox)
- checkbox.connect("toggled", self.changed)
+ checkbox = QCheckBox(s, self)
+ checkbox.setChecked(s in value)
+ vbox.addWidget(checkbox)
+ checkbox.connect(checkbox, SIGNAL("stateChanged(int)"), self.changed)
self.checkboxes.append(checkbox)
- self.selector = vbox
+ self.selector = widget
def get_current_value(self):
return[s for s, chk in zip(self.supported, self.checkboxes)
- if chk.get_active()]
+ if chk.isChecked()]
# ---------------------------------------------------------------------------
@@ -373,16 +380,16 @@
if not isinstance(supported, tuple):
supported = (0, supported)
Option.__init__(self, name, value, supported, on_change)
- adj = gtk.Adjustment(value, supported[0], supported[1], 1.0, 5.0, 0.0)
- self.selector = gtk.SpinButton(adj, climb_rate=1.0, digits=digits)
- if not self.is_float:
- self.selector.set_numeric(True)
- self.selector.connect("changed", self.changed)
+ if self.is_float:
+ self.selector = QDoubleSpinBox(self)
+ else:
+ self.selector = QSpinBox(self)
+ self.selector.setMinimum(supported[0])
+ self.selector.setMaximum(supported[1])
+ self.selector.connect(self.selector, SIGNAL("valueChanged(int)"), self.changed)
def get_current_value(self):
- if self.is_float:
- return self.selector.get_value()
- return self.selector.get_value_as_int()
+ return self.selector.value()
# ---------------------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeadmin-4.3.3/system-config-printer-kde/system-config-printer-kde.desktop new/kdeadmin-4.3.80/system-config-printer-kde/system-config-printer-kde.desktop
--- old/kdeadmin-4.3.3/system-config-printer-kde/system-config-printer-kde.desktop 2009-10-02 10:18:28.000000000 +0200
+++ new/kdeadmin-4.3.80/system-config-printer-kde/system-config-printer-kde.desktop 2009-11-21 10:45:09.000000000 +0100
@@ -12,26 +12,25 @@
X-KDE-Weight=60
Name=Printer Configuration
+Name[ast]=Configuración d'imprentadora
Name[bg]=Настройване на принтер
-Name[ca]=Configuració d'impressora
Name[cs]=Nastavení tiskárny
Name[da]=Konfiguration af printer
Name[de]=Druckereinrichtung
Name[el]=Ρυθμίσεις εκτυπωτή
Name[en_GB]=Printer Configuration
-Name[es]=Configuración de impresión
Name[et]=Printeri seadistamine
Name[fr]=Configuration de l'imprimante
Name[gl]=Configuración da impresora
Name[hu]=Nyomtatóbeállítás
Name[is]=Stillingar prentara
Name[it]=Configurazione delle stampanti
+Name[ko]=프린터 설정
Name[lv]=Printera konfigurācija
Name[nb]=Skriveroppsett
Name[nds]=Druckerinstellen
Name[nl]=Printerconfiguratie
Name[nn]=Skrivaroppsett
-Name[pa]=ਪਰਿੰਟਰ ਸੰਰਚਨਾ
Name[pl]=Konfiguracja drukarki
Name[pt]=Configuração da Impressora
Name[pt_BR]=Configuração da impressora
@@ -41,32 +40,30 @@
Name[sv]=Skrivarinställning
Name[tr]=Yazıcı Yapılandırması
Name[uk]=Налаштування принтера
-Name[wa]=Apontiaedje del sicrirece
Name[x-test]=xxPrinter Configurationxx
Name[zh_CN]=打印机配置
Name[zh_TW]=印表機設定
Comment=Configure local and remote Printers
+Comment[ast]=Configura imprentadores llocales y remotes
Comment[bg]=Настройване на локални и отдалечени принтери
-Comment[ca]=Configura les impressores locals i remotes
Comment[cs]=Nastavte lokální a vzdálené tiskárny
Comment[da]=Indstil lokale og eksterne printere
Comment[de]=Drucker einrichten
Comment[el]=Ρύθμιση τοπικών και απομακρυσμένων εκτυπωτών
Comment[en_GB]=Configure local and remote Printers
-Comment[es]=Configurar impresoras locales y remotas
Comment[et]=Kohalike ja võrguprinterite seadistamine
Comment[fr]=Configurer les imprimantes locales et distantes
Comment[gl]=Configuración as impresoras locais e remotas
Comment[hu]=helyi és távoli nyomtatók beállításai
Comment[is]=Stilla staðværa sem fjarlæga prentara
Comment[it]=Configura le stampanti locali e remote
+Comment[ko]=로컬 및 원격 프린터 설정
Comment[lv]=Konfigurēt lokālos un attālinātos printerus
Comment[nb]=Sett opp lokale og nettverkskipiplugin_rawconverter.poskrivere
Comment[nds]=Lokaal un feern Druckers instellen
-Comment[nl]=Lokale printers en die op afstand instellen
+Comment[nl]=Lokale en netwerkprinters instellen
Comment[nn]=Set opp lokale og nettverksskrivarar
-Comment[pa]=ਲੋਕਲ ਅਤੇ ਰਿਮੋਟ ਪਰਿੰਟਰ ਸੰਰਚਨਾ
Comment[pl]=Konfiguracja lokalnych i zdalnych drukarek
Comment[pt]=Configurar as impressoras locais e remotas
Comment[pt_BR]=Configurar impressoras locais e remotas
@@ -76,7 +73,6 @@
Comment[sv]=Anpassa lokala skrivare och fjärrskrivare
Comment[tr]=Yerel ve uzak Yazıcıları yapılandır
Comment[uk]=Налаштувати локальні і віддалені принтери
-Comment[wa]=Apontyî les scrireces locåles et då lon
Comment[x-test]=xxConfigure local and remote Printersxx
Comment[zh_CN]=配置本地和远程的打印机
Comment[zh_TW]=設定本地與遠端印表機
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeadmin-4.3.3/system-config-printer-kde/system-config-printer-kde.py new/kdeadmin-4.3.80/system-config-printer-kde/system-config-printer-kde.py
--- old/kdeadmin-4.3.3/system-config-printer-kde/system-config-printer-kde.py 2009-07-29 22:25:10.000000000 +0200
+++ new/kdeadmin-4.3.80/system-config-printer-kde/system-config-printer-kde.py 2009-10-15 18:35:38.000000000 +0200
@@ -48,7 +48,7 @@
#use _() to keep code the same as gnome system-config-printer
def _(string):
- return unicode(i18n(string), "utf-8")
+ return unicode(i18n(string))
def translate(self, prop):
"""reimplement method from uic to change it to use gettext"""
@@ -347,7 +347,7 @@
self.job_options_widgets[option.widget] = option
self.job_options_buttons[option.button] = option
self.connect(option.button, SIGNAL("clicked()"), self.on_job_option_reset)
- if type(option.widget) == QSpinBox:
+ if type(option.widget) == KIntSpinBox:
self.connect(option.widget, SIGNAL("valueChanged(int)"), self.on_job_option_changed)
elif type(option.widget) == QComboBox:
self.connect(option.widget, SIGNAL("currentIndexChanged(int)"), self.on_job_option_changed)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeadmin-4.3.3/system-config-printer-kde/system-config-printer.ui new/kdeadmin-4.3.80/system-config-printer-kde/system-config-printer.ui
--- old/kdeadmin-4.3.3/system-config-printer-kde/system-config-printer.ui 2009-07-08 16:43:24.000000000 +0200
+++ new/kdeadmin-4.3.80/system-config-printer-kde/system-config-printer.ui 2009-07-06 13:06:55.000000000 +0200
@@ -940,7 +940,7 @@
</widget>
</item>
<item row="0" column="1">
- <widget class="QSpinBox" name="sbJOCopies"/>
+ <widget class="KIntSpinBox" name="sbJOCopies"/>
</item>
<item row="0" column="2">
<widget class="QPushButton" name="btnJOResetCopies">
@@ -1092,7 +1092,7 @@
</widget>
</item>
<item row="1" column="1">
- <widget class="QSpinBox" name="sbJOBrightness"/>
+ <widget class="KIntSpinBox" name="sbJOBrightness"/>
</item>
<item row="1" column="2">
<widget class="QLabel" name="label_44">
@@ -1274,7 +1274,7 @@
</widget>
</item>
<item row="3" column="1" colspan="2">
- <widget class="QSpinBox" name="sbJOJobPriority"/>
+ <widget class="KIntSpinBox" name="sbJOJobPriority"/>
</item>
<item row="3" column="3">
<widget class="QPushButton" name="btnJOResetJobPriority">
@@ -1385,7 +1385,7 @@
</widget>
</item>
<item row="1" column="1">
- <widget class="QSpinBox" name="sbJOScaling"/>
+ <widget class="KIntSpinBox" name="sbJOScaling"/>
</item>
<item row="1" column="2">
<widget class="QLabel" name="label_30">
@@ -1411,7 +1411,7 @@
</widget>
</item>
<item row="0" column="1">
- <widget class="QSpinBox" name="sbJOSaturation"/>
+ <widget class="KIntSpinBox" name="sbJOSaturation"/>
</item>
<item row="0" column="2">
<widget class="QLabel" name="label_34">
@@ -1435,7 +1435,7 @@
</widget>
</item>
<item row="1" column="1">
- <widget class="QSpinBox" name="sbJOHue"/>
+ <widget class="KIntSpinBox" name="sbJOHue"/>
</item>
<item row="1" column="2">
<widget class="QLabel" name="label_35">
@@ -1459,7 +1459,7 @@
</widget>
</item>
<item row="2" column="1">
- <widget class="QSpinBox" name="sbJOGamma"/>
+ <widget class="KIntSpinBox" name="sbJOGamma"/>
</item>
<item row="2" column="3">
<widget class="QPushButton" name="btnJOResetGamma">
@@ -1505,7 +1505,7 @@
</widget>
</item>
<item row="0" column="1">
- <widget class="QSpinBox" name="sbJOCpi"/>
+ <widget class="KIntSpinBox" name="sbJOCpi"/>
</item>
<item row="0" column="3">
<widget class="QPushButton" name="btnJOResetCpi">
@@ -1522,7 +1522,7 @@
</widget>
</item>
<item row="1" column="1">
- <widget class="QSpinBox" name="sbJOLpi"/>
+ <widget class="KIntSpinBox" name="sbJOLpi"/>
</item>
<item row="1" column="3">
<widget class="QPushButton" name="btnJOResetLpi">
@@ -1539,7 +1539,7 @@
</widget>
</item>
<item row="2" column="1">
- <widget class="QSpinBox" name="sbJOPageLeft"/>
+ <widget class="KIntSpinBox" name="sbJOPageLeft"/>
</item>
<item row="2" column="2">
<widget class="QLabel" name="label_26">
@@ -1563,7 +1563,7 @@
</widget>
</item>
<item row="3" column="1">
- <widget class="QSpinBox" name="sbJOPageRight"/>
+ <widget class="KIntSpinBox" name="sbJOPageRight"/>
</item>
<item row="3" column="2">
<widget class="QLabel" name="label_27">
@@ -1587,7 +1587,7 @@
</widget>
</item>
<item row="4" column="1">
- <widget class="QSpinBox" name="sbJOPageTop"/>
+ <widget class="KIntSpinBox" name="sbJOPageTop"/>
</item>
<item row="4" column="2">
<widget class="QLabel" name="label_28">
@@ -1611,7 +1611,7 @@
</widget>
</item>
<item row="5" column="1">
- <widget class="QSpinBox" name="sbJOPageBottom"/>
+ <widget class="KIntSpinBox" name="sbJOPageBottom"/>
</item>
<item row="5" column="2">
<widget class="QLabel" name="label_29">
@@ -1665,7 +1665,7 @@
</widget>
</item>
<item row="2" column="1">
- <widget class="QSpinBox" name="sbJOColumns"/>
+ <widget class="KIntSpinBox" name="sbJOColumns"/>
</item>
<item row="2" column="2">
<widget class="QPushButton" name="btnJOResetColumns">
@@ -1768,6 +1768,11 @@
<header>kcombobox.h</header>
</customwidget>
<customwidget>
+ <class>KIntSpinBox</class>
+ <extends>QSpinBox</extends>
+ <header>knuminput.h</header>
+ </customwidget>
+ <customwidget>
<class>KLineEdit</class>
<extends>QLineEdit</extends>
<header>klineedit.h</header>
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org