diff --git a/debian/lenny/applications/abakus/debian/control b/debian/lenny/applications/abakus/debian/control
index edfc1c7b0..5aebafb8b 100644
--- a/debian/lenny/applications/abakus/debian/control
+++ b/debian/lenny/applications/abakus/debian/control
@@ -9,6 +9,8 @@ Standards-Version: 3.8.4
Package: abakus-trinity
Architecture: any
Depends: ${shlibs:Depends}
+Replaces: abakus-trinity (<< 4:14.0.0)
+Breaks: abakus-trinity (<< 4:14.0.0)
Description: calculator for KDE [Trinity]
AbaKus is a complex calculator, which provides
many different kinds of calculations.
diff --git a/debian/lenny/applications/adept/debian/control b/debian/lenny/applications/adept/debian/control
index 4238c623a..8e2160fb7 100644
--- a/debian/lenny/applications/adept/debian/control
+++ b/debian/lenny/applications/adept/debian/control
@@ -10,6 +10,8 @@ Standards-Version: 3.8.4
Package: adept-trinity
Section: kde
Depends: adept-manager-trinity, adept-installer-trinity, adept-updater-trinity, adept-notifier-trinity, adept-batch-trinity
+Replaces: adept-trinity (<< 4:14.0.0)
+Breaks: adept-trinity (<< 4:14.0.0)
Architecture: all
Description: package management suite for Trinity
These packages belong to the adept suite:
@@ -21,6 +23,8 @@ Description: package management suite for Trinity
Package: adept-common-trinity
Section: kde
Depends: debtags (>= 1.6.1), konsole-trinity (>= 3.5.0), ${shlibs:Depends}
+Replaces: adept-common-trinity (<< 4:14.0.0)
+Breaks: adept-common-trinity (<< 4:14.0.0)
Architecture: all
Description: package manager for Trinity -- common files
Icons and other common files for all adept components.
@@ -28,6 +32,8 @@ Description: package manager for Trinity -- common files
Package: adept-manager-trinity
Section: kde
Depends: adept-common-trinity, ${shlibs:Depends}
+Replaces: adept-manager-trinity (<< 4:14.0.0)
+Breaks: adept-manager-trinity (<< 4:14.0.0)
Recommends: libtqt-perl
Architecture: any
Description: package manager for Trinity
@@ -45,6 +51,8 @@ Description: package manager for Trinity
Package: adept-installer-trinity
Section: kde
Depends: adept-common-trinity, app-install-data, ${shlibs:Depends}
+Replaces: adept-installer-trinity (<< 4:14.0.0)
+Breaks: adept-installer-trinity (<< 4:14.0.0)
Recommends: libtqt-perl
Architecture: any
Description: simple user interface for application management (for Trinity)
@@ -59,6 +67,8 @@ Description: simple user interface for application management (for Trinity)
Package: adept-updater-trinity
Section: kde
Depends: adept-common-trinity, ${shlibs:Depends}
+Replaces: adept-updater-trinity (<< 4:14.0.0)
+Breaks: adept-updater-trinity (<< 4:14.0.0)
Recommends: libtqt-perl
Architecture: any
Description: system update tool for Trinity
@@ -71,6 +81,8 @@ Description: system update tool for Trinity
Package: adept-notifier-trinity
Section: kde
Depends: ${shlibs:Depends}, adept-updater-trinity, update-notifier-common
+Replaces: adept-notifier-trinity (<< 4:14.0.0)
+Breaks: adept-notifier-trinity (<< 4:14.0.0)
Architecture: any
Description: system tray notifier of available system updates
Adept Notifier provides a system tray icon notifying the user of
@@ -80,6 +92,8 @@ Description: system tray notifier of available system updates
Package: adept-batch-trinity
Section: kde
Depends: ${shlibs:Depends}, adept-manager-trinity
+Replaces: adept-batch-trinity (<< 4:14.0.0)
+Breaks: adept-batch-trinity (<< 4:14.0.0)
Architecture: any
Description: command line install for Adept
Adept Batch lets you install packages with Adept from the
diff --git a/debian/lenny/applications/amarok.cmake/debian/control b/debian/lenny/applications/amarok.cmake/debian/control
index 36d6010d9..a07b416a8 100644
--- a/debian/lenny/applications/amarok.cmake/debian/control
+++ b/debian/lenny/applications/amarok.cmake/debian/control
@@ -19,6 +19,8 @@ Homepage: http://amarok.kde.org
Package: amarok-trinity
Architecture: any
Depends: amarok-common-trinity (>= ${source:Version}), amarok-engine-xine-trinity (= ${binary:Version}) | amarok-engine-yauap-trinity (= ${binary:Version}), unzip, ${shlibs:Depends}
+Replaces: amarok-trinity (<< 4:14.0.0)
+Breaks: amarok-trinity (<< 4:14.0.0)
Suggests: amarok-engines-trinity, moodbar, konqueror-trinity | www-browser,
python, python-qt3, libqt0-ruby1.8-trinity, libvisual-0.4-plugins
Description: versatile and easy to use audio player for Trinity
@@ -47,6 +49,8 @@ Description: versatile and easy to use audio player for Trinity
Package: amarok-common-trinity
Architecture: all
Depends: ruby
+Replaces: amarok-common-trinity (<< 4:14.0.0)
+Breaks: amarok-common-trinity (<< 4:14.0.0)
Recommends: amarok-trinity (>= ${source:Version})
Suggests: libqt0-ruby1.8-trinity, python, python-qt3
Description: architecture independent files for Amarok [Trinity]
@@ -61,6 +65,8 @@ Description: architecture independent files for Amarok [Trinity]
Package: amarok-engines-trinity
Architecture: all
Depends: amarok-engine-xine-trinity (>= ${source:Version}), amarok-engine-yauap-trinity (>= ${source:Version})
+Replaces: amarok-engines-trinity (<< 4:14.0.0)
+Breaks: amarok-engines-trinity (<< 4:14.0.0)
Description: output engines for the Amarok music player [Trinity]
This package serves merely as a reference point if you want to install
all available Amarok engines. It depends on those Amarok engines that
@@ -70,6 +76,8 @@ Description: output engines for the Amarok music player [Trinity]
Package: amarok-engine-xine-trinity
Architecture: any
Depends: ${shlibs:Depends}
+Replaces: amarok-engine-xine-trinity (<< 4:14.0.0)
+Breaks: amarok-engine-xine-trinity (<< 4:14.0.0)
Recommends: amarok-trinity (= ${binary:Version})
Description: xine engine for the Amarok audio player [Trinity]
This package provides the xine engine for Amarok, which you may prefer
@@ -79,6 +87,8 @@ Description: xine engine for the Amarok audio player [Trinity]
Package: amarok-engine-yauap-trinity
Architecture: any
Depends: yauap, ${shlibs:Depends}
+Replaces: amarok-engine-yauap-trinity (<< 4:14.0.0)
+Breaks: amarok-engine-yauap-trinity (<< 4:14.0.0)
Recommends: amarok-trinity (= ${binary:Version})
Description: Yauap engine for the Amarok audio player [Trinity]
This package includes Amarok yauap engine, which provides a frontend
@@ -89,6 +99,8 @@ Description: Yauap engine for the Amarok audio player [Trinity]
Package: amarok-trinity-dbg
Priority: extra
Architecture: any
+Replaces: amarok-trinity-dbg (<< 4:14.0.0)
+Breaks: amarok-trinity-dbg (<< 4:14.0.0)
Depends: amarok-trinity (= ${binary:Version})
Recommends: tdelibs-trinity-dbg
Description: debugging symbols for Amarok [Trinity]
diff --git a/debian/lenny/applications/amarok/debian/control b/debian/lenny/applications/amarok/debian/control
index 5b0049ffa..715ec98c4 100644
--- a/debian/lenny/applications/amarok/debian/control
+++ b/debian/lenny/applications/amarok/debian/control
@@ -19,6 +19,8 @@ Homepage: http://amarok.kde.org
Package: amarok-trinity
Architecture: any
Depends: amarok-common-trinity (>= ${source:Version}), amarok-engine-xine-trinity (= ${binary:Version}) | amarok-engine-yauap-trinity (= ${binary:Version}), unzip, ${shlibs:Depends}
+Replaces: amarok-trinity (<< 4:14.0.0)
+Breaks: amarok-trinity (<< 4:14.0.0)
Suggests: amarok-engines-trinity, moodbar, konqueror-trinity | www-browser,
python, python-qt3, libqt0-ruby1.8-trinity, libvisual-0.4-plugins
Description: versatile and easy to use audio player for Trinity
@@ -47,6 +49,8 @@ Description: versatile and easy to use audio player for Trinity
Package: amarok-common-trinity
Architecture: all
Depends: ruby
+Replaces: amarok-common-trinity (<< 4:14.0.0)
+Breaks: amarok-common-trinity (<< 4:14.0.0)
Recommends: amarok-trinity (>= ${source:Version})
Suggests: libqt0-ruby1.8-trinity, python, python-qt3
Description: architecture independent files for Amarok [Trinity]
@@ -61,6 +65,8 @@ Description: architecture independent files for Amarok [Trinity]
Package: amarok-engines-trinity
Architecture: all
Depends: amarok-engine-xine-trinity (>= ${source:Version}), amarok-engine-yauap-trinity (>= ${source:Version})
+Replaces: amarok-engines-trinity (<< 4:14.0.0)
+Breaks: amarok-engines-trinity (<< 4:14.0.0)
Description: output engines for the Amarok music player [Trinity]
This package serves merely as a reference point if you want to install
all available Amarok engines. It depends on those Amarok engines that
@@ -70,6 +76,8 @@ Description: output engines for the Amarok music player [Trinity]
Package: amarok-engine-xine-trinity
Architecture: any
Depends: ${shlibs:Depends}
+Replaces: amarok-engine-xine-trinity (<< 4:14.0.0)
+Breaks: amarok-engine-xine-trinity (<< 4:14.0.0)
Recommends: amarok-trinity (= ${binary:Version})
Description: xine engine for the Amarok audio player [Trinity]
This package provides the xine engine for Amarok, which you may prefer
@@ -79,6 +87,8 @@ Description: xine engine for the Amarok audio player [Trinity]
Package: amarok-engine-yauap-trinity
Architecture: any
Depends: yauap, ${shlibs:Depends}
+Replaces: amarok-engine-yauap-trinity (<< 4:14.0.0)
+Breaks: amarok-engine-yauap-trinity (<< 4:14.0.0)
Recommends: amarok-trinity (= ${binary:Version})
Description: Yauap engine for the Amarok audio player [Trinity]
This package includes Amarok yauap engine, which provides a frontend
@@ -89,6 +99,8 @@ Description: Yauap engine for the Amarok audio player [Trinity]
Package: amarok-trinity-dbg
Priority: extra
Architecture: any
+Replaces: amarok-trinity-dbg (<< 4:14.0.0)
+Breaks: amarok-trinity-dbg (<< 4:14.0.0)
Depends: amarok-trinity (= ${binary:Version})
Recommends: tdelibs-trinity-dbg
Description: debugging symbols for Amarok [Trinity]
diff --git a/debian/lenny/applications/basket/debian/control b/debian/lenny/applications/basket/debian/control
index e9718a185..b7bd8357a 100644
--- a/debian/lenny/applications/basket/debian/control
+++ b/debian/lenny/applications/basket/debian/control
@@ -10,6 +10,8 @@ Standards-Version: 3.8.4
Package: basket-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: basket-trinity (<< 4:14.0.0)
+Breaks: basket-trinity (<< 4:14.0.0)
Recommends: basket-kontact-integration-trinity
Description: a multi-purpose note-taking application for KDE [Trinity]
This application provides as many baskets (drawers) as you wish; Several
@@ -24,8 +26,8 @@ Description: a multi-purpose note-taking application for KDE [Trinity]
Package: basket-kontact-integration-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: basket-trinity (<< 4:3.5.13-0debian9+r1258873+pr4)
-Breaks: basket-trinity (<< 4:3.5.13-0debian9+r1258873+pr4)
+Replaces: basket-kontact-integration-trinity (<< 4:14.0.0)
+Breaks: basket-kontact-integration-trinity (<< 4:14.0.0)
Description: a multi-purpose note-taking appliction, Kontact integration [Trinity]
This application provides as many baskets (drawers) as you wish; Several
kinds of objects (texts, URLs, images,...) can be drag-n-drop'd into it.
diff --git a/debian/lenny/applications/bibletime/debian/control b/debian/lenny/applications/bibletime/debian/control
index 5edb06118..cadc5f7d8 100644
--- a/debian/lenny/applications/bibletime/debian/control
+++ b/debian/lenny/applications/bibletime/debian/control
@@ -8,6 +8,8 @@ Standards-Version: 3.8.4
Package: bibletime-trinity
Architecture: any
Section: kde
+Replaces: bibletime-trinity (<< 4:14.0.0)
+Breaks: bibletime-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Recommends: sword-text, sword-dict, sword-comm
Suggests: bibletime-i18n-trinity
diff --git a/debian/lenny/applications/compizconfig-backend-kconfig/debian/control b/debian/lenny/applications/compizconfig-backend-kconfig/debian/control
index 8b011c50d..57cfdd8b3 100644
--- a/debian/lenny/applications/compizconfig-backend-kconfig/debian/control
+++ b/debian/lenny/applications/compizconfig-backend-kconfig/debian/control
@@ -8,6 +8,8 @@ Standards-Version: 3.8.4
Package: compizconfig-backend-kconfig-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: compizconfig-backend-kconfig-trinity (<< 4:14.0.0)
+Breaks: compizconfig-backend-kconfig-trinity (<< 4:14.0.0)
Conflicts: libcompizconfig-backend-kconfig-trinity
Description: KConfig [Trinity] Settings library for plugins - OpenCompositing Project
The OpenCompositing Project brings 3D desktop visual effects that improve
diff --git a/debian/lenny/applications/desktop-effects-tde/debian/control b/debian/lenny/applications/desktop-effects-tde/debian/control
index 1f494fe87..c9fd9a263 100644
--- a/debian/lenny/applications/desktop-effects-tde/debian/control
+++ b/debian/lenny/applications/desktop-effects-tde/debian/control
@@ -9,6 +9,8 @@ XS-Python-Version: all
Package: desktop-effects-tde-trinity
Architecture: all
Depends: ${python:Depends}, python-qt4
+Replaces: desktop-effects-kde-trinity (<< 4:14.0.0)
+Breaks: desktop-effects-kde-trinity (<< 4:14.0.0)
XB-Python-Version: ${python:Versions}
Description: compiz setup tool for Trinity
A simple Compiz configuration tool for Trinity. Installs and sets Compiz
diff --git a/debian/lenny/applications/digikam/debian/control b/debian/lenny/applications/digikam/debian/control
index 94ae91fef..3fc492330 100644
--- a/debian/lenny/applications/digikam/debian/control
+++ b/debian/lenny/applications/digikam/debian/control
@@ -16,6 +16,8 @@ Homepage: http://www.digikam.org
Package: digikam-trinity
Architecture: any
Depends: ${shlibs:Depends}
+Replaces: digikam-trinity (<< 4:14.0.0)
+Breaks: digikam-trinity (<< 4:14.0.0)
Recommends: kipi-plugins-trinity, tdeprint-trinity, konqueror-trinity
Suggests: digikam-trinity-doc
Description: digital photo management application for KDE [Trinity]
@@ -41,6 +43,8 @@ Description: digital photo management application for KDE [Trinity]
Package: showfoto-trinity
Architecture: any
Section: graphics
+Replaces: showfoto-trinity (<< 4:14.0.0)
+Breaks: showfoto-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, digikam-trinity
Recommends: kipi-plugins-trinity, tdeprint-trinity, konqueror-trinity
Description: image viewer/editor for KDE [Trinity]
@@ -50,6 +54,8 @@ Description: image viewer/editor for KDE [Trinity]
Package: digikam-trinity-dbg
Architecture: any
Section: devel
+Replaces: digikam-trinity-dbg (<< 4:14.0.0)
+Breaks: digikam-trinity-dbg (<< 4:14.0.0)
Depends: ${shlibs:Depends}, digikam-trinity (= ${binary:Version}), showfoto-trinity (= ${binary:Version}), tdelibs-trinity-dbg
Priority: extra
Description: debugging symbols for digikam [Trinity]
diff --git a/debian/lenny/applications/dolphin/debian/control b/debian/lenny/applications/dolphin/debian/control
index e5f307a94..225c29e0c 100644
--- a/debian/lenny/applications/dolphin/debian/control
+++ b/debian/lenny/applications/dolphin/debian/control
@@ -9,6 +9,8 @@ Standards-Version: 3.8.4
Package: dolphin-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: dolphin-trinity (<< 4:14.0.0)
+Breaks: dolphin-trinity (<< 4:14.0.0)
Recommends: amarok-trinity, ark-trinity, k3b-trinity, kmail-trinity, digikam-trinity
Suggests: kfloppy-trinity
Description: File manager for KDE focusing on usability [Trinity]
diff --git a/debian/lenny/applications/filelight-l10n/debian/control b/debian/lenny/applications/filelight-l10n/debian/control
index 41bbd01a2..a15255751 100644
--- a/debian/lenny/applications/filelight-l10n/debian/control
+++ b/debian/lenny/applications/filelight-l10n/debian/control
@@ -2,7 +2,7 @@ Source: filelight-l10n-trinity
Section: kde
Priority: optional
Maintainer: Timothy Pearson
-Uploaders: Raúl Sánchez Siles
+Uploaders: Ral Snchez Siles
Build-Depends: tdelibs4-trinity-dev (>= 4:3.4.3), cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Homepage: http://www.methylblue.com/filelight/
@@ -10,6 +10,8 @@ Homepage: http://www.methylblue.com/filelight/
Package: filelight-l10n-trinity
Architecture: any
Depends: ${shlibs:Depends} , filelight-trinity
+Replaces: filelight-l10n-trinity (<< 4:14.0.0)
+Breaks: filelight-l10n-trinity (<< 4:14.0.0)
Description: Localization (l10n) for Filelight, disk space usage tool [Trinity]
This package provides localization(l10n) files (translations and docs) for
Filelight, Filelight allows you to understand your disk usage by graphically
diff --git a/debian/lenny/applications/filelight/debian/control b/debian/lenny/applications/filelight/debian/control
index 78d2efde2..943ff1166 100644
--- a/debian/lenny/applications/filelight/debian/control
+++ b/debian/lenny/applications/filelight/debian/control
@@ -3,7 +3,7 @@ Section: kde
Priority: optional
Maintainer: Timothy Pearson
XSBC-Original-Maintainer: Debian KDE Extras Team
-Uploaders: Raúl Sánchez Siles
+Uploaders: Ral Snchez Siles
Standards-Version: 3.8.4
Build-Depends: debhelper (>= 5.0), cdbs, tdelibs4-trinity-dev, xutils, chrpath, gettext, quilt (>= 0.40), automake, autoconf, libtool, libltdl-dev
Homepage: http://www.methylblue.com/filelight/
@@ -11,6 +11,8 @@ Homepage: http://www.methylblue.com/filelight/
Package: filelight-trinity
Architecture: any
Depends: ${shlibs:Depends}
+Replaces: filelight-trinity (<< 4:14.0.0)
+Breaks: filelight-trinity (<< 4:14.0.0)
Description: show where your diskspace is being used [Trinity]
Filelight allows you to understand your disk usage by graphically
representing your filesystem as a set of concentric, segmented rings.
diff --git a/debian/lenny/applications/fusion-icon/debian/control b/debian/lenny/applications/fusion-icon/debian/control
index 07c8a3d28..25234c2dd 100644
--- a/debian/lenny/applications/fusion-icon/debian/control
+++ b/debian/lenny/applications/fusion-icon/debian/control
@@ -11,6 +11,8 @@ Standards-Version: 3.8.4
Package: fusion-icon-trinity
Architecture: all
XB-Python-Version: ${python:Versions}
+Replaces: fusion-icon-trinity (<< 4:14.0.0)
+Breaks: fusion-icon-trinity (<< 4:14.0.0)
Depends: ${misc:Depends}, ${python:Depends}, python-gtk2 | python-qt4, python-compizconfig-trinity, compiz-trinity
Description: tray icon to launch and manage Compiz Fusion [Trinity]
The OpenCompositing Project brings 3D desktop visual effects that
diff --git a/debian/lenny/applications/gtk-qt-engine/debian/control b/debian/lenny/applications/gtk-qt-engine/debian/control
index 01e4d424b..1db192bc3 100644
--- a/debian/lenny/applications/gtk-qt-engine/debian/control
+++ b/debian/lenny/applications/gtk-qt-engine/debian/control
@@ -9,6 +9,8 @@ Standards-Version: 3.8.4
Package: gtk-qt-engine-trinity
Architecture: any
Provides: gtk2-engines-gtk-qt-trinity
+Replaces: gtk-qt-engine-trinity (<< 4:14.0.0)
+Breaks: gtk-qt-engine-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: theme engine using Qt for GTK+ 2.x and Trinity
The GTK-Qt Theme Engine (also known as gtk-qt-engine) is a GTK 2 theme engine
diff --git a/debian/lenny/applications/gwenview/debian/control b/debian/lenny/applications/gwenview/debian/control
index 82c33fd04..736286221 100644
--- a/debian/lenny/applications/gwenview/debian/control
+++ b/debian/lenny/applications/gwenview/debian/control
@@ -9,6 +9,8 @@ Homepage: http://gwenview.sourceforge.net
Package: gwenview-trinity
Architecture: any
Depends: ${shlibs:Depends}
+Replaces: gwenview-trinity (<< 4:14.0.0)
+Breaks: gwenview-trinity (<< 4:14.0.0)
Recommends: tdegraphics-kfile-plugins-trinity, kipi-plugins-trinity
Suggests: gwenview-i18n
Description: image viewer for TDE
diff --git a/debian/lenny/applications/k3b/debian/control b/debian/lenny/applications/k3b/debian/control
index 5d91723a0..74cfc4638 100644
--- a/debian/lenny/applications/k3b/debian/control
+++ b/debian/lenny/applications/k3b/debian/control
@@ -11,9 +11,10 @@ Homepage: http://www.k3b.org
Package: k3b-trinity
Architecture: any
Depends: ${shlibs:Depends}, wodim | cdrskin, cdparanoia (>= 3a9.8), genisoimage, tdelibs-data-trinity (>= 4:3.1.4-2), cdrdao (>= 1.1.7-5), k3b-data-trinity (= ${source:Version}), libk3b3-trinity (= ${binary:Version})
+Replaces: k3b-trinity (<< 4:14.0.0)
+Breaks: k3b-trinity (<< 4:14.0.0)
Recommends: dvd+rw-tools, libk3b3-extracodecs-trinity
Suggests: k3b-i18n, normalize-audio, toolame, sox, movixmaker-2, vcdimager (>= 0.7)
-Replaces: libk3b3-trinity (<< 1.0.5-2)
Description: A sophisticated KDE CD burning application [Trinity]
K3b is a GUI frontend to the CD recording programs cdrdao and cdrecord.
Its aim is to provide a very user friendly interface to all the tasks
@@ -29,8 +30,9 @@ Description: A sophisticated KDE CD burning application [Trinity]
Package: k3b-data-trinity
Conflicts: k3b-trinity (<< 1.0.4-4)
-Replaces: k3b-trinity (<< 1.0.5-2)
Architecture: all
+Replaces: k3b-data-trinity (<< 4:14.0.0)
+Breaks: k3b-data-trinity (<< 4:14.0.0)
Description: A sophisticated KDE CD burning application - data files [Trinity]
K3b is a GUI frontend to the CD recording programs cdrdao and cdrecord.
Its aim is to provide a very user friendly interface to all the tasks
@@ -41,6 +43,8 @@ Description: A sophisticated KDE CD burning application - data files [Trinity]
Package: libk3b-trinity-dev
Conflicts: libk3bcore-trinity-dev, libk3bplugin-trinity-dev, libk3btools-trinity-dev, libk3bproject-trinity-dev, k3blibs-trinity-dev, k3blibs-trinity
Section: libdevel
+Replaces: libk3b-trinity-dev (<< 4:14.0.0)
+Breaks: libk3b-trinity-dev (<< 4:14.0.0)
Architecture: any
Depends: libk3b3-trinity (= ${binary:Version})
Description: The KDE cd burning application library - development files [Trinity]
@@ -53,9 +57,10 @@ Description: The KDE cd burning application library - development files [Trinity
Package: libk3b3-trinity
Section: libs
Architecture: any
+Replaces: libk3b3-trinity (<< 4:14.0.0)
+Breaks: libk3b3-trinity (<< 4:14.0.0)
Conflicts: libk3bcore-trinity, libk3bplugin-trinity, libk3btools-trinity, libk3bproject-trinity, k3blibs-trinity, libk3b2-trinity
Depends: ${shlibs:Depends}
-Replaces: libk3b2-trinity, libk3b-trinity-dev (<< 1.0.5-2)
Description: The KDE cd burning application library - runtime files [Trinity]
K3b is a GUI frontend to the cd recording programs cdrdao and cdrecord.
Its aim is to provide a very user friendly interface to all the tasks
@@ -66,9 +71,10 @@ Description: The KDE cd burning application library - runtime files [Trinity]
Package: libk3b3-extracodecs-trinity
Section: libs
Architecture: any
+Replaces: libk3b3-extracodecs-trinity (<< 4:14.0.0)
+Breaks: libk3b3-extracodecs-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Conflicts: libk3b2-mp3-trinity
-Replaces: libk3b2-mp3-trinity, libk3b2-extracodecs-trinity, libk3b3-trinity (<< 1.0.5-2)
Description: The KDE cd burning application library - extra decoders [Trinity]
K3b is a GUI frontend to the cd recording programs cdrdao and cdrecord.
Its aim is to provide a very user friendly interface to all the tasks
@@ -79,6 +85,8 @@ Description: The KDE cd burning application library - extra decoders [Trinity]
Package: libk3b2-extracodecs-trinity
Architecture: all
Priority: extra
+Replaces: libk3b2-extracodecs-trinity (<< 4:14.0.0)
+Breaks: libk3b2-extracodecs-trinity (<< 4:14.0.0)
Depends: libk3b3-extracodecs-trinity
Description: transitional package for K3b's extra decoders [Trinity]
This is a dummy transitional package to enable a smooth transition from
diff --git a/debian/lenny/applications/k9copy/debian/control b/debian/lenny/applications/k9copy/debian/control
index de8dad059..a54326497 100644
--- a/debian/lenny/applications/k9copy/debian/control
+++ b/debian/lenny/applications/k9copy/debian/control
@@ -10,8 +10,10 @@ Homepage: http://k9copy.sourceforge.net/
Package: k9copy-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, vamps, dvd+rw-tools, dvdauthor, mencoder, libdvdnav4
+Replaces: k9copy-trinity (<< 4:14.0.0)
+Breaks: k9copy-trinity (<< 4:14.0.0)
Description: DVD backup tool for Trinity
k9copy is a tabbed tool that allows to copy of one or more titles from a DVD9
- to a DVD5, in the same way than DVDShrink for Microsoft Windows (R).
+ to a DVD5, in thesame way than DVDShrink for Microsoft Windows (R).
This is the Trinity version
diff --git a/debian/lenny/applications/kaffeine-mozilla/debian/control b/debian/lenny/applications/kaffeine-mozilla/debian/control
index 9a7389392..38270dc34 100644
--- a/debian/lenny/applications/kaffeine-mozilla/debian/control
+++ b/debian/lenny/applications/kaffeine-mozilla/debian/control
@@ -9,6 +9,8 @@ Standards-Version: 3.8.4
Package: kaffeine-mozilla-trinity
Architecture: any
Depends: kaffeine-trinity, ${shlibs:Depends}, ${misc:Depends}
+Replaces: kaffeine-mozilla-trinity (<< 4:14.0.0)
+Breaks: kaffeine-mozilla-trinity (<< 4:14.0.0)
Description: mozilla plugin that lanches kaffeine for supported media types [Trinity]
This mozilla plugin launches kaffeine, the xine-based media player for KDE,
when a page containing a supported media format is loaded.
diff --git a/debian/lenny/applications/kaffeine/debian/control b/debian/lenny/applications/kaffeine/debian/control
index 105509a63..5aa779d25 100644
--- a/debian/lenny/applications/kaffeine/debian/control
+++ b/debian/lenny/applications/kaffeine/debian/control
@@ -15,6 +15,8 @@ Standards-Version: 3.8.4
Package: kaffeine-trinity
Architecture: any
Depends: ${shlibs:Depends}, hdparm
+Replaces: kaffeine-trinity (<< 4:14.0.0)
+Breaks: kaffeine-trinity (<< 4:14.0.0)
Recommends: tdesudo-trinity, kpackage-trinity
Description: versatile media player for TDE
Kaffeine is a media player for KDE. While it supports multiple player
@@ -30,6 +32,8 @@ Description: versatile media player for TDE
Package: kaffeine-trinity-dbg
Section: devel
Architecture: any
+Replaces: kaffeine-trinity-dbg (<< 4:14.0.0)
+Breaks: kaffeine-trinity-dbg (<< 4:14.0.0)
Priority: extra
Depends: kaffeine-trinity (= ${binary:Version}), tdelibs-trinity-dbg
Recommends: tdesudo-trinity, kpackage-trinity
@@ -41,6 +45,8 @@ Description: debugging symbols for kaffeine [Trinity]
Package: kaffeine-gstreamer-trinity
Architecture: any
Depends: ${shlibs:Depends}, kaffeine-trinity
+Replaces: kaffeine-gstreamer-trinity (<< 4:14.0.0)
+Breaks: kaffeine-gstreamer-trinity (<< 4:14.0.0)
Description: Gstreamer engine for kaffeine media player [Trinity]
Kaffeine is a media player for KDE. While it supports multiple player
engines, its default engine is Gstreamer, giving Kaffeine a wide variety of
diff --git a/debian/lenny/applications/katapult/debian/control b/debian/lenny/applications/katapult/debian/control
index e8a858c21..003a6d5da 100644
--- a/debian/lenny/applications/katapult/debian/control
+++ b/debian/lenny/applications/katapult/debian/control
@@ -8,6 +8,8 @@ Standards-Version: 3.8.4
Package: katapult-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: katapult-trinity (<< 4:14.0.0)
+Breaks: katapult-trinity (<< 4:14.0.0)
Description: item launcher for KDE [Trinity]
Katapult is an application, which analyses text-based queries
to launch items, such as bookmarks, directories or programs.
diff --git a/debian/lenny/applications/kbarcode/debian/control b/debian/lenny/applications/kbarcode/debian/control
index a372496f9..d2341bf16 100644
--- a/debian/lenny/applications/kbarcode/debian/control
+++ b/debian/lenny/applications/kbarcode/debian/control
@@ -9,6 +9,8 @@ Standards-Version: 3.8.4
Package: kbarcode-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, barcode, imagemagick
+Replaces: kbarcode-trinity (<< 4:14.0.0)
+Breaks: kbarcode-trinity (<< 4:14.0.0)
Recommends: libqt3-mt-mysql | libqt3-mt-psql | libqt3-mt-odbc | libqt3-mt-sqlite |
libqt3-mt-ibase
Description: barcode and label printing application for Trinity
diff --git a/debian/lenny/applications/kbfx/debian/control b/debian/lenny/applications/kbfx/debian/control
index 7c1918ac1..d3830e6d6 100644
--- a/debian/lenny/applications/kbfx/debian/control
+++ b/debian/lenny/applications/kbfx/debian/control
@@ -9,6 +9,8 @@ Standards-Version: 3.8.4
Package: kbfx-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: kbfx-trinity (<< 4:14.0.0)
+Breaks: kbfx-trinity (<< 4:14.0.0)
Description: an alternative to K-Menu for KDE [Trinity]
KBFX is an alternative to the classical K-Menu button and its menu.
It improves the user experience by enabling him to set a bigger (and thus more
diff --git a/debian/lenny/applications/kbookreader/debian/control b/debian/lenny/applications/kbookreader/debian/control
index bc85ba375..c6ab189eb 100644
--- a/debian/lenny/applications/kbookreader/debian/control
+++ b/debian/lenny/applications/kbookreader/debian/control
@@ -10,6 +10,8 @@ Homepage: http://k9copy.sourceforge.net/
Package: kbookreader-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: kbookreader-trinity (<< 4:14.0.0)
+Breaks: kbookreader-trinity (<< 4:14.0.0)
Description: eBook reader for Trinity
kbookreader is an application which allows you to view eBooks
within the Trinity Desktop Environment
diff --git a/debian/lenny/applications/kchmviewer/debian/control b/debian/lenny/applications/kchmviewer/debian/control
index 2402649ca..93a25020d 100644
--- a/debian/lenny/applications/kchmviewer/debian/control
+++ b/debian/lenny/applications/kchmviewer/debian/control
@@ -10,6 +10,8 @@ Homepage: http://www.kchmviewer.net/
Package: kchmviewer-trinity
Architecture: any
Conflicts: kchmviewer-nokde-trinity
+Replaces: kchmviewer-trinity (<< 4:14.0.0)
+Breaks: kchmviewer-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: CHM viewer for Trinity
KchmViewer is a chm (MS HTML help file format) viewer, written in C++.
diff --git a/debian/lenny/applications/kcpuload/debian/control b/debian/lenny/applications/kcpuload/debian/control
index 2577a5722..8b5024c98 100644
--- a/debian/lenny/applications/kcpuload/debian/control
+++ b/debian/lenny/applications/kcpuload/debian/control
@@ -9,6 +9,8 @@ Standards-Version: 3.8.4
Package: kcpuload-trinity
Architecture: any
Section: kde
+Replaces: kcpuload-trinity (<< 4:14.0.0)
+Breaks: kcpuload-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: knetload-trinity
Description: a CPU meter for Kicker [Trinity]
diff --git a/debian/lenny/applications/kdbusnotification/debian/control b/debian/lenny/applications/kdbusnotification/debian/control
index b08146fc3..cd2ef673b 100644
--- a/debian/lenny/applications/kdbusnotification/debian/control
+++ b/debian/lenny/applications/kdbusnotification/debian/control
@@ -8,6 +8,8 @@ Standards-Version: 3.8.4
Package: kdbusnotification-trinity
Architecture: any
Section: kde
+Replaces: kdbusnotification-trinity (<< 4:14.0.0)
+Breaks: kdbusnotification-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: a DBUS notification service [Trinity]
kdbusnotification is a small program for Trinity that displays
diff --git a/debian/lenny/applications/kdiff3/debian/control b/debian/lenny/applications/kdiff3/debian/control
index 87de53339..01e6d6a24 100644
--- a/debian/lenny/applications/kdiff3/debian/control
+++ b/debian/lenny/applications/kdiff3/debian/control
@@ -9,6 +9,8 @@ Standards-Version: 3.8.4
Package: kdiff3-trinity
Architecture: any
Depends: ${shlibs:Depends}
+Replaces: kdiff3-trinity (<< 4:14.0.0)
+Breaks: kdiff3-trinity (<< 4:14.0.0)
Recommends: kdiff3-trinity-doc
Description: compares and merges 2 or 3 files or directories [Trinity]
KDiff3 compares two or three input files and shows the differences
@@ -20,6 +22,8 @@ Description: compares and merges 2 or 3 files or directories [Trinity]
Package: kdiff3-trinity-doc
Architecture: all
Recommends: kdiff3-trinity
+Replaces: kdiff3-trinity-doc (<< 4:14.0.0)
+Breaks: kdiff3-trinity-doc (<< 4:14.0.0)
Description: documentation for kdiff3 [Trinity]
KDiff3 compares two or three input files and shows the differences
line by line and character by character. This package contains the
diff --git a/debian/lenny/applications/kdirstat/debian/control b/debian/lenny/applications/kdirstat/debian/control
index 654c44554..27e47ff0e 100644
--- a/debian/lenny/applications/kdirstat/debian/control
+++ b/debian/lenny/applications/kdirstat/debian/control
@@ -9,6 +9,8 @@ Homepage: http://kdirstat.sourceforge.net/
Package: kdirstat-trinity
Architecture: any
Depends: ${shlibs:Depends}
+Replaces: kdirstat-trinity (<< 4:14.0.0)
+Breaks: kdirstat-trinity (<< 4:14.0.0)
Description: graphical disk usage display with cleanup facilities [Trinity]
KDirStat (KDE Directory Statistics) is a small utility program that sums
up disk usage for directory trees, very much like the Unix 'du' command.
diff --git a/debian/lenny/applications/kdmtheme/debian/control b/debian/lenny/applications/kdmtheme/debian/control
index b3d52012f..943c0ecf2 100644
--- a/debian/lenny/applications/kdmtheme/debian/control
+++ b/debian/lenny/applications/kdmtheme/debian/control
@@ -12,6 +12,8 @@ Homepage: http://beta.smileaf.org/projects
Package: kdmtheme-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, kdm-trinity
+Replaces: kdmtheme-trinity (<< 4:14.0.0)
+Breaks: kdmtheme-trinity (<< 4:14.0.0)
Description: theme manager for KDM [Trinity]
kdmtheme is a theme manager for KDM. It provides a KDE Control Module (KCM)
that allows you to easily install, remove and change your KDM themes.
diff --git a/debian/lenny/applications/kdpkg/debian/control b/debian/lenny/applications/kdpkg/debian/control
index 681eb0cb2..15d673216 100644
--- a/debian/lenny/applications/kdpkg/debian/control
+++ b/debian/lenny/applications/kdpkg/debian/control
@@ -9,6 +9,8 @@ Standards-Version: 3.8.4
Package: kdpkg-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, apt, dpkg (>=1.14), sudo-trinity, menu
+Replaces: kdpkg-trinity (<< 4:14.0.0)
+Breaks: kdpkg-trinity (<< 4:14.0.0)
Description: KDE frontend for dpkg [Trinity]
kdpkg is a utility for installing .deb package files.
It is similar to gdebi, except that kdpkg is a KDE application
diff --git a/debian/lenny/applications/keep/debian/control b/debian/lenny/applications/keep/debian/control
index f12169a33..536f0d010 100644
--- a/debian/lenny/applications/keep/debian/control
+++ b/debian/lenny/applications/keep/debian/control
@@ -10,6 +10,8 @@ Standards-Version: 3.8.4
Package: keep-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, rdiff-backup
+Replaces: keep-trinity (<< 4:14.0.0)
+Breaks: keep-trinity (<< 4:14.0.0)
Description: backup system for KDE [Trinity]
Keep is an automatic backup program that allows users to set the parameters of
the backup, including the frequency and the number of backups.
diff --git a/debian/lenny/applications/kerry/debian/control b/debian/lenny/applications/kerry/debian/control
index 36f6f9aae..f43dc07dd 100644
--- a/debian/lenny/applications/kerry/debian/control
+++ b/debian/lenny/applications/kerry/debian/control
@@ -9,6 +9,8 @@ Standards-Version: 3.8.4
Package: kerry-trinity
Architecture: any
Depends: ${shlibs:Depends}, beagle (>= 0.2.3)
+Replaces: kerry-trinity (<< 4:14.0.0)
+Breaks: kerry-trinity (<< 4:14.0.0)
Description: a KDE frontend for the Beagle desktop search daemon [Trinity]
Kerry is a Trinity frontend for the Beagle desktop search daemon.
.
diff --git a/debian/lenny/applications/kgtk-qt3/debian/control b/debian/lenny/applications/kgtk-qt3/debian/control
index 9edbf0887..5ba35f8d3 100644
--- a/debian/lenny/applications/kgtk-qt3/debian/control
+++ b/debian/lenny/applications/kgtk-qt3/debian/control
@@ -9,6 +9,8 @@ Homepage: http://trinity.pearsoncomputing.net
Package: kgtk-qt3-trinity
Architecture: any
Depends: ${shlibs:Depends}
+Replaces: kgtk-qt3-trinity (<< 4:14.0.0)
+Breaks: kgtk-qt3-trinity (<< 4:14.0.0)
Conflicts: kgtk-config-bluefish, kgtk-config-eclipse, kgtk-config-firefox, kgtk-config-gimp, kgtk-config-inkscape, kgtk-config-kino, kgtk-config-openoffice, kgtk-config-opera-qt3, kgtk-config-opera-qt4, kgtk-config-scribus, kgtk-config-thunderbird, kubuntu-kgtk-trinity
Description: Use KDE dialogs in Gtk apps
This is an LD_PRELOAD hack that allows most GTK
diff --git a/debian/lenny/applications/kile/debian/control b/debian/lenny/applications/kile/debian/control
index ae5bf2225..b39ba1894 100644
--- a/debian/lenny/applications/kile/debian/control
+++ b/debian/lenny/applications/kile/debian/control
@@ -11,6 +11,8 @@ Homepage: http://kile.sourceforge.net
Package: kile-trinity
Architecture: any
Section: tex
+Replaces: kile-trinity (<< 4:14.0.0)
+Breaks: kile-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, konsole-trinity, texlive-latex-base
Recommends: kdvi-trinity, dvipng, kghostview-trinity, kpdf-trinity
Suggests: gbib, latex2html, pybliographer, xfig, kile-trinity-i18n, gv
@@ -31,6 +33,8 @@ Description: KDE Integrated LaTeX Environment [Trinity]
Package: kile-trinity-i18n-ar
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-ar (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-ar (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Recommends: kde-trinity-i18n-ar
Provides: kile-trinity-i18n
@@ -40,6 +44,8 @@ Description: Arabic (ar) translations for Kile [Trinity]
Package: kile-trinity-i18n-bg
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-bg (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-bg (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Recommends: kde-trinity-i18n-bg
Provides: kile-trinity-i18n
@@ -49,6 +55,8 @@ Description: Bulgarian (bg) translations for Kile [Trinity]
Package: kile-trinity-i18n-br
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-br (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-br (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Recommends: kde-trinity-i18n-br
Provides: kile-trinity-i18n
@@ -58,6 +66,8 @@ Description: Brazilian (br) translations for Kile [Trinity]
Package: kile-trinity-i18n-ca
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-ca (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-ca (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Recommends: kde-trinity-i18n-ca
Provides: kile-trinity-i18n
@@ -67,6 +77,8 @@ Description: Catalan (ca) translations for Kile [Trinity]
Package: kile-trinity-i18n-cs
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-cs (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-cs (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Recommends: kde-trinity-i18n-cs
Provides: kile-trinity-i18n
@@ -76,6 +88,8 @@ Description: Czech (cs) translations for Kile [Trinity]
Package: kile-trinity-i18n-cy
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-cy (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-cy (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Recommends: kde-trinity-i18n-cy
Provides: kile-trinity-i18n
@@ -85,6 +99,8 @@ Description: Welsh (cy) translations for Kile [Trinity]
Package: kile-trinity-i18n-da
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-da (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-da (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Recommends: kde-trinity-i18n-da
Provides: kile-trinity-i18n
@@ -94,6 +110,8 @@ Description: Danish (da) translations for Kile [Trinity]
Package: kile-trinity-i18n-de
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-de (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-de (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Recommends: kde-trinity-i18n-de
Provides: kile-trinity-i18n
@@ -103,6 +121,8 @@ Description: German (de) translations for Kile [Trinity]
Package: kile-trinity-i18n-el
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-el (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-el (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Recommends: kde-trinity-i18n-el
Provides: kile-trinity-i18n
@@ -112,6 +132,8 @@ Description: Greek (el) translations for Kile [Trinity]
Package: kile-trinity-i18n-engb
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-engb (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-engb (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Recommends: kde-trinity-i18n-engb
Provides: kile-trinity-i18n
@@ -121,6 +143,8 @@ Description: British English (en_GB) translations for Kile [Trinity]
Package: kile-trinity-i18n-es
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-es (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-es (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Recommends: kde-trinity-i18n-es
Provides: kile-trinity-i18n
@@ -130,6 +154,8 @@ Description: Spanish (es) translations for Kile [Trinity]
Package: kile-trinity-i18n-et
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-et (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-et (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Recommends: kde-trinity-i18n-et
Provides: kile-trinity-i18n
@@ -139,6 +165,8 @@ Description: Estonian (et) translations for Kile [Trinity]
Package: kile-trinity-i18n-eu
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-eu (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-eu (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Recommends: kde-trinity-i18n-eu
Provides: kile-trinity-i18n
@@ -148,6 +176,8 @@ Description: Basque (eu) translations for Kile [Trinity]
Package: kile-trinity-i18n-fi
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-fi (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-fi (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Recommends: kde-trinity-i18n-fi
Provides: kile-trinity-i18n
@@ -157,6 +187,8 @@ Description: Finnish (fi) translations for Kile [Trinity]
Package: kile-trinity-i18n-fr
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-fr (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-fr (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Recommends: kde-trinity-i18n-fr
Provides: kile-trinity-i18n
@@ -166,6 +198,8 @@ Description: French (fr) translations for Kile [Trinity]
Package: kile-trinity-i18n-ga
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-ga (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-ga (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Recommends: kde-trinity-i18n-ga
Provides: kile-trinity-i18n
@@ -175,6 +209,8 @@ Description: Irish Gaelic (ga) translations for Kile [Trinity]
Package: kile-trinity-i18n-gl
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-gl (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-gl (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Recommends: kde-trinity-i18n-gl
Provides: kile-trinity-i18n
@@ -184,6 +220,8 @@ Description: Galician (gl) translations for Kile [Trinity]
Package: kile-trinity-i18n-hi
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-hi (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-hi (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Recommends: kde-trinity-i18n-hi
Provides: kile-trinity-i18n
@@ -193,6 +231,8 @@ Description: Hindi (hi) translations for Kile [Trinity]
Package: kile-trinity-i18n-hu
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-hu (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-hu (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Recommends: kde-trinity-i18n-hu
Provides: kile-trinity-i18n
@@ -202,6 +242,8 @@ Description: Hungarian (hu) translations for Kile [Trinity]
Package: kile-trinity-i18n-is
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-is (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-is (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Recommends: kde-trinity-i18n-is
Provides: kile-trinity-i18n
@@ -211,6 +253,8 @@ Description: Icelandic (is) translations for Kile [Trinity]
Package: kile-trinity-i18n-it
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-it (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-it (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Recommends: kde-trinity-i18n-it
Provides: kile-trinity-i18n
@@ -220,6 +264,8 @@ Description: Italian (it) translations for Kile [Trinity]
Package: kile-trinity-i18n-ja
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-ja (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-ja (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Recommends: kde-trinity-i18n-ja
Provides: kile-trinity-i18n
@@ -229,6 +275,8 @@ Description: Japanese (ja) translations for Kile [Trinity]
Package: kile-trinity-i18n-lt
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-lt (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-lt (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Recommends: kde-trinity-i18n-lt
Provides: kile-trinity-i18n
@@ -238,6 +286,8 @@ Description: Lithuanian (lt) translations for Kile [Trinity]
Package: kile-trinity-i18n-ms
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-ms (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-ms (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Recommends: kde-trinity-i18n-ms
Provides: kile-trinity-i18n
@@ -247,6 +297,8 @@ Description: Malay (ms) translations for Kile [Trinity]
Package: kile-trinity-i18n-mt
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-mt (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-mt (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Provides: kile-trinity-i18n
Description: Maltese (mt) translations for Kile [Trinity]
@@ -255,6 +307,8 @@ Description: Maltese (mt) translations for Kile [Trinity]
Package: kile-trinity-i18n-nb
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-nb (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-nb (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Recommends: kde-trinity-i18n-nb
Provides: kile-trinity-i18n
@@ -264,6 +318,8 @@ Description: Norwegian Bookmal (nb) translations for Kile [Trinity]
Package: kile-trinity-i18n-nds
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-nds (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-nds (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Recommends: kde-trinity-i18n-nds
Provides: kile-trinity-i18n
@@ -273,6 +329,8 @@ Description: Low Saxon (nds) translations for Kile [Trinity]
Package: kile-trinity-i18n-nl
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-nl (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-nl (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Recommends: kde-trinity-i18n-nl
Provides: kile-trinity-i18n
@@ -282,6 +340,8 @@ Description: Dutch (nl) translations for Kile [Trinity]
Package: kile-trinity-i18n-nn
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-nn (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-nn (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Recommends: kde-trinity-i18n-nn
Provides: kile-trinity-i18n
@@ -291,6 +351,8 @@ Description: Norwegian Nynorsk (nn) translations for Kile [Trinity]
Package: kile-trinity-i18n-pa
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-pa (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-pa (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Recommends: kde-trinity-i18n-pa
Provides: kile-trinity-i18n
@@ -300,6 +362,8 @@ Description: Punjabi (pa) translations for Kile [Trinity]
Package: kile-trinity-i18n-pl
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-pl (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-pl (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Recommends: kde-trinity-i18n-pl
Provides: kile-trinity-i18n
@@ -309,6 +373,8 @@ Description: Polish (pl) translations for Kile [Trinity]
Package: kile-trinity-i18n-pt
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-pt (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-pt (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Recommends: kde-trinity-i18n-pt
Provides: kile-trinity-i18n
@@ -318,6 +384,8 @@ Description: Portuguese (pt) translations for Kile [Trinity]
Package: kile-trinity-i18n-ptbr
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-ptbr (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-ptbr (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Recommends: kde-trinity-i18n-ptbr
Provides: kile-trinity-i18n
@@ -327,6 +395,8 @@ Description: Brazilian Portuguese (pt_BR) translations for Kile [Trinity]
Package: kile-trinity-i18n-ro
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-ro (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-ro (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Recommends: kde-trinity-i18n-ro
Provides: kile-trinity-i18n
@@ -336,6 +406,8 @@ Description: Romanian (ro) translations for Kile [Trinity]
Package: kile-trinity-i18n-ru
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-ru (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-ru (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Recommends: kde-trinity-i18n-ru
Provides: kile-trinity-i18n
@@ -345,6 +417,8 @@ Description: Russian (ru) translations for Kile [Trinity]
Package: kile-trinity-i18n-rw
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-rw (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-rw (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Recommends: kde-trinity-i18n-rw
Provides: kile-trinity-i18n
@@ -354,6 +428,8 @@ Description: Kinyarwanda (rw) translations for Kile [Trinity]
Package: kile-trinity-i18n-sk
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-sk (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-sk (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Recommends: kde-trinity-i18n-sk
Provides: kile-trinity-i18n
@@ -363,6 +439,8 @@ Description: Slovak (sk) translations for Kile [Trinity]
Package: kile-trinity-i18n-sr
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-sr (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-sr (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Recommends: kde-trinity-i18n-sr
Provides: kile-trinity-i18n
@@ -372,6 +450,8 @@ Description: Serbian (sr) translations for Kile [Trinity]
Package: kile-trinity-i18n-srlatin
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-srlatin (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-srlatin (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Recommends: kde-trinity-i18n-srlatin
Provides: kile-trinity-i18n
@@ -381,6 +461,8 @@ Description: Latin Serbian (sr@Latn) translations for Kile [Trinity]
Package: kile-trinity-i18n-sv
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-sv (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-sv (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Recommends: kde-trinity-i18n-sv
Provides: kile-trinity-i18n
@@ -390,6 +472,8 @@ Description: Swedish (sv) translations for Kile [Trinity]
Package: kile-trinity-i18n-ta
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-ta (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-ta (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Recommends: kde-trinity-i18n-ta
Provides: kile-trinity-i18n
@@ -399,6 +483,8 @@ Description: Tamil (ta) translations for Kile [Trinity]
Package: kile-trinity-i18n-th
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-th (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-th (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Recommends: kde-trinity-i18n-th
Provides: kile-trinity-i18n
@@ -408,6 +494,8 @@ Description: Thai (th) translations for Kile [Trinity]
Package: kile-trinity-i18n-tr
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-tr (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-tr (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Recommends: kde-trinity-i18n-tr
Provides: kile-trinity-i18n
@@ -417,6 +505,8 @@ Description: Turkish (tr) translations for Kile [Trinity]
Package: kile-trinity-i18n-uk
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-uk (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-uk (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Recommends: kde-trinity-i18n-uk
Provides: kile-trinity-i18n
@@ -426,6 +516,8 @@ Description: Ukrainian (uk) translations for Kile [Trinity]
Package: kile-trinity-i18n-zhcn
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-zhcn (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-zhcn (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Recommends: kde-trinity-i18n-zhcn
Provides: kile-trinity-i18n
diff --git a/debian/lenny/applications/kima/debian/control b/debian/lenny/applications/kima/debian/control
index d553a3e9b..3f2b78348 100644
--- a/debian/lenny/applications/kima/debian/control
+++ b/debian/lenny/applications/kima/debian/control
@@ -8,6 +8,8 @@ Standards-Version: 3.8.4
Package: kima-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: kima-trinity (<< 4:14.0.0)
+Breaks: kima-trinity (<< 4:14.0.0)
Description: kicker monitoring applet [Trinity]
This applet monitors various temperature,
frequency and fan sources in your kicker
diff --git a/debian/lenny/applications/kio-apt/debian/control b/debian/lenny/applications/kio-apt/debian/control
index 114c26b8b..46eec78e4 100644
--- a/debian/lenny/applications/kio-apt/debian/control
+++ b/debian/lenny/applications/kio-apt/debian/control
@@ -9,6 +9,8 @@ Standards-Version: 3.8.4
Package: kio-apt-trinity
Architecture: any
Depends: ${shlibs:Depends}, apt, adept-batch-trinity
+Replaces: kio-apt-trinity (<< 4:14.0.0)
+Breaks: kio-apt-trinity (<< 4:14.0.0)
Description: an apt-cache ioslave for Trinity
kio-apt is an ioslave which provides the apt:/ protocol. It
integrates apt-cache functionalities into Konqueror, making
diff --git a/debian/lenny/applications/kio-locate/debian/control b/debian/lenny/applications/kio-locate/debian/control
index 3313ed463..5c668f1bf 100644
--- a/debian/lenny/applications/kio-locate/debian/control
+++ b/debian/lenny/applications/kio-locate/debian/control
@@ -9,6 +9,8 @@ Standards-Version: 3.8.4
Package: kio-locate-trinity
Architecture: any
Depends: ${shlibs:Depends}
+Replaces: kio-locate-trinity (<< 4:14.0.0)
+Breaks: kio-locate-trinity (<< 4:14.0.0)
Description: kio-slave for the locate command [Trinity]
Adds support for the "locate:" and "locater:"
protocols to Konqueror and other KDE applications.
diff --git a/debian/lenny/applications/kio-umountwrapper/debian/control b/debian/lenny/applications/kio-umountwrapper/debian/control
index 03cd3f7fa..413c8c66b 100644
--- a/debian/lenny/applications/kio-umountwrapper/debian/control
+++ b/debian/lenny/applications/kio-umountwrapper/debian/control
@@ -8,6 +8,8 @@ Standards-Version: 3.8.4
Package: kio-umountwrapper-trinity
Architecture: any
Depends: ${shlibs:Depends}
+Replaces: kio-umountwrapper-trinity (<< 4:14.0.0)
+Breaks: kio-umountwrapper-trinity (<< 4:14.0.0)
Description: progress dialog for safely removing devices in Trinity.
Wrapper around kio_media_mountwrapper.
Provides a progress dialog for Safely Removing of devices in Trinity.
diff --git a/debian/lenny/applications/kiosktool/debian/control b/debian/lenny/applications/kiosktool/debian/control
index 68d0b7404..068639c25 100644
--- a/debian/lenny/applications/kiosktool/debian/control
+++ b/debian/lenny/applications/kiosktool/debian/control
@@ -9,6 +9,8 @@ Standards-Version: 3.8.4
Package: kiosktool-trinity
Architecture: any
Depends: ${shlibs:Depends}, tdesudo-trinity
+Replaces: kiosktool-trinity (<< 4:14.0.0)
+Breaks: kiosktool-trinity (<< 4:14.0.0)
Description: tool to configure the TDE kiosk framework
A Point&Click tool for system administrators to enable
TDE's KIOSK features or otherwise preconfigure TDE for
diff --git a/debian/lenny/applications/kmplayer/debian/control b/debian/lenny/applications/kmplayer/debian/control
index 41f5f695e..f182f5290 100644
--- a/debian/lenny/applications/kmplayer/debian/control
+++ b/debian/lenny/applications/kmplayer/debian/control
@@ -14,6 +14,8 @@ Homepage: http://kmplayer.kde.org
Package: kmplayer-trinity
Architecture: any
Depends: ${shlibs:Depends}, kmplayer-base-trinity (= ${binary:Version}), libxine1-x | libxine1 (<< 1.1.8-2)
+Replaces: kmplayer-trinity (<< 4:14.0.0)
+Breaks: kmplayer-trinity (<< 4:14.0.0)
Recommends: kmplayer-plugin-trinity (= ${binary:Version})
Suggests: ffmpeg, vdr, xawtv, mplayer
Description: media player for Trinity
@@ -35,6 +37,8 @@ Description: media player for Trinity
Package: kmplayer-base-trinity
Architecture: any
Section: kde
+Replaces: kmplayer-base-trinity (<< 4:14.0.0)
+Breaks: kmplayer-base-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: Base files for KMPlayer [Trinity]
Core files needed for KMPlayer.
@@ -44,6 +48,8 @@ Description: Base files for KMPlayer [Trinity]
Package: kmplayer-konq-plugins-trinity
Architecture: any
Section: kde
+Replaces: kmplayer-konq-plugins-trinity (<< 4:14.0.0)
+Breaks: kmplayer-konq-plugins-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, kmplayer-base-trinity (= ${binary:Version}), konqueror-trinity
Description: KMPlayer plugin for KHTML/Konqueror [Trinity]
This plugin enables audio/video playback inside konqueror, using Xine (with
@@ -54,6 +60,8 @@ Description: KMPlayer plugin for KHTML/Konqueror [Trinity]
Package: kmplayer-trinity-doc
Architecture: all
Section: kde
+Replaces: kmplayer-trinity-doc (<< 4:14.0.0)
+Breaks: kmplayer-trinity-doc (<< 4:14.0.0)
Depends: ${shlibs:Depends}, kmplayer-trinity
Description: Handbook for KMPlayer [Trinity]
Documention for KMPlayer, a basic audio/video viewer application for KDE.
diff --git a/debian/lenny/applications/kmyfirewall/debian/control b/debian/lenny/applications/kmyfirewall/debian/control
index 7003b4966..dfa0bd20f 100644
--- a/debian/lenny/applications/kmyfirewall/debian/control
+++ b/debian/lenny/applications/kmyfirewall/debian/control
@@ -9,6 +9,8 @@ Homepage: http://kmyfirewall.sourceforge.net/
Package: kmyfirewall-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: kmyfirewall-trinity (<< 4:14.0.0)
+Breaks: kmyfirewall-trinity (<< 4:14.0.0)
Description: iptables based firewall configuration tool for KDE [Trinity]
KMyFirewall attempts to make it easier to setup iptables based firewalls on
Linux systems. It will be the right tool if you like to have a so called
diff --git a/debian/lenny/applications/kmymoney/debian/control b/debian/lenny/applications/kmymoney/debian/control
index 30c1d33e2..316e96269 100644
--- a/debian/lenny/applications/kmymoney/debian/control
+++ b/debian/lenny/applications/kmymoney/debian/control
@@ -9,8 +9,9 @@ Standards-Version: 3.8.4
Package: kmymoney2-trinity
Architecture: any
-Depends: ${shlibs:Depends}, ${shlibs:Misc}, ${misc:Depends},
- kmymoney2-common-trinity (>= ${source:Version})
+Depends: ${shlibs:Depends}, ${shlibs:Misc}, ${misc:Depends}, kmymoney2-common-trinity (>= ${source:Version})
+Replaces: kmymoney2-trinity (<< 4:14.0.0)
+Breaks: kmymoney2-trinity (<< 4:14.0.0)
Recommends: kmymoney2-plugin-aqbanking-trinity
Description: personal finance manager for TDE
KMyMoney is the Personal Finance Manager for TDE. It operates similar to
@@ -21,6 +22,8 @@ Description: personal finance manager for TDE
Package: kmymoney2-common-trinity
Architecture: all
Depends: ${misc:Depends}
+Replaces: kmymoney2-common-trinity (<< 4:14.0.0)
+Breaks: kmymoney2-common-trinity (<< 4:14.0.0)
Recommends: kmymoney2-trinity (>= ${source:Version})
Description: KMyMoney architecture independent files
This package contains architecture independent files needed for KMyMoney to
@@ -30,6 +33,8 @@ Description: KMyMoney architecture independent files
Package: kmymoney2-trinity-dev
Section: libdevel
Architecture: any
+Replaces: kmymoney2-trinity-dev (<< 4:14.0.0)
+Breaks: kmymoney2-trinity-dev (<< 4:14.0.0)
Depends: ${misc:Depends}, kmymoney2-trinity (= ${binary:Version})
Description: KMyMoney development files
This package contains development files needed for KMyMoney plugins.
diff --git a/debian/lenny/applications/knemo/debian/control b/debian/lenny/applications/knemo/debian/control
index 41e259f13..81781eeb0 100644
--- a/debian/lenny/applications/knemo/debian/control
+++ b/debian/lenny/applications/knemo/debian/control
@@ -9,6 +9,8 @@ Standards-Version: 3.8.4
Package: knemo-trinity
Architecture: any
Depends: kicker-trinity, net-tools, ${shlibs:Depends}
+Replaces: knemo-trinity (<< 4:14.0.0)
+Breaks: knemo-trinity (<< 4:14.0.0)
Recommends: kcontrol-trinity, wireless-tools
Description: network interfaces monitor for the Trinity systray
KNemo displays an icon in the systray for every network interface.
diff --git a/debian/lenny/applications/knetload/debian/control b/debian/lenny/applications/knetload/debian/control
index 43ba42fd8..b7db52c53 100644
--- a/debian/lenny/applications/knetload/debian/control
+++ b/debian/lenny/applications/knetload/debian/control
@@ -9,6 +9,8 @@ Standards-Version: 3.8.4
Package: knetload-trinity
Architecture: any
Section: kde
+Replaces: knetload-trinity (<< 4:14.0.0)
+Breaks: knetload-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Conflicts: knetload
Suggests: kcpuload-trinity
diff --git a/debian/lenny/applications/knetstats/debian/control b/debian/lenny/applications/knetstats/debian/control
index 12c6974ee..06d91fef6 100644
--- a/debian/lenny/applications/knetstats/debian/control
+++ b/debian/lenny/applications/knetstats/debian/control
@@ -9,6 +9,8 @@ Homepage: http://knetstats.sourceforge.net/
Package: knetstats-trinity
Architecture: any
Depends: ${shlibs:Depends}
+Replaces: knetstats-trinity (<< 4:14.0.0)
+Breaks: knetstats-trinity (<< 4:14.0.0)
Description: network interfaces monitor for the Trinity systray
A simple KDE network monitor that show rx/tx LEDs of any
network interface on a system tray icon
diff --git a/debian/lenny/applications/knetworkmanager.cmake/debian/control b/debian/lenny/applications/knetworkmanager.cmake/debian/control
index 6e36a14dd..649c51085 100644
--- a/debian/lenny/applications/knetworkmanager.cmake/debian/control
+++ b/debian/lenny/applications/knetworkmanager.cmake/debian/control
@@ -25,6 +25,8 @@ Homepage: http://opensuse.org/Projects/KNetworkManager
Package: network-manager-tde
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.7.0)
+Replaces: network-manager-kde (<< 4:14.0.0)
+Breaks: network-manager-kde (<< 4:14.0.0)
Recommends: kwalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp
Provides: knetworkmanager-trinity
Conflicts: network-manager-kde
diff --git a/debian/lenny/applications/knetworkmanager8/debian/control b/debian/lenny/applications/knetworkmanager8/debian/control
index 49ac8454d..3136bba7f 100644
--- a/debian/lenny/applications/knetworkmanager8/debian/control
+++ b/debian/lenny/applications/knetworkmanager8/debian/control
@@ -26,6 +26,8 @@ Homepage: http://opensuse.org/Projects/KNetworkManager
Package: network-manager-kde-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.7.0), network-manager (<< 0.8.9)
+Replaces: network-manager-kde-trinity (<< 4:14.0.0)
+Breaks: network-manager-kde-trinity (<< 4:14.0.0)
Recommends: kwalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp
Provides: knetworkmanager-trinity
Conflicts: network-manager-kde
diff --git a/debian/lenny/applications/knights/debian/control b/debian/lenny/applications/knights/debian/control
index 2599fc08a..0e64bc23f 100644
--- a/debian/lenny/applications/knights/debian/control
+++ b/debian/lenny/applications/knights/debian/control
@@ -11,6 +11,8 @@ Homepage: http://knights.sourceforge.net/
Package: knights-trinity
Architecture: any
Depends: ${shlibs:Depends}, tdebase-kio-plugins-trinity
+Replaces: knights-trinity (<< 4:14.0.0)
+Breaks: knights-trinity (<< 4:14.0.0)
Suggests: gnuchess | crafty | sjeng, knights-themepack-trinity
Description: A chess interface for the K Desktop Environment [Trinity]
Knights aims to be the ultimate chess resource on your computer.
diff --git a/debian/lenny/applications/knowit/debian/control b/debian/lenny/applications/knowit/debian/control
index fa527e889..8f36965d7 100644
--- a/debian/lenny/applications/knowit/debian/control
+++ b/debian/lenny/applications/knowit/debian/control
@@ -10,6 +10,8 @@ Homepage: http://knowit.sourceforge.net/
Package: knowit-trinity
Architecture: any
Depends: ${shlibs:Depends}
+Replaces: knowit-trinity (<< 4:14.0.0)
+Breaks: knowit-trinity (<< 4:14.0.0)
Description: Tool for managing notes [Trinity]
KnowIt is a tool for managing notes which are organized in
tree-like hierarchy. It is similar to TuxCards,
diff --git a/debian/lenny/applications/knutclient/debian/control b/debian/lenny/applications/knutclient/debian/control
index 520f8eaf8..57a2f7bf5 100644
--- a/debian/lenny/applications/knutclient/debian/control
+++ b/debian/lenny/applications/knutclient/debian/control
@@ -10,6 +10,8 @@ Homepage: http://www.knut.noveradsl.cz/knutclient/
Package: knutclient-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: knutclient-trinity (<< 4:14.0.0)
+Breaks: knutclient-trinity (<< 4:14.0.0)
Description: A KDE GUI that displays UPS statistics from NUT's upsd [Trinity]
KNutClient monitors UPS statistics through the NUT (Network UPS Tools,
http://www.networkupstools.org/) framework on Linux and other systems. This
diff --git a/debian/lenny/applications/koffice/debian/control b/debian/lenny/applications/koffice/debian/control
index 93824f845..4aba97f07 100644
--- a/debian/lenny/applications/koffice/debian/control
+++ b/debian/lenny/applications/koffice/debian/control
@@ -3,7 +3,7 @@ Section: kde
Priority: optional
Maintainer: Timothy Pearson
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers
-Uploaders: Ana Beatriz Guerrero Lopez , Raúl Sánchez Siles
+Uploaders: Ana Beatriz Guerrero Lopez , Ral Snchez Siles
Build-Depends: cdbs (>= 0.4.52ubuntu18), debhelper (>= 5), binutils (>= 2.14.90.0.7), recode, docbook-to-man, gawk, gettext, flex, tdelibs4-trinity-dev (>= 4:3.4.3), libaspell-dev, libfontconfig1-dev, libopenexr-dev, libpaper-dev, libreadline5-dev | libreadline6-dev, libtiff4-dev, libwv2-dev (>= 0.2.2-4), libxml2-dev, libxslt1-dev, python-dev, ruby (>= 1.8.0), ruby1.8-dev, libwpd8-dev, libpqxx-dev, libmysqlclient15-dev | libmysqlclient16-dev, sharutils, bzip2, libpoppler-tqt-dev, libexif-dev, libasound2-dev, libogg-dev-la, automake, autoconf, libtool, libltdl-dev
Build-Depends-Indep: libtqtinterface-doc, graphviz, gsfonts-x11
Standards-Version: 3.8.4
@@ -12,6 +12,8 @@ Homepage: http://www.koffice.org
Package: koffice-trinity
Architecture: all
Section: kde
+Replaces: koffice-trinity (<< 4:14.0.0)
+Breaks: koffice-trinity (<< 4:14.0.0)
Depends: karbon-trinity (>= ${source:Version}), kchart-trinity (>= ${source:Version}), kexi-trinity (>= ${source:Version}), kformula-trinity (>= ${source:Version}), kivio-trinity (>= ${source:Version}), koshell-trinity (>= ${source:Version}), kplato-trinity (>= ${source:Version}), kpresenter-trinity (>= ${source:Version}), chalk-trinity (>= ${source:Version}), kspread-trinity (>= ${source:Version}), kugar-trinity (>= ${source:Version}), kword-trinity (>= ${source:Version}), kthesaurus-trinity (>= ${source:Version})
Suggests: koffice-i18n-trinity, koffice-trinity-dev (>= ${source:Version}), koffice-trinity-doc (>= ${source:Version}), koffice-trinity-doc-html (= ${source:Version})
Description: KDE Office Suite [Trinity]
@@ -24,6 +26,8 @@ Description: KDE Office Suite [Trinity]
Package: koffice-trinity-doc
Section: doc
Architecture: all
+Replaces: koffice-trinity-doc (<< 4:14.0.0)
+Breaks: koffice-trinity-doc (<< 4:14.0.0)
Description: developer documentation for the KDE Office Suite [Trinity]
This package contains documentation for the KDE Office Suite, of
use more for developers creating applications than regular users.
@@ -33,6 +37,8 @@ Description: developer documentation for the KDE Office Suite [Trinity]
Package: koffice-trinity-doc-html
Architecture: all
Section: doc
+Replaces: koffice-trinity-doc-html (<< 4:14.0.0)
+Breaks: koffice-trinity-doc-html (<< 4:14.0.0)
Suggests: konqueror-trinity | www-browser, koffice-trinity
Description: KDE Office Suite documentation in HTML format [Trinity]
KOffice is an integrated office suite for KDE, the K Desktop
@@ -53,6 +59,8 @@ Description: KDE Office Suite documentation in HTML format [Trinity]
Package: karbon-trinity
Architecture: any
Section: graphics
+Replaces: karbon-trinity (<< 4:14.0.0)
+Breaks: karbon-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, koffice-libs-trinity (<< ${KDE-Next-Version3})
Description: a vector graphics application for the KDE Office Suite
Karbon is a vector graphics application.
@@ -62,6 +70,8 @@ Description: a vector graphics application for the KDE Office Suite
Package: kchart-trinity
Architecture: any
Section: kde
+Replaces: kchart-trinity (<< 4:14.0.0)
+Breaks: kchart-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, koffice-libs-trinity (<< ${KDE-Next-Version3})
Recommends: khelpcenter-trinity | koffice-trinity-doc-html (= ${source:Version})
Description: a chart drawing program for the KDE Office Suite [Trinity]
@@ -73,6 +83,8 @@ Description: a chart drawing program for the KDE Office Suite [Trinity]
Package: kexi-trinity
Architecture: any
Section: kde
+Replaces: kexi-trinity (<< 4:14.0.0)
+Breaks: kexi-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, koffice-libs-trinity (<< ${KDE-Next-Version3})
Suggests: kexi-mdb-plugin-trinity
Description: integrated database environment for the KDE Office Suite [Trinity]
@@ -93,6 +105,8 @@ Description: integrated database environment for the KDE Office Suite [Trinity]
Package: kformula-trinity
Architecture: any
Section: kde
+Replaces: kformula-trinity (<< 4:14.0.0)
+Breaks: kformula-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, koffice-libs-trinity (<< ${KDE-Next-Version3})
Recommends: khelpcenter-trinity | koffice-trinity-doc-html (= ${source:Version})
Description: a formula editor for the KDE Office Suite [Trinity]
@@ -108,6 +122,8 @@ Description: a formula editor for the KDE Office Suite [Trinity]
Package: kivio-trinity
Architecture: any
Section: graphics
+Replaces: kivio-trinity (<< 4:14.0.0)
+Breaks: kivio-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, kivio-data-trinity (>> 1:1.4.90.2-1), kivio-data-trinity (>> ${KDE-Version3}), kivio-data-trinity (<< ${KDE-Next-Version3}), koffice-libs-trinity (<< ${KDE-Next-Version3})
Description: a flowcharting program for the KDE Office Suite [Trinity]
Kivio is a flowcharting program that offers basic flowcharting abilities,
@@ -119,6 +135,8 @@ Description: a flowcharting program for the KDE Office Suite [Trinity]
Package: kivio-data-trinity
Architecture: all
Section: graphics
+Replaces: kivio-data-trinity (<< 4:14.0.0)
+Breaks: kivio-data-trinity (<< 4:14.0.0)
Description: data files for Kivio flowcharting program [Trinity]
This package contains architecture-independent data files for Kivio,
the flowcharting program shipped with the KDE Office Suite.
@@ -130,6 +148,8 @@ Description: data files for Kivio flowcharting program [Trinity]
Package: koshell-trinity
Architecture: any
Section: kde
+Replaces: koshell-trinity (<< 4:14.0.0)
+Breaks: koshell-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, koffice-libs-trinity (<< ${KDE-Next-Version3})
Recommends: koffice-trinity, khelpcenter-trinity | koffice-trinity-doc-html (= ${source:Version})
Description: the KDE Office Suite workspace [Trinity]
@@ -141,6 +161,8 @@ Description: the KDE Office Suite workspace [Trinity]
Package: kplato-trinity
Architecture: any
Section: kde
+Replaces: kplato-trinity (<< 4:14.0.0)
+Breaks: kplato-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, koffice-libs-trinity (<< ${KDE-Next-Version3})
Recommends: khelpcenter-trinity | koffice-trinity-doc-html (= ${source:Version})
Description: an integrated project management and planning tool [Trinity]
@@ -153,6 +175,8 @@ Description: an integrated project management and planning tool [Trinity]
Package: kpresenter-trinity
Architecture: any
Section: kde
+Replaces: kpresenter-trinity (<< 4:14.0.0)
+Breaks: kpresenter-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, ${perl:Depends}, kpresenter-data-trinity (>> ${KDE-Version3}), kpresenter-data-trinity (<< ${KDE-Next-Version3}), koffice-libs-trinity (<< ${KDE-Next-Version3})
Recommends: khelpcenter-trinity | koffice-trinity-doc-html (= ${source:Version})
Description: a presentation program for the KDE Office Suite [Trinity]
@@ -165,6 +189,8 @@ Description: a presentation program for the KDE Office Suite [Trinity]
Package: kpresenter-data-trinity
Architecture: all
Section: kde
+Replaces: kpresenter-data-trinity (<< 4:14.0.0)
+Breaks: kpresenter-data-trinity (<< 4:14.0.0)
Description: data files for KPresenter presentation program [Trinity]
This package contains architecture-independent data files for KPresenter,
the presentation program shipped with the KDE Office Suite.
@@ -176,6 +202,8 @@ Description: data files for KPresenter presentation program [Trinity]
Package: chalk-trinity
Architecture: any
Section: kde
+Replaces: chalk-trinity (<< 4:14.0.0)
+Breaks: chalk-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, chalk-data-trinity (>> ${KDE-Version3}), chalk-data-trinity (<< ${KDE-Next-Version3}), koffice-libs-trinity (<< ${KDE-Next-Version3})
Recommends: dcraw, khelpcenter-trinity | koffice-trinity-doc-html (= ${source:Version})
Description: a pixel-based image manipulation program for the KDE Office Suite [Trinity]
@@ -187,6 +215,8 @@ Description: a pixel-based image manipulation program for the KDE Office Suite [
Package: chalk-data-trinity
Architecture: all
Section: kde
+Replaces: chalk-data-trinity (<< 4:14.0.0)
+Breaks: chalk-data-trinity (<< 4:14.0.0)
Description: data files for Chalk painting program [Trinity]
This package contains architecture-independent data files for Chalk,
the painting program shipped with the KDE Office Suite.
@@ -198,6 +228,8 @@ Description: data files for Chalk painting program [Trinity]
Package: kspread-trinity
Architecture: any
Section: kde
+Replaces: kspread-trinity (<< 4:14.0.0)
+Breaks: kspread-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, koffice-libs-trinity (<< ${KDE-Next-Version3})
Recommends: khelpcenter-trinity | koffice-trinity-doc-html (= ${source:Version})
Description: a spreadsheet for the KDE Office Suite [Trinity]
@@ -210,6 +242,8 @@ Description: a spreadsheet for the KDE Office Suite [Trinity]
Package: kugar-trinity
Architecture: any
Section: kde
+Replaces: kugar-trinity (<< 4:14.0.0)
+Breaks: kugar-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, koffice-libs-trinity (<< ${KDE-Next-Version3})
Recommends: khelpcenter-trinity | koffice-trinity-doc-html (= ${source:Version})
Description: a business report maker for the KDE Office Suite [Trinity]
@@ -224,6 +258,8 @@ Description: a business report maker for the KDE Office Suite [Trinity]
Package: kword-trinity
Architecture: any
Section: kde
+Replaces: kword-trinity (<< 4:14.0.0)
+Breaks: kword-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, kword-data-trinity (>> ${KDE-Version3}), kword-data-trinity (<< ${KDE-Next-Version3}), koffice-libs-trinity (<< ${KDE-Next-Version3})
Recommends: khelpcenter-trinity | koffice-trinity-doc-html (= ${source:Version})
Description: a word processor for the KDE Office Suite [Trinity]
@@ -237,6 +273,8 @@ Description: a word processor for the KDE Office Suite [Trinity]
Package: kword-data-trinity
Architecture: all
Section: kde
+Replaces: kword-data-trinity (<< 4:14.0.0)
+Breaks: kword-data-trinity (<< 4:14.0.0)
Description: data files for KWord word processor [Trinity]
This package contains architecture-independent data files for KWord,
the word processor shipped with the KDE Office Suite.
@@ -248,6 +286,8 @@ Description: data files for KWord word processor [Trinity]
Package: kthesaurus-trinity
Architecture: any
Section: kde
+Replaces: kthesaurus-trinity (<< 4:14.0.0)
+Breaks: kthesaurus-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, koffice-libs-trinity (<< ${KDE-Next-Version3})
Recommends: khelpcenter-trinity | koffice-trinity-doc-html (= ${source:Version})
Description: thesaurus for the KDE Office Suite [Trinity]
@@ -260,6 +300,8 @@ Description: thesaurus for the KDE Office Suite [Trinity]
Package: koffice-libs-trinity
Architecture: any
Section: libs
+Replaces: koffice-libs-trinity (<< 4:14.0.0)
+Breaks: koffice-libs-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, koffice-data-trinity (>> ${KDE-Version3}), koffice-data-trinity (<< ${KDE-Next-Version3})
Recommends: latex-xft-fonts, ruby, python
Suggests: wordnet, texlive-base
@@ -272,6 +314,8 @@ Description: common libraries and binaries for the KDE Office Suite [Trinity]
Package: koffice-data-trinity
Architecture: all
Section: libs
+Replaces: koffice-data-trinity (<< 4:14.0.0)
+Breaks: koffice-data-trinity (<< 4:14.0.0)
Recommends: khelpcenter-trinity | koffice-trinity-doc-html
Description: common shared data for the KDE Office Suite [Trinity]
This package provides the architecture-independent data that is shared
@@ -282,6 +326,8 @@ Description: common shared data for the KDE Office Suite [Trinity]
Package: koffice-trinity-dev
Architecture: any
Section: libdevel
+Replaces: koffice-trinity-dev (<< 4:14.0.0)
+Breaks: koffice-trinity-dev (<< 4:14.0.0)
Depends: koffice-libs-trinity (= ${binary:Version}), karbon-trinity (= ${binary:Version}), kchart-trinity (= ${binary:Version}), kexi-trinity (= ${binary:Version}), kformula-trinity (= ${binary:Version}), kivio-trinity (= ${binary:Version}), koshell-trinity (= ${binary:Version}), kplato-trinity (= ${binary:Version}), kpresenter-trinity (= ${binary:Version}), chalk-trinity (= ${binary:Version}), kspread-trinity (= ${binary:Version}), kthesaurus-trinity (= ${binary:Version}), kugar-trinity (= ${binary:Version}), kword-trinity (= ${binary:Version}), tdelibs4-trinity-dev
Description: common libraries for KOffice (development files) [Trinity]
This package provides the development files for the libraries that are
@@ -292,6 +338,8 @@ Description: common libraries for KOffice (development files) [Trinity]
Package: koffice-trinity-dbg
Section: libdevel
Architecture: any
+Replaces: koffice-trinity-dbg (<< 4:14.0.0)
+Breaks: koffice-trinity-dbg (<< 4:14.0.0)
Priority: extra
Depends: koffice-libs-trinity (= ${binary:Version})
Description: debugging symbols for koffice [Trinity]
diff --git a/debian/lenny/applications/konversation/debian/control b/debian/lenny/applications/konversation/debian/control
index 44b89e4d2..5fbefbb2f 100644
--- a/debian/lenny/applications/konversation/debian/control
+++ b/debian/lenny/applications/konversation/debian/control
@@ -12,6 +12,8 @@ Homepage: http://konversation.kde.org/
Package: konversation-trinity
Architecture: any
Depends: ${shlibs:Depends}
+Replaces: konversation-trinity (<< 4:14.0.0)
+Breaks: konversation-trinity (<< 4:14.0.0)
Recommends: python, ruby
Suggests: libsoap-lite-perl
Description: user friendly Internet Relay Chat (IRC) client for KDE [Trinity]
@@ -35,6 +37,8 @@ Description: user friendly Internet Relay Chat (IRC) client for KDE [Trinity]
Package: konversation-trinity-dbg
Architecture: any
Priority: extra
+Replaces: konversation-trinity-dbg (<< 4:14.0.0)
+Breaks: konversation-trinity-dbg (<< 4:14.0.0)
Depends: konversation-trinity (= ${binary:Version})
Recommends: tdelibs-trinity-dbg
Description: debugging symbols for konversation
diff --git a/debian/lenny/applications/kopete-otr/debian/control b/debian/lenny/applications/kopete-otr/debian/control
index 08ad0470c..ba54b5a52 100644
--- a/debian/lenny/applications/kopete-otr/debian/control
+++ b/debian/lenny/applications/kopete-otr/debian/control
@@ -10,6 +10,8 @@ Homepage: http://kopete-otr.follefuder.org/
Package: kopete-otr-trinity
Architecture: any
Depends: ${shlibs:Depends}
+Replaces: kopete-otr-trinity (<< 4:14.0.0)
+Breaks: kopete-otr-trinity (<< 4:14.0.0)
Description: Off-The-Record encryption for Kopete [Trinity]
This plugin enables Off-The-Record encryption for the KDE instant
messenger Kopete. Using this plugin you can encrypt chatsessions to other
diff --git a/debian/lenny/applications/kpicosim/debian/control b/debian/lenny/applications/kpicosim/debian/control
index fbcda31ad..ea7e0db48 100644
--- a/debian/lenny/applications/kpicosim/debian/control
+++ b/debian/lenny/applications/kpicosim/debian/control
@@ -8,6 +8,8 @@ Standards-Version: 3.8.4
Package: kpicosim-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: kpicosim-trinity (<< 4:14.0.0)
+Breaks: kpicosim-trinity (<< 4:14.0.0)
Description: IDE and simulator for the Xilinx PicoBlaze-3 [Trinity]
kpicosim is a development environment for the Xilinx
PicoBlaze-3 soft-core processor for the KDE Desktop (Linux).
diff --git a/debian/lenny/applications/kpilot/debian/control b/debian/lenny/applications/kpilot/debian/control
index 0b30e45f9..da2241070 100644
--- a/debian/lenny/applications/kpilot/debian/control
+++ b/debian/lenny/applications/kpilot/debian/control
@@ -12,6 +12,8 @@ Standards-Version: 3.8.4
Package: kpilot-trinity
Section: utils
Architecture: any
+Replaces: kpilot-trinity (<< 4:14.0.0)
+Breaks: kpilot-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, ${misc:Depends}, debconf (>= 0.5) | debconf-2.0
Suggests: knotes-trinity, korganizer-trinity
Description: TDE Palm Pilot hot-sync tool
diff --git a/debian/lenny/applications/kpowersave.cmake/debian/control b/debian/lenny/applications/kpowersave.cmake/debian/control
index d435507bd..1ec23555d 100644
--- a/debian/lenny/applications/kpowersave.cmake/debian/control
+++ b/debian/lenny/applications/kpowersave.cmake/debian/control
@@ -10,6 +10,8 @@ Homepage: http://sourceforge.net/projects/powersave/
Package: kpowersave-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, hal (>= 0.5.8.1)
+Replaces: kpowersave-trinity (<< 4:14.0.0)
+Breaks: kpowersave-trinity (<< 4:14.0.0)
Description: HAL based power management applet for Trinity
KPowersave is a TDE systray applet which allows to control the power
management settings and policies of your computer.
diff --git a/debian/lenny/applications/kpowersave/debian/control b/debian/lenny/applications/kpowersave/debian/control
index 4a54de6f4..45b18d711 100644
--- a/debian/lenny/applications/kpowersave/debian/control
+++ b/debian/lenny/applications/kpowersave/debian/control
@@ -11,6 +11,8 @@ Homepage: http://sourceforge.net/projects/powersave/
Package: kpowersave-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, hal (>= 0.5.8.1)
+Replaces: kpowersave-trinity (<< 4:14.0.0)
+Breaks: kpowersave-trinity (<< 4:14.0.0)
Description: HAL based power management applet for Trinity
KPowersave is a KDE systray applet which allows to control the power
management settings and policies of your computer.
diff --git a/debian/lenny/applications/kradio/debian/control b/debian/lenny/applications/kradio/debian/control
index 8bb777261..3631e61e3 100644
--- a/debian/lenny/applications/kradio/debian/control
+++ b/debian/lenny/applications/kradio/debian/control
@@ -9,6 +9,8 @@ Homepage: http://kradio.sourceforge.net/
Package: kradio-trinity
Architecture: any
Depends: ${shlibs:Depends}
+Replaces: kradio-trinity (<< 4:14.0.0)
+Breaks: kradio-trinity (<< 4:14.0.0)
Description: Comfortable Radio Application for KDE [Trinity]
KRadio is a comfortable radio application for KDE 3.x with support for
V4L and V4L2 radio cards drivers.
diff --git a/debian/lenny/applications/krename/debian/control b/debian/lenny/applications/krename/debian/control
index ed591e17f..a9a37b47c 100644
--- a/debian/lenny/applications/krename/debian/control
+++ b/debian/lenny/applications/krename/debian/control
@@ -9,6 +9,8 @@ Standards-Version: 3.8.4
Package: krename-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: krename-trinity (<< 4:14.0.0)
+Breaks: krename-trinity (<< 4:14.0.0)
Description: Powerful batch renamer for KDE 3.x [Trinity]
This package contains a very powerful batch file renamer for Trinity
which can rename a list of files based on a set of expressions.
diff --git a/debian/lenny/applications/krusader/debian/control b/debian/lenny/applications/krusader/debian/control
index 46be3e1c4..df68f5511 100644
--- a/debian/lenny/applications/krusader/debian/control
+++ b/debian/lenny/applications/krusader/debian/control
@@ -10,6 +10,8 @@ Homepage: http://krusader.sourceforge.net
Package: krusader-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: krusader-trinity (<< 4:14.0.0)
+Breaks: krusader-trinity (<< 4:14.0.0)
Suggests: md5deep | cfv, kedit-trinity, khexedit-trinity, konsole-trinity, kmail-trinity,
krename-trinity, kdiff3-trinity | kompare-trinity | xxdiff, ark-trinity, arj, bzip2, cpio, lha,
unrar | unrar-free | rar, rpm, unace, unzip, zip, p7zip, tdebase-trinity-bin,
@@ -36,6 +38,8 @@ Description: twin-panel (commander-style) file manager for KDE (and other deskto
Package: krusader-trinity-dbg
Section: devel
Architecture: any
+Replaces: krusader-trinity-dbg (<< 4:14.0.0)
+Breaks: krusader-trinity-dbg (<< 4:14.0.0)
Priority: extra
Depends: krusader-trinity (= ${binary:Version})
Description: debugging symbols for krusader-trinity
diff --git a/debian/lenny/applications/ksplash-engine-moodin/debian/control b/debian/lenny/applications/ksplash-engine-moodin/debian/control
index 9a0c66c80..25f0639e4 100644
--- a/debian/lenny/applications/ksplash-engine-moodin/debian/control
+++ b/debian/lenny/applications/ksplash-engine-moodin/debian/control
@@ -10,6 +10,8 @@ Standards-Version: 3.8.4
Package: ksplash-engine-moodin-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: ksplash-engine-moodin-trinity (<< 4:14.0.0)
+Breaks: ksplash-engine-moodin-trinity (<< 4:14.0.0)
Description: fading splash screen engine for Trinity
Heavily customizable engine for various types of themes.
.
diff --git a/debian/lenny/applications/ksquirrel/debian/control b/debian/lenny/applications/ksquirrel/debian/control
index 8a7621b84..d2c01e591 100644
--- a/debian/lenny/applications/ksquirrel/debian/control
+++ b/debian/lenny/applications/ksquirrel/debian/control
@@ -16,6 +16,8 @@ Standards-Version: 3.8.4
Package: ksquirrel-trinity
Architecture: any
Depends: libksquirrel0-trinity, ${shlibs:Depends}, ${misc:Depends}
+Replaces: ksquirrel-trinity (<< 4:14.0.0)
+Breaks: ksquirrel-trinity (<< 4:14.0.0)
Description: Powerful Trinity image viewer
KSquirrel is an image viewer for KDE with disk navigator, file tree,
multiple directory view, thumbnails, extended thumbnails, dynamic
diff --git a/debian/lenny/applications/kstreamripper/debian/control b/debian/lenny/applications/kstreamripper/debian/control
index bf57f140b..96ea4651d 100644
--- a/debian/lenny/applications/kstreamripper/debian/control
+++ b/debian/lenny/applications/kstreamripper/debian/control
@@ -8,6 +8,8 @@ Standards-Version: 3.8.4
Package: kstreamripper-trinity
Architecture: any
Depends: ${shlibs:Depends}, streamripper
+Replaces: kstreamripper-trinity (<< 4:14.0.0)
+Breaks: kstreamripper-trinity (<< 4:14.0.0)
Description: TDE frontend for streamripper
KStreamRipper is a small frontend for the streamripper command
line utility. Streamripper captures internet shoutcast radio streams
diff --git a/debian/lenny/applications/ksystemlog/debian/control b/debian/lenny/applications/ksystemlog/debian/control
index 9eeba2863..4dc7c09a5 100644
--- a/debian/lenny/applications/ksystemlog/debian/control
+++ b/debian/lenny/applications/ksystemlog/debian/control
@@ -10,6 +10,8 @@ Standards-Version: 3.8.4
Package: ksystemlog-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: ksystemlog-trinity (<< 4:14.0.0)
+Breaks: ksystemlog-trinity (<< 4:14.0.0)
Description: system log viewer tool for Trinity
ksystemlog is a system log viewer tool for Trinity.
.
diff --git a/debian/lenny/applications/ktechlab/debian/control b/debian/lenny/applications/ktechlab/debian/control
index a7711a595..7bc68b3c5 100644
--- a/debian/lenny/applications/ktechlab/debian/control
+++ b/debian/lenny/applications/ktechlab/debian/control
@@ -8,6 +8,8 @@ Standards-Version: 3.8.4
Package: ktechlab-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: ktechlab-trinity (<< 4:14.0.0)
+Breaks: ktechlab-trinity (<< 4:14.0.0)
Recommends: gputils
Description: circuit simulator for microcontrollers and electronics [Trinity]
KTechlab is a circuit simulator with a nice, clickable and discoverable
diff --git a/debian/lenny/applications/ktorrent/debian/control b/debian/lenny/applications/ktorrent/debian/control
index 38305d8ea..43bab9104 100644
--- a/debian/lenny/applications/ktorrent/debian/control
+++ b/debian/lenny/applications/ktorrent/debian/control
@@ -8,6 +8,8 @@ Standards-Version: 3.8.4
Package: ktorrent-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: ktorrent-trinity (<< 4:14.0.0)
+Breaks: ktorrent-trinity (<< 4:14.0.0)
Suggests: php5-cli
Recommends: tdebase-kio-plugins-trinity
Description: BitTorrent client for Trinity
diff --git a/debian/lenny/applications/kuickshow/debian/control b/debian/lenny/applications/kuickshow/debian/control
index a878557ad..3cf2ee2de 100644
--- a/debian/lenny/applications/kuickshow/debian/control
+++ b/debian/lenny/applications/kuickshow/debian/control
@@ -8,6 +8,8 @@ Standards-Version: 3.8.4
Package: kuickshow-trinity
Section: graphics
Architecture: any
+Replaces: kuickshow-trinity (<< 4:14.0.0)
+Breaks: kuickshow-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
Description: KDE image/slideshow viewer [Trinity]
diff --git a/debian/lenny/applications/kvirc/debian/control b/debian/lenny/applications/kvirc/debian/control
index fdb7cc1ae..8f5023ee6 100644
--- a/debian/lenny/applications/kvirc/debian/control
+++ b/debian/lenny/applications/kvirc/debian/control
@@ -4,13 +4,15 @@ Section: net
Priority: optional
Maintainer: Timothy Pearson
XSBC-Original-Maintainer: Debian KDE Extras Team
-Uploaders: Raúl Sánchez Siles
+Uploaders: Ral Snchez Siles
Standards-Version: 3.8.4
Homepage: http://kvirc.net/
Package: kvirc-trinity
Architecture: any
Depends: kvirc-data-trinity (= ${source:Version}), ${shlibs:Depends}
+Replaces: kvirc-trinity (<< 4:14.0.0)
+Breaks: kvirc-trinity (<< 4:14.0.0)
Description: Trinity based next generation IRC client with module support
A highly configurable graphical IRC client with an MDI interface,
built-in scripting language, support for IRC DCC, drag & drop file
@@ -24,6 +26,8 @@ Description: Trinity based next generation IRC client with module support
Package: kvirc-data-trinity
Section: net
Architecture: all
+Replaces: kvirc-data-trinity (<< 4:14.0.0)
+Breaks: kvirc-data-trinity (<< 4:14.0.0)
Depends: kvirc-trinity (>= ${source:Version})
Description: Data files for KVIrc
This package contains the architecture-independent data needed by KVIrc in
@@ -39,6 +43,8 @@ Description: Data files for KVIrc
Package: kvirc-trinity-dev
Section: devel
Architecture: any
+Replaces: kvirc-trinity-dev (<< 4:14.0.0)
+Breaks: kvirc-trinity-dev (<< 4:14.0.0)
Depends: kvirc-trinity (>= ${source:Version})
Description: Development files for KVIrc
This package contains KVIrc libraries and include files you need if you
diff --git a/debian/lenny/applications/kvkbd/debian/control b/debian/lenny/applications/kvkbd/debian/control
index 75efa3c37..e82a50439 100644
--- a/debian/lenny/applications/kvkbd/debian/control
+++ b/debian/lenny/applications/kvkbd/debian/control
@@ -9,6 +9,8 @@ Homepage: http://pan4os.info/main/index.php
Package: kvkbd-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: kvkbd-trinity (<< 4:14.0.0)
+Breaks: kvkbd-trinity (<< 4:14.0.0)
Description: Virtual keyboard for KDE [Trinity]
Virtual keyboard for KDE for use with accessibility. Application contains
a systray widget as well as a dockwidget.
diff --git a/debian/lenny/applications/kvpnc/debian/control b/debian/lenny/applications/kvpnc/debian/control
index 7b8ade852..6a8196662 100644
--- a/debian/lenny/applications/kvpnc/debian/control
+++ b/debian/lenny/applications/kvpnc/debian/control
@@ -9,6 +9,8 @@ Standards-Version: 3.8.4
Package: kvpnc-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, menu, net-tools, psmisc, tdebase-trinity-bin | gksu | sux, module-init-tools | modutils
+Replaces: kvpnc-trinity (<< 4:14.0.0)
+Breaks: kvpnc-trinity (<< 4:14.0.0)
Suggests: iptables, openssl, openvpn, racoon, vpnc, pptp-linux, openswan, xl2tpd, openct, opensc
Description: vpn clients frontend for TDE
KVpnc is a TDE frontend for various vpn clients.
diff --git a/debian/lenny/applications/piklab/debian/control b/debian/lenny/applications/piklab/debian/control
index 330a9b6e5..81db97ac2 100644
--- a/debian/lenny/applications/piklab/debian/control
+++ b/debian/lenny/applications/piklab/debian/control
@@ -10,6 +10,8 @@ Homepage: http://piklab.sourceforge.net/
Package: piklab-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: piklab-trinity (<< 4:14.0.0)
+Breaks: piklab-trinity (<< 4:14.0.0)
Recommends: gputils, libusb-dev
Suggests: sdcc (>= 2.5.0), sdcc-libraries
Description: IDE for PIC-microcontroller development [Trinity]
diff --git a/debian/lenny/applications/potracegui/debian/control b/debian/lenny/applications/potracegui/debian/control
index 9dcd0c545..01aaf4e52 100644
--- a/debian/lenny/applications/potracegui/debian/control
+++ b/debian/lenny/applications/potracegui/debian/control
@@ -10,6 +10,8 @@ Standards-Version: 3.8.4
Package: potracegui-trinity
Architecture: any
Depends: ${shlibs:Depends}, potrace
+Replaces: potracegui-trinity (<< 4:14.0.0)
+Breaks: potracegui-trinity (<< 4:14.0.0)
Suggests: autotrace
Description: KDE frontend for potrace [Trinity]
A KDE interface for the commandline tracing tools potrace and/or autotrace. It
diff --git a/debian/lenny/applications/rosegarden/debian/control b/debian/lenny/applications/rosegarden/debian/control
index 574dd3c2f..d29778110 100644
--- a/debian/lenny/applications/rosegarden/debian/control
+++ b/debian/lenny/applications/rosegarden/debian/control
@@ -11,6 +11,8 @@ Homepage: http://www.rosegardenmusic.com/
Package: rosegarden-trinity
Architecture: any
Depends: ${shlibs:Depends}, khelpcenter-trinity, rosegarden-data-trinity (= ${source:Version}), libxml-twig-perl, sndfile-programs, xterm, tdebase-trinity-bin, konqueror-trinity | www-browser, flac
+Replaces: rosegarden-trinity (<< 4:14.0.0)
+Breaks: rosegarden-trinity (<< 4:14.0.0)
Recommends: jackd, lilypond, swh-plugins | ladspa-plugin
Suggests: qjackctl
Description: music editor and MIDI/audio sequencer [Trinity]
@@ -22,6 +24,8 @@ Description: music editor and MIDI/audio sequencer [Trinity]
Package: rosegarden-data-trinity
Architecture: all
Recommends: rosegarden-trinity
+Replaces: rosegarden-data-trinity (<< 4:14.0.0)
+Breaks: rosegarden-data-trinity (<< 4:14.0.0)
Priority: optional
Description: music editor and MIDI/audio sequencer data files [Trinity]
Rosegarden is a KDE application which provides a mixed Audio/MIDI
diff --git a/debian/lenny/applications/smartcardauth/debian/control b/debian/lenny/applications/smartcardauth/debian/control
old mode 100755
new mode 100644
index 4ac2c0ff0..e264a68e3
--- a/debian/lenny/applications/smartcardauth/debian/control
+++ b/debian/lenny/applications/smartcardauth/debian/control
@@ -9,6 +9,8 @@ Standards-Version: 3.8.4
Package: smartcardauth
Architecture: any
Depends: pcsc-tools, pcscd-nodbus, initramfs-tools, libpcsc-perl, libpcsclite1, libccid, opensc, zenity, gksu
+Replaces: smartcardauth (<< 4:14.0.0)
+Breaks: smartcardauth (<< 4:14.0.0)
Conflicts: openct
Description: SmartCard Login and LUKS Decrypt, Setup Utility
This utility will allow you to set up your computer to accept a SmartCard as an authentication source for:
diff --git a/debian/lenny/applications/smb4k/debian/control b/debian/lenny/applications/smb4k/debian/control
index 361f06da3..ba0821187 100644
--- a/debian/lenny/applications/smb4k/debian/control
+++ b/debian/lenny/applications/smb4k/debian/control
@@ -9,6 +9,8 @@ Homepage: http://smb4k.berlios.de/
Package: smb4k-trinity
Architecture: any
Depends: ${shlibs:Depends}, samba-common, smbclient, smbfs
+Replaces: smb4k-trinity (<< 4:14.0.0)
+Breaks: smb4k-trinity (<< 4:14.0.0)
Recommends: super | sudo-trinity
Description: A Samba (SMB) share advanced browser for Trinity
Smb4K is a SMB (Windows) share browser for KDE. It uses the Samba software
diff --git a/debian/lenny/applications/soundkonverter/debian/control b/debian/lenny/applications/soundkonverter/debian/control
index 358be80a5..16ecbcabd 100644
--- a/debian/lenny/applications/soundkonverter/debian/control
+++ b/debian/lenny/applications/soundkonverter/debian/control
@@ -10,6 +10,8 @@ Homepage: http://www.kde-apps.org/content/show.php?content=29024
Package: soundkonverter-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: soundkonverter-trinity (<< 4:14.0.0)
+Breaks: soundkonverter-trinity (<< 4:14.0.0)
Recommends: cdda2wav, cdparanoia, faad, ffmpeg, flac, tdemultimedia-kio-plugins-trinity, mp3gain, mplayer, mppenc, speex, timidity, vorbis-tools, vorbisgain, wavpack
Suggests: soundkonverter-amarok-trinity
Description: audio converter frontend for Trinity
@@ -32,6 +34,8 @@ Description: audio converter frontend for Trinity
Package: soundkonverter-amarok-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, soundkonverter-trinity, amarok-trinity, ruby, libqt0-ruby1.8-trinity
+Replaces: soundkonverter-amarok-trinity (<< 4:14.0.0)
+Breaks: soundkonverter-amarok-trinity (<< 4:14.0.0)
Description: audio converter frontend for Trinity (Amarok script)
Amarok script for soundKonverter. It allows you to easily transcode files when
transferring them to your media device.
diff --git a/debian/lenny/applications/tde-guidance/debian/control b/debian/lenny/applications/tde-guidance/debian/control
index 364d23b2b..e14fab2bb 100644
--- a/debian/lenny/applications/tde-guidance/debian/control
+++ b/debian/lenny/applications/tde-guidance/debian/control
@@ -13,6 +13,8 @@ Standards-Version: 3.8.4
Package: tde-guidance-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, pytdeextensions-trinity, python-trinity-trinity, sysv-rc, guidance-backends-trinity, hwdata, python (>= 2.5), python-dev (>= 2.5)
+Replaces: kde-guidance-trinity (<< 4:14.0.0)
+Breaks: kde-guidance-trinity (<< 4:14.0.0)
Conflicts: guidance-power-manager, tde-guidance-powermanager
Provides: ${python:Provides}
Description: collection of KDE system administration tools for GNU/Linux [Trinity]
@@ -32,6 +34,8 @@ Description: collection of KDE system administration tools for GNU/Linux [Trinit
Package: guidance-backends-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, hwdata, python (>= 2.5), python-dev (>= 2.5)
+Replaces: guidance-backends-trinity (<< 4:14.0.0)
+Breaks: guidance-backends-trinity (<< 4:14.0.0)
Conflicts: guidance-power-manager, tde-guidance-powermanager
Provides: ${python:Provides}
Description: collection of system administration tools for GNU/Linux [Trinity]
@@ -43,6 +47,8 @@ Description: collection of system administration tools for GNU/Linux [Trinity]
Package: tde-guidance-powermanager-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, tde-guidance-trinity, python-trinity-trinity, python-dbus, hal, python-gobject, python (>= 2.5), python-dev (>= 2.5)
+Replaces: kde-guidance-powermanager-trinity (<< 4:14.0.0)
+Breaks: kde-guidance-powermanager-trinity (<< 4:14.0.0)
Conflicts: guidance-power-manager, tde-guidance-powermanager
Provides: ${python:Provides}
Description: HAL based power manager applet [Trinity]
diff --git a/debian/lenny/applications/tde-style-lipstik/debian/control b/debian/lenny/applications/tde-style-lipstik/debian/control
index cc8cd43be..5b79a0aed 100644
--- a/debian/lenny/applications/tde-style-lipstik/debian/control
+++ b/debian/lenny/applications/tde-style-lipstik/debian/control
@@ -8,6 +8,8 @@ Standards-Version: 3.8.4
Package: tde-style-lipstik-trinity
Section: kde
Architecture: any
+Replaces: kde-style-lipstik-trinity (<< 4:14.0.0)
+Breaks: kde-style-lipstik-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Lipstik style for TDE
Based on the plastik style, Lipstik is a purified style with many options to
diff --git a/debian/lenny/applications/tde-style-qtcurve/debian/control b/debian/lenny/applications/tde-style-qtcurve/debian/control
index 5974c91b8..ca85f86b5 100644
--- a/debian/lenny/applications/tde-style-qtcurve/debian/control
+++ b/debian/lenny/applications/tde-style-qtcurve/debian/control
@@ -9,6 +9,8 @@ Standards-Version: 3.8.4
Package: tde-style-qtcurve-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: kde-style-qtcurve-trinity (<< 4:14.0.0)
+Breaks: kde-style-qtcurve-trinity (<< 4:14.0.0)
Recommends: gtk2-engines-qtcurve
Provides: tde-style-qtcurve
Description: This is a set of widget styles for Trinity based apps
@@ -21,6 +23,8 @@ Description: This is a set of widget styles for Trinity based apps
Package: qtcurve-trinity
Architecture: any
Depends: tde-style-qtcurve-trinity, gtk2-engines-qtcurve
+Replaces: qtcurve-trinity (<< 4:14.0.0)
+Breaks: qtcurve-trinity (<< 4:14.0.0)
Description: This is a set of widget styles for Trinity and Gtk2 based apps
This is an empty dummy package which will drag the packages
tde-style-qtcurve and gtk2-engines-qtcurve in your system.
diff --git a/debian/lenny/applications/tde-systemsettings/debian/control b/debian/lenny/applications/tde-systemsettings/debian/control
index 4497e37e2..e6f064f55 100644
--- a/debian/lenny/applications/tde-systemsettings/debian/control
+++ b/debian/lenny/applications/tde-systemsettings/debian/control
@@ -8,6 +8,8 @@ Standards-Version: 3.8.4
Package: tde-systemsettings-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, kcontrol-trinity
+Replaces: kde-systemsettings-trinity (<< 4:14.0.0)
+Breaks: kde-systemsettings-trinity (<< 4:14.0.0)
Description: easy to use control centre for TDE
System preferences is a replacement for the TDE
Control Centre with an improved user interface.
diff --git a/debian/lenny/applications/tdesudo/debian/control b/debian/lenny/applications/tdesudo/debian/control
index 667a2a419..67646ec9f 100644
--- a/debian/lenny/applications/tdesudo/debian/control
+++ b/debian/lenny/applications/tdesudo/debian/control
@@ -8,6 +8,8 @@ Standards-Version: 3.8.4
Package: tdesudo-trinity
Architecture: any
Depends: ${shlibs:Depends}, sudo
+Replaces: kdesudo-trinity (<< 4:14.0.0)
+Breaks: kdesudo-trinity (<< 4:14.0.0)
Description: sudo frontend for Trinity
KdeSudo is a graphical frontend for the sudo utility.
It allows you to run programs as another user by entering your password.
diff --git a/debian/lenny/applications/tdesvn/debian/control b/debian/lenny/applications/tdesvn/debian/control
index 7776b1465..0c1f99451 100644
--- a/debian/lenny/applications/tdesvn/debian/control
+++ b/debian/lenny/applications/tdesvn/debian/control
@@ -9,6 +9,8 @@ Standards-Version: 3.8.4
Package: libsvnqt4-trinity
Section: libs
Architecture: any
+Replaces: libsvnqt4-trinity (<< 4:14.0.0)
+Breaks: libsvnqt4-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Qt wrapper library for subversion [Trinity]
This package provides svnqt, a Qt wrapper library around the
@@ -20,6 +22,8 @@ Description: Qt wrapper library for subversion [Trinity]
Package: libsvnqt-trinity-dev
Section: libdevel
Architecture: any
+Replaces: libsvnqt-trinity-dev (<< 4:14.0.0)
+Breaks: libsvnqt-trinity-dev (<< 4:14.0.0)
Depends: libsvnqt4-trinity (= ${binary:Version}), libqt3-mt-dev, libsvn-dev
Description: Qt wrapper library for subversion (development files) [Trinity]
This package contains the header files and symbolic links that developers
@@ -28,6 +32,8 @@ Description: Qt wrapper library for subversion (development files) [Trinity]
Package: tdesvn-trinity
Section: devel
Architecture: any
+Replaces: kdesvn-trinity (<< 4:14.0.0)
+Breaks: kdesvn-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, ${misc:Depends}, tdesvn-kio-plugins-trinity (= ${binary:Version})
Recommends: kompare-trinity, graphviz
Suggests: khelpcenter-trinity, kdiff3-trinity
@@ -42,6 +48,8 @@ Description: subversion client with tight KDE integration [Trinity]
Package: tdesvn-kio-plugins-trinity
Section: devel
Architecture: any
+Replaces: kdesvn-kio-plugins-trinity (<< 4:14.0.0)
+Breaks: kdesvn-kio-plugins-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: tdesdk-kio-plugins-trinity
Description: subversion I/O slaves for Trinity
diff --git a/debian/lenny/applications/tellico/debian/control b/debian/lenny/applications/tellico/debian/control
index a68d139b2..7cf6f01fd 100644
--- a/debian/lenny/applications/tellico/debian/control
+++ b/debian/lenny/applications/tellico/debian/control
@@ -10,6 +10,8 @@ Homepage: http://periapsis.org/tellico/
Package: tellico-trinity
Architecture: any
Depends: tellico-data-trinity (= ${source:Version}), tellico-scripts-trinity, ${shlibs:Depends}
+Replaces: tellico-trinity (<< 4:14.0.0)
+Breaks: tellico-trinity (<< 4:14.0.0)
Description: collection manager for books, videos, music [Trinity]
Tellico is a collection manager for KDE. It includes default collections for
books, bibliographies, comic books, videos, music, coins, stamps, trading
@@ -27,6 +29,8 @@ Description: collection manager for books, videos, music [Trinity]
Package: tellico-data-trinity
Architecture: all
Depends: tdelibs-data-trinity
+Replaces: tellico-data-trinity (<< 4:14.0.0)
+Breaks: tellico-data-trinity (<< 4:14.0.0)
Recommends: tellico-trinity
Suggests: python
Description: collection manager for books, videos, music [data] [Trinity]
@@ -49,6 +53,8 @@ Description: collection manager for books, videos, music [data] [Trinity]
Package: tellico-scripts-trinity
Architecture: all
Recommends: tellico-trinity
+Replaces: tellico-scripts-trinity (<< 4:14.0.0)
+Breaks: tellico-scripts-trinity (<< 4:14.0.0)
Suggests: python, ruby
Description: collection manager for books, videos, music [scripts] [Trinity]
Tellico is a collection manager for KDE. It includes default collections for
diff --git a/debian/lenny/applications/twin-style-crystal/debian/control b/debian/lenny/applications/twin-style-crystal/debian/control
index ca5489a04..9e966189c 100644
--- a/debian/lenny/applications/twin-style-crystal/debian/control
+++ b/debian/lenny/applications/twin-style-crystal/debian/control
@@ -9,6 +9,8 @@ Standards-Version: 3.8.4
Package: twin-style-crystal-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: kwin-style-crystal-trinity (<< 4:14.0.0)
+Breaks: kwin-style-crystal-trinity (<< 4:14.0.0)
Description: semi transparant window decoration for Trinity
Crystal offers you pseudo transparent titlebar, buttons and borders
transparent, so you can see more of your lovely background image
diff --git a/debian/lenny/applications/wlassistant/debian/control b/debian/lenny/applications/wlassistant/debian/control
index f6596b6c3..7eff62514 100644
--- a/debian/lenny/applications/wlassistant/debian/control
+++ b/debian/lenny/applications/wlassistant/debian/control
@@ -9,6 +9,8 @@ Standards-Version: 3.8.4
Package: wlassistant-trinity
Architecture: any
Depends: kicker-trinity, net-tools, wireless-tools, menu, ${shlibs:Depends}
+Replaces: wlassistant-trinity (<< 4:14.0.0)
+Breaks: wlassistant-trinity (<< 4:14.0.0)
Recommends: dhcp3-client | dhcp-client | dhcpcd
Description: User friendly KDE frontend for wireless network connection [Trinity]
Wireless Assistant scans for wireless access points and displays link quality,
diff --git a/debian/lenny/applications/yakuake/debian/control b/debian/lenny/applications/yakuake/debian/control
index 0ba3c1f17..8204e37de 100644
--- a/debian/lenny/applications/yakuake/debian/control
+++ b/debian/lenny/applications/yakuake/debian/control
@@ -10,6 +10,8 @@ Homepage: http://extragear.kde.org/apps/yakuake/
Package: yakuake-trinity
Architecture: any
Depends: ${shlibs:Depends}, konsole-trinity
+Replaces: yakuake-trinity (<< 4:14.0.0)
+Breaks: yakuake-trinity (<< 4:14.0.0)
Description: a Quake-style terminal emulator based on KDE Konsole technology [Trinity]
YaKuake is inspired from the terminal in the Quake game: when you press a key
(by default F12, but that can be changed) a terminal window slides down from
diff --git a/debian/lenny/dependencies/arts/debian/control b/debian/lenny/dependencies/arts/debian/control
index 57a7a33a1..9c9e910c3 100644
--- a/debian/lenny/dependencies/arts/debian/control
+++ b/debian/lenny/dependencies/arts/debian/control
@@ -3,7 +3,7 @@ Section: libs
Maintainer: Timothy Pearson
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers
Priority: optional
-Uploaders: Adeodato Simó , Ana Beatriz Guerrero Lopez , Fathi Boudra , Modestas Vainius
+Uploaders: Adeodato Sim , Ana Beatriz Guerrero Lopez , Fathi Boudra , Modestas Vainius
Build-Depends: cdbs (>= 0.4.48), debhelper (>= 6),
docbook-to-man, gawk, gettext, sharutils, texinfo,
libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
@@ -16,6 +16,8 @@ Standards-Version: 3.8.4
Package: arts-trinity
Architecture: all
Section: sound
+Replaces: arts-trinity (<< 4:14.0.0)
+Breaks: arts-trinity (<< 4:14.0.0)
Depends: libartsc0-trinity (>= ${source:Version}), libarts1c2a-trinity (>= ${source:Version})
Description: sound system from the official KDE release
KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -29,6 +31,8 @@ Description: sound system from the official KDE release
Package: libarts1c2a-trinity
Architecture: any
Section: libs
+Replaces: libarts1c2a-trinity (<< 4:14.0.0)
+Breaks: libarts1c2a-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: libarts1-akode
Description: aRts sound system core components
@@ -51,6 +55,8 @@ Description: aRts sound system core components
Package: libarts1-trinity-dev
Architecture: any
Section: libdevel
+Replaces: libarts1-trinity-dev (<< 4:14.0.0)
+Breaks: libarts1-trinity-dev (<< 4:14.0.0)
Depends: libarts1c2a-trinity (= ${binary:Version}), libartsc0-trinity-dev (= ${binary:Version}), ${libasound2-dev}, libaudio-dev, libaudiofile-dev, libesd0-dev, libglib2.0-dev, libogg-dev, libogg-dev-la, libvorbis-dev, libtqtinterface-dev
Description: development files for the aRts sound system core components
This package contains the header files needed to build applications that
@@ -62,6 +68,8 @@ Description: development files for the aRts sound system core components
Package: libartsc0-trinity
Architecture: any
Section: libs
+Replaces: libartsc0-trinity (<< 4:14.0.0)
+Breaks: libartsc0-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: aRts sound system C support library
This package contains the C bindings for the aRts sound daemon.
@@ -72,6 +80,8 @@ Description: aRts sound system C support library
Package: libartsc0-trinity-dev
Architecture: any
Section: libdevel
+Replaces: libartsc0-trinity-dev (<< 4:14.0.0)
+Breaks: libartsc0-trinity-dev (<< 4:14.0.0)
Depends: libartsc0-trinity (= ${binary:Version}), libglib2.0-dev
Description: development files for the aRts sound system C support library
This package contains the header files needed to build applications that
@@ -83,6 +93,8 @@ Description: development files for the aRts sound system C support library
Package: arts-trinity-dbg
Section: libdevel
Architecture: any
+Replaces: arts-trinity-dbg (<< 4:14.0.0)
+Breaks: arts-trinity-dbg (<< 4:14.0.0)
Priority: extra
Depends: libarts1c2a-trinity (= ${binary:Version})
Description: debugging symbols for arts
diff --git a/debian/lenny/dependencies/avahi-tqt/debian/control b/debian/lenny/dependencies/avahi-tqt/debian/control
index 607e76dd1..8b0c55500 100644
--- a/debian/lenny/dependencies/avahi-tqt/debian/control
+++ b/debian/lenny/dependencies/avahi-tqt/debian/control
@@ -23,6 +23,8 @@ Standards-Version: 3.9.1
Package: libavahi-tqt-1
Section: libs
Architecture: any
+Replaces: libavahi-tqt-1 (<< 4:14.0.0)
+Breaks: libavahi-tqt-1 (<< 4:14.0.0)
Depends: ${shlibs:Depends},
${misc:Depends}
Pre-Depends: ${misc:Pre-Depends}
@@ -40,6 +42,8 @@ Description: Avahi TQt integration library
Package: libavahi-tqt-dev
Section: libdevel
Architecture: any
+Replaces: libavahi-tqt-dev (<< 4:14.0.0)
+Breaks: libavahi-tqt-dev (<< 4:14.0.0)
Depends: libavahi-tqt-1 (= ${binary:Version}),
${misc:Depends},
libtqtinterface-dev,
@@ -52,4 +56,4 @@ Description: Development headers for the Avahi TQt integration library
print to, files to look at and people to talk to.
.
This package contains the development headers for the interface
- to integrate the Avahi libraries into a TQt main loop application.
\ No newline at end of file
+ to integrate the Avahi libraries into a TQt main loop application.
diff --git a/debian/lenny/dependencies/dbus-1-tqt/debian/control b/debian/lenny/dependencies/dbus-1-tqt/debian/control
index 9a6e652a4..36e73bbb1 100644
--- a/debian/lenny/dependencies/dbus-1-tqt/debian/control
+++ b/debian/lenny/dependencies/dbus-1-tqt/debian/control
@@ -8,6 +8,8 @@ Standards-Version: 3.8.3
Package: libdbus-1-tqt-dev
Section: libdevel
Architecture: any
+Replaces: libdbus-1-tqt-dev (<< 4:14.0.0)
+Breaks: libdbus-1-tqt-dev (<< 4:14.0.0)
Depends: libdbus-1-tqt (= ${binary:Version}), libdbus-1-dev (>= 0.90), libtqtinterface-dev
Description: dbus bindings for the Trinity Qt [TQt] interface
D-BUS is a message bus, used for sending messages between applications.
@@ -21,6 +23,8 @@ Description: dbus bindings for the Trinity Qt [TQt] interface
Package: libdbus-1-tqt
Section: libs
Architecture: any
+Replaces: libdbus-1-tqt (<< 4:14.0.0)
+Breaks: libdbus-1-tqt (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: dbus bindings for the Trinity Qt [TQt] interface
D-BUS is a message bus, used for sending messages between applications.
diff --git a/debian/lenny/dependencies/dbus-tqt/debian/control b/debian/lenny/dependencies/dbus-tqt/debian/control
index ca76e783a..cdf2d334a 100644
--- a/debian/lenny/dependencies/dbus-tqt/debian/control
+++ b/debian/lenny/dependencies/dbus-tqt/debian/control
@@ -2,16 +2,17 @@ Source: dbus-tqt
Section: devel
Priority: optional
Maintainer: Utopia Maintenance Team
-Uploaders: Sjoerd Simons , Sebastian Dröge
+Uploaders: Sjoerd Simons , Sebastian Drge
Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5.0.37.2), libtqtinterface-dev, libdbus-1-dev (>= 0.90), cmake
Standards-Version: 3.8.3
Package: libdbus-tqt-1-dev
Section: libdevel
Architecture: any
+Replaces: libdbus-tqt-1-dev (<< 4:14.0.0)
+Breaks: libdbus-tqt-1-dev (<< 4:14.0.0)
Depends: libdbus-tqt-1-1c2 (= ${Source-Version}), libdbus-1-dev (>= 0.90), libtqtinterface-dev
Conflicts: dbus-tqt-1-dev
-Replaces: dbus-tqt-1-dev
Description: simple interprocess messaging system (TQt interface)
D-BUS is a message bus, used for sending messages between applications.
Conceptually, it fits somewhere in between raw sockets and CORBA in
@@ -24,9 +25,10 @@ Description: simple interprocess messaging system (TQt interface)
Package: libdbus-tqt-1-1c2
Section: libs
Architecture: any
+Replaces: libdbus-tqt-1-1c2 (<< 4:14.0.0)
+Breaks: libdbus-tqt-1-1c2 (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Conflicts: dbus-tqt-1, dbus-tqt-1c2, libdbus-tqt-1-1
-Replaces: dbus-tqt-1, dbus-tqt-1c2, libdbus-tqt-1-1
Description: simple interprocess messaging system (TQt-based shared library)
D-BUS is a message bus, used for sending messages between applications.
Conceptually, it fits somewhere in between raw sockets and CORBA in
diff --git a/debian/lenny/dependencies/libart-lgpl/debian/control b/debian/lenny/dependencies/libart-lgpl/debian/control
index b797b51d4..d131211f3 100644
--- a/debian/lenny/dependencies/libart-lgpl/debian/control
+++ b/debian/lenny/dependencies/libart-lgpl/debian/control
@@ -7,7 +7,7 @@ Source: libart-lgpl
Section: devel
Priority: optional
Maintainer: Josselin Mouette
-Uploaders: Debian GNOME Maintainers , Loic Minier , Sebastian Dröge , Sebastien Bacher
+Uploaders: Debian GNOME Maintainers , Loic Minier , Sebastian Drge , Sebastien Bacher
Standards-Version: 3.8.4
Build-Depends: debhelper (>= 5),
gnome-pkg-tools (>= 0.7),
@@ -18,6 +18,8 @@ Build-Depends: debhelper (>= 5),
Package: libart-2.0-2
Architecture: any
Section: libs
+Replaces: libart-2.0-2 (<< 4:14.0.0)
+Breaks: libart-2.0-2 (<< 4:14.0.0)
Depends: ${misc:Depends},
${shlibs:Depends}
Description: Library of functions for 2D graphics - runtime files
@@ -30,6 +32,8 @@ Description: Library of functions for 2D graphics - runtime files
Package: libart-2.0-dev
Architecture: any
Section: libdevel
+Replaces: libart-2.0-dev (<< 4:14.0.0)
+Breaks: libart-2.0-dev (<< 4:14.0.0)
Depends: ${misc:Depends},
${shlibs:Depends},
libart-2.0-2 (= ${binary:Version}),
diff --git a/debian/lenny/dependencies/python-tqt/debian/control b/debian/lenny/dependencies/python-tqt/debian/control
index dffd4d77c..71f586675 100644
--- a/debian/lenny/dependencies/python-tqt/debian/control
+++ b/debian/lenny/dependencies/python-tqt/debian/control
@@ -10,6 +10,8 @@ Standards-Version: 3.8.4
Package: python-tqt
Architecture: any
Depends: ${shlibs:Depends}, ${python:Depends}, ${sip:Depends}, ${misc:Depends}
+Replaces: python-tqt (<< 4:14.0.0)
+Breaks: python-tqt (<< 4:14.0.0)
Suggests: python-tqt-gl, python-tqt-doc, libtqt3-mt-mysql|libtqt3-mt-odbc|libtqt3-mt-psql
Provides: ${python:Provides}
Description: TQt bindings for Python
@@ -25,6 +27,8 @@ Description: TQt bindings for Python
Package: python-tqt-dbg
Architecture: any
Priority: extra
+Replaces: python-tqt-dbg (<< 4:14.0.0)
+Breaks: python-tqt-dbg (<< 4:14.0.0)
Section: debug
Depends: ${shlibs:Depends}, python-dbg, python-tqt (= ${binary:Version}), python-sip-dbg, ${misc:Depends}
Description: TQt bindings for Python (debug extension)
@@ -37,6 +41,8 @@ Description: TQt bindings for Python (debug extension)
Package: python-tqt-gl
Architecture: any
Depends: ${shlibs:Depends}, ${python:Depends}, python-tqt (= ${binary:Version}), python-opengl (>= 2.0.1.09-2.2), ${misc:Depends}
+Replaces: python-tqt-gl (<< 4:14.0.0)
+Breaks: python-tqt-gl (<< 4:14.0.0)
Suggests: python-tqt-doc
Provides: ${python:Provides}
Description: TQt OpenGL bindings for Python
@@ -48,6 +54,8 @@ Description: TQt OpenGL bindings for Python
Package: python-tqt-gl-dbg
Priority: extra
Section: debug
+Replaces: python-tqt-gl-dbg (<< 4:14.0.0)
+Breaks: python-tqt-gl-dbg (<< 4:14.0.0)
Architecture: any
Depends: ${shlibs:Depends}, python-dbg, python-tqt-gl (= ${binary:Version}), python-tqt-dbg (= ${binary:Version}), ${misc:Depends}
Description: TQt OpenGL bindings for Python (debug extension)
@@ -61,6 +69,8 @@ Description: TQt OpenGL bindings for Python (debug extension)
Package: python-tqtext
Architecture: any
Depends: ${shlibs:Depends}, ${python:Depends}, python-tqt (= ${binary:Version}), ${misc:Depends}
+Replaces: python-tqtext (<< 4:14.0.0)
+Breaks: python-tqtext (<< 4:14.0.0)
Provides: ${python:Provides}
Description: TQt extensions for PyQt
PyQt Extensions. Contains:
@@ -71,6 +81,8 @@ Description: TQt extensions for PyQt
Package: python-tqtext-dbg
Priority: extra
Section: debug
+Replaces: python-tqtext-dbg (<< 4:14.0.0)
+Breaks: python-tqtext-dbg (<< 4:14.0.0)
Architecture: any
Depends: ${shlibs:Depends}, python-dbg, python-tqtext (= ${binary:Version}), python-tqt-dbg (= ${binary:Version}), ${misc:Depends}
Description: TQt debug extensions for PyQt
@@ -82,6 +94,8 @@ Description: TQt debug extensions for PyQt
Package: pytqt-tools
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: pytqt-tools (<< 4:14.0.0)
+Breaks: pytqt-tools (<< 4:14.0.0)
Description: pyuic and pylupdate for TQt
pyuic is the PyQt counterpart for TQt's uic. It takes an XML
user interface file and generates Python code.
@@ -92,7 +106,8 @@ Description: pyuic and pylupdate for TQt
Package: python-tqt-dev
Depends: ${python:Depends}, ${misc:Depends}
Suggests: python-sip-dev
-Replaces: python-tqt (<< 3.17.3-2)
+Replaces: python-tqt-dev (<< 4:14.0.0)
+Breaks: python-tqt-dev (<< 4:14.0.0)
Architecture: all
Description: TQt bindings for Python - Development files
Development .sip files with definitions of PyQt classes. They
@@ -102,6 +117,8 @@ Description: TQt bindings for Python - Development files
Package: python-tqt-doc
Section: doc
Architecture: all
+Replaces: python-tqt-doc (<< 4:14.0.0)
+Breaks: python-tqt-doc (<< 4:14.0.0)
Depends: ${misc:Depends}
Suggests: python-tqt
Description: TQt bindings for Python - Documentation and examples
diff --git a/debian/lenny/dependencies/qt3/debian/control b/debian/lenny/dependencies/qt3/debian/control
index 104af1e46..ee9afe53c 100644
--- a/debian/lenny/dependencies/qt3/debian/control
+++ b/debian/lenny/dependencies/qt3/debian/control
@@ -21,7 +21,8 @@ Vcs-Svn: svn://svn.debian.org/pkg-kde/trunk/packages/qt-x11-free
Package: libqt3-mt
Architecture: any
Section: libs
-Replaces: qt3-tools (<< 2:3.0.2-20020306-1), libqt3-helper, libqt3, libqt3c102-mt
+Replaces: libqt3-mt (<< 4:14.0.0)
+Breaks: libqt3-mt (<< 4:14.0.0)
Depends: ${shlibs:Depends}, fontconfig
Recommends: libgl1-mesa-glx | libgl1, libglu1-mesa | libglu1, libxmu6 (>= 4.3.0.dfsg.1-4)
Conflicts: libqt3c102-mt, libqui1-emb, libqt3c-mt
@@ -34,8 +35,9 @@ Description: Qt GUI Library (Threaded runtime version), Version 3
Package: libqt3-mt-mysql
Architecture: any
Section: libs
+Replaces: libqt3-mt-mysql (<< 4:14.0.0)
+Breaks: libqt3-mt-mysql (<< 4:14.0.0)
Depends: ${shlibs:Depends}
-Replaces: libqt3-mysql (<= 2:3.1.1+cvs.20021220-1), libqt3c102-mt-mysql
Conflicts: libqt3c102-mt-mysql, libqt3c-mt-mysql
Description: MySQL database driver for Qt3 (Threaded)
This package contains the threaded MySQL plugin for Qt3. Install it if
@@ -44,8 +46,9 @@ Description: MySQL database driver for Qt3 (Threaded)
Package: libqt3-mt-odbc
Architecture: any
Section: libs
+Replaces: libqt3-mt-odbc (<< 4:14.0.0)
+Breaks: libqt3-mt-odbc (<< 4:14.0.0)
Depends: ${shlibs:Depends}
-Replaces: libqt3-odbc (<= 2:3.1.1+cvs.20021220-1), libqt3c102-mt-odbc
Conflicts: libqt3c102-mt-odbc, libqt3c-mt-odbc
Description: ODBC database driver for Qt3 (Threaded)
This package contains the threaded ODBC plugin for Qt3. Install it if
@@ -54,8 +57,9 @@ Description: ODBC database driver for Qt3 (Threaded)
Package: libqt3-mt-psql
Architecture: any
Section: libs
+Replaces: libqt3-mt-psql (<< 4:14.0.0)
+Breaks: libqt3-mt-psql (<< 4:14.0.0)
Depends: ${shlibs:Depends}
-Replaces: libqt3-psql (<= 2:3.1.1+cvs.20021220-1), libqt3c102-mt-psql
Conflicts: libqt3c102-mt-psql, libqt3c-mt-psql
Description: PostgreSQL database driver for Qt3 (Threaded)
This package contains the threaded PostgreSQL plugin for Qt3.
@@ -77,9 +81,10 @@ Description: PostgreSQL database driver for Qt3 (Threaded)
Package: libqt3-mt-sqlite
Architecture: any
Section: libs
+Replaces: libqt3-mt-sqlite (<< 4:14.0.0)
+Breaks: libqt3-mt-sqlite (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Conflicts: libqt3c102-mt-sqlite
-Replaces: libqt3c102-mt-sqlite
Description: SQLite database driver for Qt3 (Threaded)
This package contains the threaded SQLite plugin for Qt3. Install
it if you intend to use or write Qt programs that are to access an
@@ -88,7 +93,8 @@ Description: SQLite database driver for Qt3 (Threaded)
Package: libqt3-mt-dev
Architecture: any
Section: libdevel
-Replaces: libqt-mt-dev, libqt3-dev, libqt3-helper, libqt3-headers (<= 3:3.1.1-3), libqt3-emb (<= 3:3.0.3-1)
+Replaces: libqt3-mt-dev (<< 4:14.0.0)
+Breaks: libqt3-mt-dev (<< 4:14.0.0)
Depends: libxext-dev (>= 4.3.0.dfsg.1-4), libxrandr-dev (>= 4.3.0.dfsg.1-4),
libsm-dev (>= 4.3.0.dfsg.1-4), libxmu-dev (>= 4.3.0.dfsg.1-4),
libice-dev (>= 4.3.0.dfsg.1-4), libx11-dev (>= 4.3.0.dfsg.1-4),
@@ -118,8 +124,9 @@ Description: Qt development files (Threaded)
Package: libqt3-headers
Architecture: any
Section: devel
+Replaces: libqt3-headers (<< 4:14.0.0)
+Breaks: libqt3-headers (<< 4:14.0.0)
Recommends: libqt3-mt-dev
-Replaces: libqt3-mt-dev, libqt3-dev, libqt3-plugins-headers
Description: Qt3 header files
This package contains all header files for libqt and libqt-mt which come
with Qt3. If you want to compile or develop programs which use Qt3, you
@@ -128,9 +135,10 @@ Description: Qt3 header files
Package: libqt3-compat-headers
Architecture: any
Section: devel
+Replaces: libqt3-compat-headers (<< 4:14.0.0)
+Breaks: libqt3-compat-headers (<< 4:14.0.0)
Depends: libqt3-headers (= ${binary:Version})
Recommends: libqt3-mt-dev
-Replaces: libqt3-mt-dev (<= 3:3.1.1-2), libqt3-dev (<= 3:3.1.1-2), libqt3-headers (<= 3:3.1.1-2)
Description: Qt 1.x and 2.x compatibility includes
This package contains header files that are intended for build
compatibility for applications that build with Qt3 but still use
@@ -143,9 +151,10 @@ Description: Qt 1.x and 2.x compatibility includes
Package: qt3-dev-tools
Architecture: any
Section: devel
+Replaces: qt3-dev-tools (<< 4:14.0.0)
+Breaks: qt3-dev-tools (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Recommends: libqt3-mt-dev
-Replaces: qt3-tools, libqt3-dev, libqt3-mt-dev, qt3-doc (<= 3:3.1.1-2)
Conflicts: libqt-dev (<< 3:2.3.2-10), uic (<= 3:2.3.2-9)
Description: Qt3 development tools
This package contains all tools that are necessary to build programs
@@ -155,9 +164,10 @@ Description: Qt3 development tools
Package: qt3-designer
Architecture: any
Section: devel
+Replaces: qt3-designer (<< 4:14.0.0)
+Breaks: qt3-designer (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Recommends: qt3-dev-tools
-Replaces: qt3-tools, libqt3-dev, libqt3-mt-dev, qt3-doc (= 3:3.3.4-8)
Suggests: qt3-assistant, qt3-doc
Conflicts: qt-designer (<= 3:2.3.2-9), qt-designer-doc
Description: Qt3 Designer
@@ -173,8 +183,9 @@ Description: Qt3 Designer
Package: qt3-apps-dev
Architecture: any
Section: devel
+Replaces: qt3-apps-dev (<< 4:14.0.0)
+Breaks: qt3-apps-dev (<< 4:14.0.0)
Depends: libqt3-mt-dev
-Replaces: qt3-tools, libqt3-dev, libqt3-mt-dev
Description: Qt3 Developer applications development files
This package is intended for developers who want to develop applications
using the additional static libraries that ship with the applications
@@ -187,9 +198,10 @@ Description: Qt3 Developer applications development files
Package: qt3-linguist
Architecture: any
Section: devel
+Replaces: qt3-linguist (<< 4:14.0.0)
+Breaks: qt3-linguist (<< 4:14.0.0)
Suggests: qt3-assistant
Depends: ${shlibs:Depends}
-Replaces: qt3-tools, libqt3-dev, libqt3-mt-dev, qt3-doc (= 3:3.3.4-8)
Description: The Qt3 Linguist
This package contains the Qt3 Linguist which provides translators a
tool perfect for translating any Qt-based application into other
@@ -199,8 +211,9 @@ Description: The Qt3 Linguist
Package: qt3-assistant
Architecture: any
Section: x11
+Replaces: qt3-assistant (<< 4:14.0.0)
+Breaks: qt3-assistant (<< 4:14.0.0)
Depends: ${shlibs:Depends}, qt3-doc
-Replaces: qt3-tools, libqt3-dev, libqt3-mt-dev
Description: The Qt3 assistant application
This package contains the Qt3 Assistant, an easy to use frontend for
the complete Qt3 documentation and serves as an online help viewer for
@@ -216,8 +229,9 @@ Description: The Qt3 assistant application
Package: qt3-qtconfig
Architecture: any
Section: x11
+Replaces: qt3-qtconfig (<< 4:14.0.0)
+Breaks: qt3-qtconfig (<< 4:14.0.0)
Depends: ${shlibs:Depends}
-Replaces: qt3-tools, libqt3-dev, libqt3-mt-dev
Description: The Qt3 Configuration Application
The Qt Configuration program allows endusers to configure the look
and behavior of any Qt3 application. It is mostly only necessary
@@ -230,9 +244,10 @@ Description: The Qt3 Configuration Application
Package: qt3-dev-tools-embedded
Architecture: any
Section: devel
+Replaces: qt3-dev-tools-embedded (<< 4:14.0.0)
+Breaks: qt3-dev-tools-embedded (<< 4:14.0.0)
Recommends: libqt3-mt-dev
Depends: ${shlibs:Depends}
-Replaces: qt3-tools, libqt3-dev, libqt3-mt-dev
Description: Tools to develop embedded Qt applications
This package contains applications only suitable for developing
applications with Qt Embedded and/or Qtopia. It provides the QVFB
@@ -243,9 +258,10 @@ Description: Tools to develop embedded Qt applications
Package: qt3-dev-tools-compat
Architecture: any
Section: devel
+Replaces: qt3-dev-tools-compat (<< 4:14.0.0)
+Breaks: qt3-dev-tools-compat (<< 4:14.0.0)
Recommends: libqt3-mt-dev
Depends: ${shlibs:Depends}
-Replaces: qt3-tools, libqt3-dev, libqt3-mt-dev
Description: Conversion utilities for Qt3 development
This package contains some older Qt tools (namely qt20fix qtrename140,
qm2ts, mergetr, findtr and msg2qm). These tools are needed only by
@@ -258,6 +274,8 @@ Description: Conversion utilities for Qt3 development
Package: libqt3-i18n
Architecture: all
Section: libs
+Replaces: libqt3-i18n (<< 4:14.0.0)
+Breaks: libqt3-i18n (<< 4:14.0.0)
Recommends: libqt3-mt
Description: i18n files for Qt3 library
This package contains the internationalization files for the Qt library.
@@ -267,8 +285,9 @@ Description: i18n files for Qt3 library
Package: qt3-doc
Architecture: all
Section: doc
+Replaces: qt3-doc (<< 4:14.0.0)
+Breaks: qt3-doc (<< 4:14.0.0)
Priority: extra
-Replaces: qt-doc
Suggests: libqt3-headers, qt3-assistant | www-browser
Description: Qt3 API documentation
This package contains the complete API documentation for Qt3.
@@ -279,6 +298,8 @@ Description: Qt3 API documentation
Package: qt3-examples
Architecture: all
Section: doc
+Replaces: qt3-examples (<< 4:14.0.0)
+Breaks: qt3-examples (<< 4:14.0.0)
Priority: extra
Depends: libqt3-mt-dev (>= ${binary:Version})
Suggests: qt3-apps-dev
@@ -290,10 +311,11 @@ Description: Examples for Qt3
Package: qt-x11-free-dbg
Section: libdevel
Architecture: any
+Replaces: qt-x11-free-dbg (<< 4:14.0.0)
+Breaks: qt-x11-free-dbg (<< 4:14.0.0)
Priority: extra
Depends: libqt3-mt (= ${binary:Version}), gdb
Conflicts: libqt3-mt-dbg
-Replaces: libqt3-mt-dbg
Description: debugging symbols for qt-x11-free binaries
This package contains the debugging symbols associated with qt-x11-free.
They will automatically be used by gdb for debugging Qt-related
diff --git a/debian/lenny/dependencies/sip4-tqt/debian/control b/debian/lenny/dependencies/sip4-tqt/debian/control
index 4aeb9923a..825f458eb 100644
--- a/debian/lenny/dependencies/sip4-tqt/debian/control
+++ b/debian/lenny/dependencies/sip4-tqt/debian/control
@@ -11,10 +11,11 @@ XS-Python-Version: all
Package: python-sip
Architecture: any
Section: python
+Replaces: python-sip (<< 4:14.0.0)
+Breaks: python-sip (<< 4:14.0.0)
Provides: ${python:Provides}, sip-api-7.0, sip-api-7.1
Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
Conflicts: python-sip4 (<< 4.10)
-Replaces: python-sip4 (<< 4.10)
Description: Python/C++ bindings generator runtime library
SIP is a tool for generating bindings for C++ classes with some ideas
borrowed from SWIG, but capable of tighter bindings because of its
@@ -23,11 +24,12 @@ Description: Python/C++ bindings generator runtime library
Package: python-sip-dbg
Priority: extra
Architecture: any
+Replaces: python-sip-dbg (<< 4:14.0.0)
+Breaks: python-sip-dbg (<< 4:14.0.0)
Section: debug
Provides: ${python:Provides}
Depends: python-sip (= ${binary:Version}), python-dbg, ${shlibs:Depends}, ${misc:Depends}
Conflicts: python-sip4-dbg (<< 4.10)
-Replaces: python-sip4-dbg (<< 4.10)
Description: Python/C++ bindings generator runtime library (debug extension)
SIP is a tool for generating bindings for C++ classes with some ideas
borrowed from SWIG, but capable of tighter bindings because of its
@@ -38,11 +40,12 @@ Description: Python/C++ bindings generator runtime library (debug extension)
Package: python-sip-dev
Architecture: any
Section: python
+Replaces: python-sip-dev (<< 4:14.0.0)
+Breaks: python-sip-dev (<< 4:14.0.0)
Depends: ${python:Depends}, python-sip (= ${binary:Version}), python-dev, ${shlibs:Depends}, libjs-jquery, ${misc:Depends}
Recommends: python-sip (>= ${source:Version})
Provides: python-sip4-dev, sip4
Conflicts: python-sip4-dev (<< 4.10), sip4 (<< 4.10)
-Replaces: python-sip4-dev (<< 4.10), sip4 (<< 4.10)
Description: Python/C++ bindings generator development files
SIP is a tool for generating bindings for C++ classes with some ideas
borrowed from SWIG, but capable of tighter bindings because of its
@@ -68,8 +71,9 @@ Description: Python/C++ bindings generator development files
Package: python-sip4
Architecture: all
Section: python
+Replaces: python-sip4 (<< 4:14.0.0)
+Breaks: python-sip4 (<< 4:14.0.0)
Depends: python-sip, ${misc:Depends}
-Breaks: python-ball (<= 1.3.1-2), python-ballview (<= 1.3.1-2), python-qwt5-qt4 (<= 5.2.1~cvs20091107+dfsg-2), python-qwt5-qt3 (<= 5.2.1~cvs20091107+dfsg-2), python-qwt3d-qt4 (<= 0.1.7~cvs20090625-3), python-qwt3d-qt3 (<= 0.1.7~cvs20090625-3), python-qscintilla2 (<= 2.4-5)
Description: Python/C++ bindings generator runtime library (transitional package)
SIP is a tool for generating bindings for C++ classes with some ideas
borrowed from SWIG, but capable of tighter bindings because of its
@@ -81,6 +85,8 @@ Description: Python/C++ bindings generator runtime library (transitional package
Package: sip4
Architecture: all
Section: python
+Replaces: sip4 (<< 4:14.0.0)
+Breaks: sip4 (<< 4:14.0.0)
Depends: python-sip-dev, ${misc:Depends}
Description: Python/C++ bindings generator (transitional package)
SIP is a tool for generating bindings for C++ classes with some ideas
@@ -93,6 +99,8 @@ Description: Python/C++ bindings generator (transitional package)
Package: python-sip4-dev
Architecture: all
Section: python
+Replaces: python-sip4-dev (<< 4:14.0.0)
+Breaks: python-sip4-dev (<< 4:14.0.0)
Depends: python-sip-dev, ${misc:Depends}
Description: Python/C++ bindings generator development files (transitional package)
SIP is a tool for generating bindings for C++ classes with some ideas
@@ -105,6 +113,8 @@ Description: Python/C++ bindings generator development files (transitional packa
Package: python-sip4-dbg
Architecture: all
Section: debug
+Replaces: python-sip4-dbg (<< 4:14.0.0)
+Breaks: python-sip4-dbg (<< 4:14.0.0)
Priority: extra
Depends: python-sip-dbg, ${misc:Depends}
Description: Python/C++ bindings generator runtime library (debug, transitional package)
diff --git a/debian/lenny/dependencies/tqca-tls/debian/control b/debian/lenny/dependencies/tqca-tls/debian/control
index 844290974..ecb53970a 100644
--- a/debian/lenny/dependencies/tqca-tls/debian/control
+++ b/debian/lenny/dependencies/tqca-tls/debian/control
@@ -8,6 +8,8 @@ Standards-Version: 3.8.4
Package: tqca-tls
Section: libs
Architecture: any
+Replaces: tqca-tls (<< 4:14.0.0)
+Breaks: tqca-tls (<< 4:14.0.0)
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: TLS plugin for the TQt Cryptographic Architecture (TQCA)
This is a plugin to provide SSL/TLS capability to programs that
diff --git a/debian/lenny/dependencies/tqscintilla/debian/control b/debian/lenny/dependencies/tqscintilla/debian/control
index a38122ffd..6f2c1e971 100644
--- a/debian/lenny/dependencies/tqscintilla/debian/control
+++ b/debian/lenny/dependencies/tqscintilla/debian/control
@@ -9,7 +9,8 @@ Standards-Version: 3.8.4
Package: libtqscintilla7
Section: libs
Architecture: any
-Replaces: libtqscintilla6
+Replaces: libtqscintilla7 (<< 4:14.0.0)
+Breaks: libtqscintilla7 (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: TQt source code editing component based on Scintilla
Scintilla is a free source code editing component. It has features found
@@ -21,6 +22,8 @@ Description: TQt source code editing component based on Scintilla
Package: libtqscintilla-dev
Section: libdevel
Architecture: all
+Replaces: libtqscintilla-dev (<< 4:14.0.0)
+Breaks: libtqscintilla-dev (<< 4:14.0.0)
Depends: libtqscintilla7 (>= ${source:Version})
Description: TQt source code editing component - development files
Scintilla is a free source code editing component. It has features found
@@ -33,6 +36,8 @@ Description: TQt source code editing component - development files
Package: libtqscintilla-doc
Section: doc
Architecture: all
+Replaces: libtqscintilla-doc (<< 4:14.0.0)
+Breaks: libtqscintilla-doc (<< 4:14.0.0)
Suggests: libtqscintilla-dev
Description: TQt source code editing component - documentation
Scintilla is a free source code editing component. It has features found
diff --git a/debian/lenny/dependencies/tqt3/debian/control b/debian/lenny/dependencies/tqt3/debian/control
index 262506a56..828331f2b 100644
--- a/debian/lenny/dependencies/tqt3/debian/control
+++ b/debian/lenny/dependencies/tqt3/debian/control
@@ -19,7 +19,8 @@ Homepage: http://www.trinitydesktop.org
Package: libtqt3-mt
Architecture: any
Section: libs
-Replaces: tqt3-tools (<< 2:3.0.2-20020306-1), libtqt3-helper, libtqt3, libtqt3c102-mt
+Replaces: libtqt3-mt (<< 4:14.0.0)
+Breaks: libtqt3-mt (<< 4:14.0.0)
Depends: ${shlibs:Depends}, fontconfig
Recommends: libgl1-mesa-glx | libgl1, libglu1-mesa | libglu1, libxmu6 (>= 4.3.0.dfsg.1-4)
Conflicts: libtqt3c102-mt, libtqui1-emb, libtqt3c-mt
@@ -32,8 +33,9 @@ Description: TQt GUI Library (Threaded runtime version), Version 3
Package: libtqt3-mt-mysql
Architecture: any
Section: libs
+Replaces: libtqt3-mt-mysql (<< 4:14.0.0)
+Breaks: libtqt3-mt-mysql (<< 4:14.0.0)
Depends: ${shlibs:Depends}
-Replaces: libtqt3-mysql (<= 2:3.1.1+cvs.20021220-1), libtqt3c102-mt-mysql
Conflicts: libtqt3c102-mt-mysql, libtqt3c-mt-mysql
Description: MySQL database driver for TQt3 (Threaded)
This package contains the threaded MySQL plugin for TQt3. Install it if
@@ -42,8 +44,9 @@ Description: MySQL database driver for TQt3 (Threaded)
Package: libtqt3-mt-odbc
Architecture: any
Section: libs
+Replaces: libtqt3-mt-odbc (<< 4:14.0.0)
+Breaks: libtqt3-mt-odbc (<< 4:14.0.0)
Depends: ${shlibs:Depends}
-Replaces: libtqt3-odbc (<= 2:3.1.1+cvs.20021220-1), libtqt3c102-mt-odbc
Conflicts: libtqt3c102-mt-odbc, libtqt3c-mt-odbc
Description: ODBC database driver for TQt3 (Threaded)
This package contains the threaded ODBC plugin for TQt3. Install it if
@@ -52,8 +55,9 @@ Description: ODBC database driver for TQt3 (Threaded)
Package: libtqt3-mt-psql
Architecture: any
Section: libs
+Replaces: libtqt3-mt-psql (<< 4:14.0.0)
+Breaks: libtqt3-mt-psql (<< 4:14.0.0)
Depends: ${shlibs:Depends}
-Replaces: libtqt3-psql (<= 2:3.1.1+cvs.20021220-1), libtqt3c102-mt-psql
Conflicts: libtqt3c102-mt-psql, libtqt3c-mt-psql
Description: PostgreSQL database driver for TQt3 (Threaded)
This package contains the threaded PostgreSQL plugin for TQt3.
@@ -75,9 +79,10 @@ Description: PostgreSQL database driver for TQt3 (Threaded)
Package: libtqt3-mt-sqlite
Architecture: any
Section: libs
+Replaces: libtqt3-mt-sqlite (<< 4:14.0.0)
+Breaks: libtqt3-mt-sqlite (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Conflicts: libtqt3c102-mt-sqlite
-Replaces: libtqt3c102-mt-sqlite
Description: SQLite database driver for TQt3 (Threaded)
This package contains the threaded SQLite plugin for TQt3. Install
it if you intend to use or write TQt programs that are to access an
@@ -86,7 +91,8 @@ Description: SQLite database driver for TQt3 (Threaded)
Package: libtqt3-mt-dev
Architecture: any
Section: libdevel
-Replaces: libtqt-mt-dev, libtqt3-dev, libtqt3-helper, libtqt3-headers (<= 3:3.1.1-3), libtqt3-emb (<= 3:3.0.3-1)
+Replaces: libtqt3-mt-dev (<< 4:14.0.0)
+Breaks: libtqt3-mt-dev (<< 4:14.0.0)
Depends: libxext-dev (>= 4.3.0.dfsg.1-4), libxrandr-dev (>= 4.3.0.dfsg.1-4),
libsm-dev (>= 4.3.0.dfsg.1-4), libxmu-dev (>= 4.3.0.dfsg.1-4),
libice-dev (>= 4.3.0.dfsg.1-4), libx11-dev (>= 4.3.0.dfsg.1-4),
@@ -116,8 +122,9 @@ Description: TQt development files (Threaded)
Package: libtqt3-headers
Architecture: any
Section: devel
+Replaces: libtqt3-headers (<< 4:14.0.0)
+Breaks: libtqt3-headers (<< 4:14.0.0)
Recommends: libtqt3-mt-dev
-Replaces: libtqt3-mt-dev, libtqt3-dev, libtqt3-plugins-headers
Description: TQt3 header files
This package contains all header files for libqt and libtqt-mt which come
with TQt3. If you want to compile or develop programs which use TQt3, you
@@ -126,9 +133,10 @@ Description: TQt3 header files
Package: libtqt3-compat-headers
Architecture: any
Section: devel
+Replaces: libtqt3-compat-headers (<< 4:14.0.0)
+Breaks: libtqt3-compat-headers (<< 4:14.0.0)
Depends: libtqt3-headers (= ${binary:Version})
Recommends: libtqt3-mt-dev
-Replaces: libtqt3-mt-dev (<= 3:3.1.1-2), libtqt3-dev (<= 3:3.1.1-2), libtqt3-headers (<= 3:3.1.1-2)
Description: TQt 1.x and 2.x compatibility includes
This package contains header files that are intended for build
compatibility for applications that build with TQt3 but still use
@@ -141,9 +149,10 @@ Description: TQt 1.x and 2.x compatibility includes
Package: tqt3-dev-tools
Architecture: any
Section: devel
+Replaces: tqt3-dev-tools (<< 4:14.0.0)
+Breaks: tqt3-dev-tools (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Recommends: libtqt3-mt-dev
-Replaces: tqt3-tools, libtqt3-dev, libtqt3-mt-dev, tqt3-doc (<= 3:3.1.1-2)
Conflicts: libqt-dev (<< 3:2.3.2-10), uic (<= 3:2.3.2-9), qt3-dev-tools
Description: TQt3 development tools
This package contains all tools that are necessary to build programs
@@ -153,9 +162,10 @@ Description: TQt3 development tools
Package: tqt3-designer
Architecture: any
Section: devel
+Replaces: tqt3-designer (<< 4:14.0.0)
+Breaks: tqt3-designer (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Recommends: tqt3-dev-tools
-Replaces: tqt3-tools, libtqt3-dev, libtqt3-mt-dev, tqt3-doc (= 3:3.3.4-8)
Suggests: tqt3-assistant, tqt3-doc
Conflicts: qt-designer (<= 3:2.3.2-9), qt-designer-doc
Description: TQt3 Designer
@@ -171,8 +181,9 @@ Description: TQt3 Designer
Package: tqt3-apps-dev
Architecture: any
Section: devel
+Replaces: tqt3-apps-dev (<< 4:14.0.0)
+Breaks: tqt3-apps-dev (<< 4:14.0.0)
Depends: libtqt3-mt-dev
-Replaces: tqt3-tools, libtqt3-dev, libtqt3-mt-dev
Description: TQt3 Developer applications development files
This package is intended for developers who want to develop applications
using the additional static libraries that ship with the applications
@@ -185,9 +196,10 @@ Description: TQt3 Developer applications development files
Package: tqt3-linguist
Architecture: any
Section: devel
+Replaces: tqt3-linguist (<< 4:14.0.0)
+Breaks: tqt3-linguist (<< 4:14.0.0)
Suggests: tqt3-assistant
Depends: ${shlibs:Depends}
-Replaces: tqt3-tools, libtqt3-dev, libtqt3-mt-dev, tqt3-doc (= 3:3.3.4-8)
Description: The TQt3 Linguist
This package contains the TQt3 Linguist which provides translators a
tool perfect for translating any TQt-based application into other
@@ -197,8 +209,9 @@ Description: The TQt3 Linguist
Package: tqt3-assistant
Architecture: any
Section: x11
+Replaces: tqt3-assistant (<< 4:14.0.0)
+Breaks: tqt3-assistant (<< 4:14.0.0)
Depends: ${shlibs:Depends}, tqt3-doc
-Replaces: tqt3-tools, libtqt3-dev, libtqt3-mt-dev
Description: The TQt3 assistant application
This package contains the TQt3 Assistant, an easy to use frontend for
the complete TQt3 documentation and serves as an online help viewer for
@@ -214,8 +227,9 @@ Description: The TQt3 assistant application
Package: tqt3-qtconfig
Architecture: any
Section: x11
+Replaces: tqt3-qtconfig (<< 4:14.0.0)
+Breaks: tqt3-qtconfig (<< 4:14.0.0)
Depends: ${shlibs:Depends}
-Replaces: tqt3-tools, libtqt3-dev, libtqt3-mt-dev
Description: The TQt3 Configuration Application
The TQt Configuration program allows endusers to configure the look
and behavior of any TQt3 application. It is mostly only necessary
@@ -228,9 +242,10 @@ Description: The TQt3 Configuration Application
Package: tqt3-dev-tools-embedded
Architecture: any
Section: devel
+Replaces: tqt3-dev-tools-embedded (<< 4:14.0.0)
+Breaks: tqt3-dev-tools-embedded (<< 4:14.0.0)
Recommends: libtqt3-mt-dev
Depends: ${shlibs:Depends}
-Replaces: tqt3-tools, libtqt3-dev, libtqt3-mt-dev
Description: Tools to develop embedded TQt applications
This package contains applications only suitable for developing
applications with TQt Embedded and/or TQtopia. It provides the QVFB
@@ -241,9 +256,10 @@ Description: Tools to develop embedded TQt applications
Package: tqt3-dev-tools-compat
Architecture: any
Section: devel
+Replaces: tqt3-dev-tools-compat (<< 4:14.0.0)
+Breaks: tqt3-dev-tools-compat (<< 4:14.0.0)
Recommends: libtqt3-mt-dev
Depends: ${shlibs:Depends}
-Replaces: tqt3-tools, libtqt3-dev, libtqt3-mt-dev
Description: Conversion utilities for TQt3 development
This package contains some older TQt tools (namely qt20fix qtrename140,
qm2ts, mergetr, findtr and msg2qm). These tools are needed only by
@@ -256,6 +272,8 @@ Description: Conversion utilities for TQt3 development
Package: libtqt3-i18n
Architecture: all
Section: libs
+Replaces: libtqt3-i18n (<< 4:14.0.0)
+Breaks: libtqt3-i18n (<< 4:14.0.0)
Recommends: libtqt3-mt
Description: i18n files for TQt3 library
This package contains the internationalization files for the TQt library.
@@ -265,8 +283,9 @@ Description: i18n files for TQt3 library
Package: tqt3-doc
Architecture: all
Section: doc
+Replaces: tqt3-doc (<< 4:14.0.0)
+Breaks: tqt3-doc (<< 4:14.0.0)
Priority: extra
-Replaces: qt-doc
Suggests: libtqt3-headers, tqt3-assistant | www-browser
Description: TQt3 API documentation
This package contains the complete API documentation for TQt3.
@@ -277,6 +296,8 @@ Description: TQt3 API documentation
Package: tqt3-examples
Architecture: all
Section: doc
+Replaces: tqt3-examples (<< 4:14.0.0)
+Breaks: tqt3-examples (<< 4:14.0.0)
Priority: extra
Depends: libtqt3-mt-dev (>= ${binary:Version})
Suggests: tqt3-apps-dev
@@ -288,10 +309,11 @@ Description: Examples for TQt3
Package: tqt-x11-free-dbg
Section: libdevel
Architecture: any
+Replaces: tqt-x11-free-dbg (<< 4:14.0.0)
+Breaks: tqt-x11-free-dbg (<< 4:14.0.0)
Priority: extra
Depends: libtqt3-mt (= ${binary:Version}), gdb
Conflicts: libtqt3-mt-dbg
-Replaces: libtqt3-mt-dbg
Description: debugging symbols for tqt-x11-free binaries
This package contains the debugging symbols associated with tqt-x11-free.
They will automatically be used by gdb for debugging TQt-related
diff --git a/debian/lenny/dependencies/tqtinterface/debian/control b/debian/lenny/dependencies/tqtinterface/debian/control
index add9e1a72..a55f218b0 100644
--- a/debian/lenny/dependencies/tqtinterface/debian/control
+++ b/debian/lenny/dependencies/tqtinterface/debian/control
@@ -8,6 +8,8 @@ Standards-Version: 3.8.4
Package: libtqtinterface
Architecture: any
Section: libs
+Replaces: libtqtinterface (<< 4:14.0.0)
+Breaks: libtqtinterface (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: The Trinity Qt Interface Libraries
The Trinity Qt Interface is a library that abstracts Qt from Trinity
@@ -18,6 +20,8 @@ Description: The Trinity Qt Interface Libraries
Package: libtqtinterface-dev
Architecture: any
Section: libs
+Replaces: libtqtinterface-dev (<< 4:14.0.0)
+Breaks: libtqtinterface-dev (<< 4:14.0.0)
Depends: ${shlibs:Depends} libtqtinterface (>= ${Source-Version}), libavahi-tqt-dev, tqt3-apps-dev
Description: The Trinity Qt Interface Libraries (Development Files)
The Trinity Qt Interface is a library that abstracts Qt from Trinity
@@ -28,6 +32,8 @@ Description: The Trinity Qt Interface Libraries (Development Files)
Package: libtqtinterface-doc
Architecture: any
Section: libs
+Replaces: libtqtinterface-doc (<< 4:14.0.0)
+Breaks: libtqtinterface-doc (<< 4:14.0.0)
Depends: ${shlibs:Depends} libtqtinterface (>= ${Source-Version}), tqt3-doc
Description: The Trinity Qt Interface Libraries (Debug Files)
The Trinity Qt Interface is a library that abstracts Qt from Trinity
@@ -38,6 +44,8 @@ Description: The Trinity Qt Interface Libraries (Debug Files)
Package: libtqtinterface-dbg
Architecture: any
Section: libs
+Replaces: libtqtinterface-dbg (<< 4:14.0.0)
+Breaks: libtqtinterface-dbg (<< 4:14.0.0)
Depends: ${shlibs:Depends} libtqtinterface (>= ${Source-Version}), tqt-x11-free-dbg
Description: The Trinity Qt Interface Libraries (Debug Files)
The Trinity Qt Interface is a library that abstracts Qt from Trinity
diff --git a/debian/lenny/libraries/kipi-plugins/debian/control b/debian/lenny/libraries/kipi-plugins/debian/control
old mode 100755
new mode 100644
index fd3f5bf67..7f9285239
--- a/debian/lenny/libraries/kipi-plugins/debian/control
+++ b/debian/lenny/libraries/kipi-plugins/debian/control
@@ -12,9 +12,10 @@ Standards-Version: 3.8.4
Homepage: http://www.kipi-plugins.org/
Package: kipi-plugins-trinity
-Replaces: digikamplugins-trinity
Architecture: any
Depends: ${shlibs:Depends}
+Replaces: kipi-plugins-trinity (<< 4:14.0.0)
+Breaks: kipi-plugins-trinity (<< 4:14.0.0)
Recommends: k3b-trinity, graphicsmagick-imagemagick-compat (>=1.1.7) | imagemagick (>=5.4.8), kmail-trinity, tdeprint-trinity, sane-utils, kooka-trinity, konqueror-trinity, mpg123
Suggests: gimp, gallery, kipi-plugins-trinity-doc
Enhances: digikam-trinity, kphotoalbum-trinity, showimg, gwenview-trinity
@@ -66,6 +67,8 @@ Description: image manipulation/handling plugins for KIPI aware programs [Trinit
Package: kipi-plugins-trinity-doc
Architecture: all
Section: doc
+Replaces: kipi-plugins-trinity-doc (<< 4:14.0.0)
+Breaks: kipi-plugins-trinity-doc (<< 4:14.0.0)
Depends: khelpcenter-trinity
Suggests: kipi-plugins-trinity
Description: kipi-plugins documentation [Trinity]
diff --git a/debian/lenny/libraries/libkdcraw/debian/control b/debian/lenny/libraries/libkdcraw/debian/control
index e203a0c28..aa86aa433 100644
--- a/debian/lenny/libraries/libkdcraw/debian/control
+++ b/debian/lenny/libraries/libkdcraw/debian/control
@@ -13,6 +13,8 @@ Homepage: http://www.kipi-plugins.org/
Package: libkdcraw3-trinity-dev
Section: libdevel
Architecture: any
+Replaces: libkdcraw3-trinity-dev (<< 4:14.0.0)
+Breaks: libkdcraw3-trinity-dev (<< 4:14.0.0)
Depends: libkdcraw3-trinity (= ${binary:Version}), pkg-config
Conflicts: libkdcraw-dev
Description: RAW picture decoding C++ library (development) [Trinity]
@@ -25,6 +27,8 @@ Description: RAW picture decoding C++ library (development) [Trinity]
Package: libkdcraw3-trinity
Section: libs
Architecture: any
+Replaces: libkdcraw3-trinity (<< 4:14.0.0)
+Breaks: libkdcraw3-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: Raw picture decoding C++ library (runtime) [Trinity]
C++ interface around dcraw binary program used to decode RAW
diff --git a/debian/lenny/libraries/libkexiv2/debian/control b/debian/lenny/libraries/libkexiv2/debian/control
index 59490c655..6edfde91d 100644
--- a/debian/lenny/libraries/libkexiv2/debian/control
+++ b/debian/lenny/libraries/libkexiv2/debian/control
@@ -11,6 +11,8 @@ Homepage: http://www.kipi-plugins.org/
Package: libkexiv2-3-trinity-dev
Section: libdevel
Architecture: any
+Replaces: libkexiv2-3-trinity-dev (<< 4:14.0.0)
+Breaks: libkexiv2-3-trinity-dev (<< 4:14.0.0)
Depends: libkexiv2-3-trinity (= ${binary:Version}), pkg-config
Description: Qt like interface for the libexiv2 library (development) [Trinity]
libkexif2-dev contains development files and documentation for libkexiv2
@@ -21,6 +23,8 @@ Description: Qt like interface for the libexiv2 library (development) [Trinity]
Package: libkexiv2-3-trinity
Section: libs
Architecture: any
+Replaces: libkexiv2-3-trinity (<< 4:14.0.0)
+Breaks: libkexiv2-3-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: Qt like interface for the libexiv2 library (runtime) [Trinity]
libkexif2 contains the library of libkexiv2.
diff --git a/debian/lenny/libraries/libkipi/debian/control b/debian/lenny/libraries/libkipi/debian/control
index 9824298b4..ffc736fab 100644
--- a/debian/lenny/libraries/libkipi/debian/control
+++ b/debian/lenny/libraries/libkipi/debian/control
@@ -9,6 +9,8 @@ Standards-Version: 3.8.4
Package: libkipi0-trinity-dev
Provides: libkipi-trinity-dev
Conflicts: libkipi-trinity-dev
+Replaces: libkipi0-trinity-dev (<< 4:14.0.0)
+Breaks: libkipi0-trinity-dev (<< 4:14.0.0)
Section: libdevel
Architecture: any
Depends: libkipi0-trinity (= ${Source-Version}), pkg-config
@@ -26,6 +28,8 @@ Description: library for apps that want to use kipi-plugins (development version
Package: libkipi0-trinity
Conflicts: libkipi0c2-trinity
Section: libs
+Replaces: libkipi0-trinity (<< 4:14.0.0)
+Breaks: libkipi0-trinity (<< 4:14.0.0)
Architecture: any
Depends: ${shlibs:Depends}
Description: library for apps that want to use kipi-plugins (runtime version) [Trinity]
diff --git a/debian/lenny/libraries/libksquirrel/debian/control b/debian/lenny/libraries/libksquirrel/debian/control
index 8fc0ef737..1d03926a0 100644
--- a/debian/lenny/libraries/libksquirrel/debian/control
+++ b/debian/lenny/libraries/libksquirrel/debian/control
@@ -14,12 +14,16 @@ Homagepage: http://ksquirrel.sourceforge.net
Package: libksquirrel0-trinity
Architecture: any
Depends: ${shlibs:Depends}
+Replaces: libksquirrel0-trinity (<< 4:14.0.0)
+Breaks: libksquirrel0-trinity (<< 4:14.0.0)
Description: Trinity image viewer
Runtime libraries for KSquirrel.
Package: libksquirrel-trinity-dev
Section: libdevel
Architecture: any
+Replaces: libksquirrel-trinity-dev (<< 4:14.0.0)
+Breaks: libksquirrel-trinity-dev (<< 4:14.0.0)
Depends: ${shlibs:Depends}, libksquirrel0-trinity (= ${binary:Version})
Description: Trinity image viewer
Development libraries for KSquirrel.
@@ -27,5 +31,7 @@ Description: Trinity image viewer
Package: libksquirrel-tools-trinity
Architecture: any
Depends: ${shlibs:Depends}, libksquirrel0-trinity (= ${binary:Version})
+Replaces: libksquirrel-tools-trinity (<< 4:14.0.0)
+Breaks: libksquirrel-tools-trinity (<< 4:14.0.0)
Description: Trinity image viewer
Tools for KSquirrel.
diff --git a/debian/lenny/libraries/libtqt-perl/debian/changelog b/debian/lenny/libraries/libtqt-perl/debian/changelog
index 78d64b05a..c5a93479e 100644
--- a/debian/lenny/libraries/libtqt-perl/debian/changelog
+++ b/debian/lenny/libraries/libtqt-perl/debian/changelog
@@ -46,7 +46,7 @@ libqt-perl (3.008-3) unstable; urgency=low
* debian/compat, debian/control, debian/examples, debian/manpages,
debian/rules: Repackaged using dh-make and cdbs. Closes: #463089.
* debian/control, debian/rules: Using chrpath to remove rpath.
- * config.h.in, PerlQt/bin/pqtapi, PerlQt/bin/pqtsh: Removed previously
+ * config.h.in, PerlTQt/bin/pqtapi, PerlTQt/bin/pqtsh: Removed previously
automatically added changes.
* debian/watch: Added.
diff --git a/debian/lenny/libraries/libtqt-perl/debian/control b/debian/lenny/libraries/libtqt-perl/debian/control
index 3277f09e6..3bef4f1d3 100644
--- a/debian/lenny/libraries/libtqt-perl/debian/control
+++ b/debian/lenny/libraries/libtqt-perl/debian/control
@@ -3,13 +3,15 @@ Section: perl
Priority: optional
Maintainer: Timothy Pearson
XSBC-Original-Maintainer: Bart Martens
-Build-Depends: cdbs, debhelper (>= 5), autotools-dev, libtqtinterface-dev, perl (>= 5.8.0), automake, autoconf, kdelibs4-trinity-dev, libsmokeqt-trinity-dev, chrpath, libtool (>= 1.5.2)
+Build-Depends: cdbs, debhelper (>= 5), autotools-dev, libtqtinterface-dev, perl (>= 5.8.0), automake, autoconf, tdelibs4-trinity-dev, libsmokeqt-trinity-dev, chrpath, libtool (>= 1.5.2)
Build-Conflicts: libtqt-perl
Standards-Version: 3.8.4
Package: libtqt-perl
Architecture: any
Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}
+Replaces: libtqt-perl (<< 4:14.0.0)
+Breaks: libtqt-perl (<< 4:14.0.0)
Description: Perl bindings for the TQt library
This module lets you use the TQt library from Perl.
It provides an object-oriented interface and is easy to use.
diff --git a/debian/lenny/libraries/libtqt-perl/debian/docs b/debian/lenny/libraries/libtqt-perl/debian/docs
index 83bf44358..60566c90c 100644
--- a/debian/lenny/libraries/libtqt-perl/debian/docs
+++ b/debian/lenny/libraries/libtqt-perl/debian/docs
@@ -1,3 +1,3 @@
README
TODO
-PerlQt/tutorials
+PerlTQt/tutorials
diff --git a/debian/lenny/libraries/libtqt-perl/debian/examples b/debian/lenny/libraries/libtqt-perl/debian/examples
index f60bcd7e0..50594b81e 100644
--- a/debian/lenny/libraries/libtqt-perl/debian/examples
+++ b/debian/lenny/libraries/libtqt-perl/debian/examples
@@ -1 +1 @@
-PerlQt/examples/*
+PerlTQt/examples/*
diff --git a/debian/lenny/libraries/libtqt-perl/debian/pqtapi.1 b/debian/lenny/libraries/libtqt-perl/debian/pqtapi.1
index 009ac1643..f6005623a 100644
--- a/debian/lenny/libraries/libtqt-perl/debian/pqtapi.1
+++ b/debian/lenny/libraries/libtqt-perl/debian/pqtapi.1
@@ -1,6 +1,6 @@
.TH PERLQT 1 "July 31, 2002"
.SH NAME
-pqtapi \- PerlQt introspection tool
+pqtapi \- PerlTQt introspection tool
.SH SYNOPSIS
.B pqtapi
.RI " [ " -r " " " ] [ " " ]
@@ -10,14 +10,14 @@ This manual page documents briefly the
.B pqtapi
command.
.PP
-\fBpqtapi\fP is a PerlQt Introspection tool.
+\fBpqtapi\fP is a PerlTQt Introspection tool.
For example:
$ pqtapi -ir 'setpoint.* int'
void QCanvasLine::setPoints(int, int, int, int)
void QPointArray::setPoint(uint, int, int)
-For more information, please see the documentation on the PerlQt website
+For more information, please see the documentation on the PerlTQt website
http://perlqt.sourceforge.net/
.SH OPTIONS
diff --git a/debian/lenny/libraries/libtqt-perl/debian/pqtsh.1 b/debian/lenny/libraries/libtqt-perl/debian/pqtsh.1
index 402884ba5..19c7a93a0 100644
--- a/debian/lenny/libraries/libtqt-perl/debian/pqtsh.1
+++ b/debian/lenny/libraries/libtqt-perl/debian/pqtsh.1
@@ -1,6 +1,6 @@
.TH PERLQT 1 "July 31, 2002"
.SH NAME
-pqtsh \- PerlQt Graphical shell
+pqtsh \- PerlTQt Graphical shell
.SH SYNOPSIS
.B pqtsh
@@ -10,10 +10,10 @@ This manual page documents briefly the
command.
.PP
\fBpqtsh\fP is a graphical shell that can be used to test and experiment
-with the PerlQt api interactively. It is fairly self-explanatory and includes
+with the PerlTQt api interactively. It is fairly self-explanatory and includes
an interactive example (Help -> Example).
-For more information, please see the documentation on the PerlQt website
+For more information, please see the documentation on the PerlTQt website
http://perlqt.sourceforge.net/
.SH AUTHOR
diff --git a/debian/lenny/libraries/libtqt-perl/debian/puic.1 b/debian/lenny/libraries/libtqt-perl/debian/puic.1
index b83219b02..671bd97fd 100644
--- a/debian/lenny/libraries/libtqt-perl/debian/puic.1
+++ b/debian/lenny/libraries/libtqt-perl/debian/puic.1
@@ -32,7 +32,7 @@ command.
file created with the Qt Designer package. This will generate the package
defined in the UI file and a basic main package for testing purposes.
-For more information, please see the documentation on the PerlQt website
+For more information, please see the documentation on the PerlTQt website
http://perlqt.sourceforge.net/
.SH OPTIONS
diff --git a/debian/lenny/libraries/libtqt-perl/debian/rules b/debian/lenny/libraries/libtqt-perl/debian/rules
index 6a7885e21..7bf57d40b 100755
--- a/debian/lenny/libraries/libtqt-perl/debian/rules
+++ b/debian/lenny/libraries/libtqt-perl/debian/rules
@@ -16,7 +16,7 @@ SAVERESTORE=\
puic/Makefile.in \
smoke/Makefile.in \
smoke/qt/Makefile.in \
- PerlQt/bin \
+ PerlTQt/bin \
DEB_AUTO_UPDATE_AUTOCONF := 2.61
@@ -47,7 +47,7 @@ build/libtqt-perl::
chrpath -d puic/puic
clean::
- rm -f PerlQt/bin/.exists
+ rm -f PerlTQt/bin/.exists
for f in $(SAVERESTORE) ; do [ ! -e $$f.d-r-orig ] || ( rm -rf $$f && mv $$f.d-r-orig $$f ) ; done
rm -f pre-build-stamp
diff --git a/debian/lenny/libraries/libtqt-perl/debian/watch b/debian/lenny/libraries/libtqt-perl/debian/watch
index 2dfa7626d..18c470968 100644
--- a/debian/lenny/libraries/libtqt-perl/debian/watch
+++ b/debian/lenny/libraries/libtqt-perl/debian/watch
@@ -1,2 +1,2 @@
version=3
-http://sf.net/perlqt/PerlQt-([^b]+)\.tar\.gz
+http://sf.net/perlqt/PerlTQt-([^b]+)\.tar\.gz
diff --git a/debian/lenny/libraries/mlt++/debian/control b/debian/lenny/libraries/mlt++/debian/control
index 3ded7ab8a..6d9df2be3 100644
--- a/debian/lenny/libraries/mlt++/debian/control
+++ b/debian/lenny/libraries/mlt++/debian/control
@@ -10,6 +10,8 @@ Build-Depends: debhelper (>= 5), libmlt-trinity-dev (>= 0.2.4.svn20071228), auto
Package: libmlt++0.2.5-trinity
Architecture: any
Depends: ${shlibs:Depends}
+Replaces: libmlt++0.2.5-trinity (<< 4:14.0.0)
+Breaks: libmlt++0.2.5-trinity (<< 4:14.0.0)
Provides: libmlt++-trinity
Description: An open source multimedia framework (C++ wrapper) [Trinity]
MLT is an open source multimedia framework, designed and developed for
@@ -27,6 +29,8 @@ Description: An open source multimedia framework (C++ wrapper) [Trinity]
Package: libmlt++-trinity-dev
Section: libdevel
Architecture: any
+Replaces: libmlt++-trinity-dev (<< 4:14.0.0)
+Breaks: libmlt++-trinity-dev (<< 4:14.0.0)
Depends: libmlt++0.2.5-trinity (= ${binary:Version}), libmlt-trinity-dev (>= 0.2.4.svn20071228)
Description: An open source multimedia framework (C++ wrapper) [Trinity]
MLT is an open source multimedia framework, designed and developed for
diff --git a/debian/lenny/libraries/mlt/debian/control b/debian/lenny/libraries/mlt/debian/control
index b905822f7..09621eccf 100644
--- a/debian/lenny/libraries/mlt/debian/control
+++ b/debian/lenny/libraries/mlt/debian/control
@@ -15,6 +15,8 @@ Build-Depends: debhelper (>= 5), libdv4-dev, libquicktime-dev (>= 2:1.0.0),
Package: libmlt0.2.5-trinity
Architecture: any
Depends: ${shlibs:Depends}, libmlt-data
+Replaces: libmlt0.2.5-trinity (<< 4:14.0.0)
+Breaks: libmlt0.2.5-trinity (<< 4:14.0.0)
Provides: libmlt-trinity
Description: An open source multimedia framework - Core files [Trinity]
MLT is an open source multimedia framework, designed and developed for
@@ -30,6 +32,8 @@ Description: An open source multimedia framework - Core files [Trinity]
Package: libmiracle0.2.5-trinity
Architecture: any
Depends: ${shlibs:Depends}, libmlt0.2.5-trinity (= ${binary:Version}), libvalerie0.2.5-trinity (= ${binary:Version})
+Replaces: libmiracle0.2.5-trinity (<< 4:14.0.0)
+Breaks: libmiracle0.2.5-trinity (<< 4:14.0.0)
Description: An open source multimedia framework - Core files [Trinity]
MLT is an open source multimedia framework, designed and developed for
television broadcasting. It provides a toolkit for broadcasters, video
@@ -43,6 +47,8 @@ Description: An open source multimedia framework - Core files [Trinity]
Package: libvalerie0.2.5-trinity
Architecture: any
Depends: ${shlibs:Depends}, libmlt0.2.5-trinity (= ${binary:Version}), libmiracle0.2.5-trinity (= ${binary:Version})
+Replaces: libvalerie0.2.5-trinity (<< 4:14.0.0)
+Breaks: libvalerie0.2.5-trinity (<< 4:14.0.0)
Description: An open source multimedia framework - Core files [Trinity]
MLT is an open source multimedia framework, designed and developed for
television broadcasting. It provides a toolkit for broadcasters, video
@@ -57,6 +63,8 @@ Description: An open source multimedia framework - Core files [Trinity]
Package: libmlt-trinity-dev
Section: libdevel
Architecture: any
+Replaces: libmlt-trinity-dev (<< 4:14.0.0)
+Breaks: libmlt-trinity-dev (<< 4:14.0.0)
Depends: libmlt0.2.5-trinity (= ${binary:Version}), libmiracle0.2.5-trinity (= ${binary:Version}), libvalerie0.2.5-trinity (= ${binary:Version})
Provides: libmiracle-trinity-dev, libvalerie-trinity-dev
Description: An open source multimedia framework - Development files [Trinity]
diff --git a/debian/lenny/libraries/pytdeextensions/debian/control b/debian/lenny/libraries/pytdeextensions/debian/control
index 0ec05cc9d..139709f0d 100644
--- a/debian/lenny/libraries/pytdeextensions/debian/control
+++ b/debian/lenny/libraries/pytdeextensions/debian/control
@@ -11,6 +11,8 @@ Standards-Version: 3.8.4
Package: pytdeextensions-trinity
Architecture: all
Depends: ${python:Depends}
+Replaces: pykdeextensions-trinity (<< 4:14.0.0)
+Breaks: pykdeextensions-trinity (<< 4:14.0.0)
Conflicts: pytdeextensions
Provides: ${python:Provides}
Description: Python packages to support KDE applications (scripts) [Trinity]
@@ -22,6 +24,8 @@ Description: Python packages to support KDE applications (scripts) [Trinity]
Package: libpythonize0-trinity-dev
Architecture: any
Section: libdevel
+Replaces: libpythonize0-trinity-dev (<< 4:14.0.0)
+Breaks: libpythonize0-trinity-dev (<< 4:14.0.0)
Depends: libpythonize0-trinity (= ${binary:Version}), python-dev
Description: Python packages to support KDE applications (development) [Trinity]
PyKDE Extensions is a collection of software and Python packages
@@ -34,6 +38,8 @@ Description: Python packages to support KDE applications (development) [Trinity]
Package: libpythonize0-trinity
Architecture: any
Section: libs
+Replaces: libpythonize0-trinity (<< 4:14.0.0)
+Breaks: libpythonize0-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: libpythonize0
Description: Python packages to support KDE applications (library) [Trinity]
diff --git a/debian/lenny/libraries/python-trinity/debian/control b/debian/lenny/libraries/python-trinity/debian/control
index c1f13e757..afacf68ee 100644
--- a/debian/lenny/libraries/python-trinity/debian/control
+++ b/debian/lenny/libraries/python-trinity/debian/control
@@ -12,6 +12,8 @@ XS-Python-Version: all
Package: python-trinity-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${python:Depends}, python-tqt
+Replaces: python-trinity-trinity (<< 4:14.0.0)
+Breaks: python-trinity-trinity (<< 4:14.0.0)
XB-Python-Version: ${python:Versions}
Provides: ${python:Provides}
Conflicts: python-trinity-trinity
@@ -23,6 +25,8 @@ Description: Trinity bindings for Python [Trinity]
Package: python-trinity-trinity-dbg
Priority: extra
Architecture: any
+Replaces: python-trinity-trinity-dbg (<< 4:14.0.0)
+Breaks: python-trinity-trinity-dbg (<< 4:14.0.0)
Depends: python-trinity-trinity (= ${binary:Version}), python-dbg, python-tqt-dbg, ${shlibs:Depends}
XB-Python-Version: ${python:Versions}
Description: Trinity bindings for Python (debug extensions) [Trinity]
@@ -35,6 +39,8 @@ Description: Trinity bindings for Python (debug extensions) [Trinity]
Package: python-trinity-trinity-dev
Section: python
Architecture: all
+Replaces: python-trinity-trinity-dev (<< 4:14.0.0)
+Breaks: python-trinity-trinity-dev (<< 4:14.0.0)
Depends: pytqt-tools, ${python:Depends}
XB-Python-Version: ${python:Versions}
Description: Trinity bindings for Python - Development files and scripts [Trinity]
@@ -47,6 +53,8 @@ Description: Trinity bindings for Python - Development files and scripts [Trinit
Package: python-trinity-trinity-doc
Section: doc
Architecture: all
+Replaces: python-trinity-trinity-doc (<< 4:14.0.0)
+Breaks: python-trinity-trinity-doc (<< 4:14.0.0)
Description: Documentation and examples for PyKDE [Trinity]
General documentation and examples for PyKDE providing programming
tips and working code you can use to learn from.
diff --git a/debian/lenny/metapackages/sudo-trinity/debian/control b/debian/lenny/metapackages/sudo-trinity/debian/control
old mode 100755
new mode 100644
index ce61db602..6505a3e51
--- a/debian/lenny/metapackages/sudo-trinity/debian/control
+++ b/debian/lenny/metapackages/sudo-trinity/debian/control
@@ -9,5 +9,7 @@ Standards-Version: 3.8.4
Package: sudo-trinity
Architecture: all
Depends: sudo
+Replaces: sudo-trinity (<< 4:14.0.0)
+Breaks: sudo-trinity (<< 4:14.0.0)
Description: TDE sudo
- TDE configuration files for sudo
\ No newline at end of file
+ TDE configuration files for sudo
diff --git a/debian/lenny/tde-i18n/debian/control b/debian/lenny/tde-i18n/debian/control
index 1c1486752..f4bcf47de 100644
--- a/debian/lenny/tde-i18n/debian/control
+++ b/debian/lenny/tde-i18n/debian/control
@@ -9,6 +9,8 @@ Standards-Version: 3.8.4
Package: tde-i18n-af-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-af-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-af-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -19,6 +21,8 @@ Description: Afrikaans (af) internationalized (i18n) files for KDE
Package: tde-i18n-ar-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-ar-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-ar-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity-trinity
@@ -29,6 +33,8 @@ Description: Arabic (ar) internationalized (i18n) files for KDE
Package: tde-i18n-az-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-az-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-az-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -39,6 +45,8 @@ Description: Azerbaijani (az) internationalized (i18n) files for KDE
Package: tde-i18n-be-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-be-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-be-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -49,6 +57,8 @@ Description: Belarusian (be) internationalized (i18n) files for KDE
Package: tde-i18n-bg-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-bg-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-bg-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -59,6 +69,8 @@ Description: Bulgarian (bg) internationalized (i18n) files for KDE
Package: tde-i18n-bn-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-bn-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-bn-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -69,6 +81,8 @@ Description: Bengali (bn) internationalized (i18n) files for KDE
Package: tde-i18n-br-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-br-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-br-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -79,6 +93,8 @@ Description: Breton (br) internationalized (i18n) files for KDE
Package: tde-i18n-bs-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-bs-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-bs-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -89,6 +105,8 @@ Description: Bosnian (bs) internationalized (i18n) files for KDE
Package: tde-i18n-ca-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-ca-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-ca-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -99,6 +117,8 @@ Description: Catalan (ca) internationalized (i18n) files for KDE
Package: tde-i18n-cs-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-cs-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-cs-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -109,6 +129,8 @@ Description: Czech (cs) internationalized (i18n) files for KDE
Package: tde-i18n-csb-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-csb-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-csb-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -119,6 +141,8 @@ Description: Kashubian (csb) internationalized (i18n) files for KDE
Package: tde-i18n-cy-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-cy-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-cy-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -129,6 +153,8 @@ Description: Welsh (cy) internationalized (i18n) files for KDE
Package: tde-i18n-da-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-da-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-da-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -139,6 +165,8 @@ Description: Danish (da) internationalized (i18n) files for KDE
Package: tde-i18n-de-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-de-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-de-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -149,6 +177,8 @@ Description: German (de) internationalized (i18n) files for KDE
Package: tde-i18n-el-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-el-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-el-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -159,6 +189,8 @@ Description: Greek (el) internationalized (i18n) files for KDE
Package: tde-i18n-engb-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-engb-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-engb-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -169,6 +201,8 @@ Description: British English (en_GB) internationalized (i18n) files for KDE
Package: tde-i18n-eo-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-eo-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-eo-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -179,6 +213,8 @@ Description: Esperanto (eo) internationalized (i18n) files for KDE
Package: tde-i18n-es-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-es-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-es-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -189,6 +225,8 @@ Description: Spanish (es) internationalized (i18n) files for KDE
Package: tde-i18n-et-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-et-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-et-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -199,6 +237,8 @@ Description: Estonian (et) internationalized (i18n) files for KDE
Package: tde-i18n-eu-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-eu-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-eu-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -209,6 +249,8 @@ Description: Basque (eu) internationalized (i18n) files for KDE
Package: tde-i18n-fa-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-fa-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-fa-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -219,6 +261,8 @@ Description: Farsi (Persian) (fa) internationalized (i18n) files for KDE
Package: tde-i18n-fi-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-fi-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-fi-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -229,6 +273,8 @@ Description: Finnish (fi) internationalized (i18n) files for KDE
Package: tde-i18n-fr-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-fr-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-fr-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -239,6 +285,8 @@ Description: French (fr) internationalized (i18n) files for KDE
Package: tde-i18n-fy-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-fy-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-fy-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -249,6 +297,8 @@ Description: Frisian (fy) internationalized (i18n) files for KDE
Package: tde-i18n-ga-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-ga-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-ga-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -259,6 +309,8 @@ Description: Irish Gaelic (ga) internationalized (i18n) files for KDE
Package: tde-i18n-gl-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-gl-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-gl-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -269,6 +321,8 @@ Description: Galician (gl) internationalized (i18n) files for KDE
Package: tde-i18n-he-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-he-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-he-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -279,6 +333,8 @@ Description: Hebrew (he) internationalized (i18n) files for KDE
Package: tde-i18n-hi-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-hi-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-hi-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -289,6 +345,8 @@ Description: Hindi (hi) internationalized (i18n) files for KDE
Package: tde-i18n-hr-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-hr-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-hr-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -299,6 +357,8 @@ Description: Croatian (hr) internationalized (i18n) files for KDE
Package: tde-i18n-hu-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-hu-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-hu-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -309,6 +369,8 @@ Description: Hungarian (hu) internationalized (i18n) files for KDE
Package: tde-i18n-is-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-is-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-is-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -319,6 +381,8 @@ Description: Icelandic (is) internationalized (i18n) files for KDE
Package: tde-i18n-it-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-it-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-it-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -329,6 +393,8 @@ Description: Italian (it) internationalized (i18n) files for KDE
Package: tde-i18n-ja-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-ja-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-ja-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -339,6 +405,8 @@ Description: Japanese (ja) internationalized (i18n) files for KDE
Package: tde-i18n-kk-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-kk-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-kk-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -349,6 +417,8 @@ Description: Kazakh (kk) internationalized (i18n) files for KDE
Package: tde-i18n-km-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-km-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-km-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -359,6 +429,8 @@ Description: Khmer (km) internationalized (i18n) files for KDE
Package: tde-i18n-ko-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-ko-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-ko-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -369,6 +441,8 @@ Description: Korean (ko) internationalized (i18n) files for KDE
Package: tde-i18n-lt-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-lt-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-lt-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -379,6 +453,8 @@ Description: Lithuanian (lt) internationalized (i18n) files for KDE
Package: tde-i18n-lv-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-lv-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-lv-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -389,6 +465,8 @@ Description: Latvian (lv) internationalized (i18n) files for KDE
Package: tde-i18n-mk-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-mk-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-mk-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -399,6 +477,8 @@ Description: Macedonian (mk) internationalized (i18n) files for KDE
Package: tde-i18n-mn-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-mn-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-mn-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -409,6 +489,8 @@ Description: Mongolian (mn) internationalized (i18n) files for KDE
Package: tde-i18n-ms-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-ms-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-ms-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -419,6 +501,8 @@ Description: Malay (ms) internationalized (i18n) files for KDE
Package: tde-i18n-nb-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-nb-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-nb-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity, tde-i18n-no
@@ -429,6 +513,8 @@ Description: Norwegian Bookmal (nb) internationalized (i18n) files for KDE
Package: tde-i18n-nds-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-nds-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-nds-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -439,6 +525,8 @@ Description: Low Saxon (nds) internationalized (i18n) files for KDE
Package: tde-i18n-nl-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-nl-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-nl-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -449,6 +537,8 @@ Description: Dutch (nl) internationalized (i18n) files for KDE
Package: tde-i18n-nn-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-nn-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-nn-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Description: Norwegian Nynorsk (nn) internationalized (i18n) files for KDE
@@ -458,6 +548,8 @@ Description: Norwegian Nynorsk (nn) internationalized (i18n) files for KDE
Package: tde-i18n-pa-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-pa-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-pa-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -468,6 +560,8 @@ Description: Punjabi (pa) internationalized (i18n) files for KDE
Package: tde-i18n-pl-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-pl-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-pl-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -478,6 +572,8 @@ Description: Polish (pl) internationalized (i18n) files for KDE
Package: tde-i18n-pt-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-pt-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-pt-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -488,6 +584,8 @@ Description: Portuguese (pt) internationalized (i18n) files for KDE
Package: tde-i18n-ptbr-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-ptbr-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-ptbr-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -498,6 +596,8 @@ Description: Brazilian Portuguese (pt_BR) internationalized (i18n) files for KDE
Package: tde-i18n-ro-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-ro-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-ro-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -508,6 +608,8 @@ Description: Romanian (ro) internationalized (i18n) files for KDE
Package: tde-i18n-ru-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-ru-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-ru-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -518,6 +620,8 @@ Description: Russian (ru) internationalized (i18n) files for KDE
Package: tde-i18n-rw-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-rw-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-rw-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -528,6 +632,8 @@ Description: Kinyarwanda (rw) internationalized (i18n) files for KDE
Package: tde-i18n-se-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-se-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-se-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -538,6 +644,8 @@ Description: Northern Sami (se) internationalized (i18n) files for KDE
Package: tde-i18n-sk-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-sk-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-sk-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -548,6 +656,8 @@ Description: Slovak (sk) internationalized (i18n) files for KDE
Package: tde-i18n-sl-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-sl-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-sl-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -558,6 +668,8 @@ Description: Slovenian (sl) internationalized (i18n) files for KDE
Package: tde-i18n-sr-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-sr-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-sr-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -568,6 +680,8 @@ Description: Serbian (sr) internationalized (i18n) files for KDE
Package: tde-i18n-ss-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-ss-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-ss-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -578,6 +692,8 @@ Description: Swati (ss) internationalized (i18n) files for KDE
Package: tde-i18n-srlatin-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-srlatin-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-srlatin-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -588,6 +704,8 @@ Description: Latin Serbian (sr@Latn) internationalized (i18n) files for KDE
Package: tde-i18n-sv-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-sv-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-sv-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -598,6 +716,8 @@ Description: Swedish (sv) internationalized (i18n) files for KDE
Package: tde-i18n-ta-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-ta-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-ta-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -608,6 +728,8 @@ Description: Tamil (ta) internationalized (i18n) files for KDE
Package: tde-i18n-te-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-te-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-te-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -618,6 +740,8 @@ Description: Telugu (te) internationalized (i18n) files for KDE
Package: tde-i18n-tg-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-tg-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-tg-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -628,6 +752,8 @@ Description: Tajik (tg) internationalized (i18n) files for KDE
Package: tde-i18n-th-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-th-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-th-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -638,6 +764,8 @@ Description: Thai (th) internationalized (i18n) files for KDE
Package: tde-i18n-tr-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-tr-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-tr-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -648,6 +776,8 @@ Description: Turkish (tr) internationalized (i18n) files for KDE
Package: tde-i18n-uk-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-uk-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-uk-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -658,6 +788,8 @@ Description: Ukrainian (uk) internationalized (i18n) files for KDE
Package: tde-i18n-uz-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-uz-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-uz-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -669,6 +801,8 @@ Description: Uzbek (uz) internationalized (i18n) files for KDE
Package: tde-i18n-uzcyrillic-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-uzcyrillic-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-uzcyrillic-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -679,6 +813,8 @@ Description: Cyrillic Uzbek (uz@cyrillic) internationalized (i18n) files for KDE
Package: tde-i18n-vi-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-vi-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-vi-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -689,6 +825,8 @@ Description: Vietnamese (vi) internationalized (i18n) files for KDE
Package: tde-i18n-wa-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-wa-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-wa-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -699,6 +837,8 @@ Description: Walloon (wa) internationalized (i18n) files for KDE
Package: tde-i18n-zhcn-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-zhcn-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-zhcn-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -709,6 +849,8 @@ Description: Chinese Simplified (zh_CN) internationalized (i18n) files for KDE
Package: tde-i18n-zhtw-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-zhtw-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-zhtw-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
diff --git a/debian/lenny/tdeaccessibility/debian/control b/debian/lenny/tdeaccessibility/debian/control
index fc7c8579e..0adaaa9f0 100644
--- a/debian/lenny/tdeaccessibility/debian/control
+++ b/debian/lenny/tdeaccessibility/debian/control
@@ -10,6 +10,8 @@ Standards-Version: 3.8.4
Package: tdeaccessibility-trinity
Section: kde
Architecture: all
+Replaces: kdeaccessibility-trinity (<< 4:14.0.0)
+Breaks: kdeaccessibility-trinity (<< 4:14.0.0)
Depends: kmag-trinity (>= ${Source-Version}), kmousetool-trinity (>= ${Source-Version}), kmouth-trinity (>= ${Source-Version}), kbstate-trinity (>= ${Source-Version}), ksayit-trinity (>= ${Source-Version}), kttsd-trinity (>= ${Source-Version})
Recommends: kde-icons-mono-trinity (>= ${Source-Version})
Suggests: kttsd-contrib-plugins-trinity (>= ${Source-Version}), tdeaccessibility-trinity-doc-html (>= ${Source-Version})
@@ -27,6 +29,8 @@ Description: accessibility packages from the official Trinity release
Package: tdeaccessibility-trinity-doc-html
Architecture: all
Section: doc
+Replaces: kdeaccessibility-trinity-doc-html (<< 4:14.0.0)
+Breaks: kdeaccessibility-trinity-doc-html (<< 4:14.0.0)
Suggests: konqueror-trinity | www-browser, tdebase-trinity
Description: KDE accessibility documentation in HTML format
By default the modules provided by KDE only provide their documentation
@@ -45,6 +49,8 @@ Description: KDE accessibility documentation in HTML format
Package: kde-icons-mono-trinity
Section: kde
Architecture: all
+Replaces: kde-icons-mono-trinity (<< 4:14.0.0)
+Breaks: kde-icons-mono-trinity (<< 4:14.0.0)
Description: a monochromatic icons theme for KDE
A monochromatic icon theme for KDE, designed for accessibility purposes.
.
@@ -54,6 +60,8 @@ Description: a monochromatic icons theme for KDE
Package: kbstate-trinity
Section: utils
Architecture: any
+Replaces: kbstate-trinity (<< 4:14.0.0)
+Breaks: kbstate-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
Description: a keyboard status applet for KDE
@@ -65,6 +73,8 @@ Description: a keyboard status applet for KDE
Package: kmag-trinity
Section: utils
Architecture: any
+Replaces: kmag-trinity (<< 4:14.0.0)
+Breaks: kmag-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
Description: a screen magnifier for KDE
@@ -81,6 +91,8 @@ Description: a screen magnifier for KDE
Package: kmousetool-trinity
Section: utils
Architecture: any
+Replaces: kmousetool-trinity (<< 4:14.0.0)
+Breaks: kmousetool-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
Description: KDE mouse manipulation tool for the disabled
@@ -94,6 +106,8 @@ Description: KDE mouse manipulation tool for the disabled
Package: kmouth-trinity
Section: utils
Architecture: any
+Replaces: kmouth-trinity (<< 4:14.0.0)
+Breaks: kmouth-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
Description: a type-and-say KDE frontend for speech synthesizers
@@ -108,6 +122,8 @@ Description: a type-and-say KDE frontend for speech synthesizers
Package: ksayit-trinity
Section: utils
Architecture: any
+Replaces: ksayit-trinity (<< 4:14.0.0)
+Breaks: ksayit-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
Description: a frontend for the KDE Text-to-Speech system
@@ -120,6 +136,8 @@ Description: a frontend for the KDE Text-to-Speech system
Package: kttsd-trinity
Section: utils
Architecture: any
+Replaces: kttsd-trinity (<< 4:14.0.0)
+Breaks: kttsd-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Recommends: ksayit-trinity (= ${Source-Version}) | kmouth-trinity (= ${Source-Version}), festival | flite | epos
Suggests: kttsd-contrib-plugins-trinity (= ${Source-Version})
@@ -138,6 +156,8 @@ Description: a Text-to-Speech system for KDE
Package: kttsd-contrib-plugins-trinity
Section: utils
Architecture: any
+Replaces: kttsd-contrib-plugins-trinity (<< 4:14.0.0)
+Breaks: kttsd-contrib-plugins-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: the KDE Text-to-Speech system
kttsd synthetizer plugins that depends on non-free software :
@@ -152,6 +172,8 @@ Description: the KDE Text-to-Speech system
Package: tdeaccessibility-trinity-dbg
Section: libdevel
Architecture: any
+Replaces: kdeaccessibility-trinity-dbg (<< 4:14.0.0)
+Breaks: kdeaccessibility-trinity-dbg (<< 4:14.0.0)
Depends: tdelibs-trinity-dbg
Priority: extra
Description: debugging symbols for tdeaccessibility-trinity
diff --git a/debian/lenny/tdeaddons/debian/control b/debian/lenny/tdeaddons/debian/control
index f2fec99ec..1cdd28ec6 100644
--- a/debian/lenny/tdeaddons/debian/control
+++ b/debian/lenny/tdeaddons/debian/control
@@ -10,6 +10,8 @@ Standards-Version: 3.8.4
Package: tdeaddons-trinity
Architecture: all
Section: kde
+Replaces: kdeaddons-trinity (<< 4:14.0.0)
+Breaks: kdeaddons-trinity (<< 4:14.0.0)
Depends: atlantikdesigner-trinity (>= ${Source-Version}), kaddressbook-plugins-trinity (>= ${Source-Version}), kate-plugins-trinity (>= ${Source-Version}), tdeaddons-kfile-plugins-trinity (>= ${Source-Version}), kicker-applets-trinity (>= ${Source-Version}), konq-plugins-trinity (>= ${Source-Version}), ksig-trinity (>= ${Source-Version}), noatun-plugins-trinity (>= ${Source-Version})
Suggests: tdeaddons-trinity-doc-html
Description: add-on plugins and applets provided with Trinity
@@ -24,6 +26,8 @@ Description: add-on plugins and applets provided with Trinity
Package: tdeaddons-trinity-doc-html
Architecture: all
Section: doc
+Replaces: kdeaddons-trinity-doc-html (<< 4:14.0.0)
+Breaks: kdeaddons-trinity-doc-html (<< 4:14.0.0)
Suggests: konqueror-trinity | www-browser, tdeaddons-trinity
Description: KDE add-ons documentation in HTML format
By default the modules provided by KDE only provide their documentation
@@ -42,6 +46,8 @@ Description: KDE add-ons documentation in HTML format
Package: atlantikdesigner-trinity
Architecture: any
Section: games
+Replaces: atlantikdesigner-trinity (<< 4:14.0.0)
+Breaks: atlantikdesigner-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Enhances: atlantik-trinity
Description: game board designer for Atlantik
@@ -59,6 +65,8 @@ Description: game board designer for Atlantik
Package: kaddressbook-plugins-trinity
Architecture: any
Section: kde
+Replaces: kaddressbook-plugins-trinity (<< 4:14.0.0)
+Breaks: kaddressbook-plugins-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: kworldclock-trinity, khelpcenter-trinity, tdeaddons-trinity-doc-html
Enhances: kaddressbook-trinity
@@ -76,6 +84,8 @@ Description: plugins for KAddressBook, the Trinity address book
Package: kate-plugins-trinity
Architecture: any
Section: editors
+Replaces: kate-plugins-trinity (<< 4:14.0.0)
+Breaks: kate-plugins-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, tidy
Suggests: khelpcenter-trinity, tdeaddons-trinity-doc-html, kaddressbook-trinity
Enhances: kate-trinity
@@ -95,6 +105,8 @@ Description: plugins for Kate, the KDE Advanced Text Editor
Package: tdeaddons-kfile-plugins-trinity
Architecture: any
Section: kde
+Replaces: kdeaddons-kfile-plugins-trinity (<< 4:14.0.0)
+Breaks: kdeaddons-kfile-plugins-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Provides: renamedlg-plugins-trinity
Description: Trinity file dialog plugins for text files and folders
@@ -114,6 +126,8 @@ Description: Trinity file dialog plugins for text files and folders
Package: kicker-applets-trinity
Architecture: any
Section: kde
+Replaces: kicker-applets-trinity (<< 4:14.0.0)
+Breaks: kicker-applets-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, kicker-trinity
Suggests: xmms-kde-trinity, khelpcenter-trinity, tdeaddons-trinity-doc-html
Provides: ktimemon-trinity
@@ -135,6 +149,8 @@ Description: applets for Kicker, the Trinity panel
Package: knewsticker-scripts-trinity
Architecture: all
Section: kde
+Replaces: knewsticker-scripts-trinity (<< 4:14.0.0)
+Breaks: knewsticker-scripts-trinity (<< 4:14.0.0)
Depends: ${perl:Depends}, python, libfinance-quote-perl, libmime-perl, libnews-nntpclient-perl, libwww-perl
Recommends: knewsticker-trinity
Enhances: knewsticker-trinity
@@ -152,6 +168,8 @@ Description: scripts for KNewsTicker, the Trinity news ticker
Package: konq-plugins-trinity
Architecture: any
Section: kde
+Replaces: konq-plugins-trinity (<< 4:14.0.0)
+Breaks: konq-plugins-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, libjpeg-progs, python, rsync, unison
Recommends: akregator-trinity, ark-trinity, imagemagick
Suggests: khelpcenter-trinity, tdeaddons-trinity-doc-html
@@ -179,6 +197,8 @@ Description: plugins for Konqueror, the Trinity file/web/doc browser
Package: ksig-trinity
Architecture: any
Section: kde
+Replaces: ksig-trinity (<< 4:14.0.0)
+Breaks: ksig-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: kmail-trinity
Enhances: kmail-trinity
@@ -198,6 +218,8 @@ Description: graphical tool for managing multiple email signatures
Package: noatun-plugins-trinity
Architecture: any
Section: sound
+Replaces: noatun-plugins-trinity (<< 4:14.0.0)
+Breaks: noatun-plugins-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Enhances: noatun-trinity
Description: plugins for Noatun, the Trinity media player
@@ -215,6 +237,8 @@ Description: plugins for Noatun, the Trinity media player
Package: tdeaddons-trinity-dbg
Section: libdevel
Architecture: any
+Replaces: kdeaddons-trinity-dbg (<< 4:14.0.0)
+Breaks: kdeaddons-trinity-dbg (<< 4:14.0.0)
Depends: tdelibs-trinity-dbg
Priority: extra
Description: debugging symbols for tdeaddons-trinity
diff --git a/debian/lenny/tdeadmin/debian/control b/debian/lenny/tdeadmin/debian/control
index fcf54e33e..76819b941 100644
--- a/debian/lenny/tdeadmin/debian/control
+++ b/debian/lenny/tdeadmin/debian/control
@@ -10,6 +10,8 @@ Standards-Version: 3.8.4
Package: tdeadmin-trinity
Section: kde
Architecture: all
+Replaces: kdeadmin-trinity (<< 4:14.0.0)
+Breaks: kdeadmin-trinity (<< 4:14.0.0)
Depends: kcron-trinity (>= ${Source-Version}), kdat-trinity (>= ${Source-Version}), tdeadmin-kfile-plugins-trinity (>= ${Source-Version}), knetworkconf-trinity (>= ${Source-Version}), kpackage-trinity (>= ${Source-Version}), ksysv-trinity (>= ${Source-Version}), kuser-trinity (>= ${Source-Version})
Recommends: lilo-config-trinity (>= ${Source-Version})
Suggests: tdeadmin-trinity-doc-html (>= ${Source-Version})
@@ -25,6 +27,8 @@ Description: system administration tools from the official Trinity release
Package: tdeadmin-trinity-doc-html
Architecture: all
Section: doc
+Replaces: kdeadmin-trinity-doc-html (<< 4:14.0.0)
+Breaks: kdeadmin-trinity-doc-html (<< 4:14.0.0)
Suggests: konqueror-trinity | www-browser, tdebase-trinity
Description: KDE administration documentation in HTML format
By default the modules provided by KDE only provide their documentation
@@ -43,6 +47,8 @@ Description: KDE administration documentation in HTML format
Package: kcron-trinity
Section: admin
Architecture: any
+Replaces: kcron-trinity (<< 4:14.0.0)
+Breaks: kcron-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
Description: the Trinity crontab editor
@@ -55,6 +61,8 @@ Description: the Trinity crontab editor
Package: kdat-trinity
Section: admin
Architecture: any
+Replaces: kdat-trinity (<< 4:14.0.0)
+Breaks: kdat-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
Description: a Trinity tape backup tool
@@ -74,6 +82,8 @@ Description: a Trinity tape backup tool
Package: tdeadmin-kfile-plugins-trinity
Section: kde
Architecture: any
+Replaces: kdeadmin-kfile-plugins-trinity (<< 4:14.0.0)
+Breaks: kdeadmin-kfile-plugins-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: Trinity file metainfo plugins for deb and rpm files
File metainfo plugins for deb and rpm package files.
@@ -84,6 +94,8 @@ Description: Trinity file metainfo plugins for deb and rpm files
Package: knetworkconf-trinity
Section: kde
Architecture: any
+Replaces: knetworkconf-trinity (<< 4:14.0.0)
+Breaks: knetworkconf-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: Trinity network configuration tool
This is a KDE control center module to configure TCP/IP settings. It
@@ -95,6 +107,8 @@ Description: Trinity network configuration tool
Package: kpackage-trinity
Section: admin
Architecture: any
+Replaces: kpackage-trinity (<< 4:14.0.0)
+Breaks: kpackage-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Recommends: rpm
Suggests: khelpcenter-trinity
@@ -109,6 +123,8 @@ Description: Trinity package management tool
Package: ksysv-trinity
Section: admin
Architecture: any
+Replaces: ksysv-trinity (<< 4:14.0.0)
+Breaks: ksysv-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
Description: Trinity SysV-style init configuration editor
@@ -121,6 +137,8 @@ Description: Trinity SysV-style init configuration editor
Package: kuser-trinity
Section: admin
Architecture: any
+Replaces: kuser-trinity (<< 4:14.0.0)
+Breaks: kuser-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
Description: Trinity user/group administration tool
@@ -132,6 +150,8 @@ Description: Trinity user/group administration tool
Package: lilo-config-trinity
Section: kde
Architecture: none
+Replaces: lilo-config-trinity (<< 4:14.0.0)
+Breaks: lilo-config-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, kcontrol-trinity
Recommends: tdebase-trinity-bin
Suggests: lilo
@@ -148,6 +168,8 @@ Description: Trinity frontend for lilo configuration
Package: tdeadmin-trinity-dbg
Section: libdevel
Architecture: any
+Replaces: kdeadmin-trinity-dbg (<< 4:14.0.0)
+Breaks: kdeadmin-trinity-dbg (<< 4:14.0.0)
Depends: tdelibs-trinity-dbg
Priority: extra
Description: debugging symbols for tdeadmin-trinity
diff --git a/debian/lenny/tdeartwork/debian/control b/debian/lenny/tdeartwork/debian/control
index a4bb8764b..510797e8e 100644
--- a/debian/lenny/tdeartwork/debian/control
+++ b/debian/lenny/tdeartwork/debian/control
@@ -11,6 +11,8 @@ Standards-Version: 3.8.4
Package: tdeartwork-trinity
Architecture: all
Section: kde
+Replaces: kdeartwork-trinity (<< 4:14.0.0)
+Breaks: kdeartwork-trinity (<< 4:14.0.0)
Depends: tdeartwork-misc-trinity (>= ${Source-Version}), tdeartwork-emoticons-trinity (>= ${Source-Version}), tdeartwork-style-trinity (>= ${Source-Version}), tdeartwork-theme-icon-trinity (>= ${Source-Version}), tdeartwork-theme-window-trinity (>= ${Source-Version}), kdewallpapers-trinity (>= ${Source-Version}), kscreensaver-trinity (>= ${Source-Version})
Recommends: kscreensaver-xsavers-trinity
Description: themes, styles and more from the official Trinity release
@@ -28,6 +30,8 @@ Description: themes, styles and more from the official Trinity release
Package: tdeartwork-emoticons-trinity
Architecture: all
Section: kde
+Replaces: kdeartwork-emoticons-trinity (<< 4:14.0.0)
+Breaks: kdeartwork-emoticons-trinity (<< 4:14.0.0)
Enhances: kopete-trinity
Description: emoticon collections for KDE chat clients
This package contains several collections of emoticons used by official
@@ -39,6 +43,8 @@ Description: emoticon collections for KDE chat clients
Package: tdeartwork-misc-trinity
Architecture: all
Section: kde
+Replaces: kdeartwork-misc-trinity (<< 4:14.0.0)
+Breaks: kdeartwork-misc-trinity (<< 4:14.0.0)
Suggests: kworldclock
Description: various multimedia goodies released with KDE
This package contains miscellaneous multimedia goodies for KDE.
@@ -50,6 +56,8 @@ Description: various multimedia goodies released with KDE
Package: tdeartwork-style-trinity
Architecture: any
Section: kde
+Replaces: kdeartwork-style-trinity (<< 4:14.0.0)
+Breaks: kdeartwork-style-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: widget styles released with Trinity
This package contains additional widget styles for Trinity. Widget styles
@@ -63,8 +71,9 @@ Description: widget styles released with Trinity
Package: tdeartwork-theme-icon-trinity
Architecture: all
Section: kde
+Replaces: kdeartwork-theme-icon-trinity (<< 4:14.0.0)
+Breaks: kdeartwork-theme-icon-trinity (<< 4:14.0.0)
Recommends: kdesktop-trinity, kicker-trinity
-Replaces: tdelibs-data-trinity (<< 4:3.5)
Description: icon themes released with Trinity
This package contains additional icon themes for Trinity. Icon themes can be
used to customise the appearance of standard icons throughout KDE. They
@@ -76,6 +85,8 @@ Description: icon themes released with Trinity
Package: tdeartwork-theme-window-trinity
Architecture: any
Section: kde
+Replaces: kdeartwork-theme-window-trinity (<< 4:14.0.0)
+Breaks: kdeartwork-theme-window-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: window decoration themes released with Trinity
This package contains additional window decoration themes for Trinity. Window
@@ -89,8 +100,9 @@ Description: window decoration themes released with Trinity
Package: kdewallpapers-trinity
Architecture: all
Section: kde
+Replaces: kdewallpapers-trinity (<< 4:14.0.0)
+Breaks: kdewallpapers-trinity (<< 4:14.0.0)
Suggests: twin-trinity | x-window-manager
-Replaces: tdebase-data-trinity (<< 4:3.5)
Description: wallpapers released with Trinity
This package contains additional wallpapers for Trinity. Wallpapers can be
applied using the background manager in the KDE Control Centre.
@@ -101,6 +113,8 @@ Description: wallpapers released with Trinity
Package: kscreensaver-trinity
Architecture: any
Section: kde
+Replaces: kscreensaver-trinity (<< 4:14.0.0)
+Breaks: kscreensaver-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, tdebase-trinity-bin
Recommends: twin-trinity, kscreensaver-xsavers-trinity (= ${Source-Version})
Description: additional screen savers released with Trinity
@@ -118,6 +132,8 @@ Description: additional screen savers released with Trinity
Package: kscreensaver-xsavers-trinity
Architecture: any
Section: kde
+Replaces: kscreensaver-xsavers-trinity (<< 4:14.0.0)
+Breaks: kscreensaver-xsavers-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, tdebase-trinity-bin, xscreensaver-data
Recommends: twin-trinity, kscreensaver-trinity (= ${Source-Version}), xscreensaver-gl
Suggests: kscreensaver-xsavers-webcollage-trinity
@@ -139,6 +155,8 @@ Description: Trinity hooks for standard xscreensavers
Package: kscreensaver-xsavers-webcollage-trinity
Architecture: all
Section: kde
+Replaces: kscreensaver-xsavers-webcollage-trinity (<< 4:14.0.0)
+Breaks: kscreensaver-xsavers-webcollage-trinity (<< 4:14.0.0)
Depends: kscreensaver-xsavers-extra-trinity, miscfiles | wordlist, netpbm
Description: webcollage screensaver Trinity hook
This package give access to the webcollage screensaver through the Trinity
@@ -162,6 +180,8 @@ Description: webcollage screensaver Trinity hook
Package: kscreensaver-xsavers-extra-trinity
Architecture: all
Section: kde
+Replaces: kscreensaver-xsavers-extra-trinity (<< 4:14.0.0)
+Breaks: kscreensaver-xsavers-extra-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, kscreensaver-xsavers-trinity, xscreensaver-data-extra, xscreensaver-gl-extra, rss-glx, fireflies
Recommends: twin-trinity, kscreensaver-trinity (= ${Source-Version})
Description: Trinity hooks for standard xscreensavers
@@ -180,6 +200,8 @@ Description: Trinity hooks for standard xscreensavers
Package: tdeartwork-trinity-dbg
Section: libdevel
Architecture: any
+Replaces: kdeartwork-trinity-dbg (<< 4:14.0.0)
+Breaks: kdeartwork-trinity-dbg (<< 4:14.0.0)
Depends: tdelibs-trinity-dbg
Priority: extra
Description: debugging symbols for tdeartwork-trinity
diff --git a/debian/lenny/tdebase/debian/control b/debian/lenny/tdebase/debian/control
index 41fb6f9be..ffd6f3386 100644
--- a/debian/lenny/tdebase/debian/control
+++ b/debian/lenny/tdebase/debian/control
@@ -12,6 +12,8 @@ Standards-Version: 3.8.4
Package: tdebase-trinity
Section: kde
Architecture: all
+Replaces: kdebase-trinity (<< 4:14.0.0)
+Breaks: kdebase-trinity (<< 4:14.0.0)
Depends: kappfinder-trinity (>= ${Source-Version}), kate-trinity (>= ${Source-Version}), kcontrol-trinity (>= ${Source-Version}), tdebase-trinity-bin (>= ${Source-Version}), tdebase-data-trinity (>= ${Source-Version}), tdebase-kio-plugins-trinity (>= ${Source-Version}), kdepasswd-trinity (>= ${Source-Version}), tdeprint-trinity (>= ${Source-Version}), kdesktop-trinity (>= ${Source-Version}), kfind-trinity (>= ${Source-Version}), khelpcenter-trinity (>= ${Source-Version}), kicker-trinity (>= ${Source-Version}), klipper-trinity (>= ${Source-Version}), kmenuedit-trinity (>= ${Source-Version}), konqueror-nsplugins-trinity (>= ${Source-Version}), konqueror-trinity (>= ${Source-Version}), konsole-trinity (>= ${Source-Version}), kpager-trinity (>= ${Source-Version}), kpersonalizer-trinity (>= ${Source-Version}), ksmserver-trinity (>= ${Source-Version}), ksplash-trinity (>= ${Source-Version}), ksysguard-trinity (>= ${Source-Version}), ktip-trinity (>= ${Source-Version}), twin-trinity (>= ${Source-Version}), libkonq4-trinity (>= ${Source-Version}), hal-trinity | kfreebsd-gnu | hurd, xcalib
Recommends: kdm-trinity (>= ${Source-Version}), tdebase-runtime-data-common-trinity, libtqt3-integration-trinity
Suggests: tdebase-trinity-doc-html (>= ${Source-Version})
@@ -29,6 +31,8 @@ Description: base components from the official KDE release
Package: tdebase-runtime-data-common-trinity
Section: kde
Architecture: all
+Replaces: kdebase-runtime-data-common-trinity (<< 4:14.0.0)
+Breaks: kdebase-runtime-data-common-trinity (<< 4:14.0.0)
Depends: tdebase-trinity
Description: Shared common files for Trinity and KDE4
.
@@ -38,8 +42,9 @@ Description: Shared common files for Trinity and KDE4
Package: kappfinder-trinity
Section: kde
Architecture: any
+Replaces: kappfinder-trinity (<< 4:14.0.0)
+Breaks: kappfinder-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
-Replaces: tdebase-trinity (<< 4:3.0.0)
Description: non-KDE application finder for KDE
kappfinder searches your workstation for many common applications and
creates menu entries for them.
@@ -50,10 +55,11 @@ Description: non-KDE application finder for KDE
Package: kate-trinity
Section: editors
Architecture: any
+Replaces: kate-trinity (<< 4:14.0.0)
+Breaks: kate-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Recommends: kregexpeditor-trinity
Suggests: aspell | ispell | hspell, kate-plugins-trinity, khelpcenter-trinity, konsole-trinity
-Replaces: tdebase-trinity-doc (<< 4:3.0.0)
Description: advanced text editor for KDE
Kate is a multi document editor, based on a rewritten version of the kwrite
editing widget of KDE.
@@ -80,11 +86,12 @@ Description: advanced text editor for KDE
Package: kcontrol-trinity
Section: kde
Architecture: any
+Replaces: kcontrol-trinity (<< 4:14.0.0)
+Breaks: kcontrol-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, tdebase-data-trinity (>> ${KDE-Version3}), tdebase-data-trinity (<< ${KDE-Next-Version3}), usbutils
Recommends: udev
Suggests: khelpcenter-trinity, ntpdate | ntp-simple
Conflicts: tdebase-libs-trinity (<< 4:3.0.0)
-Replaces: tdebase-trinity (<< 4:3.0.0), tdebase-trinity-doc (<< 4:3.0.0), tdebase-libs-trinity (<< 4:3.0.0), konqueror-trinity (<< 4:3.0.0)
Description: control center for KDE
The KDE Control Center provides you with a centralized and convenient
way to configure all of your KDE settings.
@@ -103,10 +110,11 @@ Description: control center for KDE
Package: tdebase-trinity-bin
Section: kde
Architecture: any
+Replaces: kdebase-trinity-bin (<< 4:14.0.0)
+Breaks: kdebase-trinity-bin (<< 4:14.0.0)
Depends: ${shlibs:Depends}, libpam-runtime (>= 0.76-14)
Suggests: khelpcenter-trinity, gdb
Conflicts: tdebase-libs-trinity (<< 4:3.0.0), kdm-trinity (<< 4:3.4.1-2), tdebase-workspace-data-trinity (<< 7:3.5.0)
-Replaces: kcontrol-trinity (<< 4:3.3.0), tdebase-trinity (<< 4:3.0.0), tdebase-trinity-doc (<< 4:3.0.0), tdebase-libs-trinity (<< 4:3.0.0), kscreensaver-trinity (<< 4:3.0.0), kdm-trinity (= 4:3.3.2-1b)
Description: core binaries for the KDE base module
This package contains miscellaneous programs needed by other
KDE applications, particularly those in the KDE base module.
@@ -117,8 +125,9 @@ Description: core binaries for the KDE base module
Package: tdebase-data-trinity
Section: kde
Architecture: all
+Replaces: kdebase-data-trinity (<< 4:14.0.0)
+Breaks: kdebase-data-trinity (<< 4:14.0.0)
Conflicts: kcontrol-trinity (<< 4:3.4.2-1), twin-trinity (<< 4:3.4.2-1), kicker-trinity (<< 4:3.4.2-1)
-Replaces: tdebase-trinity (<< 4:3.0.0), tdeedu-data-trinity (<< 4:3.4.0), tdelibs-data-trinity (<< 4:3.3.0), kdewallpapers-trinity (<< 4:3.0.0), kcontrol-trinity (<< 4:3.5.5a.dfsg.1-1ubuntu18)
Description: shared data files for the KDE base module
This package contains the architecture-independent shared data files
needed for a basic KDE desktop installation.
@@ -129,8 +138,9 @@ Description: shared data files for the KDE base module
Package: tdebase-trinity-dev
Section: devel
Architecture: any
+Replaces: kdebase-trinity-dev (<< 4:14.0.0)
+Breaks: kdebase-trinity-dev (<< 4:14.0.0)
Depends: kate-trinity (= ${Source-Version}), kcontrol-trinity (= ${Source-Version}), tdebase-trinity-bin (= ${Source-Version}), tdeprint-trinity (= ${Source-Version}), kdesktop-trinity (= ${Source-Version}), khelpcenter-trinity (= ${Source-Version}), kicker-trinity (= ${Source-Version}), klipper-trinity (= ${Source-Version}), kmenuedit-trinity (= ${Source-Version}), konqueror-nsplugins-trinity (= ${Source-Version}), konqueror-trinity (= ${Source-Version}), konsole-trinity (= ${Source-Version}), ksmserver-trinity (= ${Source-Version}), ksplash-trinity (= ${Source-Version}), ksysguard-trinity (= ${Source-Version}), twin-trinity (= ${Source-Version}), tdelibs4-trinity-dev (>= 4:3.5.8)
-Replaces: kate-trinity (<< 4:3.0.0), tdebase-trinity (<< 4:3.0.0), konqueror-trinity (<< 4:3.0.0)
Description: development files for the KDE base module
This package contains headers and other development files needed to
compile software based on the KDE base module.
@@ -141,7 +151,8 @@ Description: development files for the KDE base module
Package: tdebase-trinity-doc
Section: doc
Architecture: all
-Replaces: libkonq4-trinity-dev (<< 4:3.2.0)
+Replaces: kdebase-trinity-doc (<< 4:14.0.0)
+Breaks: kdebase-trinity-doc (<< 4:14.0.0)
Description: developer documentation for the KDE base module
This package contains documentation for the KDE base module, of
use more for developers creating applications than regular users.
@@ -152,6 +163,8 @@ Description: developer documentation for the KDE base module
Package: tdebase-trinity-doc-html
Architecture: all
Section: doc
+Replaces: kdebase-trinity-doc-html (<< 4:14.0.0)
+Breaks: kdebase-trinity-doc-html (<< 4:14.0.0)
Suggests: konqueror-trinity | www-browser, tdebase-trinity
Description: KDE base documentation in HTML format
By default the modules provided by KDE only provide their documentation
@@ -170,11 +183,12 @@ Description: KDE base documentation in HTML format
Package: tdebase-kio-plugins-trinity
Section: kde
Architecture: any
+Replaces: kdebase-kio-plugins-trinity (<< 4:14.0.0)
+Breaks: kdebase-kio-plugins-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, kdesktop-trinity, libsasl2-modules, psmisc, cryptsetup, man-db (>= 2.5.1-1)
Recommends: hal-trinity, pmount, kamera-trinity, tdemultimedia-kio-plugins-trinity
Suggests: khelpcenter-trinity, mtools
Conflicts: tdebase-libs-trinity (<< 4:3.0.0), mediamanager
-Replaces: tdebase-trinity (<< 4:3.0.0), tdebase-trinity-doc (<< 4:3.0.0), tdebase-libs-trinity (<< 4:3.0.0), konqueror-trinity (<< 4:3.0.0), tdebase-trinity-bin (<< 4:3.5.5a.dfsg.1-1ubuntu18), tdebase-data-trinity (<< 4:3.5.8-2ubuntu18)
Description: core I/O slaves for KDE
This package includes the base kioslaves. They include, amongst many
others, file, http, ftp, smtp, pop and imap.
@@ -191,6 +205,8 @@ Description: core I/O slaves for KDE
Package: kdepasswd-trinity
Section: utils
Architecture: any
+Replaces: kdepasswd-trinity (<< 4:14.0.0)
+Breaks: kdepasswd-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: password changer for KDE
This is a simple application which allows users to change their
@@ -202,10 +218,11 @@ Description: password changer for KDE
Package: tdeprint-trinity
Section: utils
Architecture: any
+Replaces: kdeprint-trinity (<< 4:14.0.0)
+Breaks: kdeprint-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, enscript, poster, psutils
Recommends: kghostview-trinity | postscript-viewer
Suggests: khelpcenter-trinity, efax | hylafax-client | mgetty-fax, smbclient
-Replaces: tdebase-trinity (<< 4:3.0.0), tdebase-trinity-doc (<< 4:3.0.0)
Description: print system for KDE
This package contains the KDE printing subsystem. It can use CUPS,
lpd-ng or the traditional lpd. It also includes support for fax and
@@ -221,8 +238,9 @@ Description: print system for KDE
Package: kdesktop-trinity
Section: kde
Architecture: any
+Replaces: kdesktop-trinity (<< 4:14.0.0)
+Breaks: kdesktop-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, tdebase-trinity-bin (= ${Source-Version}), eject, xdg-user-dirs
-Replaces: tdebase-trinity (<< 4:3.0.0), konqueror-trinity (<< 4:3.0.0)
Description: miscellaneous binaries and files for the KDE desktop
This package contains miscellaneous binaries and files integral to
the KDE desktop.
@@ -233,6 +251,8 @@ Description: miscellaneous binaries and files for the KDE desktop
Package: kdm-trinity
Section: kde
Architecture: any
+Replaces: kdm-trinity (<< 4:14.0.0)
+Breaks: kdm-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, tdebase-trinity-bin (= ${Source-Version}), tdebase-data-trinity (>> ${KDE-Version3}), tdebase-data-trinity (<< ${KDE-Next-Version3}), debconf (>= 1.2.9) | debconf-2.0, libpam-runtime (>= 0.76-14), xbase-clients
Recommends: logrotate, xserver-xorg
Suggests: khelpcenter-trinity, ksmserver-trinity (= ${Source-Version}), kdepasswd-trinity (= ${Source-Version}), menu
@@ -259,10 +279,11 @@ Description: X display manager for KDE
Package: kfind-trinity
Section: utils
Architecture: any
+Replaces: kfind-trinity (<< 4:14.0.0)
+Breaks: kfind-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
Conflicts: tdebase-libs-trinity (<< 4:3.0.0)
-Replaces: tdebase-trinity (<< 4:3.0.0), tdebase-libs-trinity (<< 4:3.0.0)
Description: file-find utility for KDE
kfind can be used to find files and directories on your
workstations.
@@ -273,9 +294,10 @@ Description: file-find utility for KDE
Package: khelpcenter-trinity
Section: kde
Architecture: any
+Replaces: khelpcenter-trinity (<< 4:14.0.0)
+Breaks: khelpcenter-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: htdig
-Replaces: tdebase-trinity-doc (<< 4:3.0.0), konqueror-trinity (<< 4:3.0.0)
Description: help center for KDE
The KDE Help Center provides documentation on how to use the KDE desktop.
.
@@ -288,10 +310,11 @@ Description: help center for KDE
Package: kicker-trinity
Section: kde
Architecture: any
+Replaces: kicker-trinity (<< 4:14.0.0)
+Breaks: kicker-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, tdebase-data-trinity (>> ${KDE-Version3}), tdebase-data-trinity (<< ${KDE-Next-Version3})
Suggests: khelpcenter-trinity, kicker-applets-trinity, menu
Conflicts: tdebase-libs-trinity (<< 4:3.0.0)
-Replaces: tdebase-trinity (<< 4:3.0.0), tdebase-trinity-doc (<< 4:3.0.0), tdebase-libs-trinity (<< 4:3.0.0), konqueror-trinity (<< 4:3.0.0)
Description: desktop panel for KDE
Kicker provides the KDE panel on you desktop. It can be used as a
program launcher and can load plugins to provide additional
@@ -303,9 +326,10 @@ Description: desktop panel for KDE
Package: klipper-trinity
Section: kde
Architecture: any
+Replaces: klipper-trinity (<< 4:14.0.0)
+Breaks: klipper-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
-Replaces: tdebase-trinity (<< 4:3.0.0), tdebase-trinity-doc (<< 4:3.0.0)
Description: clipboard utility for Trinity
klipper provides standard clipboard functions (cut and paste, history
saving) plus additional features, like the ability to offer actions to
@@ -318,9 +342,10 @@ Description: clipboard utility for Trinity
Package: kmenuedit-trinity
Section: kde
Architecture: any
+Replaces: kmenuedit-trinity (<< 4:14.0.0)
+Breaks: kmenuedit-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
-Replaces: tdebase-trinity (<< 4:3.0.0), tdebase-trinity-doc (<< 4:3.0.0)
Description: menu editor for KDE
The KDE menu editor allows you to make customisations to the KDE menu
structure.
@@ -331,11 +356,12 @@ Description: menu editor for KDE
Package: konqueror-trinity
Section: web
Architecture: any
+Replaces: konqueror-trinity (<< 4:14.0.0)
+Breaks: konqueror-trinity (<< 4:14.0.0)
Provides: info-browser, man-browser, www-browser, konqueror
Depends: ${shlibs:Depends}, kcontrol-trinity (= ${Source-Version}), tdebase-kio-plugins-trinity (= ${Source-Version}), kdesktop-trinity (= ${Source-Version}), kfind-trinity (= ${Source-Version}), konqueror-nsplugins-trinity
Suggests: khelpcenter-trinity, konq-plugins-trinity, ksvg-trinity, gij-4.1, libgcj7-awt, libjessie-java
Conflicts: tdebase-audiolibs-trinity (<< 4:3.0.0), tdebase-libs-trinity (<< 4:3.0.0)
-Replaces: tdebase-trinity (<< 4:3.0.0), tdebase-audiolibs-trinity (<< 4:3.0.0), tdebase-trinity-doc (<< 4:3.0.0), tdebase-libs-trinity (<< 4:3.0.0)
Description: KDE's advanced file manager, web browser and document viewer
Konqueror is the file manager for the K Desktop Environment.
It supports basic file management on local UNIX filesystems,
@@ -363,8 +389,9 @@ Description: KDE's advanced file manager, web browser and document viewer
Package: konqueror-nsplugins-trinity
Section: utils
Architecture: any
+Replaces: konqueror-nsplugins-trinity (<< 4:14.0.0)
+Breaks: konqueror-nsplugins-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, konqueror-trinity
-Replaces: konqueror-trinity (<< 4:3.0.0)
Description: Netscape plugin support for Konqueror
This package includes support for Netscape plugins in Konqueror.
.
@@ -374,8 +401,9 @@ Description: Netscape plugin support for Konqueror
Package: konsole-trinity
Section: kde
Architecture: any
+Replaces: konsole-trinity (<< 4:14.0.0)
+Breaks: konsole-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
-Replaces: tdebase-trinity (<< 4:3.0.0)
Suggests: khelpcenter-trinity
Provides: x-terminal-emulator
Description: X terminal emulator for KDE
@@ -400,9 +428,10 @@ Description: X terminal emulator for KDE
Package: kpager-trinity
Section: kde
Architecture: any
+Replaces: kpager-trinity (<< 4:14.0.0)
+Breaks: kpager-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
-Replaces: tdebase-trinity (<< 4:3.0.0), tdebase-trinity-doc (<< 4:3.0.0)
Description: desktop pager for KDE
This package contains KDE's desktop pager, which displays your virtual
desktops iconically in a window, along with icons of any running
@@ -414,8 +443,9 @@ Description: desktop pager for KDE
Package: kpersonalizer-trinity
Section: kde
Architecture: any
+Replaces: kpersonalizer-trinity (<< 4:14.0.0)
+Breaks: kpersonalizer-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, tdebase-data-trinity (>> ${KDE-Version3}), tdebase-data-trinity (<< ${KDE-Next-Version3})
-Replaces: tdebase-trinity (<< 4:3.0.0)
Description: installation personalizer for KDE
KDE Personalizer is the application that configures the KDE desktop for you.
It's a very useful wizard that allows you to quickly change the KDE desktop to
@@ -428,10 +458,11 @@ Description: installation personalizer for KDE
Package: ksmserver-trinity
Section: kde
Architecture: any
+Replaces: ksmserver-trinity (<< 4:14.0.0)
+Breaks: ksmserver-trinity (<< 4:14.0.0)
Provides: x-session-manager
Depends: ${shlibs:Depends}, tdebase-runtime-data-common-trinity, twin-trinity (= ${Source-Version}) | x-window-manager
Recommends: kpersonalizer-trinity (= ${Source-Version})
-Replaces: tdebase-trinity (<< 4:3.0.0)
Description: session manager for KDE
This package contains the KDE session manager. It is responsible for
restoring your KDE session on login. It is also needed to properly
@@ -449,9 +480,10 @@ Description: session manager for KDE
Package: ksplash-trinity
Section: kde
Architecture: any
+Replaces: ksplash-trinity (<< 4:14.0.0)
+Breaks: ksplash-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, tdebase-data-trinity (>> ${KDE-Version3}), tdebase-data-trinity (<< ${KDE-Next-Version3})
Suggests: khelpcenter-trinity
-Replaces: tdebase-trinity (<< 4:3.0.0)
Description: the KDE splash screen
This package includes the KDE Splash screen, which is seen when
a KDE session is launched.
@@ -462,10 +494,11 @@ Description: the KDE splash screen
Package: ksysguard-trinity
Section: utils
Architecture: any
+Replaces: ksysguard-trinity (<< 4:14.0.0)
+Breaks: ksysguard-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, ksysguardd-trinity (= ${Source-Version})
Suggests: khelpcenter-trinity
Conflicts: kpm-trinity (<< 4:3.0.0)
-Replaces: tdebase-trinity (<< 4:3.0.0), tdebase-trinity-doc (<< 4:3.0.0), kpm (<< 4:3.0.0)
Description: system guard for KDE
KDE System Guard allows you to monitor various statistics about your
computer.
@@ -476,8 +509,9 @@ Description: system guard for KDE
Package: ksysguardd-trinity
Section: utils
Architecture: any
+Replaces: ksysguardd-trinity (<< 4:14.0.0)
+Breaks: ksysguardd-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
-Replaces: tdebase-trinity (<< 4:3.0.0)
Description: system guard daemon for KDE
KDE System Guard Daemon is the daemon part of ksysguard. The daemon can
be installed on a remote machine to enable ksysguard on another machine
@@ -489,8 +523,9 @@ Description: system guard daemon for KDE
Package: ktip-trinity
Section: kde
Architecture: any
+Replaces: ktip-trinity (<< 4:14.0.0)
+Breaks: ktip-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
-Replaces: tdebase-trinity (<< 4:3.0.0)
Description: useful tips for KDE
ktip provides many useful tips on using KDE when you log in.
.
@@ -500,10 +535,11 @@ Description: useful tips for KDE
Package: twin-trinity
Section: kde
Architecture: any
+Replaces: kwin-trinity (<< 4:14.0.0)
+Breaks: kwin-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Provides: x-window-manager
Suggests: tdebase-trinity-bin (= ${Source-Version}), tdebase-data-trinity (>> ${KDE-Version3}), tdebase-data-trinity (<< ${KDE-Next-Version3}), kdesktop-trinity (= ${Source-Version}), kicker-trinity (= ${Source-Version}), kpager-trinity (= ${Source-Version}), kpersonalizer-trinity (= ${Source-Version}), ksmserver-trinity (= ${Source-Version}), ksplash-trinity (= ${Source-Version})
-Replaces: tdeartwork-theme-window-trinity (<< 4:3.4.0), tdebase-trinity (<< 4:3.0.0)
Conflicts: kde-window-manager-trinity (<< 7:3.5.0)
Description: the KDE window manager
This package contains the default X window manager for KDE.
@@ -514,9 +550,10 @@ Description: the KDE window manager
Package: libkonq4-trinity
Section: libs
Architecture: any
+Replaces: libkonq4-trinity (<< 4:14.0.0)
+Breaks: libkonq4-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Conflicts: tdebase-libs-trinity (<< 4:3.0.0)
-Replaces: tdebase-libs-trinity (<< 4:3.0.0), konqueror-trinity (<< 4:3.0.0)
Description: core libraries for Konqueror
These libraries are used by several KDE applications, most notably
Konqueror and the kdesktop package.
@@ -527,6 +564,8 @@ Description: core libraries for Konqueror
Package: libtqt3-integration-trinity
Section: libs
Architecture: any
+Replaces: libtqt3-integration-trinity (<< 4:14.0.0)
+Breaks: libtqt3-integration-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: Integration library between TQt3 and TDE
These libraries allow you to use TDE dialogs in native TQt3 applications.
@@ -537,9 +576,10 @@ Description: Integration library between TQt3 and TDE
Package: libkonq4-trinity-dev
Section: libdevel
Architecture: any
+Replaces: libkonq4-trinity-dev (<< 4:14.0.0)
+Breaks: libkonq4-trinity-dev (<< 4:14.0.0)
Depends: libkonq4-trinity (= ${Source-Version}), tdelibs4-trinity-dev (>= 4:3.5.8)
Conflicts: libkonq-trinity-dev (<< 4:3.0.0), libkonq3-trinity (<< 4:3.0.0)
-Replaces: tdebase-dev (<< 4:3.0.0), libkonq-dev (<< 4:3.0.0), libkonq3 (<< 4:3.0.0)
Description: development files for Konqueror's core libraries
This package contains headers and other development files for the core
Konqueror libraries.
@@ -550,6 +590,8 @@ Description: development files for Konqueror's core libraries
Package: tdebase-trinity-dbg
Section: libdevel
Architecture: any
+Replaces: kdebase-trinity-dbg (<< 4:14.0.0)
+Breaks: kdebase-trinity-dbg (<< 4:14.0.0)
Priority: extra
Depends: libkonq4-trinity (= ${Source-Version}), tdelibs-trinity-dbg
Description: debugging symbols for tdebase
diff --git a/debian/lenny/tdebindings/debian/control b/debian/lenny/tdebindings/debian/control
index bd52bed60..55d1ec903 100644
--- a/debian/lenny/tdebindings/debian/control
+++ b/debian/lenny/tdebindings/debian/control
@@ -9,12 +9,14 @@ Section: devel
Priority: optional
Maintainer: Timothy Pearson
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers
-Uploaders: Adeodato Simó , Ana Beatriz Guerrero Lopez , Ricardo Cardenes , Sune Vuorela
+Uploaders: Adeodato Sim , Ana Beatriz Guerrero Lopez , Ricardo Cardenes , Sune Vuorela
Standards-Version: 3.8.4
Package: tdebindings-java-trinity
Section: libs
Architecture: all
+Replaces: kdebindings-java-trinity (<< 4:14.0.0)
+Breaks: kdebindings-java-trinity (<< 4:14.0.0)
Depends: libdcop3-java-trinity (= ${source:Version}), libqt3-java-trinity (= ${source:Version}), libtrinity-java-trinity (= ${source:Version})
Description: TDE Java bindings metapackage [Trinity]
A metapackage depending on all TDE, Qt and DCOP bindings libraries
@@ -25,6 +27,8 @@ Description: TDE Java bindings metapackage [Trinity]
Package: libdcop3-java-trinity
Architecture: all
Section: libs
+Replaces: libdcop3-java-trinity (<< 4:14.0.0)
+Breaks: libdcop3-java-trinity (<< 4:14.0.0)
Depends: libdcop3-jni-trinity (>> ${KDE-Version3}), libdcop3-jni-trinity (<< ${KDE-Next-Version3}), gij | java1-runtime | java2-runtime
Description: DCOP bindings for Java [Trinity]
This package contains the Java classes necessary to run Java programs
@@ -36,6 +40,8 @@ Description: DCOP bindings for Java [Trinity]
Package: libdcop3-jni-trinity
Architecture: amd64 i386 ia64 powerpc s390 sparc
Section: libs
+Replaces: libdcop3-jni-trinity (<< 4:14.0.0)
+Breaks: libdcop3-jni-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: DCOP bindings for Java ( Native libraries ) [Trinity]
This package contains the shared libraries and scripts necessary to
@@ -48,6 +54,8 @@ Description: DCOP bindings for Java ( Native libraries ) [Trinity]
Package: libdcop3-java-trinity-dev
Architecture: amd64 i386 ia64 powerpc s390 sparc
Section: libdevel
+Replaces: libdcop3-java-trinity-dev (<< 4:14.0.0)
+Breaks: libdcop3-java-trinity-dev (<< 4:14.0.0)
Depends: libdcop3-java-trinity (>> ${KDE-Version3}), libdcop3-java-trinity (<< ${KDE-Next-Version3})
Description: DCOP bindings for Java (dcopidl2java program) [Trinity]
This package contains the dcopidl2java program which generates Java
@@ -60,6 +68,8 @@ Description: DCOP bindings for Java (dcopidl2java program) [Trinity]
Package: libqt3-java-trinity
Architecture: all
Section: libs
+Replaces: libqt3-java-trinity (<< 4:14.0.0)
+Breaks: libqt3-java-trinity (<< 4:14.0.0)
Depends: libqt3-jni-trinity (>> ${KDE-Version3}), libqt3-jni-trinity (<< ${KDE-Next-Version3}), gij | java1-runtime | java2-runtime
Suggests: juic-trinity
Description: Java bindings for Qt [Trinity]
@@ -75,6 +85,8 @@ Description: Java bindings for Qt [Trinity]
Package: libqt3-jni-trinity
Architecture: amd64 i386 ia64 powerpc s390 sparc
Section: libs
+Replaces: libqt3-jni-trinity (<< 4:14.0.0)
+Breaks: libqt3-jni-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: Java bindings for Qt ( Native libraries ) [Trinity]
This package contains the shared libraries necessary to run Java
@@ -86,6 +98,8 @@ Description: Java bindings for Qt ( Native libraries ) [Trinity]
Package: libtrinity-java-trinity
Architecture: all
Section: libs
+Replaces: libtrinity-java-trinity (<< 4:14.0.0)
+Breaks: libtrinity-java-trinity (<< 4:14.0.0)
Depends: libtrinity-jni-trinity (>> ${KDE-Version3}), libtrinity-jni-trinity (<< ${KDE-Next-Version3}), gij | java1-runtime | java2-runtime
Description: tdelibs bindings for Java [Trinity]
This package contains the Java classes necessary to run Java programs
@@ -100,6 +114,8 @@ Description: tdelibs bindings for Java [Trinity]
Package: libtrinity-jni-trinity
Architecture: amd64 i386 ia64 powerpc s390 sparc
Section: libs
+Replaces: libtrinity-jni-trinity (<< 4:14.0.0)
+Breaks: libtrinity-jni-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: tdelibs bindings for java ( Native libraries ) [Trinity]
This package contains the shared libraries necessary to run Java
@@ -111,6 +127,8 @@ Description: tdelibs bindings for java ( Native libraries ) [Trinity]
Package: libsmokeqt1-trinity
Architecture: any
Section: libs
+Replaces: libsmokeqt1-trinity (<< 4:14.0.0)
+Breaks: libsmokeqt1-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: SMOKE Binding Library to Qt
The "Scripting Meta Object Kompiler Engine" library is used by
@@ -122,6 +140,8 @@ Description: SMOKE Binding Library to Qt
Package: libsmokeqt-trinity-dev
Architecture: any
Section: libdevel
+Replaces: libsmokeqt-trinity-dev (<< 4:14.0.0)
+Breaks: libsmokeqt-trinity-dev (<< 4:14.0.0)
Depends: libsmokeqt1-trinity (= ${binary:Version})
Description: SMOKE Binding Library to Qt - Development Files
The "Scripting Meta Object Kompiler Engine" library is used by
@@ -137,6 +157,8 @@ Description: SMOKE Binding Library to Qt - Development Files
Package: libsmokekde1-trinity
Architecture: any
Section: libs
+Replaces: libsmokekde1-trinity (<< 4:14.0.0)
+Breaks: libsmokekde1-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: SMOKE Binding Library to TDE
The "Scripting Meta Object Kompiler Engine" library is used by
@@ -148,6 +170,8 @@ Description: SMOKE Binding Library to TDE
Package: libsmokekde-trinity-dev
Architecture: any
Section: libdevel
+Replaces: libsmokekde-trinity-dev (<< 4:14.0.0)
+Breaks: libsmokekde-trinity-dev (<< 4:14.0.0)
Depends: libsmokekde1-trinity (= ${binary:Version})
Description: SMOKE Binding Library to TDE - Development Files
The "Scripting Meta Object Kompiler Engine" library is used by
@@ -163,6 +187,8 @@ Description: SMOKE Binding Library to TDE - Development Files
Package: python-dcop-trinity
Architecture: any
Section: python
+Replaces: python-dcop-trinity (<< 4:14.0.0)
+Breaks: python-dcop-trinity (<< 4:14.0.0)
Depends: ${python:Depends}, ${shlibs:Depends}
Provides: ${python:Provides}
Description: DCOP bindings for Python
@@ -176,6 +202,8 @@ Description: DCOP bindings for Python
Package: libkjsembed1-trinity
Architecture: any
Section: libs
+Replaces: libkjsembed1-trinity (<< 4:14.0.0)
+Breaks: libkjsembed1-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: Embedded JavaScript library
This package contains the shared libraries necessary to run programs
@@ -187,6 +215,8 @@ Description: Embedded JavaScript library
Package: libkjsembed-trinity-dev
Architecture: any
Section: libdevel
+Replaces: libkjsembed-trinity-dev (<< 4:14.0.0)
+Breaks: libkjsembed-trinity-dev (<< 4:14.0.0)
Depends: libkjsembed1-trinity (= ${binary:Version})
Description: Embedded JavaScript library (Development files)
This package contains the header files and symbolic links necessary
@@ -202,6 +232,8 @@ Description: Embedded JavaScript library (Development files)
Package: kjscmd-trinity
Architecture: any
Section: interpreters
+Replaces: kjscmd-trinity (<< 4:14.0.0)
+Breaks: kjscmd-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: A script interpreter using the TDE JavaScript library
This package contains the kjscmd program, which is a standalone
@@ -212,6 +244,8 @@ Description: A script interpreter using the TDE JavaScript library
Package: juic-trinity
Architecture: all
Section: libdevel
+Replaces: juic-trinity (<< 4:14.0.0)
+Breaks: juic-trinity (<< 4:14.0.0)
Depends: xsltproc
Recommends: libqt3-java-trinity
Suggests: qt3-designer
@@ -227,6 +261,8 @@ Description: The Qt Java UI Compiler
Package: libkorundum0-ruby1.8-trinity
Architecture: any
Section: interpreters
+Replaces: libkorundum0-ruby1.8-trinity (<< 4:14.0.0)
+Breaks: libkorundum0-ruby1.8-trinity (<< 4:14.0.0)
Depends: libqt0-ruby1.8-trinity (= ${binary:Version}), ${shlibs:Depends}
Description: TDE bindings for Ruby [Trinity]
This package contains the files necessary for running and developing
@@ -240,6 +276,8 @@ Description: TDE bindings for Ruby [Trinity]
Package: libqt0-ruby1.8-trinity
Architecture: any
Section: interpreters
+Replaces: libqt0-ruby1.8-trinity (<< 4:14.0.0)
+Breaks: libqt0-ruby1.8-trinity (<< 4:14.0.0)
Depends: ruby1.8, ${shlibs:Depends}
Description: Qt bindings for Ruby [Trinity]
This package contains the files necessary for running and developing
@@ -253,6 +291,8 @@ Description: Qt bindings for Ruby [Trinity]
Package: tde-xparts-extras-trinity
Architecture: any
Depends: ${shlibs:Depends}
+Replaces: kde-xparts-extras-trinity (<< 4:14.0.0)
+Breaks: kde-xparts-extras-trinity (<< 4:14.0.0)
Description: Extra xparts for TDE [Trinity]
This package contains extra xparts-based modules for Trinity
This includes the mozilla-konqueror plugin
diff --git a/debian/lenny/tdeedu/debian/control b/debian/lenny/tdeedu/debian/control
index 4f9345340..a8afe7c5a 100644
--- a/debian/lenny/tdeedu/debian/control
+++ b/debian/lenny/tdeedu/debian/control
@@ -10,6 +10,8 @@ Standards-Version: 3.8.4
Package: tdeedu-trinity
Architecture: all
Section: kde
+Replaces: kdeedu-trinity (<< 4:14.0.0)
+Breaks: kdeedu-trinity (<< 4:14.0.0)
Depends: blinken-trinity (>= ${Source-Version}), kalzium-trinity (>= ${Source-Version}), kanagram-trinity (>= ${Source-Version}), kbruch-trinity (>= ${Source-Version}), tdeedu-data-trinity (>= ${Source-Version}), keduca-trinity (>= ${Source-Version}), kgeography-trinity (>= ${Source-Version}), khangman-trinity (>= ${Source-Version}), kig-trinity (>= ${Source-Version}), kiten-trinity (>= ${Source-Version}), klatin-trinity (>= ${Source-Version}), klettres-trinity (>= ${Source-Version}), kmplot-trinity (>= ${Source-Version}), kpercentage-trinity (>= ${Source-Version}), kstars-trinity (>= ${Source-Version}), ktouch-trinity (>= ${Source-Version}), kturtle-trinity (>= ${Source-Version}), kverbos-trinity (>= ${Source-Version}), kvoctrain-trinity (>= ${Source-Version}), kwordquiz-trinity (>= ${Source-Version}), indi-trinity (>= ${Source-Version})
Suggests: tdeedu-trinity-doc-html
Description: educational apps from the official Trinity release
@@ -24,6 +26,8 @@ Description: educational apps from the official Trinity release
Package: tdeedu-data-trinity
Architecture: all
Section: kde
+Replaces: kdeedu-data-trinity (<< 4:14.0.0)
+Breaks: kdeedu-data-trinity (<< 4:14.0.0)
Description: shared data for Trinity educational applications
This package contains shared data necessary for running the
educational applications provided with KDE (the K Desktop
@@ -35,6 +39,8 @@ Description: shared data for Trinity educational applications
Package: tdeedu-trinity-dbg
Architecture: any
Priority: extra
+Replaces: kdeedu-trinity-dbg (<< 4:14.0.0)
+Breaks: kdeedu-trinity-dbg (<< 4:14.0.0)
Depends: tdelibs-trinity-dbg
Section: libdevel
Description: debugging symbols for tdeedu-trinity
@@ -45,6 +51,8 @@ Description: debugging symbols for tdeedu-trinity
Package: tdeedu-trinity-doc-html
Architecture: all
Section: doc
+Replaces: kdeedu-trinity-doc-html (<< 4:14.0.0)
+Breaks: kdeedu-trinity-doc-html (<< 4:14.0.0)
Suggests: konqueror-trinity | www-browser, tdeedu-trinity
Description: Trinity edutainment documentation in HTML format
By default the educational applications provided with KDE (the K
@@ -64,6 +72,8 @@ Description: Trinity edutainment documentation in HTML format
Package: blinken-trinity
Architecture: any
Section: games
+Replaces: blinken-trinity (<< 4:14.0.0)
+Breaks: blinken-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, ttf-sjfonts, tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3})
Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
Description: Trinity version of the Simon Says electronic memory game
@@ -82,6 +92,8 @@ Description: Trinity version of the Simon Says electronic memory game
Package: kalzium-trinity
Architecture: any
Section: science
+Replaces: kalzium-trinity (<< 4:14.0.0)
+Breaks: kalzium-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, kalzium-data-trinity (>> ${KDE-Version3}), kalzium-data-trinity (<< ${KDE-Next-Version3}), tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3})
Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
Description: chemistry teaching tool for Trinity
@@ -107,6 +119,8 @@ Description: chemistry teaching tool for Trinity
Package: kalzium-data-trinity
Architecture: all
Section: science
+Replaces: kalzium-data-trinity (<< 4:14.0.0)
+Breaks: kalzium-data-trinity (<< 4:14.0.0)
Description: data files for Kalzium
This package contains architecture-independent data files for
Kalzium, the KDE periodic table application. This includes pictures
@@ -121,6 +135,8 @@ Description: data files for Kalzium
Package: kanagram-trinity
Architecture: any
Section: games
+Replaces: kanagram-trinity (<< 4:14.0.0)
+Breaks: kanagram-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3})
Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
Description: letter order game for Trinity
@@ -142,6 +158,8 @@ Description: letter order game for Trinity
Package: kbruch-trinity
Architecture: any
Section: math
+Replaces: kbruch-trinity (<< 4:14.0.0)
+Breaks: kbruch-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3})
Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
Description: fraction calculation teaching tool for Trinity
@@ -155,6 +173,8 @@ Description: fraction calculation teaching tool for Trinity
Package: keduca-trinity
Architecture: any
Section: kde
+Replaces: keduca-trinity (<< 4:14.0.0)
+Breaks: keduca-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3})
Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
Description: interactive form-based tests for Trinity
@@ -167,6 +187,8 @@ Description: interactive form-based tests for Trinity
Package: kgeography-trinity
Architecture: any
Section: kde
+Replaces: kgeography-trinity (<< 4:14.0.0)
+Breaks: kgeography-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, kgeography-data-trinity (>> ${KDE-Version3}), kgeography-data-trinity (<< ${KDE-Next-Version3}), tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3})
Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
Description: Geography learning tool for Trinity
@@ -181,6 +203,8 @@ Description: Geography learning tool for Trinity
Package: kgeography-data-trinity
Architecture: all
Section: kde
+Replaces: kgeography-data-trinity (<< 4:14.0.0)
+Breaks: kgeography-data-trinity (<< 4:14.0.0)
Description: data files for KGeography
This package contains architecture-independent data files for
KGeography, the geography learning tool for KDE. This includes map
@@ -194,6 +218,8 @@ Description: data files for KGeography
Package: khangman-trinity
Architecture: any
Section: games
+Replaces: khangman-trinity (<< 4:14.0.0)
+Breaks: khangman-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, ttf-dustin, tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3})
Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
Description: the classical hangman game for Trinity
@@ -212,6 +238,8 @@ Description: the classical hangman game for Trinity
Package: kig-trinity
Architecture: any
Section: math
+Replaces: kig-trinity (<< 4:14.0.0)
+Breaks: kig-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3})
Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
Description: interactive geometry program for KDE
@@ -238,6 +266,8 @@ Description: interactive geometry program for KDE
Package: kiten-trinity
Architecture: any
Section: kde
+Replaces: kiten-trinity (<< 4:14.0.0)
+Breaks: kiten-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3}), ttf-kochi-gothic | ttf-kochi-mincho
Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
Description: Japanese reference/study tool for Trinity
@@ -253,6 +283,8 @@ Description: Japanese reference/study tool for Trinity
Package: klatin-trinity
Architecture: any
Section: kde
+Replaces: klatin-trinity (<< 4:14.0.0)
+Breaks: klatin-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3})
Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
Description: application to help revise/teach Latin
@@ -276,6 +308,8 @@ Description: application to help revise/teach Latin
Package: klettres-trinity
Architecture: any
Section: kde
+Replaces: klettres-trinity (<< 4:14.0.0)
+Breaks: klettres-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, klettres-data-trinity (>> ${KDE-Version3}), klettres-data-trinity (<< ${KDE-Next-Version3}), tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3})
Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
Description: foreign alphabet tutor for Trinity
@@ -293,7 +327,8 @@ Description: foreign alphabet tutor for Trinity
Package: klettres-data-trinity
Architecture: all
Section: kde
-Replaces: klettres-trinity (<< 4:3.2.0.1)
+Replaces: klettres-data-trinity (<< 4:14.0.0)
+Breaks: klettres-data-trinity (<< 4:14.0.0)
Description: data files for KLettres foreign alphabet tutor
This package contains architecture-independent data files for
KLettres, the foreign alphabet tutor for KDE. This includes sound
@@ -307,6 +342,8 @@ Description: data files for KLettres foreign alphabet tutor
Package: kmplot-trinity
Architecture: any
Section: math
+Replaces: kmplot-trinity (<< 4:14.0.0)
+Breaks: kmplot-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3})
Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
Description: mathematical function plotter for Trinity
@@ -329,6 +366,8 @@ Description: mathematical function plotter for Trinity
Package: kpercentage-trinity
Architecture: any
Section: math
+Replaces: kpercentage-trinity (<< 4:14.0.0)
+Breaks: kpercentage-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3})
Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
Description: percentage calculation teaching tool for Trinity
@@ -345,6 +384,8 @@ Description: percentage calculation teaching tool for Trinity
Package: kstars-trinity
Architecture: any
Section: science
+Replaces: kstars-trinity (<< 4:14.0.0)
+Breaks: kstars-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, kstars-data-trinity (>> ${KDE-Version3}), kstars-data-trinity (<< ${KDE-Next-Version3}), tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3}), indi-trinity (= ${Source-Version})
Suggests: konqueror-trinity, khelpcenter-trinity, tdeedu-trinity-doc-html
Description: desktop planetarium for Trinity
@@ -366,7 +407,8 @@ Description: desktop planetarium for Trinity
Package: kstars-data-trinity
Architecture: all
Section: science
-Replaces: kstars-trinity (<< 4:3.2.0.1)
+Replaces: kstars-data-trinity (<< 4:14.0.0)
+Breaks: kstars-data-trinity (<< 4:14.0.0)
Description: data files for KStars desktop planetarium
This package contains architecture-independent data files for KStars,
the graphical desktop planetarium for KDE. This includes star
@@ -380,6 +422,8 @@ Description: data files for KStars desktop planetarium
Package: ktouch-trinity
Architecture: any
Section: kde
+Replaces: ktouch-trinity (<< 4:14.0.0)
+Breaks: ktouch-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3})
Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
Description: touch typing tutor for Trinity
@@ -398,6 +442,8 @@ Description: touch typing tutor for Trinity
Package: kturtle-trinity
Architecture: any
Section: devel
+Replaces: kturtle-trinity (<< 4:14.0.0)
+Breaks: kturtle-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3})
Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
Description: educational Logo programming environment
@@ -424,6 +470,8 @@ Description: educational Logo programming environment
Package: kverbos-trinity
Architecture: any
Section: kde
+Replaces: kverbos-trinity (<< 4:14.0.0)
+Breaks: kverbos-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3})
Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
Description: Spanish verb form study application for Trinity
@@ -441,6 +489,8 @@ Description: Spanish verb form study application for Trinity
Package: kvoctrain-trinity
Architecture: any
Section: kde
+Replaces: kvoctrain-trinity (<< 4:14.0.0)
+Breaks: kvoctrain-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, ${perl:Depends}, libwww-perl, tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3})
Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
Description: vocabulary trainer for Trinity
@@ -465,6 +515,8 @@ Description: vocabulary trainer for Trinity
Package: kwordquiz-trinity
Architecture: any
Section: kde
+Replaces: kwordquiz-trinity (<< 4:14.0.0)
+Breaks: kwordquiz-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3})
Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
Description: flashcard and vocabulary learning program for Trinity
@@ -482,6 +534,8 @@ Description: flashcard and vocabulary learning program for Trinity
Package: libtdeedu3-trinity
Architecture: any
Section: libs
+Replaces: libkdeedu3-trinity (<< 4:14.0.0)
+Breaks: libkdeedu3-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: library for use with Trinity educational apps
The KDE-based library libtdeedu is used with educational
@@ -494,6 +548,8 @@ Description: library for use with Trinity educational apps
Package: libtdeedu-trinity-dev
Architecture: any
Section: libdevel
+Replaces: libkdeedu-trinity-dev (<< 4:14.0.0)
+Breaks: libkdeedu-trinity-dev (<< 4:14.0.0)
Depends: libtdeedu3-trinity (= ${Source-Version}), tdelibs4-trinity-dev (>= 4:3.5.8)
Description: development files for Trinity educational library
The KDE-based library libtdeedu is used with educational
@@ -508,9 +564,10 @@ Description: development files for Trinity educational library
Package: libkiten1-trinity
Architecture: any
Section: libs
+Replaces: libkiten1-trinity (<< 4:14.0.0)
+Breaks: libkiten1-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, edict, kanjidic
Recommends: ttf-kochi-gothic | ttf-kochi-mincho
-Replaces: kiten (<< 4:3.4.0)
Description: library for Kiten Japanese reference/study tool
Kiten is a Japanese reference/study tool for KDE. The library
libkiten contains portions of Kiten that may be useful for other
@@ -527,6 +584,8 @@ Description: library for Kiten Japanese reference/study tool
Package: libkiten-trinity-dev
Architecture: any
Section: libdevel
+Replaces: libkiten-trinity-dev (<< 4:14.0.0)
+Breaks: libkiten-trinity-dev (<< 4:14.0.0)
Depends: libkiten1-trinity (= ${Source-Version}), tdelibs4-trinity-dev (>= 4:3.5.8)
Description: development files for Kiten library
Kiten is a Japanese reference/study tool for KDE. The library
@@ -543,8 +602,9 @@ Description: development files for Kiten library
Package: indi-trinity
Architecture: any
Section: science
+Replaces: indi-trinity (<< 4:14.0.0)
+Breaks: indi-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
-Replaces: kstars-trinity (<< 4:3.5.4-2)
Description: Instrument Neutral Distributed Interface for astronomical devices
INDI is an Instrument Neutral Distributed Interface control protocol for
astronomical devices, which provides a framework that decouples low level
diff --git a/debian/lenny/tdegames/debian/control b/debian/lenny/tdegames/debian/control
index 547fa7398..9f634b9b7 100644
--- a/debian/lenny/tdegames/debian/control
+++ b/debian/lenny/tdegames/debian/control
@@ -11,6 +11,8 @@ Standards-Version: 3.8.4
Package: tdegames-trinity
Architecture: all
Section: kde
+Replaces: kdegames-trinity (<< 4:14.0.0)
+Breaks: kdegames-trinity (<< 4:14.0.0)
Depends: atlantik-trinity (>= ${Source-Version}), kasteroids-trinity (>= ${Source-Version}), katomic-trinity (>= ${Source-Version}), kbackgammon-trinity (>= ${Source-Version}), kbattleship-trinity (>= ${Source-Version}), kblackbox-trinity (>= ${Source-Version}), kbounce-trinity (>= ${Source-Version}), kenolaba-trinity (>= ${Source-Version}), kfouleggs-trinity (>= ${Source-Version}), kgoldrunner-trinity (>= ${Source-Version}), kjumpingcube-trinity (>= ${Source-Version}), klickety-trinity (>= ${Source-Version}), klines-trinity (>= ${Source-Version}), kmahjongg-trinity (>= ${Source-Version}), kmines-trinity (>= ${Source-Version}), knetwalk-trinity (>= ${Source-Version}), kolf-trinity (>= ${Source-Version}), konquest-trinity (>= ${Source-Version}), kpat-trinity (>= ${Source-Version}), kpoker-trinity (>= ${Source-Version}), kreversi-trinity (>= ${Source-Version}), ksame-trinity (>= ${Source-Version}), kshisen-trinity (>= ${Source-Version}), ksirtet-trinity (>= ${Source-Version}), ksmiletris-trinity (>= ${Source-Version}), ksnake-trinity (>= ${Source-Version}), ksokoban-trinity (>= ${Source-Version}), kspaceduel-trinity (>= ${Source-Version}), ktron-trinity (>= ${Source-Version}), ktuberling-trinity (>= ${Source-Version}), twin4-trinity (>= ${Source-Version}), lskat-trinity (>= ${Source-Version})
Suggests: tdegames-trinity-doc-html (>= ${Source-Version}), khelpcenter-trinity
Description: games from the official Trinity release
@@ -25,6 +27,8 @@ Description: games from the official Trinity release
Package: tdegames-trinity-doc-html
Architecture: all
Section: doc
+Replaces: kdegames-trinity-doc-html (<< 4:14.0.0)
+Breaks: kdegames-trinity-doc-html (<< 4:14.0.0)
Suggests: konqueror-trinity | www-browser, tdegames-trinity
Description: KDE games documentation in HTML format
By default the games provided with KDE (the K Desktop Environment)
@@ -43,6 +47,8 @@ Description: KDE games documentation in HTML format
Package: libtdegames1-trinity
Architecture: any
Section: games
+Replaces: libkdegames1-trinity (<< 4:14.0.0)
+Breaks: libkdegames1-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: Trinity games library and common files
This library provides a common infrastructure for several of the
@@ -56,6 +62,8 @@ Description: Trinity games library and common files
Package: tdegames-trinity-dbg
Architecture: any
Depends: tdelibs-trinity-dbg
+Replaces: kdegames-trinity-dbg (<< 4:14.0.0)
+Breaks: kdegames-trinity-dbg (<< 4:14.0.0)
Priority: extra
Section: kde
Description: debugging symbols for tdegames
@@ -66,6 +74,8 @@ Description: debugging symbols for tdegames
Package: libtdegames-trinity-dev
Architecture: any
Section: libdevel
+Replaces: libkdegames-trinity-dev (<< 4:14.0.0)
+Breaks: libkdegames-trinity-dev (<< 4:14.0.0)
Depends: tdelibs4-trinity-dev (>= 4:3.5.1), libtdegames1-trinity (= ${Source-Version})
Description: Trinity games library headers
This package is necessary if you want to develop your own games using
@@ -77,6 +87,8 @@ Description: Trinity games library headers
Package: libtdegames-trinity-doc
Architecture: all
Section: doc
+Replaces: libkdegames-trinity-doc (<< 4:14.0.0)
+Breaks: libkdegames-trinity-doc (<< 4:14.0.0)
Recommends: tdelibs4-trinity-doc, libtqtinterface-doc
Suggests: konqueror-trinity | www-browser, libtdegames-trinity-dev
Description: API documentation for the Trinity games library
@@ -89,6 +101,8 @@ Description: API documentation for the Trinity games library
Package: tdegames-card-data-trinity
Architecture: all
Section: games
+Replaces: kdegames-card-data-trinity (<< 4:14.0.0)
+Breaks: kdegames-card-data-trinity (<< 4:14.0.0)
Description: Card decks for Trinity games
Several different collections of card images for use by KDE games.
.
@@ -98,6 +112,8 @@ Description: Card decks for Trinity games
Package: atlantik-trinity
Architecture: any
Section: games
+Replaces: atlantik-trinity (<< 4:14.0.0)
+Breaks: atlantik-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: atlantikdesigner-trinity, monopd
Description: KDE client for Monopoly-like network games
@@ -113,6 +129,8 @@ Description: KDE client for Monopoly-like network games
Package: atlantik-trinity-dev
Architecture: any
Section: devel
+Replaces: atlantik-trinity-dev (<< 4:14.0.0)
+Breaks: atlantik-trinity-dev (<< 4:14.0.0)
Priority: extra
Depends: ${shlibs:Depends}, atlantik-trinity (= ${Source-Version}), libtdegames-trinity-dev (= ${Source-Version})
Description: Development files for Atlantik
@@ -125,6 +143,8 @@ Description: Development files for Atlantik
Package: kasteroids-trinity
Architecture: any
Section: games
+Replaces: kasteroids-trinity (<< 4:14.0.0)
+Breaks: kasteroids-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: Asteroids for Trinity
You know this game. It is based on Warwick Allison's QwSpriteField
@@ -140,6 +160,8 @@ Description: Asteroids for Trinity
Package: katomic-trinity
Architecture: any
Section: games
+Replaces: katomic-trinity (<< 4:14.0.0)
+Breaks: katomic-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: Atomic Entertainment game for Trinity
This is a puzzle game, in which the object is to assemble a molecule
@@ -153,6 +175,8 @@ Description: Atomic Entertainment game for Trinity
Package: kbackgammon-trinity
Architecture: any
Section: games
+Replaces: kbackgammon-trinity (<< 4:14.0.0)
+Breaks: kbackgammon-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: gnubg
Description: A Backgammon game for Trinity
@@ -168,6 +192,8 @@ Description: A Backgammon game for Trinity
Package: kbattleship-trinity
Architecture: any
Section: games
+Replaces: kbattleship-trinity (<< 4:14.0.0)
+Breaks: kbattleship-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: Battleship game for Trinity
This is an implementation of the Battleship game. Each player tries
@@ -181,6 +207,8 @@ Description: Battleship game for Trinity
Package: kblackbox-trinity
Architecture: any
Section: games
+Replaces: kblackbox-trinity (<< 4:14.0.0)
+Breaks: kblackbox-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: A simple logical game for the Trinity project
KBlackBox is a game of hide and seek played on an grid of boxes. Your
@@ -196,6 +224,8 @@ Description: A simple logical game for the Trinity project
Package: kbounce-trinity
Architecture: any
Section: games
+Replaces: kbounce-trinity (<< 4:14.0.0)
+Breaks: kbounce-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: Jezzball clone for the K Desktop Environment
This is a clone of the popular Jezzball game originally created by
@@ -221,6 +251,8 @@ Description: Jezzball clone for the K Desktop Environment
Package: kenolaba-trinity
Architecture: any
Section: games
+Replaces: kenolaba-trinity (<< 4:14.0.0)
+Breaks: kenolaba-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: Enolaba board game for Trinity
kenolaba is a simple board strategy game that is played by two
@@ -238,6 +270,8 @@ Description: Enolaba board game for Trinity
Package: kfouleggs-trinity
Architecture: any
Section: games
+Replaces: kfouleggs-trinity (<< 4:14.0.0)
+Breaks: kfouleggs-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: A KDE clone of the Japanese PuyoPuyo game
KFouleggs is a clone of the Japanese PuyoPuyo game, with advanced
@@ -251,6 +285,8 @@ Description: A KDE clone of the Japanese PuyoPuyo game
Package: kgoldrunner-trinity
Architecture: any
Section: games
+Replaces: kgoldrunner-trinity (<< 4:14.0.0)
+Breaks: kgoldrunner-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: A Trinity clone of the Loderunner arcade game
KGoldrunner, a game of action and puzzle solving. Run through the
@@ -274,6 +310,8 @@ Description: A Trinity clone of the Loderunner arcade game
Package: kjumpingcube-trinity
Architecture: any
Section: games
+Replaces: kjumpingcube-trinity (<< 4:14.0.0)
+Breaks: kjumpingcube-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: Tactical one or two player game
KJumpingCube is a simple tactical game. You can play it against the
@@ -289,6 +327,8 @@ Description: Tactical one or two player game
Package: klickety-trinity
Architecture: any
Section: games
+Replaces: klickety-trinity (<< 4:14.0.0)
+Breaks: klickety-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: A Clickomania-like game for Trinity
Klickety is an adaptation of the (perhaps) well-known Clickomania
@@ -300,6 +340,8 @@ Description: A Clickomania-like game for Trinity
Package: klines-trinity
Architecture: any
Section: games
+Replaces: klines-trinity (<< 4:14.0.0)
+Breaks: klines-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: Color lines for Trinity
KLines is a simple game. It is played by one player, so there is only
@@ -320,6 +362,8 @@ Description: Color lines for Trinity
Package: kmahjongg-trinity
Architecture: any
Section: games
+Replaces: kmahjongg-trinity (<< 4:14.0.0)
+Breaks: kmahjongg-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: the classic mahjongg game for Trinity project
Your mission in this game is to remove all tiles from the game board. A
@@ -332,6 +376,8 @@ Description: the classic mahjongg game for Trinity project
Package: kmines-trinity
Architecture: any
Section: games
+Replaces: kmines-trinity (<< 4:14.0.0)
+Breaks: kmines-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: Minesweeper for Trinity
KMines is the classic Minesweeper game. You must uncover all the
@@ -349,6 +395,8 @@ Description: Minesweeper for Trinity
Package: knetwalk-trinity
Architecture: any
Section: games
+Replaces: knetwalk-trinity (<< 4:14.0.0)
+Breaks: knetwalk-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: A game for system administrators
This game presents the player with a rectangular field consisting of
@@ -362,6 +410,8 @@ Description: A game for system administrators
Package: kolf-trinity
Architecture: any
Section: games
+Replaces: kolf-trinity (<< 4:14.0.0)
+Breaks: kolf-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: Minigolf game for KDE
This is a minigolf game for KDE that allows you to go through different
@@ -373,6 +423,8 @@ Description: Minigolf game for KDE
Package: kolf-trinity-dev
Architecture: any
Section: devel
+Replaces: kolf-trinity-dev (<< 4:14.0.0)
+Breaks: kolf-trinity-dev (<< 4:14.0.0)
Priority: extra
Depends: ${shlibs:Depends}, kolf-trinity (= ${Source-Version}), libtdegames-trinity-dev (= ${Source-Version})
Description: Development files for Kolf
@@ -385,6 +437,8 @@ Description: Development files for Kolf
Package: konquest-trinity
Architecture: any
Section: games
+Replaces: konquest-trinity (<< 4:14.0.0)
+Breaks: konquest-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: KDE based GNU-Lactic Konquest game
This the KDE version of Gnu-Lactic Konquest, a multi-player strategy
@@ -397,6 +451,8 @@ Description: KDE based GNU-Lactic Konquest game
Package: kpat-trinity
Architecture: any
Section: games
+Replaces: kpat-trinity (<< 4:14.0.0)
+Breaks: kpat-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, tdebase-data-trinity, tdegames-card-data-trinity
Description: Trinity solitaire patience game
KPatience is a collection of 14 card games. All the games are single
@@ -408,6 +464,8 @@ Description: Trinity solitaire patience game
Package: kpoker-trinity
Architecture: any
Section: games
+Replaces: kpoker-trinity (<< 4:14.0.0)
+Breaks: kpoker-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, tdegames-card-data-trinity
Description: Trinity based Poker clone
KPoker is a KDE compliant clone of those highly addictive pocket
@@ -419,6 +477,8 @@ Description: Trinity based Poker clone
Package: kreversi-trinity
Architecture: any
Section: games
+Replaces: kreversi-trinity (<< 4:14.0.0)
+Breaks: kreversi-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: Reversi for Trinity
Reversi is a simple strategy game that is played by two
@@ -434,6 +494,8 @@ Description: Reversi for Trinity
Package: ksame-trinity
Architecture: any
Section: games
+Replaces: ksame-trinity (<< 4:14.0.0)
+Breaks: ksame-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: SameGame for Trinity
KSame is a simple game. It's played by one player, so there is only
@@ -447,6 +509,8 @@ Description: SameGame for Trinity
Package: kshisen-trinity
Architecture: any
Section: games
+Replaces: kshisen-trinity (<< 4:14.0.0)
+Breaks: kshisen-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: Shisen-Sho for Trinity
KShisen-Sho is a single-player-game similar to Mahjongg and uses the
@@ -460,6 +524,8 @@ Description: Shisen-Sho for Trinity
Package: ksirtet-trinity
Architecture: any
Section: games
+Replaces: ksirtet-trinity (<< 4:14.0.0)
+Breaks: ksirtet-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: Tetris and Puyo-Puyo games for Trinity
This program is a clone of the well known game Tetris. You must fit
@@ -477,6 +543,8 @@ Description: Tetris and Puyo-Puyo games for Trinity
Package: ksmiletris-trinity
Architecture: any
Section: games
+Replaces: ksmiletris-trinity (<< 4:14.0.0)
+Breaks: ksmiletris-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: Tetris like game for Trinity
This is a game with falling blocks composed of different types of
@@ -489,6 +557,8 @@ Description: Tetris like game for Trinity
Package: ksnake-trinity
Architecture: any
Section: games
+Replaces: ksnake-trinity (<< 4:14.0.0)
+Breaks: ksnake-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: Snake Race for Trinity
Snake Race is a game of speed and agility. You are a hungry snake and
@@ -500,6 +570,8 @@ Description: Snake Race for Trinity
Package: ksokoban-trinity
Architecture: any
Section: games
+Replaces: ksokoban-trinity (<< 4:14.0.0)
+Breaks: ksokoban-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: Sokoban game for Trinity
The first sokoban game was created in 1982 by Hiroyuki Imabayashi at
@@ -527,6 +599,8 @@ Description: Sokoban game for Trinity
Package: kspaceduel-trinity
Architecture: any
Section: games
+Replaces: kspaceduel-trinity (<< 4:14.0.0)
+Breaks: kspaceduel-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: Arcade two-player space game for Trinity
KSpaceduel is an space arcade game for two players.
@@ -542,6 +616,8 @@ Description: Arcade two-player space game for Trinity
Package: ktron-trinity
Architecture: any
Section: games
+Replaces: ktron-trinity (<< 4:14.0.0)
+Breaks: ktron-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: Tron clone for the K Desktop Environment
The object of the game is to avoid running into walls, your own tail,
@@ -553,6 +629,8 @@ Description: Tron clone for the K Desktop Environment
Package: ktuberling-trinity
Architecture: any
Section: games
+Replaces: ktuberling-trinity (<< 4:14.0.0)
+Breaks: ktuberling-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: Potato Guy for Trinity
KTuberling is a game intended for small children. Of course, it may
@@ -577,6 +655,8 @@ Description: Potato Guy for Trinity
Package: twin4-trinity
Architecture: any
Section: games
+Replaces: kwin4-trinity (<< 4:14.0.0)
+Breaks: kwin4-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: Connect Four clone for Trinity
Four wins is a game for two players. Each player is represented by a
@@ -596,6 +676,8 @@ Description: Connect Four clone for Trinity
Package: lskat-trinity
Architecture: any
Section: games
+Replaces: lskat-trinity (<< 4:14.0.0)
+Breaks: lskat-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, tdegames-card-data-trinity
Description: Lieutnant Skat card game for Trinity
Lieutnant Skat (from German Offiziersskat) is a card game for two
diff --git a/debian/lenny/tdegraphics/debian/control b/debian/lenny/tdegraphics/debian/control
index 615d3f793..f1b9cc0a7 100644
--- a/debian/lenny/tdegraphics/debian/control
+++ b/debian/lenny/tdegraphics/debian/control
@@ -10,6 +10,8 @@ Standards-Version: 3.8.4
Package: tdegraphics-trinity
Section: kde
Architecture: all
+Replaces: kdegraphics-trinity (<< 4:14.0.0)
+Breaks: kdegraphics-trinity (<< 4:14.0.0)
Depends: kamera-trinity (>= ${source:Version}), kcoloredit-trinity (>= ${source:Version}), tdegraphics-kfile-plugins-trinity (>= ${source:Version}), kdvi-trinity (>= ${source:Version}), kfax-trinity (>= ${source:Version}), kfaxview-trinity (>= ${source:Version}), kgamma-trinity (>= ${source:Version}), kghostview-trinity (>= ${source:Version}), kiconedit-trinity (>= ${source:Version}), kmrml-trinity (>= ${source:Version}), kolourpaint-trinity (>= ${source:Version}), kooka-trinity (>= ${source:Version}), kpdf-trinity (>= ${source:Version}), kpovmodeler-trinity (>= ${source:Version}), kruler-trinity (>= ${source:Version}), ksnapshot-trinity (>= ${source:Version}), ksvg-trinity (>= ${source:Version}), kview-trinity (>= ${source:Version}), kviewshell-trinity (>= ${source:Version}), libkscan1-trinity (>= ${source:Version})
Suggests: tdegraphics-trinity-doc-html (>= ${source:Version})
Description: graphics apps from the official Trinity release
@@ -24,6 +26,8 @@ Description: graphics apps from the official Trinity release
Package: tdegraphics-trinity-doc-html
Architecture: all
Section: doc
+Replaces: kdegraphics-trinity-doc-html (<< 4:14.0.0)
+Breaks: kdegraphics-trinity-doc-html (<< 4:14.0.0)
Suggests: konqueror-trinity | www-browser, tdebase-trinity
Description: KDE graphics documentation in HTML format
By default the modules provided by KDE only provide their documentation
@@ -42,6 +46,8 @@ Description: KDE graphics documentation in HTML format
Package: kamera-trinity
Section: graphics
Architecture: any
+Replaces: kamera-trinity (<< 4:14.0.0)
+Breaks: kamera-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
Description: digital camera io_slave for Konqueror
@@ -54,6 +60,8 @@ Description: digital camera io_slave for Konqueror
Package: kcoloredit-trinity
Section: graphics
Architecture: any
+Replaces: kcoloredit-trinity (<< 4:14.0.0)
+Breaks: kcoloredit-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
Description: a color palette editor and color picker for KDE
@@ -66,6 +74,8 @@ Description: a color palette editor and color picker for KDE
Package: tdegraphics-trinity-dev
Section: devel
Architecture: any
+Replaces: kdegraphics-trinity-dev (<< 4:14.0.0)
+Breaks: kdegraphics-trinity-dev (<< 4:14.0.0)
Depends: kghostview-trinity (= ${binary:Version}), kmrml-trinity (= ${binary:Version}), kpovmodeler-trinity (= ${binary:Version}), ksvg-trinity (= ${binary:Version}), kview-trinity (= ${binary:Version}), kviewshell-trinity (= ${binary:Version}), tdelibs4-trinity-dev (>= 4:3.5.8)
Description: development files for the KDE graphics module
This package contains headers and other development files for the KDE
@@ -77,6 +87,8 @@ Description: development files for the KDE graphics module
Package: tdegraphics-kfile-plugins-trinity
Section: kde
Architecture: any
+Replaces: kdegraphics-kfile-plugins-trinity (<< 4:14.0.0)
+Breaks: kdegraphics-kfile-plugins-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: KDE metainfo plugins for graphic files
This packages provides meta information for graphic files (file sizes,
@@ -88,9 +100,10 @@ Description: KDE metainfo plugins for graphic files
Package: kdvi-trinity
Section: graphics
Architecture: any
+Replaces: kdvi-trinity (<< 4:14.0.0)
+Breaks: kdvi-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, texlive-fonts-recommended
Suggests: khelpcenter-trinity
-Replaces: tdebase-data-trinity (<< 4:3.3.91)
Description: dvi viewer for KDE
This program and KPart allow the user to display *.DVI files from TeX.
.
@@ -100,6 +113,8 @@ Description: dvi viewer for KDE
Package: kfax-trinity
Section: graphics
Architecture: any
+Replaces: kfax-trinity (<< 4:14.0.0)
+Breaks: kfax-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, libtiff-tools
Description: G3/G4 fax viewer for Trinity
A fax viewer for Trinity, supporting the display of raw and tiffed fax images
@@ -111,6 +126,8 @@ Description: G3/G4 fax viewer for Trinity
Package: kfaxview-trinity
Section: graphics
Architecture: any
+Replaces: kfaxview-trinity (<< 4:14.0.0)
+Breaks: kfaxview-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: G3/G4 fax viewer for Trinity using kviewshell
A fax viewer for Trinity, supporting the display of raw and tiffed fax images
@@ -125,6 +142,8 @@ Description: G3/G4 fax viewer for Trinity using kviewshell
Package: kgamma-trinity
Section: graphics
Architecture: any
+Replaces: kgamma-trinity (<< 4:14.0.0)
+Breaks: kgamma-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
Description: gamma correction module for the Trinity Control Center
@@ -140,6 +159,8 @@ Description: gamma correction module for the Trinity Control Center
Package: kghostview-trinity
Section: graphics
Architecture: any
+Replaces: kghostview-trinity (<< 4:14.0.0)
+Breaks: kghostview-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, ghostscript
Suggests: khelpcenter-trinity
Provides: postscript-viewer, pdf-viewer
@@ -157,6 +178,8 @@ Description: PostScript viewer for Trinity
Package: kiconedit-trinity
Section: graphics
Architecture: any
+Replaces: kiconedit-trinity (<< 4:14.0.0)
+Breaks: kiconedit-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
Description: an icon editor for Trinity
@@ -168,6 +191,8 @@ Description: an icon editor for Trinity
Package: kmrml-trinity
Section: kde
Architecture: any
+Replaces: kmrml-trinity (<< 4:14.0.0)
+Breaks: kmrml-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Recommends: gnuift
Description: a Konqueror plugin for searching pictures
@@ -182,6 +207,8 @@ Description: a Konqueror plugin for searching pictures
Package: kolourpaint-trinity
Section: graphics
Architecture: any
+Replaces: kolourpaint-trinity (<< 4:14.0.0)
+Breaks: kolourpaint-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
Description: a simple paint program for Trinity
@@ -205,6 +232,8 @@ Description: a simple paint program for Trinity
Package: kooka-trinity
Section: graphics
Architecture: any
+Replaces: kooka-trinity (<< 4:14.0.0)
+Breaks: kooka-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Recommends: ocrad | gocr
Suggests: khelpcenter-trinity
@@ -229,6 +258,8 @@ Description: scanner program for Trinity
Package: kpdf-trinity
Section: graphics
Architecture: any
+Replaces: kpdf-trinity (<< 4:14.0.0)
+Breaks: kpdf-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Recommends: kghostview-trinity (= ${binary:Version})
Suggests: khelpcenter-trinity
@@ -244,6 +275,8 @@ Description: PDF viewer for Trinity
Package: kpovmodeler-trinity
Section: graphics
Architecture: any
+Replaces: kpovmodeler-trinity (<< 4:14.0.0)
+Breaks: kpovmodeler-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity, povray
Description: a graphical editor for povray scenes
@@ -267,6 +300,8 @@ Description: a graphical editor for povray scenes
Package: kruler-trinity
Section: graphics
Architecture: any
+Replaces: kruler-trinity (<< 4:14.0.0)
+Breaks: kruler-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
Description: a screen ruler and color measurement tool for Trinity
@@ -278,9 +313,10 @@ Description: a screen ruler and color measurement tool for Trinity
Package: ksnapshot-trinity
Section: graphics
Architecture: any
+Replaces: ksnapshot-trinity (<< 4:14.0.0)
+Breaks: ksnapshot-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
-Replaces: tdebase-data-trinity (<< 4:3.3.91)
Description: screenshot utility for Trinity
KSnapshot is a simple applet for taking screenshots. It is capable of
capturing images of either the whole desktop or just a single window.
@@ -292,6 +328,8 @@ Description: screenshot utility for Trinity
Package: ksvg-trinity
Section: graphics
Architecture: any
+Replaces: ksvg-trinity (<< 4:14.0.0)
+Breaks: ksvg-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: SVG viewer for Trinity
KSVG allows you view SVG (scalable vector graphics) files. This package
@@ -304,6 +342,8 @@ Description: SVG viewer for Trinity
Package: kview-trinity
Section: graphics
Architecture: any
+Replaces: kview-trinity (<< 4:14.0.0)
+Breaks: kview-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
Description: simple image viewer/converter for Trinity
@@ -317,6 +357,8 @@ Description: simple image viewer/converter for Trinity
Package: kviewshell-trinity
Section: graphics
Architecture: any
+Replaces: kviewshell-trinity (<< 4:14.0.0)
+Breaks: kviewshell-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: generic framework for viewer applications in Trinity
KViewShell is a generic viewing framework that allows the graphical
@@ -332,6 +374,8 @@ Description: generic framework for viewer applications in Trinity
Package: libkscan-trinity-dev
Section: libdevel
Architecture: any
+Replaces: libkscan-trinity-dev (<< 4:14.0.0)
+Breaks: libkscan-trinity-dev (<< 4:14.0.0)
Depends: libkscan1-trinity (= ${binary:Version}), tdelibs4-trinity-dev (>= 4:3.5.8)
Description: development files for the Trinity scanner library
This package contains development files for Trinity's scanner library.
@@ -342,6 +386,8 @@ Description: development files for the Trinity scanner library
Package: libkscan1-trinity
Section: libs
Architecture: any
+Replaces: libkscan1-trinity (<< 4:14.0.0)
+Breaks: libkscan1-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: scanner library for Trinity
KScan is KDE's scanner library. It's used by kooka and by koffice currently.
@@ -354,6 +400,8 @@ Description: scanner library for Trinity
Package: libpoppler-tqt
Section: net
Architecture: any
+Replaces: libpoppler-tqt (<< 4:14.0.0)
+Breaks: libpoppler-tqt (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: TQt support for Poppler
TQt support library for Poppler.
@@ -365,6 +413,8 @@ Description: TQt support for Poppler
Package: libpoppler-tqt-dev
Section: net
Architecture: any
+Replaces: libpoppler-tqt-dev (<< 4:14.0.0)
+Breaks: libpoppler-tqt-dev (<< 4:14.0.0)
Depends: ${shlibs:Depends}, libpoppler-dev, libpoppler-tqt
Description: Development files for TQt support for Poppler
Development files of TQt support library for Poppler.
@@ -376,6 +426,8 @@ Description: Development files for TQt support for Poppler
Package: tdegraphics-trinity-dbg
Section: libdevel
Architecture: any
+Replaces: kdegraphics-trinity-dbg (<< 4:14.0.0)
+Breaks: kdegraphics-trinity-dbg (<< 4:14.0.0)
Priority: extra
Depends: tdelibs-trinity-dbg, libkscan1-trinity (= ${binary:Version})
Description: debugging symbols for tdegraphics
diff --git a/debian/lenny/tdelibs/debian/control b/debian/lenny/tdelibs/debian/control
index c539fdb5f..1ec5ceced 100644
--- a/debian/lenny/tdelibs/debian/control
+++ b/debian/lenny/tdelibs/debian/control
@@ -3,7 +3,7 @@ Section: libs
Priority: optional
Maintainer: Timothy Pearson
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers
-Uploaders: Adeodato Simó , Ana Beatriz Guerrero Lopez , Daniel Schepler , Fathi Boudra , Sune Vuorela
+Uploaders: Adeodato Sim , Ana Beatriz Guerrero Lopez , Daniel Schepler , Fathi Boudra , Sune Vuorela
Build-Depends: cdbs (>= 0.4.41ubuntu2), debhelper (>= 5.0.31), autotools-dev,
binutils (>= 2.14.90.0.7), docbook-to-man, gawk, gettext,
libart-2.0-dev (>= 2.3.17), libarts1-trinity-dev (>= 1.5.0), libacl1-dev,
@@ -15,7 +15,7 @@ Build-Depends: cdbs (>= 0.4.41ubuntu2), debhelper (>= 5.0.31), autotools-dev,
libtiff4-dev (>= 3.7.3-1), libavahi-client-dev (>= 0.4),
libxml2-dev, libxml2-utils, libxslt1-dev,
sharutils, texinfo, libogg-dev-la, libtqtinterface-dev,
- gettext-kde, lsb-release, base-files, sudo,
+ gettext-kde, lsb-release, base-files, sudo, libr-dev,
cmake, libltdl-dev
Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11
Standards-Version: 3.8.3
@@ -23,6 +23,8 @@ Standards-Version: 3.8.3
Package: tdelibs-trinity
Section: libs
Architecture: all
+Replaces: kdelibs-trinity (<< 4:14.0.0)
+Breaks: kdelibs-trinity (<< 4:14.0.0)
Provides: tdelibs
Depends: tdelibs4c2a-trinity (>= ${Source-Version}),
tdelibs-data-trinity (>= ${Source-Version})
@@ -39,13 +41,10 @@ Description: core libraries from the official Trinity release
Package: tdelibs-data-trinity
Section: libs
Architecture: all
+Replaces: kdelibs-data-trinity (<< 4:14.0.0)
+Breaks: kdelibs-data-trinity (<< 4:14.0.0)
Depends: hicolor-icon-theme
Provides: tdelibs-data
-Replaces: tdeartwork-style-trinity (<< 7:3.4.0), konq-plugins-trinity (<< 7:3.4.0),
- ksvg-trinity (<< 7:3.4.0), kpackage-trinity (<< 4:3.4.2), kicker-trinity (<< 4:3.5-rc1),
- kttsd-trinity (<< 4:3.5-rc1), tdevelop3-data-trinity (<< 4:3.3.0), libdjvulibre1,
- libdjvulibre15 (<< 3.5.16-2), krita (= 1:1.4.90.1-1), digikam-trinity (<< 0.8.1-3),
- kaffeine-trinity (<< 0.8.1-3)
Description: core shared data for all TDE applications
This package contains all the architecture independent data files
commonly used by TDE applications. You need these data files to run
@@ -57,15 +56,14 @@ Description: core shared data for all TDE applications
Package: tdelibs4c2a-trinity
Section: libs
Architecture: any
+Replaces: kdelibs4c2a-trinity (<< 4:14.0.0)
+Breaks: kdelibs4c2a-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, tdelibs-data-trinity,
tdelibs-data-trinity, perl, xbase-clients,
launchpad-integration, sudo
Recommends: xdg-user-dirs
Suggests: fam, perl-suid
Conflicts: tdelibs4-trinity, tdelibs4c2-trinity (>> 4:1.0.0), tdelibs-bin-trinity (<< 4:3.3.3), tdelibs4-trinity-dev (<< 4:3.5.7.dfsg.1-6)
-Replaces: tdelibs4-trinity, tdeartwork-style-trinity,
- kcontrol-trinity, tdelibs-bin-trinity (<< 4:3.5.3-1),
- tdelibs4-trinity-dev (= 4:3.5.7.dfsg.1-5)
Description: core libraries and binaries for all TDE applications
This package contains all the shared libraries and common core binaries
used by all TDE applications. You need these libraries and binaries to
@@ -80,6 +78,8 @@ Description: core libraries and binaries for all TDE applications
Package: tdelibs4-trinity-dev
Section: libdevel
Architecture: any
+Replaces: kdelibs4-trinity-dev (<< 4:14.0.0)
+Breaks: kdelibs4-trinity-dev (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity (= ${Source-Version}), libart-2.0-dev (>= 2.3.17),
libarts1-trinity-dev (>= 1.5.0), ${libasound2-dev}, libacl1-dev, libattr1-dev,
libaspell-dev, hspell, libbz2-dev, libcupsys2-dev,
@@ -88,9 +88,8 @@ Depends: tdelibs4c2a-trinity (= ${Source-Version}), libart-2.0-dev (>= 2.3.17),
libsasl2-dev, libssl-dev, libxcomposite-dev,
libtiff4-dev (>= 3.7.3-1), libxml2-dev, libxml2-utils, libxslt1-dev,
libavahi-client-dev (>= 0.4), libtqtinterface-dev,
- gettext-kde
+ gettext-kde, libr-dev
Provides: tdelibs-trinity-dev
-Replaces: tdebase-trinity-dev (<< 7:3.4.0), tdelibs4c2a-trinity (<< 4:3.5.8-3ubuntu2)
Description: development files for the TDE core libraries
This package contains all the headers and other related files needed
to compile TDE applications, or develop applications which use the
@@ -102,6 +101,8 @@ Description: development files for the TDE core libraries
Package: tdelibs4-trinity-doc
Section: doc
Architecture: all
+Replaces: kdelibs4-trinity-doc (<< 4:14.0.0)
+Breaks: kdelibs4-trinity-doc (<< 4:14.0.0)
Provides: tdelibs-trinity-doc
Description: developer documentation for the TDE core libraries
This package contains documentation for the core TDE libraries, of
@@ -114,9 +115,10 @@ Description: developer documentation for the TDE core libraries
Package: tdelibs-trinity-dbg
Section: libdevel
Architecture: any
+Replaces: kdelibs-trinity-dbg (<< 4:14.0.0)
+Breaks: kdelibs-trinity-dbg (<< 4:14.0.0)
Priority: extra
Conflicts: tdelibs4-trinity-dbg, tdelibs4c2-trinity-dbg, tdelibs4c2a-trinity-dbg
-Replaces: tdelibs4-trinity-dbg, tdelibs4c2-trinity-dbg, tdelibs4c2a-trinity-dbg
Depends: tdelibs4c2a-trinity (= ${Source-Version}), libtqtinterface-dbg, libc6-dbg [amd64]
Description: debugging symbols for tdelibs
This package contains the debugging symbols associated with tdelibs.
diff --git a/debian/lenny/tdelibs/debian/rules b/debian/lenny/tdelibs/debian/rules
index 119f2a4fe..73323de78 100755
--- a/debian/lenny/tdelibs/debian/rules
+++ b/debian/lenny/tdelibs/debian/rules
@@ -21,7 +21,7 @@ version=Debian Package $(DEB_VERSION)
DEB_OPT_FLAG += -DDEBIAN_VERSION=$(DEB_VERSION)
DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/kde" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" \
--DWITH_LIBART="ON" -DWITH_LIBIDN="ON" -DWITH_TIFF="ON" -DWITH_JASPER="ON" -DWITH_OPENEXR="ON" -DWITH_AVAHI="ON" -DWITH_ASPELL="ON" -DWITH_HSPELL="ON"
+-DWITH_LIBART="ON" -DWITH_LIBIDN="ON" -DWITH_TIFF="ON" -DWITH_JASPER="ON" -DWITH_OPENEXR="ON" -DWITH_AVAHI="ON" -DWITH_ASPELL="ON" -DWITH_HSPELL="ON" -DWITH_ELFICON="ON"
# Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to
# never build in parallel, regardless of DEB_BUILD_OPTIONS.
diff --git a/debian/lenny/tdelibs/debian/tdelibs4c2a-trinity.install b/debian/lenny/tdelibs/debian/tdelibs4c2a-trinity.install
index 91c12cb5b..3887f606d 100644
--- a/debian/lenny/tdelibs/debian/tdelibs4c2a-trinity.install
+++ b/debian/lenny/tdelibs/debian/tdelibs4c2a-trinity.install
@@ -50,6 +50,7 @@ debian/tmp/opt/trinity/bin/lnusertemp
debian/tmp/opt/trinity/bin/make_driver_db_cups
debian/tmp/opt/trinity/bin/make_driver_db_lpr
debian/tmp/opt/trinity/bin/meinproc
+debian/tmp/opt/trinity/bin/tdelfeditor
debian/tmp/opt/trinity/bin/start_tdeinit
debian/tmp/opt/trinity/bin/start_tdeinit_wrapper
debian/tmp/opt/trinity/lib/trinity/cupsdconf.la
@@ -314,3 +315,6 @@ debian/tmp/opt/trinity/lib/libkwalletclient.so.1
debian/tmp/opt/trinity/lib/libkwalletclient.so.1.0.1
debian/tmp/opt/trinity/lib/libvcard.so.0
debian/tmp/opt/trinity/lib/libvcard.so.0.0.0
+debian/tmp/opt/trinity/share/services/kfile_elf.desktop
+debian/tmp/opt/trinity/lib/trinity/kfile_elf.so
+debian/tmp/opt/trinity/lib/trinity/kfile_elf.la
diff --git a/debian/lenny/tdemultimedia/debian/control b/debian/lenny/tdemultimedia/debian/control
index ef581ed59..6cdd95e02 100644
--- a/debian/lenny/tdemultimedia/debian/control
+++ b/debian/lenny/tdemultimedia/debian/control
@@ -10,6 +10,8 @@ Standards-Version: 3.8.4
Package: tdemultimedia-trinity
Section: kde
Architecture: all
+Replaces: kdemultimedia-trinity (<< 4:14.0.0)
+Breaks: kdemultimedia-trinity (<< 4:14.0.0)
Depends: artsbuilder-trinity (>= ${Source-Version}), juk-trinity (>= ${Source-Version}), kaboodle-trinity (>= ${Source-Version}), kaudiocreator-trinity (>= ${Source-Version}), tdemultimedia-kappfinder-data-trinity (>= ${Source-Version}), tdemultimedia-kfile-plugins-trinity (>= ${Source-Version}), tdemultimedia-kio-plugins-trinity (>= ${Source-Version}), kmid-trinity (>= ${Source-Version}), kmix-trinity (>= ${Source-Version}), krec-trinity (>= ${Source-Version}), kscd-trinity (>= ${Source-Version}), libarts1-akode-trinity (>= ${Source-Version}), libarts1-audiofile-trinity (>= ${Source-Version}), libarts1-mpeglib-trinity (>= ${Source-Version}), libarts1-xine-trinity (>= ${Source-Version}), mpeglib-trinity (>= ${Source-Version}), noatun-trinity (>= ${Source-Version})
Suggests: tdemultimedia-trinity-doc-html (>= ${Source-Version})
Description: multimedia apps from the official Trinity release
@@ -27,9 +29,10 @@ Description: multimedia apps from the official Trinity release
Package: tdemultimedia-trinity-dev
Section: devel
Architecture: any
+Replaces: kdemultimedia-trinity-dev (<< 4:14.0.0)
+Breaks: kdemultimedia-trinity-dev (<< 4:14.0.0)
Depends: tdelibs4-trinity-dev (>= 4:3.5.7), artsbuilder-trinity (= ${Source-Version}), tdemultimedia-kio-plugins-trinity (= ${Source-Version}), kmid-trinity (= ${Source-Version}), kmix-trinity (= ${Source-Version}), krec-trinity (= ${Source-Version}), kscd-trinity (= ${Source-Version}), libarts1-akode-trinity (= ${Source-Version}), libarts1-mpeglib-trinity (= ${Source-Version}), libkcddb1-trinity (= ${Source-Version}), mpeglib-trinity (= ${Source-Version}), noatun-trinity (= ${Source-Version})
Conflicts: libmpeg-trinity-dev
-Replaces: artsbuilder-trinity (<< 4:3.0.0), mpeglib-trinity (<< 4:3.0.0), noatun-trinity (<< 4:3.0.0)
Description: development files for the Trinity multimedia module
Development files and headers for the Trinity multimedia module.
.
@@ -39,6 +42,8 @@ Description: development files for the Trinity multimedia module
Package: tdemultimedia-trinity-doc-html
Architecture: all
Section: doc
+Replaces: kdemultimedia-trinity-doc-html (<< 4:14.0.0)
+Breaks: kdemultimedia-trinity-doc-html (<< 4:14.0.0)
Suggests: konqueror-trinity | www-browser, tdebase-trinity
Description: Trinity multimedia documentation in HTML format
By default the modules provided by KDE only provide their documentation
@@ -57,9 +62,10 @@ Description: Trinity multimedia documentation in HTML format
Package: artsbuilder-trinity
Section: sound
Architecture: any
+Replaces: artsbuilder-trinity (<< 4:14.0.0)
+Breaks: artsbuilder-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
-Replaces: tdebase-data-trinity (<< 4:3.3.91), tdemultimedia-dev-trinity (<< 4:3.5.0-2)
Description: synthesizer designer for aRts
This is the analog Realtime synthesizer's graphical design tool.
.
@@ -69,6 +75,8 @@ Description: synthesizer designer for aRts
Package: juk-trinity
Section: kde
Architecture: any
+Replaces: juk-trinity (<< 4:14.0.0)
+Breaks: juk-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
Description: music organizer and player for Trinity
@@ -95,6 +103,8 @@ Description: music organizer and player for Trinity
Package: kaboodle-trinity
Section: sound
Architecture: any
+Replaces: kaboodle-trinity (<< 4:14.0.0)
+Breaks: kaboodle-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Recommends: libarts1-xine-trinity
Suggests: khelpcenter-trinity
@@ -108,6 +118,8 @@ Description: light, embedded media player for Trinity
Package: kaudiocreator-trinity
Section: sound
Architecture: any
+Replaces: kaudiocreator-trinity (<< 4:14.0.0)
+Breaks: kaudiocreator-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, tdemultimedia-kio-plugins-trinity (= ${Source-Version})
Recommends: vorbis-tools, flac
Suggests: lame
@@ -122,8 +134,9 @@ Description: CD ripper and audio encoder frontend for Trinity
Package: tdemultimedia-kfile-plugins-trinity
Section: kde
Architecture: any
+Replaces: kdemultimedia-kfile-plugins-trinity (<< 4:14.0.0)
+Breaks: kdemultimedia-kfile-plugins-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
-Replaces: tdemultimedia-kio-plugins (<< 4:3.4.1-1)
Description: au/avi/m3u/mp3/ogg/wav plugins for kfile
au/avi/m3u/mp3/ogg/wav file metainformation plugins for Trinity.
.
@@ -133,6 +146,8 @@ Description: au/avi/m3u/mp3/ogg/wav plugins for kfile
Package: tdemultimedia-kappfinder-data-trinity
Section: kde
Architecture: any
+Replaces: kdemultimedia-kappfinder-data-trinity (<< 4:14.0.0)
+Breaks: kdemultimedia-kappfinder-data-trinity (<< 4:14.0.0)
Depends: kappfinder-trinity
Description: multimedia data for kappfinder-trinity
This package provides data on multimedia applications for kappfinder-trinity.
@@ -143,9 +158,10 @@ Description: multimedia data for kappfinder-trinity
Package: tdemultimedia-kio-plugins-trinity
Section: kde
Architecture: any
+Replaces: kdemultimedia-kio-plugins-trinity (<< 4:14.0.0)
+Breaks: kdemultimedia-kio-plugins-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: lame
-Replaces: tdebase-kio-plugins-trinity (<< 4:3.4.0)
Description: enables the browsing of audio CDs under Konqueror
This package allow audio CDs to be browsed like a file system using
Konqueror and the audiocd:/ URL.
@@ -156,6 +172,8 @@ Description: enables the browsing of audio CDs under Konqueror
Package: kmid-trinity
Section: sound
Architecture: any
+Replaces: kmid-trinity (<< 4:14.0.0)
+Breaks: kmid-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
Description: MIDI/karaoke player for Trinity
@@ -167,6 +185,8 @@ Description: MIDI/karaoke player for Trinity
Package: kmix-trinity
Section: sound
Architecture: any
+Replaces: kmix-trinity (<< 4:14.0.0)
+Breaks: kmix-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
Provides: x-audio-mixer
@@ -179,6 +199,8 @@ Description: sound mixer applet for Trinity
Package: krec-trinity
Section: sound
Architecture: any
+Replaces: krec-trinity (<< 4:14.0.0)
+Breaks: krec-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
Description: sound recorder utility for Trinity
@@ -190,6 +212,8 @@ Description: sound recorder utility for Trinity
Package: kscd-trinity
Section: sound
Architecture: any
+Replaces: kscd-trinity (<< 4:14.0.0)
+Breaks: kscd-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter
Description: audio CD player for Trinity
@@ -201,8 +225,9 @@ Description: audio CD player for Trinity
Package: libarts1-akode-trinity
Section: libs
Architecture: any
+Replaces: libarts1-akode-trinity (<< 4:14.0.0)
+Breaks: libarts1-akode-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
-Replaces: libakode2-trinity (<< 2-beta3-2), akode-trinity
Description: akode plugin for aRts
This package contains akode plugins for aRts.
.
@@ -212,6 +237,8 @@ Description: akode plugin for aRts
Package: libarts1-audiofile-trinity
Section: libs
Architecture: any
+Replaces: libarts1-audiofile-trinity (<< 4:14.0.0)
+Breaks: libarts1-audiofile-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: audiofile plugin for aRts
This package contains audiofile plugins for aRts.
@@ -222,6 +249,8 @@ Description: audiofile plugin for aRts
Package: libarts1-mpeglib-trinity
Section: libs
Architecture: any
+Replaces: libarts1-mpeglib-trinity (<< 4:14.0.0)
+Breaks: libarts1-mpeglib-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: mpeglib plugin for aRts, supporting mp3 and mpeg audio/video
This package contains the mpeglib aRts plugin, supporting mp3 and mpeg
@@ -235,6 +264,8 @@ Description: mpeglib plugin for aRts, supporting mp3 and mpeg audio/video
Package: libarts1-xine-trinity
Section: libs
Architecture: any
+Replaces: libarts1-xine-trinity (<< 4:14.0.0)
+Breaks: libarts1-xine-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: aRts plugin enabling xine support
This package contains aRts' xine plugin, allowing the use of the xine
@@ -246,6 +277,8 @@ Description: aRts plugin enabling xine support
Package: libkcddb1-trinity
Section: libs
Architecture: any
+Replaces: libkcddb1-trinity (<< 4:14.0.0)
+Breaks: libkcddb1-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: CDDB library for Trinity
The Trinity native CDDB (CD Data Base) library, providing easy access to Audio
@@ -258,9 +291,10 @@ Description: CDDB library for Trinity
Package: mpeglib-trinity
Section: libs
Architecture: any
+Replaces: mpeglib-trinity (<< 4:14.0.0)
+Breaks: mpeglib-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Recommends: libarts1-mpeglib-trinity (= ${Source-Version})
-Replaces: tdemultimedia-trinity-dev (<< 4:3.5.2-1)
Description: MP3 and MPEG-1 audio and video library
mpeglib is a MPEG-1 and MP3 audio and video library. It supports
MPEG-1 audio (layers 1, 2, 3), MPEG-1 video, MPEG-1 system layer,
@@ -272,6 +306,8 @@ Description: MP3 and MPEG-1 audio and video library
Package: noatun-trinity
Section: sound
Architecture: any
+Replaces: noatun-trinity (<< 4:14.0.0)
+Breaks: noatun-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity, noatun-plugins-trinity
Description: media player for Trinity
@@ -284,6 +320,8 @@ Description: media player for Trinity
Package: tdemultimedia-trinity-dbg
Section: libdevel
Architecture: any
+Replaces: kdemultimedia-trinity-dbg (<< 4:14.0.0)
+Breaks: kdemultimedia-trinity-dbg (<< 4:14.0.0)
Priority: extra
Depends: tdelibs-trinity-dbg, libkcddb1-trinity (= ${Source-Version})
Description: debugging symbols for tdemultimedia
diff --git a/debian/lenny/tdenetwork/debian/control b/debian/lenny/tdenetwork/debian/control
index 2a120d709..1ce66043d 100644
--- a/debian/lenny/tdenetwork/debian/control
+++ b/debian/lenny/tdenetwork/debian/control
@@ -10,6 +10,8 @@ Standards-Version: 3.8.4
Package: tdenetwork-trinity
Section: kde
Architecture: all
+Replaces: kdenetwork-trinity (<< 4:14.0.0)
+Breaks: kdenetwork-trinity (<< 4:14.0.0)
Depends: dcoprss-trinity (>= ${Source-Version}), tdenetwork-kfile-plugins-trinity (>= ${Source-Version}), kdict-trinity (>= ${Source-Version}), kdnssd-trinity (>= ${Source-Version}), kget-trinity (>= ${Source-Version}), knewsticker-trinity (>= ${Source-Version}), kopete-trinity (>= ${Source-Version}), kpf-trinity (>= ${Source-Version}), kppp-trinity (>= ${Source-Version}), krdc-trinity (>= ${Source-Version}), krfb-trinity (>= ${Source-Version}), ksirc-trinity (>= ${Source-Version}), kwifimanager-trinity (>= ${Source-Version}), librss1-trinity (>= ${Source-Version})
Recommends: tdenetwork-filesharing-trinity (>= ${Source-Version}), ktalkd-trinity (>= ${Source-Version}), lisa-trinity (>= ${Source-Version})
Suggests: tdenetwork-trinity-doc-html (>= ${Source-Version})
@@ -25,6 +27,8 @@ Description: network-related apps from the official Trinity release
Package: dcoprss-trinity
Section: net
Architecture: any
+Replaces: dcoprss-trinity (<< 4:14.0.0)
+Breaks: dcoprss-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: RSS utilities for Trinity
tdenetwork-dcoprss is a RSS to DCOP bridge, allowing all
@@ -40,6 +44,8 @@ Description: RSS utilities for Trinity
Package: tdenetwork-trinity-doc-html
Architecture: all
Section: doc
+Replaces: kdenetwork-trinity-doc-html (<< 4:14.0.0)
+Breaks: kdenetwork-trinity-doc-html (<< 4:14.0.0)
Suggests: konqueror-trinity | www-browser, tdebase-trinity
Description: Trinity network documentation in HTML format
By default the modules provided by KDE only provide their documentation
@@ -58,6 +64,8 @@ Description: Trinity network documentation in HTML format
Package: tdenetwork-kfile-plugins-trinity
Section: kde
Architecture: any
+Replaces: kdenetwork-kfile-plugins-trinity (<< 4:14.0.0)
+Breaks: kdenetwork-kfile-plugins-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Enhances: konqueror-trinity
Description: torrent metainfo plugin for Trinity
@@ -72,9 +80,10 @@ Description: torrent metainfo plugin for Trinity
Package: tdenetwork-filesharing-trinity
Section: net
Architecture: any
+Replaces: kdenetwork-filesharing-trinity (<< 4:14.0.0)
+Breaks: kdenetwork-filesharing-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Recommends: perl-suid
-Replaces: kcontrol-trinity (<< 4:3.3.0)
Description: network filesharing configuration module for Trinity
This package provides a KDE Control Center module to configure
NFS and Samba.
@@ -85,10 +94,11 @@ Description: network filesharing configuration module for Trinity
Package: kdict-trinity
Section: net
Architecture: any
+Replaces: kdict-trinity (<< 4:14.0.0)
+Breaks: kdict-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
Provides: dict-client-trinity
-Replaces: tdebase-data-trinity (<< 4:3.4.0)
Description: dictionary client for Trinity
KDict is an advanced KDE graphical client for the DICT Protocol, with full
Unicode support. It enables you to search through dictionary databases for a
@@ -101,6 +111,8 @@ Description: dictionary client for Trinity
Package: kget-trinity
Section: net
Architecture: any
+Replaces: kget-trinity (<< 4:14.0.0)
+Breaks: kget-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
Description: download manager for Trinity
@@ -117,6 +129,8 @@ Description: download manager for Trinity
Package: knewsticker-trinity
Section: kde
Architecture: any
+Replaces: knewsticker-trinity (<< 4:14.0.0)
+Breaks: knewsticker-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, kicker-trinity
Suggests: khelpcenter-trinity, knewsticker-scripts-trinity
Description: news ticker applet for Trinity
@@ -132,10 +146,11 @@ Description: news ticker applet for Trinity
Package: kopete-trinity
Section: kde
Architecture: any
+Replaces: kopete-trinity (<< 4:14.0.0)
+Breaks: kopete-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Recommends: qca-tls
Suggests: tdeartwork-emoticons-trinity, khelpcenter-trinity, imagemagick, gnupg, gnomemeeting
-Replaces: konversation-trinity (<= 0.14.0-4), sim (<= 0.9.3-2)
Description: instant messenger for Trinity
Kopete is an instant messenger program which can communicate with a variety
of IM systems, such as Yahoo, ICQ, MSN, IRC and Jabber.
@@ -154,6 +169,8 @@ Description: instant messenger for Trinity
Package: kpf-trinity
Section: net
Architecture: any
+Replaces: kpf-trinity (<< 4:14.0.0)
+Breaks: kpf-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
Description: public fileserver for Trinity
@@ -168,6 +185,8 @@ Description: public fileserver for Trinity
Package: kppp-trinity
Section: net
Architecture: any
+Replaces: kppp-trinity (<< 4:14.0.0)
+Breaks: kppp-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, ppp
Suggests: khelpcenter-trinity
Description: modem dialer and ppp frontend for Trinity
@@ -185,6 +204,8 @@ Description: modem dialer and ppp frontend for Trinity
Package: krdc-trinity
Section: net
Architecture: any
+Replaces: krdc-trinity (<< 4:14.0.0)
+Breaks: krdc-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
Recommends: rdesktop
@@ -199,6 +220,8 @@ Description: Remote Desktop Connection for Trinity
Package: krfb-trinity
Section: net
Architecture: any
+Replaces: krfb-trinity (<< 4:14.0.0)
+Breaks: krfb-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
Description: Desktop Sharing for Trinity
@@ -215,6 +238,8 @@ Description: Desktop Sharing for Trinity
Package: ksirc-trinity
Section: net
Architecture: any
+Replaces: ksirc-trinity (<< 4:14.0.0)
+Breaks: ksirc-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, ${perl:Depends}
Recommends: libio-socket-ssl-perl
Suggests: khelpcenter-trinity
@@ -231,12 +256,13 @@ Description: IRC client for Trinity
Package: ktalkd-trinity
Section: net
Priority: extra
+Replaces: ktalkd-trinity (<< 4:14.0.0)
+Breaks: ktalkd-trinity (<< 4:14.0.0)
Architecture: any
Depends: ${shlibs:Depends}, netbase, update-inetd
Recommends: talk, ytalk
Suggests: khelpcenter-trinity
Provides: talkd-trinity
-Replaces: talkd-trinity
Description: talk daemon for Trinity
KTalkd is an enhanced talk daemon - a program to handle incoming talk
requests, announce them and allow you to respond to it using a talk
@@ -249,6 +275,8 @@ Description: talk daemon for Trinity
Package: kwifimanager-trinity
Section: net
Architecture: any
+Replaces: kwifimanager-trinity (<< 4:14.0.0)
+Breaks: kwifimanager-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, wireless-tools
Suggests: khelpcenter-trinity
Description: wireless lan manager for Trinity
@@ -263,6 +291,8 @@ Description: wireless lan manager for Trinity
Package: librss1-trinity
Section: libs
Architecture: any
+Replaces: librss1-trinity (<< 4:14.0.0)
+Breaks: librss1-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: RSS library for Trinity
This is the runtime package for programs that use the KDE RSS library.
@@ -275,8 +305,9 @@ Description: RSS library for Trinity
Package: tdenetwork-trinity-dev
Section: devel
Architecture: any
+Replaces: kdenetwork-trinity-dev (<< 4:14.0.0)
+Breaks: kdenetwork-trinity-dev (<< 4:14.0.0)
Depends: kdict-trinity (= ${Source-Version}), kopete-trinity (= ${Source-Version}), ksirc-trinity (= ${Source-Version}), librss1-trinity (= ${Source-Version}), tdelibs4-trinity-dev (>= 4:3.5.8)
-Replaces: librss1-trinity-dev, kdict-trinity (<< 4:3.5.0-3)
Description: development files for the Trinity network module
This is the development package which contains the headers for the KDE RSS
library as well as the Kopete chat client, as well as miscellaneous
@@ -288,9 +319,10 @@ Description: development files for the Trinity network module
Package: lisa-trinity
Section: net
Architecture: any
+Replaces: lisa-trinity (<< 4:14.0.0)
+Breaks: lisa-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity, samba-common
-Replaces: konqueror-trinity (<< 4:3.3.0)
Description: LAN information server for Trinity
LISa is intended to provide KDE with a kind of "network neighborhood"
but relying only on the TCP/IP protocol.
@@ -301,6 +333,8 @@ Description: LAN information server for Trinity
Package: kdnssd-trinity
Section: net
Architecture: any
+Replaces: kdnssd-trinity (<< 4:14.0.0)
+Breaks: kdnssd-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Recommends: avahi-daemon
Suggests: avahi-autoipd | zeroconf
@@ -314,6 +348,8 @@ Description: Zeroconf support for KDE
Package: tdenetwork-trinity-dbg
Section: libdevel
Architecture: any
+Replaces: kdenetwork-trinity-dbg (<< 4:14.0.0)
+Breaks: kdenetwork-trinity-dbg (<< 4:14.0.0)
Priority: extra
Depends: librss1-trinity (= ${Source-Version}), tdelibs-trinity-dbg
Description: debugging symbols for tdenetwork-trinity
diff --git a/debian/lenny/tdepim/debian/control b/debian/lenny/tdepim/debian/control
index 5a742326e..848ece787 100644
--- a/debian/lenny/tdepim/debian/control
+++ b/debian/lenny/tdepim/debian/control
@@ -20,6 +20,8 @@ Standards-Version: 3.8.4
Package: tdepim-trinity
Section: kde
Architecture: all
+Replaces: kdepim-trinity (<< 4:14.0.0)
+Breaks: kdepim-trinity (<< 4:14.0.0)
Depends: akregator-trinity (>= ${Source-Version}), kaddressbook-trinity (>= ${Source-Version}), kalarm-trinity (>= ${Source-Version}), kandy-trinity (>= ${Source-Version}), karm-trinity (>= ${Source-Version}), tdepim-kfile-plugins-trinity (>= ${Source-Version}), tdepim-kio-plugins-trinity (>= ${Source-Version}), tdepim-kresources-trinity (>= ${Source-Version}), tdepim-wizards-trinity (>= ${Source-Version}), kitchensync-trinity (>= ${Source-Version}), kleopatra-trinity (>= ${Source-Version}), kmail-trinity (>= ${Source-Version}), kmailcvt-trinity (>= ${Source-Version}), knode-trinity (>= ${Source-Version}), knotes-trinity (>= ${Source-Version}), konsolekalendar-trinity (>= ${Source-Version}), kontact-trinity (>= ${Source-Version}), korganizer-trinity (>= ${Source-Version}), korn-trinity (>= ${Source-Version}), ktnef-trinity (>= ${Source-Version}), libindex0-trinity (>= ${Source-Version}), libkcal2b-trinity (>= ${Source-Version}), libtdepim1a-trinity (>= ${Source-Version}), libkgantt0-trinity (>= ${Source-Version}), libkleopatra1-trinity (>= ${Source-Version}), libkpimexchange1-trinity (>= ${Source-Version}), libkpimidentities1-trinity (>= ${Source-Version}), libksieve0-trinity (>= ${Source-Version}), libktnef1-trinity (>= ${Source-Version}), libmimelib1c2a-trinity (>= ${Source-Version})
Suggests: tdepim-trinity-doc-html
Description: Personal Information Management apps from the official Trinity release
@@ -36,6 +38,8 @@ Description: Personal Information Management apps from the official Trinity rele
Package: tdepim-trinity-dbg
Priority: extra
Section: libdevel
+Replaces: kdepim-trinity-dbg (<< 4:14.0.0)
+Breaks: kdepim-trinity-dbg (<< 4:14.0.0)
Depends: tdelibs-trinity-dbg
Architecture: any
Description: debugging symbols for tdepim-trinity
@@ -46,8 +50,9 @@ Description: debugging symbols for tdepim-trinity
Package: tdepim-trinity-dev
Section: devel
Architecture: any
+Replaces: kdepim-trinity-dev (<< 4:14.0.0)
+Breaks: kdepim-trinity-dev (<< 4:14.0.0)
Depends: kaddressbook-trinity (= ${Source-Version}), kalarm-trinity (= ${Source-Version}), tdepim-kresources-trinity (= ${Source-Version}), kmail-trinity (= ${Source-Version}), knotes-trinity (= ${Source-Version}), kontact-trinity (= ${Source-Version}), korganizer-trinity (= ${Source-Version}), libkpimidentities1-trinity (= ${Source-Version}), libkcal2-trinity-dev (= ${Source-Version}), libtdepim1-trinity-dev (= ${Source-Version}), libkgantt0-trinity-dev (= ${Source-Version}), libkleopatra1-trinity-dev (= ${Source-Version}), libkpimexchange1-trinity-dev (= ${Source-Version}), libksieve0-trinity-dev (= ${Source-Version}), libktnef1-trinity-dev (= ${Source-Version}), libmimelib1-trinity-dev (= ${Source-Version})
-Replaces: libkcal2-trinity-dev (<< 4:3.4.1), libmimelib1-trinity-dev (<< 4:3.4.2)
Description: KDE Personal Information Management [development]
This package contains development files needed to compile tdepim applications.
.
@@ -59,6 +64,8 @@ Description: KDE Personal Information Management [development]
Package: tdepim-trinity-doc
Section: doc
Architecture: all
+Replaces: kdepim-trinity-doc (<< 4:14.0.0)
+Breaks: kdepim-trinity-doc (<< 4:14.0.0)
Suggests: konqueror-trinity | www-browser, doc-base
Description: KDE Personal Information Management library documentation
KDE core library documentation. You need this documentation to develop KDE PIM
@@ -72,6 +79,8 @@ Description: KDE Personal Information Management library documentation
Package: tdepim-trinity-doc-html
Section: doc
Architecture: all
+Replaces: kdepim-trinity-doc-html (<< 4:14.0.0)
+Breaks: kdepim-trinity-doc-html (<< 4:14.0.0)
Suggests: konqueror-trinity | www-browser, tdepim-trinity
Description: KDE PIM documentation in HTML format
By default the Personal Information Management applications provided with
@@ -88,6 +97,8 @@ Description: KDE PIM documentation in HTML format
Package: akregator-trinity
Section: web
Architecture: any
+Replaces: akregator-trinity (<< 4:14.0.0)
+Breaks: akregator-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: RSS feed aggregator for KDE
aKregator is a fast, lightweight, and intuitive feed reader program
@@ -102,8 +113,9 @@ Description: RSS feed aggregator for KDE
Package: kaddressbook-trinity
Section: utils
Architecture: any
+Replaces: kaddressbook-trinity (<< 4:14.0.0)
+Breaks: kaddressbook-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
-Replaces: kontact-trinity (<< 4:3.5.7-1ubuntu5)
Conflicts: kontact-trinity (<< 4:3.5.7-1ubuntu5)
Suggests: tdepim-kresources-trinity, tdebase-kio-plugins-trinity
Description: KDE NG addressbook application
@@ -118,6 +130,8 @@ Description: KDE NG addressbook application
Package: kalarm-trinity
Section: kde
Architecture: any
+Replaces: kalarm-trinity (<< 4:14.0.0)
+Breaks: kalarm-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: kmix-trinity, kttsd-trinity
Description: Trinity alarm message, command and email scheduler
@@ -141,6 +155,8 @@ Description: Trinity alarm message, command and email scheduler
Package: kandy-trinity
Section: utils
Architecture: any
+Replaces: kandy-trinity (<< 4:14.0.0)
+Breaks: kandy-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: Trinity mobile phone utility
At the moment Kandy is more or less a terminal program with some special
@@ -156,7 +172,8 @@ Description: Trinity mobile phone utility
Package: karm-trinity
Section: utils
Architecture: any
-Replaces: kontact-trinity (<< 4:3.5.7-1ubuntu5)
+Replaces: karm-trinity (<< 4:14.0.0)
+Breaks: karm-trinity (<< 4:14.0.0)
Conflicts: kontact-trinity (<< 4:3.5.7-1ubuntu5)
Depends: ${shlibs:Depends}
Description: Trinity time tracker tool
@@ -169,6 +186,8 @@ Description: Trinity time tracker tool
Package: tdepim-kfile-plugins-trinity
Section: kde
Architecture: any
+Replaces: kdepim-kfile-plugins-trinity (<< 4:14.0.0)
+Breaks: kdepim-kfile-plugins-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: KDE File dialog plugins for palm and vcf files
File dialog plugins for palm and vcf files.
@@ -179,8 +198,9 @@ Description: KDE File dialog plugins for palm and vcf files
Package: tdepim-kio-plugins-trinity
Section: kde
Architecture: any
+Replaces: kdepim-kio-plugins-trinity (<< 4:14.0.0)
+Breaks: kdepim-kio-plugins-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
-Replaces: tdebase-kio-plugins-trinity (<< 4:3.4.0)
Description: Trinity pim I/O Slaves
This package includes the pim kioslaves. This includes imap4, sieve,
and mbox.
@@ -191,8 +211,9 @@ Description: Trinity pim I/O Slaves
Package: tdepim-kresources-trinity
Section: kde
Architecture: any
+Replaces: kdepim-kresources-trinity (<< 4:14.0.0)
+Breaks: kdepim-kresources-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
-Replaces: libkcal2a-trinity (<< 4:3.4.1), kaddressbook-trinity (<< 4:3.4.1), knotes-trinity (<< 4:3.4.1)
Recommends: ${shlibs:Recommends}, korganizer-trinity
Suggests: knotes-trinity
Description: Trinity pim resource plugins
@@ -206,8 +227,9 @@ Description: Trinity pim resource plugins
Package: tdepim-wizards-trinity
Section: kde
Architecture: any
+Replaces: kdepim-wizards-trinity (<< 4:14.0.0)
+Breaks: kdepim-wizards-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
-Replaces: tdepim-trinity-dev (<< 4:3.4.1-2)
Suggests: egroupware
Description: Trinity server configuration wizards
This package contains KDE-based wizards for configuring eGroupware,
@@ -219,10 +241,11 @@ Description: Trinity server configuration wizards
Package: kitchensync-trinity
Section: kde
Architecture: any
+Replaces: kitchensync-trinity (<< 4:14.0.0)
+Breaks: kitchensync-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: konqueror-trinity
Conflicts: kdebluetooth-irmcsync-trinity (<< 0.99+1.0beta2-4.1), ksync-trinity
-Replaces: ksync-trinity
Description: Synchronization framework
This package contains a synchronization framework, still under heavy
development (?). Kitchensync uses opensync.
@@ -233,6 +256,8 @@ Description: Synchronization framework
Package: kleopatra-trinity
Section: net
Architecture: any
+Replaces: kleopatra-trinity (<< 4:14.0.0)
+Breaks: kleopatra-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, gnupg-agent, gnupg2, gpgsm, dirmngr, pinentry-qt | pinentry-x11
Description: Trinity Certificate Manager
Kleopatra is the KDE tool for managing X.509 certificates in the gpgsm
@@ -244,11 +269,12 @@ Description: Trinity Certificate Manager
Package: kmail-trinity
Section: mail
Architecture: any
+Replaces: kmail-trinity (<< 4:14.0.0)
+Breaks: kmail-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, ${perl:Depends}, tdepim-kio-plugins-trinity, tdebase-kio-plugins-trinity, gpgsm, gnupg-agent, pinentry-qt | pinentry-x11
Recommends: procmail
Suggests: gnupg, gnupg-agent, pinentry-qt | pinentry-x11, kaddressbook-trinity, kleopatra-trinity, spamassassin | bogofilter | annoyance-filter | spambayes | bsfilter | crm114, clamav | f-prot-installer
Conflicts: kontact-trinity (<< 4:3.5.7-1ubuntu5)
-Replaces: tdepim-trinity-dev (<< 4:3.4.0), tdebase-trinity-data (<< 4:3.4.0), kontact-trinity (<< 4:3.5.7-1ubuntu5)
Provides: imap-client, mail-reader
Description: Trinity Email client
KMail is a fully-featured email client that fits nicely into the KDE
@@ -266,6 +292,8 @@ Description: Trinity Email client
Package: kmailcvt-trinity
Section: mail
Architecture: any
+Replaces: kmailcvt-trinity (<< 4:14.0.0)
+Breaks: kmailcvt-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, kmail-trinity
Description: Trinity KMail mail folder converter
Converts mail folders to KMail format. Formats supported for import
@@ -277,8 +305,9 @@ Description: Trinity KMail mail folder converter
Package: knode-trinity
Section: news
Architecture: any
+Replaces: knode-trinity (<< 4:14.0.0)
+Breaks: knode-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
-Replaces: tdepim-trinity-dev (<< 4:3.4.0), kontact-trinity (<< 4:3.5.7-1ubuntu2)
Provides: news-reader
Description: Trinity news reader
KNode is an easy-to-use, convenient newsreader. It is intended to be usable
@@ -292,9 +321,10 @@ Description: Trinity news reader
Package: knotes-trinity
Section: kde
Architecture: any
+Replaces: knotes-trinity (<< 4:14.0.0)
+Breaks: knotes-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: tdepim-kresources-trinity
-Replaces: kontact-trinity (<< 4:3.5.7-1ubuntu5)
Conflicts: kontact-trinity (<< 4:3.5.7-1ubuntu5)
Description: Trinity sticky notes
KNotes is a program that lets you write sticky notes. The notes are saved
@@ -307,6 +337,8 @@ Description: Trinity sticky notes
Package: kode-trinity
Section: devel
Architecture: any
+Replaces: kode-trinity (<< 4:14.0.0)
+Breaks: kode-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: Helper library for programmatic generation of C++ code
This package includes a program kode for generation of C++ template files
@@ -319,6 +351,8 @@ Description: Helper library for programmatic generation of C++ code
Package: konsolekalendar-trinity
Section: kde
Architecture: any
+Replaces: konsolekalendar-trinity (<< 4:14.0.0)
+Breaks: konsolekalendar-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: Trinity konsole personal organizer
KonsoleKalendar is a command-line interface to KDE calendars.
@@ -331,10 +365,11 @@ Description: Trinity konsole personal organizer
Package: kontact-trinity
Section: kde
Architecture: any
+Replaces: kontact-trinity (<< 4:14.0.0)
+Breaks: kontact-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, kmail-trinity, korganizer-trinity, kaddressbook-trinity
Recommends: ${shlibs:Recommends}, kmail-trinity, knode-trinity, knotes-trinity
Suggests: ${shlibs:Suggests}, akregator-trinity, knewsticker-trinity, kweather-trinity, gnokii
-Replaces: akregator-trinity (<< 4:3.4.0), akregator-kontact-plugin-trinity
Conflicts: akregator-kontact-plugin-trinity
Description: Trinity pim application
Kontact is the integrated solution to your personal information management
@@ -350,9 +385,10 @@ Description: Trinity pim application
Package: korganizer-trinity
Section: kde
Architecture: any
+Replaces: korganizer-trinity (<< 4:14.0.0)
+Breaks: korganizer-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, ${perl:Depends}
Recommends: kghostview-trinity
-Replaces: kontact-trinity (<< 4:3.5.7-1ubuntu5)
Conflicts: kontact-trinity (<< 4:3.5.7-1ubuntu5)
Description: Trinity personal organizer
This package contains KOrganizer, a calendar and scheduling program.
@@ -372,6 +408,8 @@ Description: Trinity personal organizer
Package: korn-trinity
Section: kde
Architecture: any
+Replaces: korn-trinity (<< 4:14.0.0)
+Breaks: korn-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, tdepim-kio-plugins-trinity, tdebase-kio-plugins-trinity
Description: Trinity mail checker
Korn is a KDE mail checker that can display a small summary in the Kicker
@@ -387,6 +425,8 @@ Description: Trinity mail checker
Package: ktnef-trinity
Section: kde
Architecture: any
+Replaces: ktnef-trinity (<< 4:14.0.0)
+Breaks: ktnef-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: Trinity TNEF viewer
The TNEF File Viewer allows you to handle mail attachments using the TNEF
@@ -399,6 +439,8 @@ Description: Trinity TNEF viewer
Package: libindex0-trinity
Section: libs
Architecture: any
+Replaces: libindex0-trinity (<< 4:14.0.0)
+Breaks: libindex0-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: Trinity indexing library
This library provides text indexing and is currently used by KMail
@@ -412,6 +454,8 @@ Description: Trinity indexing library
Package: libindex0-trinity-dev
Section: libdevel
Architecture: any
+Replaces: libindex0-trinity-dev (<< 4:14.0.0)
+Breaks: libindex0-trinity-dev (<< 4:14.0.0)
Depends: libindex0-trinity (= ${Source-Version})
Description: Trinity indexing library [development]
This library provides text indexing and is currently used by KMail
@@ -426,10 +470,11 @@ Description: Trinity indexing library [development]
Package: libkcal2b-trinity
Section: libs
Architecture: any
+Replaces: libkcal2b-trinity (<< 4:14.0.0)
+Breaks: libkcal2b-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Recommends: ${shlibs:Recommends}
Conflicts: libkcal2-trinity, libkcal2a-trinity
-Replaces: libkcal2a-trinity
Suggests: tdepim-kresources-trinity
Description: Trinity calendaring library
This library provides a C++ API for handling the vCalendar and iCalendar
@@ -443,8 +488,9 @@ Description: Trinity calendaring library
Package: libkcal2-trinity-dev
Section: libdevel
Architecture: any
+Replaces: libkcal2-trinity-dev (<< 4:14.0.0)
+Breaks: libkcal2-trinity-dev (<< 4:14.0.0)
Depends: libkcal2b-trinity (= ${Source-Version}), libtdepim1-trinity-dev (= ${Source-Version}), libktnef1-trinity-dev (= ${Source-Version})
-Replaces: tdepim-trinity-dev (<= 4:3.5.4-1)
Description: Trinity calendaring library [development]
This library provides a C++ API for handling the vCalendar and iCalendar
formats.
@@ -458,8 +504,9 @@ Description: Trinity calendaring library [development]
Package: libtdepim1a-trinity
Section: libs
Architecture: any
+Replaces: libkdepim1a-trinity (<< 4:14.0.0)
+Breaks: libkdepim1a-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
-Replaces: akregator-trinity (<< 4:3.4.0), libtdepim1-trinity, korganizer-trinity (<< 4:3.5.7-1ubuntu3)
Description: Trinity PIM library
This is the runtime package for programs that use the libtdepim-trinity library.
.
@@ -469,8 +516,9 @@ Description: Trinity PIM library
Package: libtdepim1-trinity-dev
Section: libdevel
Architecture: any
+Replaces: libkdepim1-trinity-dev (<< 4:14.0.0)
+Breaks: libkdepim1-trinity-dev (<< 4:14.0.0)
Depends: libtdepim1a-trinity (= ${Source-Version}), tdelibs4-trinity-dev (>= 4:3.5.7)
-Replaces: tdepim-trinity-dev (<< 4:3.4.1)
Description: Trinity PIM library [development]
This is the development package which contains the headers for the libtdepim-trinity
library.
@@ -481,6 +529,8 @@ Description: Trinity PIM library [development]
Package: libkgantt0-trinity
Section: libs
Architecture: any
+Replaces: libkgantt0-trinity (<< 4:14.0.0)
+Breaks: libkgantt0-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: Trinity gantt charting library
This is the runtime package for programs that use the libkgantt-trinity library.
@@ -491,6 +541,8 @@ Description: Trinity gantt charting library
Package: libkgantt0-trinity-dev
Section: libdevel
Architecture: any
+Replaces: libkgantt0-trinity-dev (<< 4:14.0.0)
+Breaks: libkgantt0-trinity-dev (<< 4:14.0.0)
Depends: libkgantt0-trinity (= ${Source-Version}), libtdepim1-trinity-dev (= ${Source-Version})
Description: Trinity gantt charting library [development]
This is the development package which contains the headers for the libkgantt-trinity
@@ -502,9 +554,10 @@ Description: Trinity gantt charting library [development]
Package: libkleopatra1-trinity
Section: libs
Architecture: any
+Replaces: libkleopatra1-trinity (<< 4:14.0.0)
+Breaks: libkleopatra1-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, ${perl:Depends}, gnupg
Conflicts: libkleopatra0-trinity
-Replaces: libtdenetwork2-trinity3, libkleopatra0a-trinity
Description: KDE GnuPG interface libraries
This library is used by several KDE applications to interface to the
GnuPG program.
@@ -517,9 +570,10 @@ Description: KDE GnuPG interface libraries
Package: libkleopatra1-trinity-dev
Section: libdevel
Architecture: any
+Replaces: libkleopatra1-trinity-dev (<< 4:14.0.0)
+Breaks: libkleopatra1-trinity-dev (<< 4:14.0.0)
Depends: libkleopatra1-trinity (= ${Source-Version}), libtdepim1-trinity-dev (= ${Source-Version})
Conflicts: libkleopatra0-trinity-dev
-Replaces: libkleopatra0-trinity-dev
Description: Trinity GnuPG interface libraries [development]
This library is used by several KDE applications to interface to the
GnuPG program.
@@ -533,9 +587,10 @@ Description: Trinity GnuPG interface libraries [development]
Package: libkmime2-trinity
Section: libs
Architecture: any
+Replaces: libkmime2-trinity (<< 4:14.0.0)
+Breaks: libkmime2-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Conflicts: libmimelib1a-trinity
-Replaces: libmimelib1a-trinity
Description: Trinity MIME interface library
This library provides a C++ interface to MIME messages, parsing them into
an object tree.
@@ -546,6 +601,8 @@ Description: Trinity MIME interface library
Package: libkpimexchange1-trinity
Section: libs
Architecture: any
+Replaces: libkpimexchange1-trinity (<< 4:14.0.0)
+Breaks: libkpimexchange1-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: Trinity PIM Exchange library
This is the runtime package for programs that use the libkpimexchange-trinity
@@ -557,6 +614,8 @@ Description: Trinity PIM Exchange library
Package: libkpimexchange1-trinity-dev
Section: libdevel
Architecture: any
+Replaces: libkpimexchange1-trinity-dev (<< 4:14.0.0)
+Breaks: libkpimexchange1-trinity-dev (<< 4:14.0.0)
Depends: libkpimexchange1-trinity (= ${Source-Version}), libkcal2-trinity-dev (= ${Source-Version}), libtdepim1-trinity-dev (= ${Source-Version})
Description: Trinity PIM Exchange library [development]
This is the development package which contains the headers for the
@@ -568,6 +627,8 @@ Description: Trinity PIM Exchange library [development]
Package: libkpimidentities1-trinity
Section: libs
Architecture: any
+Replaces: libkpimidentities1-trinity (<< 4:14.0.0)
+Breaks: libkpimidentities1-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: Trinity PIM user identity information library
This library provides information to KDE programs about user identity,
@@ -582,6 +643,8 @@ Description: Trinity PIM user identity information library
Package: libksieve0-trinity
Section: libs
Architecture: any
+Replaces: libksieve0-trinity (<< 4:14.0.0)
+Breaks: libksieve0-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: Trinity mail/news message filtering library
This is the runtime package for programs that use the libksieve-trinity library.
@@ -592,6 +655,8 @@ Description: Trinity mail/news message filtering library
Package: libksieve0-trinity-dev
Section: libdevel
Architecture: any
+Replaces: libksieve0-trinity-dev (<< 4:14.0.0)
+Breaks: libksieve0-trinity-dev (<< 4:14.0.0)
Depends: libksieve0-trinity (= ${Source-Version}), libtdepim1-trinity-dev (= ${Source-Version})
Description: Trinity mail/news message filtering library [development]
This is the development package which contains the headers for the libksieve-trinity
@@ -603,8 +668,9 @@ Description: Trinity mail/news message filtering library [development]
Package: libktnef1-trinity
Section: libs
Architecture: any
+Replaces: libktnef1-trinity (<< 4:14.0.0)
+Breaks: libktnef1-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
-Replaces: ktnef-trinity (<< 4:3.4.0)
Description: Library for handling KTNEF email attachments
This library handles mail attachments using the TNEF format. These
attachments are usually found in mails coming from Microsoft mail
@@ -619,8 +685,9 @@ Description: Library for handling KTNEF email attachments
Package: libktnef1-trinity-dev
Section: libdevel
Architecture: any
+Replaces: libktnef1-trinity-dev (<< 4:14.0.0)
+Breaks: libktnef1-trinity-dev (<< 4:14.0.0)
Depends: libktnef1-trinity (= ${Source-Version}), libtdepim1-trinity-dev (= ${Source-Version})
-Replaces: tdepim-trinity-dev (<< 4:3.4.0)
Description: KTNEF handler library [development]
This library handles mail attachments using the TNEF format. These
attachments are usually found in mails coming from Microsoft mail
@@ -636,9 +703,10 @@ Description: KTNEF handler library [development]
Package: libmimelib1c2a-trinity
Section: libs
Architecture: any
+Replaces: libmimelib1c2a-trinity (<< 4:14.0.0)
+Breaks: libmimelib1c2a-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Conflicts: libmimelib1a-trinity
-Replaces: libmimelib1a-trinity
Description: Trinity mime library
This library is used by several Trinity applications to handle mime types.
.
@@ -650,6 +718,8 @@ Description: Trinity mime library
Package: libmimelib1-trinity-dev
Section: libdevel
Architecture: any
+Replaces: libmimelib1-trinity-dev (<< 4:14.0.0)
+Breaks: libmimelib1-trinity-dev (<< 4:14.0.0)
Depends: libmimelib1c2a-trinity (= ${Source-Version})
Description: Trinity mime library [development]
This library is used by several KDE applications to handle mime types.
diff --git a/debian/lenny/tdesdk/debian/control b/debian/lenny/tdesdk/debian/control
index e4d5dbb0d..39fea60bc 100644
--- a/debian/lenny/tdesdk/debian/control
+++ b/debian/lenny/tdesdk/debian/control
@@ -14,6 +14,8 @@ Standards-Version: 3.8.4
Package: tdesdk-trinity
Architecture: all
Section: kde
+Replaces: kdesdk-trinity (<< 4:14.0.0)
+Breaks: kdesdk-trinity (<< 4:14.0.0)
Depends: cervisia-trinity (>= ${Source-Version}), kapptemplate-trinity (>= ${Source-Version}), kbabel-trinity (>= ${Source-Version}), kbugbuster-trinity (>= ${Source-Version}), kcachegrind-trinity (>= ${Source-Version}), tdesdk-kfile-plugins-trinity (>= ${Source-Version}), tdesdk-kio-plugins-trinity (>= ${Source-Version}) | tdesvn-kio-plugins-trinity, tdesdk-misc-trinity (>= ${Source-Version}), tdesdk-scripts-trinity, kmtrace-trinity (>= ${Source-Version}), kompare-trinity (>= ${Source-Version}), kspy-trinity (>= ${Source-Version}), kuiviewer-trinity (>= ${Source-Version}), kunittest-trinity (>= ${Source-Version}), poxml-trinity (>= ${Source-Version}), umbrello-trinity (>= ${Source-Version})
Suggests: kcachegrind-converters-trinity, kbabel-trinity-dev, tdesdk-trinity-doc-html
Description: software development kit from the official Trinity release
@@ -28,8 +30,9 @@ Description: software development kit from the official Trinity release
Package: tdesdk-trinity-doc-html
Architecture: all
Section: doc
+Replaces: kdesdk-trinity-doc-html (<< 4:14.0.0)
+Breaks: kdesdk-trinity-doc-html (<< 4:14.0.0)
Suggests: konqueror-trinity | www-browser, tdesdk-trinity
-Replaces: cervisia-trinity (<< 4:3.2.0), kbabel-trinity (<< 4:3.2.0), kbugbuster-trinity (<< 4:3.2.0), kompare-trinity (<< 4:3.2.0)
Description: Trinity Software Development Kit documentation in HTML format
By default the modules provided by KDE only provide their documentation
in KDE docbook format, which can only be read by Konqueror or KHelpCenter.
@@ -47,6 +50,8 @@ Description: Trinity Software Development Kit documentation in HTML format
Package: cervisia-trinity
Architecture: any
Section: devel
+Replaces: cervisia-trinity (<< 4:14.0.0)
+Breaks: cervisia-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity, tdesdk-trinity-doc-html
Conflicts: cervisia
@@ -65,6 +70,8 @@ Description: a graphical CVS front end for Trinity
Package: kapptemplate-trinity
Architecture: all
Section: devel
+Replaces: kapptemplate-trinity (<< 4:14.0.0)
+Breaks: kapptemplate-trinity (<< 4:14.0.0)
Conflicts: kapptemplate
Recommends: automake1.9 | automaken, tdelibs4-trinity-dev (>= 4:3.5.8)
Description: creates a framework to develop a Trinity application
@@ -79,6 +86,8 @@ Description: creates a framework to develop a Trinity application
Package: kbabel-trinity
Architecture: any
Section: devel
+Replaces: kbabel-trinity (<< 4:14.0.0)
+Breaks: kbabel-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Conflicts: kbabel
Recommends: gettext
@@ -100,9 +109,10 @@ Description: PO-file editing suite for Trinity
Package: kbabel-trinity-dev
Architecture: any
Section: libdevel
+Replaces: kbabel-trinity-dev (<< 4:14.0.0)
+Breaks: kbabel-trinity-dev (<< 4:14.0.0)
Depends: kbabel-trinity (= ${Source-Version}), tdelibs4-trinity-dev (>= 4:3.5.8)
Conflicts: kbabel
-Replaces: kbabel-trinity (<< 4:3.0.8-0)
Description: PO-file editing suite for Trinity (development files)
This is a suite of programs for editing gettext message files (PO-files).
It is designed to help you translate fast and consistently.
@@ -122,6 +132,8 @@ Description: PO-file editing suite for Trinity (development files)
Package: kbugbuster-trinity
Architecture: any
Section: devel
+Replaces: kbugbuster-trinity (<< 4:14.0.0)
+Breaks: kbugbuster-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Conflicts: kbugbuster
Suggests: khelpcenter-trinity
@@ -136,6 +148,8 @@ Description: a front end for the Trinity bug tracking system
Package: kcachegrind-trinity
Architecture: any
Section: devel
+Replaces: kcachegrind-trinity (<< 4:14.0.0)
+Breaks: kcachegrind-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Conflicts: kcachegrind
Recommends: valgrind-callgrind-trinity | valgrind-calltree-trinity, graphviz
@@ -155,6 +169,8 @@ Description: visualisation tool for valgrind profiling output
Package: kcachegrind-converters-trinity
Architecture: all
Section: devel
+Replaces: kcachegrind-converters-trinity (<< 4:14.0.0)
+Breaks: kcachegrind-converters-trinity (<< 4:14.0.0)
Depends: ${perl:Depends}, php5-cli, python
Conflicts: kcachegrind-converters
Recommends: kcachegrind-trinity
@@ -173,6 +189,8 @@ Description: format converters for KCachegrind profiling visualisation tool
Package: tdesdk-kfile-plugins-trinity
Architecture: any
Section: kde
+Replaces: kdesdk-kfile-plugins-trinity (<< 4:14.0.0)
+Breaks: kdesdk-kfile-plugins-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Conflicts: tdesdk-kfile-plugins
Description: Trinity file dialog plugins for software development files
@@ -186,11 +204,12 @@ Description: Trinity file dialog plugins for software development files
Package: tdesdk-misc-trinity
Architecture: any
Section: devel
+Replaces: kdesdk-misc-trinity (<< 4:14.0.0)
+Breaks: kdesdk-misc-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Recommends: libqt3-mt-dev | libqt3-dev
Suggests: gimp | xpaint
Conflicts: kdepalettes-trinity (<= 4:3.1.0-1), scheck-trinity (<< 4:3.2.0-0), tdesdk-misc
-Replaces: kdepalettes-trinity (<= 4:3.1.0-1), scheck-trinity (<< 4:3.2.0-0), tdevelop3-plugins-trinity (<= 4:3.2.0-3)
Description: various goodies from the Trinity Software Development Kit
This package contains miscellaneous goodies provided with the official
KDE release to assist with KDE software development.
@@ -207,11 +226,12 @@ Description: various goodies from the Trinity Software Development Kit
Package: tdesdk-scripts-trinity
Architecture: all
Section: devel
+Replaces: kdesdk-scripts-trinity (<< 4:14.0.0)
+Breaks: kdesdk-scripts-trinity (<< 4:14.0.0)
Depends: ${perl:Depends}, python
Recommends: automake1.9 | automaken, cvs, gawk
Suggests: khelpcenter-trinity, tdesdk-trinity-doc-html, dmalloc, gdb, tdelibs4-trinity-doc, qt3-doc, valgrind, devscripts
Enhances: kate-trinity
-Replaces: tdevelop-trinity (<< 1:1.4.0-3.2)
Description: a set of useful development scripts for Trinity
This package contains a number of scripts which can be used to help in
developing KDE-based applications. Many of these scripts however are
@@ -230,6 +250,8 @@ Description: a set of useful development scripts for Trinity
Package: kmtrace-trinity
Architecture: any
Section: devel
+Replaces: kmtrace-trinity (<< 4:14.0.0)
+Breaks: kmtrace-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, less
Conflicts: kmtrace
Description: a Trinity memory leak tracer
@@ -242,6 +264,8 @@ Description: a Trinity memory leak tracer
Package: kompare-trinity
Architecture: any
Section: devel
+Replaces: kompare-trinity (<< 4:14.0.0)
+Breaks: kompare-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Conflicts: kompare
Suggests: khelpcenter-trinity
@@ -256,6 +280,8 @@ Description: a Trinity GUI for viewing differences between files
Package: kspy-trinity
Architecture: any
Section: devel
+Replaces: kspy-trinity (<< 4:14.0.0)
+Breaks: kspy-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, tdelibs4-trinity-dev (>= 4:3.5.8)
Conflicts: kspy
Description: examines the internal state of a Qt/KDE app
@@ -276,6 +302,8 @@ Description: examines the internal state of a Qt/KDE app
Package: kuiviewer-trinity
Architecture: any
Section: devel
+Replaces: kuiviewer-trinity (<< 4:14.0.0)
+Breaks: kuiviewer-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Conflicts: kuiviewer
Suggests: qt3-designer
@@ -292,9 +320,10 @@ Description: viewer for Qt Designer user interface files
Package: libcvsservice0-trinity
Architecture: any
Section: libs
+Replaces: libcvsservice0-trinity (<< 4:14.0.0)
+Breaks: libcvsservice0-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, cvs
Conflicts: libcvsservice0
-Replaces: cervisia-trinity (<< 4:3.2.0)
Description: DCOP service for accessing CVS repositories
This library provides a DCOP service for accessing and working with
remote CVS repositories. Applications may link with this library to
@@ -309,9 +338,10 @@ Description: DCOP service for accessing CVS repositories
Package: libcvsservice-trinity-dev
Architecture: any
Section: libdevel
+Replaces: libcvsservice-trinity-dev (<< 4:14.0.0)
+Breaks: libcvsservice-trinity-dev (<< 4:14.0.0)
Depends: libcvsservice0-trinity (= ${Source-Version}), tdelibs4-trinity-dev (>= 4:3.5.8)
Conflicts: libcvsservice-dev
-Replaces: cervisia-trinity (<< 4:3.2.0)
Description: development files for CVS DCOP service
The library libcvsservice provides a DCOP service for accessing and
working with remote CVS repositories. Applications may link with this
@@ -327,6 +357,8 @@ Description: development files for CVS DCOP service
Package: poxml-trinity
Architecture: any
Section: devel
+Replaces: poxml-trinity (<< 4:14.0.0)
+Breaks: poxml-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Conflicts: poxml
Description: tools for using PO-files to translate DocBook XML files
@@ -342,10 +374,11 @@ Description: tools for using PO-files to translate DocBook XML files
Package: umbrello-trinity
Architecture: any
Section: devel
+Replaces: umbrello-trinity (<< 4:14.0.0)
+Breaks: umbrello-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity, tdesdk-trinity-doc-html
Conflicts: umbrello-manual-trinity (<< 20040311), umbrello
-Replaces: umbrello-manual-trinity (<< 20040311)
Description: UML modelling tool and code generator
Umbrello UML Modeller is a Unified Modelling Language editor for KDE.
With UML you can create diagrams of software and other systems in an
@@ -362,9 +395,10 @@ Description: UML modelling tool and code generator
Package: tdesdk-kio-plugins-trinity
Architecture: any
Section: devel
+Replaces: kdesdk-kio-plugins-trinity (<< 4:14.0.0)
+Breaks: kdesdk-kio-plugins-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, subversion
Conflicts: tdesdk-kio-plugins
-Replaces: tdesdk-misc-trinity (<< 4:3.5.0)
Description: subversion ioslave for Trinity
This package provides easy access to remote SVN repositories from within
Konqueror, and KDE generally, by browsing them as if they were a
@@ -376,6 +410,8 @@ Description: subversion ioslave for Trinity
Package: kunittest-trinity
Architecture: any
Section: devel
+Replaces: kunittest-trinity (<< 4:14.0.0)
+Breaks: kunittest-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Conflicts: kunittest
Suggests: tdelibs4-trinity-doc
@@ -392,6 +428,8 @@ Description: unit testing library for Trinity
Package: tdesdk-trinity-dbg
Section: libdevel
Architecture: any
+Replaces: kdesdk-trinity-dbg (<< 4:14.0.0)
+Breaks: kdesdk-trinity-dbg (<< 4:14.0.0)
Priority: extra
Depends: tdelibs-trinity-dbg, libcvsservice-trinity-dev (= ${Source-Version}), kbabel-trinity-dev (= ${Source-Version})
Conflicts: tdesdk-dbg
diff --git a/debian/lenny/tdetoys/debian/control b/debian/lenny/tdetoys/debian/control
index d6abe3fcc..7388f1dbd 100644
--- a/debian/lenny/tdetoys/debian/control
+++ b/debian/lenny/tdetoys/debian/control
@@ -10,6 +10,8 @@ Standards-Version: 3.8.4
Package: tdetoys-trinity
Architecture: all
Section: kde
+Replaces: kdetoys-trinity (<< 4:14.0.0)
+Breaks: kdetoys-trinity (<< 4:14.0.0)
Depends: amor-trinity (>= ${Source-Version}), eyesapplet-trinity (>= ${Source-Version}), fifteenapplet-trinity (>= ${Source-Version}), kmoon-trinity (>= ${Source-Version}), kodo-trinity (>= ${Source-Version}), kteatime-trinity (>= ${Source-Version}), ktux-trinity (>= ${Source-Version}), kweather-trinity (>= ${Source-Version}), kworldclock-trinity (>= ${Source-Version})
Suggests: tdetoys-trinity-doc-html (>= ${Source-Version})
Description: toys from the official Trinity release
@@ -24,8 +26,9 @@ Description: toys from the official Trinity release
Package: tdetoys-trinity-doc-html
Architecture: all
Section: doc
+Replaces: kdetoys-trinity-doc-html (<< 4:14.0.0)
+Breaks: kdetoys-trinity-doc-html (<< 4:14.0.0)
Suggests: konqueror-trinity | www-browser, tdetoys-trinity
-Replaces: amor-trinity (<< 4:2.2.0-0), kmoon-trinity (<< 4:2.2.0-0), kodo-trinity (<< 4:2.2.0-0), kteatime-trinity (<< 4:2.2.0-0), kweather-trinity (<< 4:3.0.0-0), kworldclock-trinity (<< 4:2.2.0-0)
Description: Trinity toys documentation in HTML format
By default the modules provided by KDE only provide their documentation
in KDE docbook format, which can only be read by Konqueror or KHelpCenter.
@@ -43,11 +46,12 @@ Description: Trinity toys documentation in HTML format
Package: amor-trinity
Architecture: any
Section: games
+Replaces: amor-trinity (<< 4:14.0.0)
+Breaks: amor-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Recommends: twin-trinity
Suggests: khelpcenter-trinity
Conflicts: task-tdetoys-trinity
-Replaces: tdetoys-trinity (<< 4:3.0.1-0), task-tdetoys-trinity
Description: a Trinity creature for your desktop
AMOR stands for Amusing Misuse Of Resources. It provides several different
characters who prance around your X screen doing tricks and giving you tips.
@@ -61,10 +65,11 @@ Description: a Trinity creature for your desktop
Package: eyesapplet-trinity
Architecture: any
Section: kde
+Replaces: eyesapplet-trinity (<< 4:14.0.0)
+Breaks: eyesapplet-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Recommends: kicker-trinity
Conflicts: task-tdetoys-trinity
-Replaces: tdetoys-trinity (<< 4:3.0.1-0), task-tdetoys-trinity
Description: eyes applet for Trinity
An applet for the KDE panel containing a pair of eyes that follow your mouse
around the screen.
@@ -75,6 +80,8 @@ Description: eyes applet for Trinity
Package: fifteenapplet-trinity
Architecture: any
Section: kde
+Replaces: fifteenapplet-trinity (<< 4:14.0.0)
+Breaks: fifteenapplet-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Recommends: kicker-trinity
Description: fifteen pieces puzzle for Trinity
@@ -88,11 +95,12 @@ Description: fifteen pieces puzzle for Trinity
Package: kmoon-trinity
Architecture: any
Section: kde
+Replaces: kmoon-trinity (<< 4:14.0.0)
+Breaks: kmoon-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Recommends: kicker-trinity
Suggests: khelpcenter-trinity
Conflicts: task-tdetoys-trinity
-Replaces: tdetoys-trinity (<< 4:3.0.1-0), task-tdetoys-trinity
Description: moon phase indicator for Trinity
An applet for the KDE panel that displays the current phase of the moon.
.
@@ -102,10 +110,11 @@ Description: moon phase indicator for Trinity
Package: kodo-trinity
Architecture: any
Section: games
+Replaces: kodo-trinity (<< 4:14.0.0)
+Breaks: kodo-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
Conflicts: task-tdetoys-trinity
-Replaces: tdetoysv (<< 4:3.0.1-0), task-tdetoys-trinity
Description: mouse odometer for Trinity
KOdometer measures your desktop mileage. It tracks the movement of your mouse
pointer across your desktop and renders it in inches/feet/miles! It can
@@ -117,10 +126,11 @@ Description: mouse odometer for Trinity
Package: kteatime-trinity
Architecture: any
Section: kde
+Replaces: kteatime-trinity (<< 4:14.0.0)
+Breaks: kteatime-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, kicker-trinity
Suggests: khelpcenter-trinity
Conflicts: task-tdetoys-trinity
-Replaces: tdetoys-trinity (<< 4:3.0.1-0), task-tdetoys-trinity
Description: Trinity utility for making a fine cup of tea
KTeaTime is a handy timer for steeping tea. No longer will you have to
guess at how long it takes for your tea to be ready. Simply select the
@@ -139,10 +149,11 @@ Description: Trinity utility for making a fine cup of tea
Package: ktux-trinity
Architecture: any
Section: kde
+Replaces: ktux-trinity (<< 4:14.0.0)
+Breaks: ktux-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: twin-trinity
Conflicts: task-tdetoys-trinity
-Replaces: tdetoys-trinity (<< 4:3.0.1-0), task-tdetoys-trinity
Description: Tux screensaver for Trinity
A neat Tux-in-a-spaceship screensaver for the K Desktop Environment (KDE).
.
@@ -152,6 +163,8 @@ Description: Tux screensaver for Trinity
Package: kweather-trinity
Architecture: any
Section: kde
+Replaces: kweather-trinity (<< 4:14.0.0)
+Breaks: kweather-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Recommends: kicker-trinity
Suggests: khelpcenter-trinity
@@ -170,10 +183,11 @@ Description: weather display applet for Trinity
Package: kworldclock-trinity
Architecture: any
Section: games
+Replaces: kworldclock-trinity (<< 4:14.0.0)
+Breaks: kworldclock-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: tdeartwork-misc-trinity, kicker-trinity, kdesktop-trinity, khelpcenter-trinity
Conflicts: task-tdetoys-trinity, kworldwatch-trinity (<= 4:2.2-beta1-1)
-Replaces: tdetoys-trinity (<< 4:3.0.1-0), task-tdetoys-trinity, kworldwatch-trinity (<= 4:2.2-beta1-1)
Provides: kworldwatch-trinity
Description: earth watcher for Trinity
Displays where in the world it is light and dark depending on time, as
@@ -189,6 +203,8 @@ Description: earth watcher for Trinity
Package: tdetoys-trinity-dbg
Section: libdevel
Architecture: any
+Replaces: kdetoys-trinity-dbg (<< 4:14.0.0)
+Breaks: kdetoys-trinity-dbg (<< 4:14.0.0)
Depends: tdelibs-trinity-dbg
Priority: extra
Description: debugging symbols for tdetoys-trinity
diff --git a/debian/lenny/tdeutils/debian/control b/debian/lenny/tdeutils/debian/control
index bd4eb1525..2c965d3c9 100644
--- a/debian/lenny/tdeutils/debian/control
+++ b/debian/lenny/tdeutils/debian/control
@@ -11,6 +11,8 @@ Standards-Version: 3.8.4
Package: tdeutils-trinity
Section: kde
Architecture: all
+Replaces: kdeutils-trinity (<< 4:14.0.0)
+Breaks: kdeutils-trinity (<< 4:14.0.0)
Depends: ark-trinity (>= ${Source-Version}), kcalc-trinity (>= ${Source-Version}), kcharselect-trinity (>= ${Source-Version}), kdelirc-trinity (>= ${Source-Version}), kdessh-trinity (>= ${Source-Version}), kdf-trinity (>= ${Source-Version}), kedit-trinity (>= ${Source-Version}), kfloppy-trinity (>= ${Source-Version}), kgpg-trinity (>= ${Source-Version}), khexedit-trinity (>= ${Source-Version}), kjots-trinity (>= ${Source-Version}), klaptopdaemon-trinity (>= ${Source-Version}) | kpowersave-trinity, kmilo-trinity (>= ${Source-Version}), kregexpeditor-trinity (>= ${Source-Version}), ksim-trinity (>= ${Source-Version}), ktimer-trinity (>= ${Source-Version}), kwalletmanager-trinity (>= ${Source-Version}), superkaramba-trinity (>= ${Source-Version})
Suggests: tdeutils-trinity-doc-html (>= ${Source-Version})
Description: general purpose utilities from the official Trinity release
@@ -25,6 +27,8 @@ Description: general purpose utilities from the official Trinity release
Package: tdeutils-trinity-doc
Section: doc
Architecture: all
+Replaces: kdeutils-trinity-doc (<< 4:14.0.0)
+Breaks: kdeutils-trinity-doc (<< 4:14.0.0)
Description: developer documentation for the KDE utilities module
This package contains documentation for the KDE utilities module, of
use more for developers creating applications than regular users.
@@ -35,6 +39,8 @@ Description: developer documentation for the KDE utilities module
Package: tdeutils-trinity-doc-html
Architecture: all
Section: doc
+Replaces: kdeutils-trinity-doc-html (<< 4:14.0.0)
+Breaks: kdeutils-trinity-doc-html (<< 4:14.0.0)
Suggests: konqueror-trinity | www-browser, tdebase-trinity
Description: Trinity utilities documentation in HTML format
By default the modules provided by KDE only provide their documentation
@@ -53,6 +59,8 @@ Description: Trinity utilities documentation in HTML format
Package: tdeutils-trinity-dev
Section: utils
Architecture: any
+Replaces: kdeutils-trinity-dev (<< 4:14.0.0)
+Breaks: kdeutils-trinity-dev (<< 4:14.0.0)
Depends: ark-trinity (= ${Source-Version}), kcalc-trinity (= ${Source-Version}), kdelirc-trinity (= ${Source-Version}), kedit-trinity (= ${Source-Version}), khexedit-trinity (= ${Source-Version}), klaptopdaemon-trinity (= ${Source-Version}), kmilo-trinity (= ${Source-Version}), kregexpeditor-trinity (= ${Source-Version}), ksim-trinity (= ${Source-Version}), tdelibs4-trinity-dev (>= 4:3.5.8)
Description: development files for the Trinity utilities module
This package contains development files needed to compile tdeutils
@@ -64,10 +72,11 @@ Description: development files for the Trinity utilities module
Package: ark-trinity
Section: utils
Architecture: any
+Replaces: ark-trinity (<< 4:14.0.0)
+Breaks: ark-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Recommends: ncompress, unzip, zip, zoo, bzip2, p7zip-full, xz-utils, lzma
Suggests: khelpcenter-trinity, rar, unrar | unrar-free
-Replaces: tdebase-data-trinity (<< 4:3.3.91)
Description: graphical archiving tool for Trinity
Ark is a graphical program for managing various archive formats within the
KDE environment. Archives can be viewed, extracted, created and modified
@@ -86,9 +95,10 @@ Description: graphical archiving tool for Trinity
Package: kcalc-trinity
Section: utils
Architecture: any
+Replaces: kcalc-trinity (<< 4:14.0.0)
+Breaks: kcalc-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
-Replaces: tdebase-data-trinity (<< 4:3.3.91)
Description: calculator for Trinity
KCalc is KDE's scientific calculator.
.
@@ -104,6 +114,8 @@ Description: calculator for Trinity
Package: kcharselect-trinity
Section: utils
Architecture: any
+Replaces: kcharselect-trinity (<< 4:14.0.0)
+Breaks: kcharselect-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
Description: character selector for Trinity
@@ -115,6 +127,8 @@ Description: character selector for Trinity
Package: kdelirc-trinity
Section: utils
Architecture: any
+Replaces: kdelirc-trinity (<< 4:14.0.0)
+Breaks: kdelirc-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
Description: infrared control for Trinity
@@ -126,6 +140,8 @@ Description: infrared control for Trinity
Package: kdessh-trinity
Section: kde
Architecture: any
+Replaces: kdessh-trinity (<< 4:14.0.0)
+Breaks: kdessh-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, openssh-client | ssh-client
Description: ssh frontend for Trinity
This package contains KDE's frontend for ssh.
@@ -136,6 +152,8 @@ Description: ssh frontend for Trinity
Package: kdf-trinity
Section: utils
Architecture: any
+Replaces: kdf-trinity (<< 4:14.0.0)
+Breaks: kdf-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
Description: disk space utility for Trinity
@@ -150,6 +168,8 @@ Description: disk space utility for Trinity
Package: kedit-trinity
Section: editors
Architecture: any
+Replaces: kedit-trinity (<< 4:14.0.0)
+Breaks: kedit-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
Description: basic text editor for Trinity
@@ -166,6 +186,8 @@ Description: basic text editor for Trinity
Package: kfloppy-trinity
Section: utils
Architecture: any
+Replaces: kfloppy-trinity (<< 4:14.0.0)
+Breaks: kfloppy-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, dosfstools
Suggests: khelpcenter-trinity
Description: floppy formatter for KDE
@@ -178,6 +200,8 @@ Description: floppy formatter for KDE
Package: kgpg-trinity
Section: kde
Architecture: any
+Replaces: kgpg-trinity (<< 4:14.0.0)
+Breaks: kgpg-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, konsole-trinity (>= 4:3.5.8), gnupg
Suggests: khelpcenter-trinity
Description: GnuPG frontend for Trinity
@@ -201,6 +225,8 @@ Description: GnuPG frontend for Trinity
Package: khexedit-trinity
Section: utils
Architecture: any
+Replaces: khexedit-trinity (<< 4:14.0.0)
+Breaks: khexedit-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
Description: Trinity hex editor
@@ -214,6 +240,8 @@ Description: Trinity hex editor
Package: kjots-trinity
Section: utils
Architecture: any
+Replaces: kjots-trinity (<< 4:14.0.0)
+Breaks: kjots-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
Description: note taking utility for Trinity
@@ -226,6 +254,8 @@ Description: note taking utility for Trinity
Package: klaptopdaemon-trinity
Section: kde
Architecture: any
+Replaces: klaptopdaemon-trinity (<< 4:14.0.0)
+Breaks: klaptopdaemon-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
Description: battery monitoring and management for laptops using KDE
@@ -238,6 +268,8 @@ Description: battery monitoring and management for laptops using KDE
Package: kmilo-trinity
Section: utils
Architecture: any
+Replaces: kmilo-trinity (<< 4:14.0.0)
+Breaks: kmilo-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: laptop special keys support for Trinity
KMilo lets you use the special keys on some keyboards and laptops.
@@ -252,6 +284,8 @@ Description: laptop special keys support for Trinity
Package: kmilo-legacy-trinity
Section: utils
Architecture: any
+Replaces: kmilo-legacy-trinity (<< 4:14.0.0)
+Breaks: kmilo-legacy-trinity (<< 4:14.0.0)
Depends: kmilo-trinity, ${shlibs:Depends}
Description: non-standard plugins for KMilo
KMilo lets you use the special keys on some keyboards and laptops.
@@ -268,6 +302,8 @@ Description: non-standard plugins for KMilo
Package: kregexpeditor-trinity
Section: kde
Architecture: any
+Replaces: kregexpeditor-trinity (<< 4:14.0.0)
+Breaks: kregexpeditor-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
Description: graphical regular expression editor plugin for Trinity
@@ -280,6 +316,8 @@ Description: graphical regular expression editor plugin for Trinity
Package: ksim-trinity
Section: utils
Architecture: any
+Replaces: ksim-trinity (<< 4:14.0.0)
+Breaks: ksim-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
Description: system information monitor for Trinity
@@ -293,6 +331,8 @@ Description: system information monitor for Trinity
Package: ktimer-trinity
Section: utils
Architecture: any
+Replaces: ktimer-trinity (<< 4:14.0.0)
+Breaks: ktimer-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
Description: timer utility for Trinity
@@ -306,6 +346,8 @@ Description: timer utility for Trinity
Package: kwalletmanager-trinity
Section: utils
Architecture: any
+Replaces: kwalletmanager-trinity (<< 4:14.0.0)
+Breaks: kwalletmanager-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
Description: wallet manager for Trinity
@@ -319,6 +361,8 @@ Description: wallet manager for Trinity
Package: superkaramba-trinity
Section: kde
Architecture: any
+Replaces: superkaramba-trinity (<< 4:14.0.0)
+Breaks: superkaramba-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
Conflicts: karamba-trinity
@@ -341,6 +385,8 @@ Description: a program based on karamba improving the eyecandy of KDE
Package: tdeutils-trinity-dbg
Section: libdevel
Architecture: any
+Replaces: kdeutils-trinity-dbg (<< 4:14.0.0)
+Breaks: kdeutils-trinity-dbg (<< 4:14.0.0)
Depends: tdelibs-trinity-dbg
Priority: extra
Description: debugging symbols for tdeutils-trinity
diff --git a/debian/lenny/tdevelop/debian/control b/debian/lenny/tdevelop/debian/control
index a90bc00bf..fce6ef3c6 100644
--- a/debian/lenny/tdevelop/debian/control
+++ b/debian/lenny/tdevelop/debian/control
@@ -2,13 +2,15 @@ Source: tdevelop-trinity
Section: kde
Priority: optional
Maintainer: Timothy Pearson
-XSBC-Original-Maintainer: Jeremy Lainé
+XSBC-Original-Maintainer: Jeremy Lain
Build-Depends: cdbs (>= 0.4.38), debhelper (>= 5), tdelibs4-trinity-dev (>= 4:3.5.10), gettext, tdelibs4-trinity-doc, libtqtinterface-doc, flex, python, libcvsservice-trinity-dev (>= 4:3.5.10), groff-base, libsvn-dev, libaprutil1-dev, libdb-dev, automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Package: tdevelop-trinity
Architecture: any
Depends: ${shlibs:Depends}, tdevelop-data-trinity (>= ${source:Version}), tdebase-trinity-bin
+Replaces: kdevelop-trinity (<< 4:14.0.0)
+Breaks: kdevelop-trinity (<< 4:14.0.0)
Recommends: tdevelop-trinity-doc, make, libtool, autoconf, automaken, gdb (>= 6.4)
Suggests: libtqtinterface-dev, tdelibs4-trinity-dev, sgmltools-lite, gettext, ark-trinity, kbabel-trinity, kiconedit-trinity, tdesdk-scripts-trinity, graphviz, tdebase-kio-plugins-trinity, exuberant-ctags, khelpcenter-trinity, tdelibs4-trinity-doc, libtqtinterface-doc, konsole-trinity, cmake, ruby, python
Description: An IDE for Unix/X11
@@ -25,6 +27,8 @@ Description: An IDE for Unix/X11
Package: tdevelop-trinity-doc
Section: doc
Architecture: all
+Replaces: kdevelop-trinity-doc (<< 4:14.0.0)
+Breaks: kdevelop-trinity-doc (<< 4:14.0.0)
Description: An IDE for Unix/X11 - documentation
KDevelop is an easy to use Integrated Development Environment
for developing C/C++ applications under X11. It features
@@ -40,6 +44,8 @@ Description: An IDE for Unix/X11 - documentation
Package: tdevelop-data-trinity
Architecture: all
+Replaces: kdevelop-data-trinity (<< 4:14.0.0)
+Breaks: kdevelop-data-trinity (<< 4:14.0.0)
Description: An IDE for Unix/X11 - data
KDevelop is an easy to use Integrated Development Environment
for developing C/C++ applications under X11. It features
@@ -56,6 +62,8 @@ Description: An IDE for Unix/X11 - data
Package: tdevelop-trinity-dev
Architecture: any
Depends: tdevelop-trinity (= ${binary:Version}), tdelibs4-trinity-dev
+Replaces: kdevelop-trinity-dev (<< 4:14.0.0)
+Breaks: kdevelop-trinity-dev (<< 4:14.0.0)
Description: An IDE for Unix/X11 - development files
KDevelop is an easy to use Integrated Development Environment
for developing C/C++ applications under X11. It features
diff --git a/debian/lenny/tdewebdev/debian/control b/debian/lenny/tdewebdev/debian/control
index cc0ac365c..d98b6a46f 100644
--- a/debian/lenny/tdewebdev/debian/control
+++ b/debian/lenny/tdewebdev/debian/control
@@ -3,7 +3,7 @@ Section: web
Priority: optional
Maintainer: Timothy Pearson
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers
-Uploaders: Adeodato Simó , Ana Beatriz Guerrero Lopez , Armin Berres , Sune Vuorela
+Uploaders: Adeodato Sim , Ana Beatriz Guerrero Lopez , Armin Berres , Sune Vuorela
Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5), autotools-dev, gawk, gettext, tdelibs4-trinity-dev, libreadline5-dev | libreadline6-dev, libxml2-dev, libxslt1-dev, sharutils, texinfo, automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Homepage: http://trinity.pearsoncomputing.net
@@ -11,6 +11,8 @@ Homepage: http://trinity.pearsoncomputing.net
Package: tdewebdev-trinity
Architecture: all
Section: kde
+Replaces: kdewebdev-trinity (<< 4:14.0.0)
+Breaks: kdewebdev-trinity (<< 4:14.0.0)
Depends: quanta-trinity (>= ${source:Version}), kfilereplace-trinity (>= ${source:Version}), kimagemapeditor-trinity (>= ${source:Version}), klinkstatus-trinity (>= ${source:Version}), kommander-trinity (>= ${source:Version}), kxsldbg-trinity (>= ${source:Version})
Suggests: kommander-trinity-dev (>= ${source:Version}), tdewebdev-trinity-doc-html (>= ${source:Version})
Description: web development apps from the official KDE release [Trinity]
@@ -25,6 +27,8 @@ Description: web development apps from the official KDE release [Trinity]
Package: tdewebdev-trinity-doc-html
Architecture: all
Section: doc
+Replaces: kdewebdev-trinity-doc-html (<< 4:14.0.0)
+Breaks: kdewebdev-trinity-doc-html (<< 4:14.0.0)
Suggests: konqueror-trinity | www-browser, tdewebdev-trinity
Description: KDE web development documentation in HTML format [Trinity]
By default the modules provided by KDE only provide their documentation
@@ -43,6 +47,8 @@ Description: KDE web development documentation in HTML format [Trinity]
Package: quanta-trinity
Architecture: any
Section: web
+Replaces: quanta-trinity (<< 4:14.0.0)
+Breaks: quanta-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, kfilereplace-trinity, klinkstatus-trinity, kommander-trinity, quanta-data-trinity, tidy
Recommends: cervisia, gnupg, kompare-trinity, kxsldbg-trinity, docbook-defguide
Suggests: gubed, kimagemapeditor-trinity, wget, khelpcenter-trinity, php-doc
@@ -66,6 +72,8 @@ Description: web development environment for KDE [Trinity]
Package: quanta-data-trinity
Architecture: all
Section: web
+Replaces: quanta-data-trinity (<< 4:14.0.0)
+Breaks: quanta-data-trinity (<< 4:14.0.0)
Recommends: quanta-trinity (= ${source:Version})
Description: data files for Quanta Plus web development environment [Trinity]
This package contains architecture-independent data files for Quanta
@@ -80,6 +88,8 @@ Description: data files for Quanta Plus web development environment [Trinity]
Package: kfilereplace-trinity
Architecture: any
Section: kde
+Replaces: kfilereplace-trinity (<< 4:14.0.0)
+Breaks: kfilereplace-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: quanta-trinity
Description: batch search-and-replace component for KDE [Trinity]
@@ -97,6 +107,8 @@ Description: batch search-and-replace component for KDE [Trinity]
Package: kimagemapeditor-trinity
Architecture: any
Section: editors
+Replaces: kimagemapeditor-trinity (<< 4:14.0.0)
+Breaks: kimagemapeditor-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: quanta-trinity
Description: HTML image map editor for KDE [Trinity]
@@ -110,6 +122,8 @@ Description: HTML image map editor for KDE [Trinity]
Package: klinkstatus-trinity
Architecture: any
Section: web
+Replaces: klinkstatus-trinity (<< 4:14.0.0)
+Breaks: klinkstatus-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: quanta-trinity, khelpcenter-trinity
Description: web link validity checker for KDE [Trinity]
@@ -126,6 +140,8 @@ Description: web link validity checker for KDE [Trinity]
Package: kommander-trinity
Architecture: any
Section: kde
+Replaces: kommander-trinity (<< 4:14.0.0)
+Breaks: kommander-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, gettext
Suggests: kommander-trinity-dev, quanta-trinity, khelpcenter-trinity
Description: visual dialog builder and executor tool [Trinity]
@@ -153,6 +169,8 @@ Description: visual dialog builder and executor tool [Trinity]
Package: kommander-trinity-dev
Architecture: any
Section: libdevel
+Replaces: kommander-trinity-dev (<< 4:14.0.0)
+Breaks: kommander-trinity-dev (<< 4:14.0.0)
Depends: kommander-trinity (= ${binary:Version}), tdelibs4-dev (>= 4:3.5.8)
Description: development files for Kommander [Trinity]
This package contains the headers and other development files for
@@ -170,6 +188,8 @@ Description: development files for Kommander [Trinity]
Package: kxsldbg-trinity
Architecture: any
Section: text
+Replaces: kxsldbg-trinity (<< 4:14.0.0)
+Breaks: kxsldbg-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: quanta-trinity, khelpcenter-trinity
Description: graphical XSLT debugger for KDE [Trinity]
@@ -187,6 +207,8 @@ Description: graphical XSLT debugger for KDE [Trinity]
Package: tdewebdev-trinity-dbg
Section: libdevel
Architecture: any
+Replaces: kdewebdev-trinity-dbg (<< 4:14.0.0)
+Breaks: kdewebdev-trinity-dbg (<< 4:14.0.0)
Depends: tdelibs-trinity-dbg
Priority: extra
Description: debugging symbols for tdewebdev [Trinity]
diff --git a/debian/squeeze/applications/abakus/debian/control b/debian/squeeze/applications/abakus/debian/control
index edfc1c7b0..5aebafb8b 100644
--- a/debian/squeeze/applications/abakus/debian/control
+++ b/debian/squeeze/applications/abakus/debian/control
@@ -9,6 +9,8 @@ Standards-Version: 3.8.4
Package: abakus-trinity
Architecture: any
Depends: ${shlibs:Depends}
+Replaces: abakus-trinity (<< 4:14.0.0)
+Breaks: abakus-trinity (<< 4:14.0.0)
Description: calculator for KDE [Trinity]
AbaKus is a complex calculator, which provides
many different kinds of calculations.
diff --git a/debian/squeeze/applications/adept/debian/control b/debian/squeeze/applications/adept/debian/control
index 4238c623a..8e2160fb7 100644
--- a/debian/squeeze/applications/adept/debian/control
+++ b/debian/squeeze/applications/adept/debian/control
@@ -10,6 +10,8 @@ Standards-Version: 3.8.4
Package: adept-trinity
Section: kde
Depends: adept-manager-trinity, adept-installer-trinity, adept-updater-trinity, adept-notifier-trinity, adept-batch-trinity
+Replaces: adept-trinity (<< 4:14.0.0)
+Breaks: adept-trinity (<< 4:14.0.0)
Architecture: all
Description: package management suite for Trinity
These packages belong to the adept suite:
@@ -21,6 +23,8 @@ Description: package management suite for Trinity
Package: adept-common-trinity
Section: kde
Depends: debtags (>= 1.6.1), konsole-trinity (>= 3.5.0), ${shlibs:Depends}
+Replaces: adept-common-trinity (<< 4:14.0.0)
+Breaks: adept-common-trinity (<< 4:14.0.0)
Architecture: all
Description: package manager for Trinity -- common files
Icons and other common files for all adept components.
@@ -28,6 +32,8 @@ Description: package manager for Trinity -- common files
Package: adept-manager-trinity
Section: kde
Depends: adept-common-trinity, ${shlibs:Depends}
+Replaces: adept-manager-trinity (<< 4:14.0.0)
+Breaks: adept-manager-trinity (<< 4:14.0.0)
Recommends: libtqt-perl
Architecture: any
Description: package manager for Trinity
@@ -45,6 +51,8 @@ Description: package manager for Trinity
Package: adept-installer-trinity
Section: kde
Depends: adept-common-trinity, app-install-data, ${shlibs:Depends}
+Replaces: adept-installer-trinity (<< 4:14.0.0)
+Breaks: adept-installer-trinity (<< 4:14.0.0)
Recommends: libtqt-perl
Architecture: any
Description: simple user interface for application management (for Trinity)
@@ -59,6 +67,8 @@ Description: simple user interface for application management (for Trinity)
Package: adept-updater-trinity
Section: kde
Depends: adept-common-trinity, ${shlibs:Depends}
+Replaces: adept-updater-trinity (<< 4:14.0.0)
+Breaks: adept-updater-trinity (<< 4:14.0.0)
Recommends: libtqt-perl
Architecture: any
Description: system update tool for Trinity
@@ -71,6 +81,8 @@ Description: system update tool for Trinity
Package: adept-notifier-trinity
Section: kde
Depends: ${shlibs:Depends}, adept-updater-trinity, update-notifier-common
+Replaces: adept-notifier-trinity (<< 4:14.0.0)
+Breaks: adept-notifier-trinity (<< 4:14.0.0)
Architecture: any
Description: system tray notifier of available system updates
Adept Notifier provides a system tray icon notifying the user of
@@ -80,6 +92,8 @@ Description: system tray notifier of available system updates
Package: adept-batch-trinity
Section: kde
Depends: ${shlibs:Depends}, adept-manager-trinity
+Replaces: adept-batch-trinity (<< 4:14.0.0)
+Breaks: adept-batch-trinity (<< 4:14.0.0)
Architecture: any
Description: command line install for Adept
Adept Batch lets you install packages with Adept from the
diff --git a/debian/squeeze/applications/amarok.cmake/debian/control b/debian/squeeze/applications/amarok.cmake/debian/control
index 36d6010d9..a07b416a8 100644
--- a/debian/squeeze/applications/amarok.cmake/debian/control
+++ b/debian/squeeze/applications/amarok.cmake/debian/control
@@ -19,6 +19,8 @@ Homepage: http://amarok.kde.org
Package: amarok-trinity
Architecture: any
Depends: amarok-common-trinity (>= ${source:Version}), amarok-engine-xine-trinity (= ${binary:Version}) | amarok-engine-yauap-trinity (= ${binary:Version}), unzip, ${shlibs:Depends}
+Replaces: amarok-trinity (<< 4:14.0.0)
+Breaks: amarok-trinity (<< 4:14.0.0)
Suggests: amarok-engines-trinity, moodbar, konqueror-trinity | www-browser,
python, python-qt3, libqt0-ruby1.8-trinity, libvisual-0.4-plugins
Description: versatile and easy to use audio player for Trinity
@@ -47,6 +49,8 @@ Description: versatile and easy to use audio player for Trinity
Package: amarok-common-trinity
Architecture: all
Depends: ruby
+Replaces: amarok-common-trinity (<< 4:14.0.0)
+Breaks: amarok-common-trinity (<< 4:14.0.0)
Recommends: amarok-trinity (>= ${source:Version})
Suggests: libqt0-ruby1.8-trinity, python, python-qt3
Description: architecture independent files for Amarok [Trinity]
@@ -61,6 +65,8 @@ Description: architecture independent files for Amarok [Trinity]
Package: amarok-engines-trinity
Architecture: all
Depends: amarok-engine-xine-trinity (>= ${source:Version}), amarok-engine-yauap-trinity (>= ${source:Version})
+Replaces: amarok-engines-trinity (<< 4:14.0.0)
+Breaks: amarok-engines-trinity (<< 4:14.0.0)
Description: output engines for the Amarok music player [Trinity]
This package serves merely as a reference point if you want to install
all available Amarok engines. It depends on those Amarok engines that
@@ -70,6 +76,8 @@ Description: output engines for the Amarok music player [Trinity]
Package: amarok-engine-xine-trinity
Architecture: any
Depends: ${shlibs:Depends}
+Replaces: amarok-engine-xine-trinity (<< 4:14.0.0)
+Breaks: amarok-engine-xine-trinity (<< 4:14.0.0)
Recommends: amarok-trinity (= ${binary:Version})
Description: xine engine for the Amarok audio player [Trinity]
This package provides the xine engine for Amarok, which you may prefer
@@ -79,6 +87,8 @@ Description: xine engine for the Amarok audio player [Trinity]
Package: amarok-engine-yauap-trinity
Architecture: any
Depends: yauap, ${shlibs:Depends}
+Replaces: amarok-engine-yauap-trinity (<< 4:14.0.0)
+Breaks: amarok-engine-yauap-trinity (<< 4:14.0.0)
Recommends: amarok-trinity (= ${binary:Version})
Description: Yauap engine for the Amarok audio player [Trinity]
This package includes Amarok yauap engine, which provides a frontend
@@ -89,6 +99,8 @@ Description: Yauap engine for the Amarok audio player [Trinity]
Package: amarok-trinity-dbg
Priority: extra
Architecture: any
+Replaces: amarok-trinity-dbg (<< 4:14.0.0)
+Breaks: amarok-trinity-dbg (<< 4:14.0.0)
Depends: amarok-trinity (= ${binary:Version})
Recommends: tdelibs-trinity-dbg
Description: debugging symbols for Amarok [Trinity]
diff --git a/debian/squeeze/applications/amarok/debian/control b/debian/squeeze/applications/amarok/debian/control
index 5b0049ffa..715ec98c4 100644
--- a/debian/squeeze/applications/amarok/debian/control
+++ b/debian/squeeze/applications/amarok/debian/control
@@ -19,6 +19,8 @@ Homepage: http://amarok.kde.org
Package: amarok-trinity
Architecture: any
Depends: amarok-common-trinity (>= ${source:Version}), amarok-engine-xine-trinity (= ${binary:Version}) | amarok-engine-yauap-trinity (= ${binary:Version}), unzip, ${shlibs:Depends}
+Replaces: amarok-trinity (<< 4:14.0.0)
+Breaks: amarok-trinity (<< 4:14.0.0)
Suggests: amarok-engines-trinity, moodbar, konqueror-trinity | www-browser,
python, python-qt3, libqt0-ruby1.8-trinity, libvisual-0.4-plugins
Description: versatile and easy to use audio player for Trinity
@@ -47,6 +49,8 @@ Description: versatile and easy to use audio player for Trinity
Package: amarok-common-trinity
Architecture: all
Depends: ruby
+Replaces: amarok-common-trinity (<< 4:14.0.0)
+Breaks: amarok-common-trinity (<< 4:14.0.0)
Recommends: amarok-trinity (>= ${source:Version})
Suggests: libqt0-ruby1.8-trinity, python, python-qt3
Description: architecture independent files for Amarok [Trinity]
@@ -61,6 +65,8 @@ Description: architecture independent files for Amarok [Trinity]
Package: amarok-engines-trinity
Architecture: all
Depends: amarok-engine-xine-trinity (>= ${source:Version}), amarok-engine-yauap-trinity (>= ${source:Version})
+Replaces: amarok-engines-trinity (<< 4:14.0.0)
+Breaks: amarok-engines-trinity (<< 4:14.0.0)
Description: output engines for the Amarok music player [Trinity]
This package serves merely as a reference point if you want to install
all available Amarok engines. It depends on those Amarok engines that
@@ -70,6 +76,8 @@ Description: output engines for the Amarok music player [Trinity]
Package: amarok-engine-xine-trinity
Architecture: any
Depends: ${shlibs:Depends}
+Replaces: amarok-engine-xine-trinity (<< 4:14.0.0)
+Breaks: amarok-engine-xine-trinity (<< 4:14.0.0)
Recommends: amarok-trinity (= ${binary:Version})
Description: xine engine for the Amarok audio player [Trinity]
This package provides the xine engine for Amarok, which you may prefer
@@ -79,6 +87,8 @@ Description: xine engine for the Amarok audio player [Trinity]
Package: amarok-engine-yauap-trinity
Architecture: any
Depends: yauap, ${shlibs:Depends}
+Replaces: amarok-engine-yauap-trinity (<< 4:14.0.0)
+Breaks: amarok-engine-yauap-trinity (<< 4:14.0.0)
Recommends: amarok-trinity (= ${binary:Version})
Description: Yauap engine for the Amarok audio player [Trinity]
This package includes Amarok yauap engine, which provides a frontend
@@ -89,6 +99,8 @@ Description: Yauap engine for the Amarok audio player [Trinity]
Package: amarok-trinity-dbg
Priority: extra
Architecture: any
+Replaces: amarok-trinity-dbg (<< 4:14.0.0)
+Breaks: amarok-trinity-dbg (<< 4:14.0.0)
Depends: amarok-trinity (= ${binary:Version})
Recommends: tdelibs-trinity-dbg
Description: debugging symbols for Amarok [Trinity]
diff --git a/debian/squeeze/applications/basket/debian/control b/debian/squeeze/applications/basket/debian/control
index c364246a8..b7bd8357a 100644
--- a/debian/squeeze/applications/basket/debian/control
+++ b/debian/squeeze/applications/basket/debian/control
@@ -10,6 +10,8 @@ Standards-Version: 3.8.4
Package: basket-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: basket-trinity (<< 4:14.0.0)
+Breaks: basket-trinity (<< 4:14.0.0)
Recommends: basket-kontact-integration-trinity
Description: a multi-purpose note-taking application for KDE [Trinity]
This application provides as many baskets (drawers) as you wish; Several
@@ -24,8 +26,8 @@ Description: a multi-purpose note-taking application for KDE [Trinity]
Package: basket-kontact-integration-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: basket-trinity (<< 4:3.5.13-0debian9+r1258873+pr3)
-Breaks: basket-trinity (<< 4:3.5.13-0debian9+r1258873+pr3)
+Replaces: basket-kontact-integration-trinity (<< 4:14.0.0)
+Breaks: basket-kontact-integration-trinity (<< 4:14.0.0)
Description: a multi-purpose note-taking appliction, Kontact integration [Trinity]
This application provides as many baskets (drawers) as you wish; Several
kinds of objects (texts, URLs, images,...) can be drag-n-drop'd into it.
diff --git a/debian/squeeze/applications/bibletime/debian/control b/debian/squeeze/applications/bibletime/debian/control
index 5edb06118..cadc5f7d8 100644
--- a/debian/squeeze/applications/bibletime/debian/control
+++ b/debian/squeeze/applications/bibletime/debian/control
@@ -8,6 +8,8 @@ Standards-Version: 3.8.4
Package: bibletime-trinity
Architecture: any
Section: kde
+Replaces: bibletime-trinity (<< 4:14.0.0)
+Breaks: bibletime-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Recommends: sword-text, sword-dict, sword-comm
Suggests: bibletime-i18n-trinity
diff --git a/debian/squeeze/applications/compizconfig-backend-kconfig/debian/control b/debian/squeeze/applications/compizconfig-backend-kconfig/debian/control
index 8b011c50d..57cfdd8b3 100644
--- a/debian/squeeze/applications/compizconfig-backend-kconfig/debian/control
+++ b/debian/squeeze/applications/compizconfig-backend-kconfig/debian/control
@@ -8,6 +8,8 @@ Standards-Version: 3.8.4
Package: compizconfig-backend-kconfig-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: compizconfig-backend-kconfig-trinity (<< 4:14.0.0)
+Breaks: compizconfig-backend-kconfig-trinity (<< 4:14.0.0)
Conflicts: libcompizconfig-backend-kconfig-trinity
Description: KConfig [Trinity] Settings library for plugins - OpenCompositing Project
The OpenCompositing Project brings 3D desktop visual effects that improve
diff --git a/debian/squeeze/applications/desktop-effects-tde/debian/control b/debian/squeeze/applications/desktop-effects-tde/debian/control
index 1f494fe87..c9fd9a263 100644
--- a/debian/squeeze/applications/desktop-effects-tde/debian/control
+++ b/debian/squeeze/applications/desktop-effects-tde/debian/control
@@ -9,6 +9,8 @@ XS-Python-Version: all
Package: desktop-effects-tde-trinity
Architecture: all
Depends: ${python:Depends}, python-qt4
+Replaces: desktop-effects-kde-trinity (<< 4:14.0.0)
+Breaks: desktop-effects-kde-trinity (<< 4:14.0.0)
XB-Python-Version: ${python:Versions}
Description: compiz setup tool for Trinity
A simple Compiz configuration tool for Trinity. Installs and sets Compiz
diff --git a/debian/squeeze/applications/digikam/debian/control b/debian/squeeze/applications/digikam/debian/control
index 94ae91fef..3fc492330 100644
--- a/debian/squeeze/applications/digikam/debian/control
+++ b/debian/squeeze/applications/digikam/debian/control
@@ -16,6 +16,8 @@ Homepage: http://www.digikam.org
Package: digikam-trinity
Architecture: any
Depends: ${shlibs:Depends}
+Replaces: digikam-trinity (<< 4:14.0.0)
+Breaks: digikam-trinity (<< 4:14.0.0)
Recommends: kipi-plugins-trinity, tdeprint-trinity, konqueror-trinity
Suggests: digikam-trinity-doc
Description: digital photo management application for KDE [Trinity]
@@ -41,6 +43,8 @@ Description: digital photo management application for KDE [Trinity]
Package: showfoto-trinity
Architecture: any
Section: graphics
+Replaces: showfoto-trinity (<< 4:14.0.0)
+Breaks: showfoto-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, digikam-trinity
Recommends: kipi-plugins-trinity, tdeprint-trinity, konqueror-trinity
Description: image viewer/editor for KDE [Trinity]
@@ -50,6 +54,8 @@ Description: image viewer/editor for KDE [Trinity]
Package: digikam-trinity-dbg
Architecture: any
Section: devel
+Replaces: digikam-trinity-dbg (<< 4:14.0.0)
+Breaks: digikam-trinity-dbg (<< 4:14.0.0)
Depends: ${shlibs:Depends}, digikam-trinity (= ${binary:Version}), showfoto-trinity (= ${binary:Version}), tdelibs-trinity-dbg
Priority: extra
Description: debugging symbols for digikam [Trinity]
diff --git a/debian/squeeze/applications/dolphin/debian/control b/debian/squeeze/applications/dolphin/debian/control
index e5f307a94..225c29e0c 100644
--- a/debian/squeeze/applications/dolphin/debian/control
+++ b/debian/squeeze/applications/dolphin/debian/control
@@ -9,6 +9,8 @@ Standards-Version: 3.8.4
Package: dolphin-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: dolphin-trinity (<< 4:14.0.0)
+Breaks: dolphin-trinity (<< 4:14.0.0)
Recommends: amarok-trinity, ark-trinity, k3b-trinity, kmail-trinity, digikam-trinity
Suggests: kfloppy-trinity
Description: File manager for KDE focusing on usability [Trinity]
diff --git a/debian/squeeze/applications/filelight-l10n/debian/control b/debian/squeeze/applications/filelight-l10n/debian/control
index 41bbd01a2..a15255751 100644
--- a/debian/squeeze/applications/filelight-l10n/debian/control
+++ b/debian/squeeze/applications/filelight-l10n/debian/control
@@ -2,7 +2,7 @@ Source: filelight-l10n-trinity
Section: kde
Priority: optional
Maintainer: Timothy Pearson
-Uploaders: Raúl Sánchez Siles
+Uploaders: Ral Snchez Siles
Build-Depends: tdelibs4-trinity-dev (>= 4:3.4.3), cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Homepage: http://www.methylblue.com/filelight/
@@ -10,6 +10,8 @@ Homepage: http://www.methylblue.com/filelight/
Package: filelight-l10n-trinity
Architecture: any
Depends: ${shlibs:Depends} , filelight-trinity
+Replaces: filelight-l10n-trinity (<< 4:14.0.0)
+Breaks: filelight-l10n-trinity (<< 4:14.0.0)
Description: Localization (l10n) for Filelight, disk space usage tool [Trinity]
This package provides localization(l10n) files (translations and docs) for
Filelight, Filelight allows you to understand your disk usage by graphically
diff --git a/debian/squeeze/applications/filelight/debian/control b/debian/squeeze/applications/filelight/debian/control
index 78d2efde2..943ff1166 100644
--- a/debian/squeeze/applications/filelight/debian/control
+++ b/debian/squeeze/applications/filelight/debian/control
@@ -3,7 +3,7 @@ Section: kde
Priority: optional
Maintainer: Timothy Pearson
XSBC-Original-Maintainer: Debian KDE Extras Team
-Uploaders: Raúl Sánchez Siles
+Uploaders: Ral Snchez Siles
Standards-Version: 3.8.4
Build-Depends: debhelper (>= 5.0), cdbs, tdelibs4-trinity-dev, xutils, chrpath, gettext, quilt (>= 0.40), automake, autoconf, libtool, libltdl-dev
Homepage: http://www.methylblue.com/filelight/
@@ -11,6 +11,8 @@ Homepage: http://www.methylblue.com/filelight/
Package: filelight-trinity
Architecture: any
Depends: ${shlibs:Depends}
+Replaces: filelight-trinity (<< 4:14.0.0)
+Breaks: filelight-trinity (<< 4:14.0.0)
Description: show where your diskspace is being used [Trinity]
Filelight allows you to understand your disk usage by graphically
representing your filesystem as a set of concentric, segmented rings.
diff --git a/debian/squeeze/applications/fusion-icon/debian/control b/debian/squeeze/applications/fusion-icon/debian/control
index 07c8a3d28..25234c2dd 100644
--- a/debian/squeeze/applications/fusion-icon/debian/control
+++ b/debian/squeeze/applications/fusion-icon/debian/control
@@ -11,6 +11,8 @@ Standards-Version: 3.8.4
Package: fusion-icon-trinity
Architecture: all
XB-Python-Version: ${python:Versions}
+Replaces: fusion-icon-trinity (<< 4:14.0.0)
+Breaks: fusion-icon-trinity (<< 4:14.0.0)
Depends: ${misc:Depends}, ${python:Depends}, python-gtk2 | python-qt4, python-compizconfig-trinity, compiz-trinity
Description: tray icon to launch and manage Compiz Fusion [Trinity]
The OpenCompositing Project brings 3D desktop visual effects that
diff --git a/debian/squeeze/applications/gtk-qt-engine/debian/control b/debian/squeeze/applications/gtk-qt-engine/debian/control
index 01e4d424b..1db192bc3 100644
--- a/debian/squeeze/applications/gtk-qt-engine/debian/control
+++ b/debian/squeeze/applications/gtk-qt-engine/debian/control
@@ -9,6 +9,8 @@ Standards-Version: 3.8.4
Package: gtk-qt-engine-trinity
Architecture: any
Provides: gtk2-engines-gtk-qt-trinity
+Replaces: gtk-qt-engine-trinity (<< 4:14.0.0)
+Breaks: gtk-qt-engine-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: theme engine using Qt for GTK+ 2.x and Trinity
The GTK-Qt Theme Engine (also known as gtk-qt-engine) is a GTK 2 theme engine
diff --git a/debian/squeeze/applications/gwenview/debian/control b/debian/squeeze/applications/gwenview/debian/control
index 82c33fd04..736286221 100644
--- a/debian/squeeze/applications/gwenview/debian/control
+++ b/debian/squeeze/applications/gwenview/debian/control
@@ -9,6 +9,8 @@ Homepage: http://gwenview.sourceforge.net
Package: gwenview-trinity
Architecture: any
Depends: ${shlibs:Depends}
+Replaces: gwenview-trinity (<< 4:14.0.0)
+Breaks: gwenview-trinity (<< 4:14.0.0)
Recommends: tdegraphics-kfile-plugins-trinity, kipi-plugins-trinity
Suggests: gwenview-i18n
Description: image viewer for TDE
diff --git a/debian/squeeze/applications/k3b/debian/control b/debian/squeeze/applications/k3b/debian/control
index 5d91723a0..74cfc4638 100644
--- a/debian/squeeze/applications/k3b/debian/control
+++ b/debian/squeeze/applications/k3b/debian/control
@@ -11,9 +11,10 @@ Homepage: http://www.k3b.org
Package: k3b-trinity
Architecture: any
Depends: ${shlibs:Depends}, wodim | cdrskin, cdparanoia (>= 3a9.8), genisoimage, tdelibs-data-trinity (>= 4:3.1.4-2), cdrdao (>= 1.1.7-5), k3b-data-trinity (= ${source:Version}), libk3b3-trinity (= ${binary:Version})
+Replaces: k3b-trinity (<< 4:14.0.0)
+Breaks: k3b-trinity (<< 4:14.0.0)
Recommends: dvd+rw-tools, libk3b3-extracodecs-trinity
Suggests: k3b-i18n, normalize-audio, toolame, sox, movixmaker-2, vcdimager (>= 0.7)
-Replaces: libk3b3-trinity (<< 1.0.5-2)
Description: A sophisticated KDE CD burning application [Trinity]
K3b is a GUI frontend to the CD recording programs cdrdao and cdrecord.
Its aim is to provide a very user friendly interface to all the tasks
@@ -29,8 +30,9 @@ Description: A sophisticated KDE CD burning application [Trinity]
Package: k3b-data-trinity
Conflicts: k3b-trinity (<< 1.0.4-4)
-Replaces: k3b-trinity (<< 1.0.5-2)
Architecture: all
+Replaces: k3b-data-trinity (<< 4:14.0.0)
+Breaks: k3b-data-trinity (<< 4:14.0.0)
Description: A sophisticated KDE CD burning application - data files [Trinity]
K3b is a GUI frontend to the CD recording programs cdrdao and cdrecord.
Its aim is to provide a very user friendly interface to all the tasks
@@ -41,6 +43,8 @@ Description: A sophisticated KDE CD burning application - data files [Trinity]
Package: libk3b-trinity-dev
Conflicts: libk3bcore-trinity-dev, libk3bplugin-trinity-dev, libk3btools-trinity-dev, libk3bproject-trinity-dev, k3blibs-trinity-dev, k3blibs-trinity
Section: libdevel
+Replaces: libk3b-trinity-dev (<< 4:14.0.0)
+Breaks: libk3b-trinity-dev (<< 4:14.0.0)
Architecture: any
Depends: libk3b3-trinity (= ${binary:Version})
Description: The KDE cd burning application library - development files [Trinity]
@@ -53,9 +57,10 @@ Description: The KDE cd burning application library - development files [Trinity
Package: libk3b3-trinity
Section: libs
Architecture: any
+Replaces: libk3b3-trinity (<< 4:14.0.0)
+Breaks: libk3b3-trinity (<< 4:14.0.0)
Conflicts: libk3bcore-trinity, libk3bplugin-trinity, libk3btools-trinity, libk3bproject-trinity, k3blibs-trinity, libk3b2-trinity
Depends: ${shlibs:Depends}
-Replaces: libk3b2-trinity, libk3b-trinity-dev (<< 1.0.5-2)
Description: The KDE cd burning application library - runtime files [Trinity]
K3b is a GUI frontend to the cd recording programs cdrdao and cdrecord.
Its aim is to provide a very user friendly interface to all the tasks
@@ -66,9 +71,10 @@ Description: The KDE cd burning application library - runtime files [Trinity]
Package: libk3b3-extracodecs-trinity
Section: libs
Architecture: any
+Replaces: libk3b3-extracodecs-trinity (<< 4:14.0.0)
+Breaks: libk3b3-extracodecs-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Conflicts: libk3b2-mp3-trinity
-Replaces: libk3b2-mp3-trinity, libk3b2-extracodecs-trinity, libk3b3-trinity (<< 1.0.5-2)
Description: The KDE cd burning application library - extra decoders [Trinity]
K3b is a GUI frontend to the cd recording programs cdrdao and cdrecord.
Its aim is to provide a very user friendly interface to all the tasks
@@ -79,6 +85,8 @@ Description: The KDE cd burning application library - extra decoders [Trinity]
Package: libk3b2-extracodecs-trinity
Architecture: all
Priority: extra
+Replaces: libk3b2-extracodecs-trinity (<< 4:14.0.0)
+Breaks: libk3b2-extracodecs-trinity (<< 4:14.0.0)
Depends: libk3b3-extracodecs-trinity
Description: transitional package for K3b's extra decoders [Trinity]
This is a dummy transitional package to enable a smooth transition from
diff --git a/debian/squeeze/applications/k9copy/debian/control b/debian/squeeze/applications/k9copy/debian/control
index de8dad059..a54326497 100644
--- a/debian/squeeze/applications/k9copy/debian/control
+++ b/debian/squeeze/applications/k9copy/debian/control
@@ -10,8 +10,10 @@ Homepage: http://k9copy.sourceforge.net/
Package: k9copy-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, vamps, dvd+rw-tools, dvdauthor, mencoder, libdvdnav4
+Replaces: k9copy-trinity (<< 4:14.0.0)
+Breaks: k9copy-trinity (<< 4:14.0.0)
Description: DVD backup tool for Trinity
k9copy is a tabbed tool that allows to copy of one or more titles from a DVD9
- to a DVD5, in the same way than DVDShrink for Microsoft Windows (R).
+ to a DVD5, in thesame way than DVDShrink for Microsoft Windows (R).
This is the Trinity version
diff --git a/debian/squeeze/applications/kaffeine-mozilla/debian/control b/debian/squeeze/applications/kaffeine-mozilla/debian/control
index 9a7389392..38270dc34 100644
--- a/debian/squeeze/applications/kaffeine-mozilla/debian/control
+++ b/debian/squeeze/applications/kaffeine-mozilla/debian/control
@@ -9,6 +9,8 @@ Standards-Version: 3.8.4
Package: kaffeine-mozilla-trinity
Architecture: any
Depends: kaffeine-trinity, ${shlibs:Depends}, ${misc:Depends}
+Replaces: kaffeine-mozilla-trinity (<< 4:14.0.0)
+Breaks: kaffeine-mozilla-trinity (<< 4:14.0.0)
Description: mozilla plugin that lanches kaffeine for supported media types [Trinity]
This mozilla plugin launches kaffeine, the xine-based media player for KDE,
when a page containing a supported media format is loaded.
diff --git a/debian/squeeze/applications/kaffeine/debian/control b/debian/squeeze/applications/kaffeine/debian/control
index 105509a63..5aa779d25 100644
--- a/debian/squeeze/applications/kaffeine/debian/control
+++ b/debian/squeeze/applications/kaffeine/debian/control
@@ -15,6 +15,8 @@ Standards-Version: 3.8.4
Package: kaffeine-trinity
Architecture: any
Depends: ${shlibs:Depends}, hdparm
+Replaces: kaffeine-trinity (<< 4:14.0.0)
+Breaks: kaffeine-trinity (<< 4:14.0.0)
Recommends: tdesudo-trinity, kpackage-trinity
Description: versatile media player for TDE
Kaffeine is a media player for KDE. While it supports multiple player
@@ -30,6 +32,8 @@ Description: versatile media player for TDE
Package: kaffeine-trinity-dbg
Section: devel
Architecture: any
+Replaces: kaffeine-trinity-dbg (<< 4:14.0.0)
+Breaks: kaffeine-trinity-dbg (<< 4:14.0.0)
Priority: extra
Depends: kaffeine-trinity (= ${binary:Version}), tdelibs-trinity-dbg
Recommends: tdesudo-trinity, kpackage-trinity
@@ -41,6 +45,8 @@ Description: debugging symbols for kaffeine [Trinity]
Package: kaffeine-gstreamer-trinity
Architecture: any
Depends: ${shlibs:Depends}, kaffeine-trinity
+Replaces: kaffeine-gstreamer-trinity (<< 4:14.0.0)
+Breaks: kaffeine-gstreamer-trinity (<< 4:14.0.0)
Description: Gstreamer engine for kaffeine media player [Trinity]
Kaffeine is a media player for KDE. While it supports multiple player
engines, its default engine is Gstreamer, giving Kaffeine a wide variety of
diff --git a/debian/squeeze/applications/katapult/debian/control b/debian/squeeze/applications/katapult/debian/control
index e8a858c21..003a6d5da 100644
--- a/debian/squeeze/applications/katapult/debian/control
+++ b/debian/squeeze/applications/katapult/debian/control
@@ -8,6 +8,8 @@ Standards-Version: 3.8.4
Package: katapult-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: katapult-trinity (<< 4:14.0.0)
+Breaks: katapult-trinity (<< 4:14.0.0)
Description: item launcher for KDE [Trinity]
Katapult is an application, which analyses text-based queries
to launch items, such as bookmarks, directories or programs.
diff --git a/debian/squeeze/applications/kbarcode/debian/control b/debian/squeeze/applications/kbarcode/debian/control
index a372496f9..d2341bf16 100644
--- a/debian/squeeze/applications/kbarcode/debian/control
+++ b/debian/squeeze/applications/kbarcode/debian/control
@@ -9,6 +9,8 @@ Standards-Version: 3.8.4
Package: kbarcode-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, barcode, imagemagick
+Replaces: kbarcode-trinity (<< 4:14.0.0)
+Breaks: kbarcode-trinity (<< 4:14.0.0)
Recommends: libqt3-mt-mysql | libqt3-mt-psql | libqt3-mt-odbc | libqt3-mt-sqlite |
libqt3-mt-ibase
Description: barcode and label printing application for Trinity
diff --git a/debian/squeeze/applications/kbfx/debian/control b/debian/squeeze/applications/kbfx/debian/control
index 7c1918ac1..d3830e6d6 100644
--- a/debian/squeeze/applications/kbfx/debian/control
+++ b/debian/squeeze/applications/kbfx/debian/control
@@ -9,6 +9,8 @@ Standards-Version: 3.8.4
Package: kbfx-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: kbfx-trinity (<< 4:14.0.0)
+Breaks: kbfx-trinity (<< 4:14.0.0)
Description: an alternative to K-Menu for KDE [Trinity]
KBFX is an alternative to the classical K-Menu button and its menu.
It improves the user experience by enabling him to set a bigger (and thus more
diff --git a/debian/squeeze/applications/kbookreader/debian/control b/debian/squeeze/applications/kbookreader/debian/control
index bc85ba375..c6ab189eb 100644
--- a/debian/squeeze/applications/kbookreader/debian/control
+++ b/debian/squeeze/applications/kbookreader/debian/control
@@ -10,6 +10,8 @@ Homepage: http://k9copy.sourceforge.net/
Package: kbookreader-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: kbookreader-trinity (<< 4:14.0.0)
+Breaks: kbookreader-trinity (<< 4:14.0.0)
Description: eBook reader for Trinity
kbookreader is an application which allows you to view eBooks
within the Trinity Desktop Environment
diff --git a/debian/squeeze/applications/kchmviewer/debian/control b/debian/squeeze/applications/kchmviewer/debian/control
index 2402649ca..93a25020d 100644
--- a/debian/squeeze/applications/kchmviewer/debian/control
+++ b/debian/squeeze/applications/kchmviewer/debian/control
@@ -10,6 +10,8 @@ Homepage: http://www.kchmviewer.net/
Package: kchmviewer-trinity
Architecture: any
Conflicts: kchmviewer-nokde-trinity
+Replaces: kchmviewer-trinity (<< 4:14.0.0)
+Breaks: kchmviewer-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: CHM viewer for Trinity
KchmViewer is a chm (MS HTML help file format) viewer, written in C++.
diff --git a/debian/squeeze/applications/kcpuload/debian/control b/debian/squeeze/applications/kcpuload/debian/control
index 2577a5722..8b5024c98 100644
--- a/debian/squeeze/applications/kcpuload/debian/control
+++ b/debian/squeeze/applications/kcpuload/debian/control
@@ -9,6 +9,8 @@ Standards-Version: 3.8.4
Package: kcpuload-trinity
Architecture: any
Section: kde
+Replaces: kcpuload-trinity (<< 4:14.0.0)
+Breaks: kcpuload-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: knetload-trinity
Description: a CPU meter for Kicker [Trinity]
diff --git a/debian/squeeze/applications/kdbusnotification/debian/control b/debian/squeeze/applications/kdbusnotification/debian/control
index b08146fc3..cd2ef673b 100644
--- a/debian/squeeze/applications/kdbusnotification/debian/control
+++ b/debian/squeeze/applications/kdbusnotification/debian/control
@@ -8,6 +8,8 @@ Standards-Version: 3.8.4
Package: kdbusnotification-trinity
Architecture: any
Section: kde
+Replaces: kdbusnotification-trinity (<< 4:14.0.0)
+Breaks: kdbusnotification-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: a DBUS notification service [Trinity]
kdbusnotification is a small program for Trinity that displays
diff --git a/debian/squeeze/applications/kdiff3/debian/control b/debian/squeeze/applications/kdiff3/debian/control
index 87de53339..01e6d6a24 100644
--- a/debian/squeeze/applications/kdiff3/debian/control
+++ b/debian/squeeze/applications/kdiff3/debian/control
@@ -9,6 +9,8 @@ Standards-Version: 3.8.4
Package: kdiff3-trinity
Architecture: any
Depends: ${shlibs:Depends}
+Replaces: kdiff3-trinity (<< 4:14.0.0)
+Breaks: kdiff3-trinity (<< 4:14.0.0)
Recommends: kdiff3-trinity-doc
Description: compares and merges 2 or 3 files or directories [Trinity]
KDiff3 compares two or three input files and shows the differences
@@ -20,6 +22,8 @@ Description: compares and merges 2 or 3 files or directories [Trinity]
Package: kdiff3-trinity-doc
Architecture: all
Recommends: kdiff3-trinity
+Replaces: kdiff3-trinity-doc (<< 4:14.0.0)
+Breaks: kdiff3-trinity-doc (<< 4:14.0.0)
Description: documentation for kdiff3 [Trinity]
KDiff3 compares two or three input files and shows the differences
line by line and character by character. This package contains the
diff --git a/debian/squeeze/applications/kdirstat/debian/control b/debian/squeeze/applications/kdirstat/debian/control
index 654c44554..27e47ff0e 100644
--- a/debian/squeeze/applications/kdirstat/debian/control
+++ b/debian/squeeze/applications/kdirstat/debian/control
@@ -9,6 +9,8 @@ Homepage: http://kdirstat.sourceforge.net/
Package: kdirstat-trinity
Architecture: any
Depends: ${shlibs:Depends}
+Replaces: kdirstat-trinity (<< 4:14.0.0)
+Breaks: kdirstat-trinity (<< 4:14.0.0)
Description: graphical disk usage display with cleanup facilities [Trinity]
KDirStat (KDE Directory Statistics) is a small utility program that sums
up disk usage for directory trees, very much like the Unix 'du' command.
diff --git a/debian/squeeze/applications/kdmtheme/debian/control b/debian/squeeze/applications/kdmtheme/debian/control
index b3d52012f..943c0ecf2 100644
--- a/debian/squeeze/applications/kdmtheme/debian/control
+++ b/debian/squeeze/applications/kdmtheme/debian/control
@@ -12,6 +12,8 @@ Homepage: http://beta.smileaf.org/projects
Package: kdmtheme-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, kdm-trinity
+Replaces: kdmtheme-trinity (<< 4:14.0.0)
+Breaks: kdmtheme-trinity (<< 4:14.0.0)
Description: theme manager for KDM [Trinity]
kdmtheme is a theme manager for KDM. It provides a KDE Control Module (KCM)
that allows you to easily install, remove and change your KDM themes.
diff --git a/debian/squeeze/applications/kdpkg/debian/control b/debian/squeeze/applications/kdpkg/debian/control
index 681eb0cb2..15d673216 100644
--- a/debian/squeeze/applications/kdpkg/debian/control
+++ b/debian/squeeze/applications/kdpkg/debian/control
@@ -9,6 +9,8 @@ Standards-Version: 3.8.4
Package: kdpkg-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, apt, dpkg (>=1.14), sudo-trinity, menu
+Replaces: kdpkg-trinity (<< 4:14.0.0)
+Breaks: kdpkg-trinity (<< 4:14.0.0)
Description: KDE frontend for dpkg [Trinity]
kdpkg is a utility for installing .deb package files.
It is similar to gdebi, except that kdpkg is a KDE application
diff --git a/debian/squeeze/applications/keep/debian/control b/debian/squeeze/applications/keep/debian/control
index f12169a33..536f0d010 100644
--- a/debian/squeeze/applications/keep/debian/control
+++ b/debian/squeeze/applications/keep/debian/control
@@ -10,6 +10,8 @@ Standards-Version: 3.8.4
Package: keep-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, rdiff-backup
+Replaces: keep-trinity (<< 4:14.0.0)
+Breaks: keep-trinity (<< 4:14.0.0)
Description: backup system for KDE [Trinity]
Keep is an automatic backup program that allows users to set the parameters of
the backup, including the frequency and the number of backups.
diff --git a/debian/squeeze/applications/kerry/debian/control b/debian/squeeze/applications/kerry/debian/control
index 36f6f9aae..f43dc07dd 100644
--- a/debian/squeeze/applications/kerry/debian/control
+++ b/debian/squeeze/applications/kerry/debian/control
@@ -9,6 +9,8 @@ Standards-Version: 3.8.4
Package: kerry-trinity
Architecture: any
Depends: ${shlibs:Depends}, beagle (>= 0.2.3)
+Replaces: kerry-trinity (<< 4:14.0.0)
+Breaks: kerry-trinity (<< 4:14.0.0)
Description: a KDE frontend for the Beagle desktop search daemon [Trinity]
Kerry is a Trinity frontend for the Beagle desktop search daemon.
.
diff --git a/debian/squeeze/applications/kgtk-qt3/debian/control b/debian/squeeze/applications/kgtk-qt3/debian/control
index 9edbf0887..5ba35f8d3 100644
--- a/debian/squeeze/applications/kgtk-qt3/debian/control
+++ b/debian/squeeze/applications/kgtk-qt3/debian/control
@@ -9,6 +9,8 @@ Homepage: http://trinity.pearsoncomputing.net
Package: kgtk-qt3-trinity
Architecture: any
Depends: ${shlibs:Depends}
+Replaces: kgtk-qt3-trinity (<< 4:14.0.0)
+Breaks: kgtk-qt3-trinity (<< 4:14.0.0)
Conflicts: kgtk-config-bluefish, kgtk-config-eclipse, kgtk-config-firefox, kgtk-config-gimp, kgtk-config-inkscape, kgtk-config-kino, kgtk-config-openoffice, kgtk-config-opera-qt3, kgtk-config-opera-qt4, kgtk-config-scribus, kgtk-config-thunderbird, kubuntu-kgtk-trinity
Description: Use KDE dialogs in Gtk apps
This is an LD_PRELOAD hack that allows most GTK
diff --git a/debian/squeeze/applications/kile/debian/control b/debian/squeeze/applications/kile/debian/control
index ae5bf2225..b39ba1894 100644
--- a/debian/squeeze/applications/kile/debian/control
+++ b/debian/squeeze/applications/kile/debian/control
@@ -11,6 +11,8 @@ Homepage: http://kile.sourceforge.net
Package: kile-trinity
Architecture: any
Section: tex
+Replaces: kile-trinity (<< 4:14.0.0)
+Breaks: kile-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, konsole-trinity, texlive-latex-base
Recommends: kdvi-trinity, dvipng, kghostview-trinity, kpdf-trinity
Suggests: gbib, latex2html, pybliographer, xfig, kile-trinity-i18n, gv
@@ -31,6 +33,8 @@ Description: KDE Integrated LaTeX Environment [Trinity]
Package: kile-trinity-i18n-ar
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-ar (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-ar (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Recommends: kde-trinity-i18n-ar
Provides: kile-trinity-i18n
@@ -40,6 +44,8 @@ Description: Arabic (ar) translations for Kile [Trinity]
Package: kile-trinity-i18n-bg
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-bg (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-bg (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Recommends: kde-trinity-i18n-bg
Provides: kile-trinity-i18n
@@ -49,6 +55,8 @@ Description: Bulgarian (bg) translations for Kile [Trinity]
Package: kile-trinity-i18n-br
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-br (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-br (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Recommends: kde-trinity-i18n-br
Provides: kile-trinity-i18n
@@ -58,6 +66,8 @@ Description: Brazilian (br) translations for Kile [Trinity]
Package: kile-trinity-i18n-ca
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-ca (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-ca (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Recommends: kde-trinity-i18n-ca
Provides: kile-trinity-i18n
@@ -67,6 +77,8 @@ Description: Catalan (ca) translations for Kile [Trinity]
Package: kile-trinity-i18n-cs
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-cs (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-cs (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Recommends: kde-trinity-i18n-cs
Provides: kile-trinity-i18n
@@ -76,6 +88,8 @@ Description: Czech (cs) translations for Kile [Trinity]
Package: kile-trinity-i18n-cy
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-cy (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-cy (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Recommends: kde-trinity-i18n-cy
Provides: kile-trinity-i18n
@@ -85,6 +99,8 @@ Description: Welsh (cy) translations for Kile [Trinity]
Package: kile-trinity-i18n-da
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-da (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-da (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Recommends: kde-trinity-i18n-da
Provides: kile-trinity-i18n
@@ -94,6 +110,8 @@ Description: Danish (da) translations for Kile [Trinity]
Package: kile-trinity-i18n-de
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-de (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-de (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Recommends: kde-trinity-i18n-de
Provides: kile-trinity-i18n
@@ -103,6 +121,8 @@ Description: German (de) translations for Kile [Trinity]
Package: kile-trinity-i18n-el
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-el (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-el (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Recommends: kde-trinity-i18n-el
Provides: kile-trinity-i18n
@@ -112,6 +132,8 @@ Description: Greek (el) translations for Kile [Trinity]
Package: kile-trinity-i18n-engb
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-engb (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-engb (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Recommends: kde-trinity-i18n-engb
Provides: kile-trinity-i18n
@@ -121,6 +143,8 @@ Description: British English (en_GB) translations for Kile [Trinity]
Package: kile-trinity-i18n-es
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-es (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-es (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Recommends: kde-trinity-i18n-es
Provides: kile-trinity-i18n
@@ -130,6 +154,8 @@ Description: Spanish (es) translations for Kile [Trinity]
Package: kile-trinity-i18n-et
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-et (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-et (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Recommends: kde-trinity-i18n-et
Provides: kile-trinity-i18n
@@ -139,6 +165,8 @@ Description: Estonian (et) translations for Kile [Trinity]
Package: kile-trinity-i18n-eu
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-eu (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-eu (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Recommends: kde-trinity-i18n-eu
Provides: kile-trinity-i18n
@@ -148,6 +176,8 @@ Description: Basque (eu) translations for Kile [Trinity]
Package: kile-trinity-i18n-fi
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-fi (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-fi (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Recommends: kde-trinity-i18n-fi
Provides: kile-trinity-i18n
@@ -157,6 +187,8 @@ Description: Finnish (fi) translations for Kile [Trinity]
Package: kile-trinity-i18n-fr
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-fr (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-fr (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Recommends: kde-trinity-i18n-fr
Provides: kile-trinity-i18n
@@ -166,6 +198,8 @@ Description: French (fr) translations for Kile [Trinity]
Package: kile-trinity-i18n-ga
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-ga (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-ga (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Recommends: kde-trinity-i18n-ga
Provides: kile-trinity-i18n
@@ -175,6 +209,8 @@ Description: Irish Gaelic (ga) translations for Kile [Trinity]
Package: kile-trinity-i18n-gl
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-gl (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-gl (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Recommends: kde-trinity-i18n-gl
Provides: kile-trinity-i18n
@@ -184,6 +220,8 @@ Description: Galician (gl) translations for Kile [Trinity]
Package: kile-trinity-i18n-hi
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-hi (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-hi (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Recommends: kde-trinity-i18n-hi
Provides: kile-trinity-i18n
@@ -193,6 +231,8 @@ Description: Hindi (hi) translations for Kile [Trinity]
Package: kile-trinity-i18n-hu
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-hu (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-hu (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Recommends: kde-trinity-i18n-hu
Provides: kile-trinity-i18n
@@ -202,6 +242,8 @@ Description: Hungarian (hu) translations for Kile [Trinity]
Package: kile-trinity-i18n-is
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-is (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-is (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Recommends: kde-trinity-i18n-is
Provides: kile-trinity-i18n
@@ -211,6 +253,8 @@ Description: Icelandic (is) translations for Kile [Trinity]
Package: kile-trinity-i18n-it
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-it (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-it (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Recommends: kde-trinity-i18n-it
Provides: kile-trinity-i18n
@@ -220,6 +264,8 @@ Description: Italian (it) translations for Kile [Trinity]
Package: kile-trinity-i18n-ja
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-ja (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-ja (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Recommends: kde-trinity-i18n-ja
Provides: kile-trinity-i18n
@@ -229,6 +275,8 @@ Description: Japanese (ja) translations for Kile [Trinity]
Package: kile-trinity-i18n-lt
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-lt (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-lt (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Recommends: kde-trinity-i18n-lt
Provides: kile-trinity-i18n
@@ -238,6 +286,8 @@ Description: Lithuanian (lt) translations for Kile [Trinity]
Package: kile-trinity-i18n-ms
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-ms (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-ms (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Recommends: kde-trinity-i18n-ms
Provides: kile-trinity-i18n
@@ -247,6 +297,8 @@ Description: Malay (ms) translations for Kile [Trinity]
Package: kile-trinity-i18n-mt
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-mt (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-mt (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Provides: kile-trinity-i18n
Description: Maltese (mt) translations for Kile [Trinity]
@@ -255,6 +307,8 @@ Description: Maltese (mt) translations for Kile [Trinity]
Package: kile-trinity-i18n-nb
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-nb (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-nb (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Recommends: kde-trinity-i18n-nb
Provides: kile-trinity-i18n
@@ -264,6 +318,8 @@ Description: Norwegian Bookmal (nb) translations for Kile [Trinity]
Package: kile-trinity-i18n-nds
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-nds (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-nds (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Recommends: kde-trinity-i18n-nds
Provides: kile-trinity-i18n
@@ -273,6 +329,8 @@ Description: Low Saxon (nds) translations for Kile [Trinity]
Package: kile-trinity-i18n-nl
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-nl (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-nl (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Recommends: kde-trinity-i18n-nl
Provides: kile-trinity-i18n
@@ -282,6 +340,8 @@ Description: Dutch (nl) translations for Kile [Trinity]
Package: kile-trinity-i18n-nn
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-nn (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-nn (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Recommends: kde-trinity-i18n-nn
Provides: kile-trinity-i18n
@@ -291,6 +351,8 @@ Description: Norwegian Nynorsk (nn) translations for Kile [Trinity]
Package: kile-trinity-i18n-pa
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-pa (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-pa (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Recommends: kde-trinity-i18n-pa
Provides: kile-trinity-i18n
@@ -300,6 +362,8 @@ Description: Punjabi (pa) translations for Kile [Trinity]
Package: kile-trinity-i18n-pl
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-pl (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-pl (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Recommends: kde-trinity-i18n-pl
Provides: kile-trinity-i18n
@@ -309,6 +373,8 @@ Description: Polish (pl) translations for Kile [Trinity]
Package: kile-trinity-i18n-pt
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-pt (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-pt (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Recommends: kde-trinity-i18n-pt
Provides: kile-trinity-i18n
@@ -318,6 +384,8 @@ Description: Portuguese (pt) translations for Kile [Trinity]
Package: kile-trinity-i18n-ptbr
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-ptbr (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-ptbr (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Recommends: kde-trinity-i18n-ptbr
Provides: kile-trinity-i18n
@@ -327,6 +395,8 @@ Description: Brazilian Portuguese (pt_BR) translations for Kile [Trinity]
Package: kile-trinity-i18n-ro
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-ro (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-ro (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Recommends: kde-trinity-i18n-ro
Provides: kile-trinity-i18n
@@ -336,6 +406,8 @@ Description: Romanian (ro) translations for Kile [Trinity]
Package: kile-trinity-i18n-ru
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-ru (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-ru (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Recommends: kde-trinity-i18n-ru
Provides: kile-trinity-i18n
@@ -345,6 +417,8 @@ Description: Russian (ru) translations for Kile [Trinity]
Package: kile-trinity-i18n-rw
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-rw (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-rw (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Recommends: kde-trinity-i18n-rw
Provides: kile-trinity-i18n
@@ -354,6 +428,8 @@ Description: Kinyarwanda (rw) translations for Kile [Trinity]
Package: kile-trinity-i18n-sk
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-sk (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-sk (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Recommends: kde-trinity-i18n-sk
Provides: kile-trinity-i18n
@@ -363,6 +439,8 @@ Description: Slovak (sk) translations for Kile [Trinity]
Package: kile-trinity-i18n-sr
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-sr (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-sr (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Recommends: kde-trinity-i18n-sr
Provides: kile-trinity-i18n
@@ -372,6 +450,8 @@ Description: Serbian (sr) translations for Kile [Trinity]
Package: kile-trinity-i18n-srlatin
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-srlatin (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-srlatin (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Recommends: kde-trinity-i18n-srlatin
Provides: kile-trinity-i18n
@@ -381,6 +461,8 @@ Description: Latin Serbian (sr@Latn) translations for Kile [Trinity]
Package: kile-trinity-i18n-sv
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-sv (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-sv (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Recommends: kde-trinity-i18n-sv
Provides: kile-trinity-i18n
@@ -390,6 +472,8 @@ Description: Swedish (sv) translations for Kile [Trinity]
Package: kile-trinity-i18n-ta
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-ta (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-ta (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Recommends: kde-trinity-i18n-ta
Provides: kile-trinity-i18n
@@ -399,6 +483,8 @@ Description: Tamil (ta) translations for Kile [Trinity]
Package: kile-trinity-i18n-th
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-th (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-th (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Recommends: kde-trinity-i18n-th
Provides: kile-trinity-i18n
@@ -408,6 +494,8 @@ Description: Thai (th) translations for Kile [Trinity]
Package: kile-trinity-i18n-tr
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-tr (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-tr (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Recommends: kde-trinity-i18n-tr
Provides: kile-trinity-i18n
@@ -417,6 +505,8 @@ Description: Turkish (tr) translations for Kile [Trinity]
Package: kile-trinity-i18n-uk
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-uk (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-uk (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Recommends: kde-trinity-i18n-uk
Provides: kile-trinity-i18n
@@ -426,6 +516,8 @@ Description: Ukrainian (uk) translations for Kile [Trinity]
Package: kile-trinity-i18n-zhcn
Architecture: all
Section: tex
+Replaces: kile-trinity-i18n-zhcn (<< 4:14.0.0)
+Breaks: kile-trinity-i18n-zhcn (<< 4:14.0.0)
Depends: kile-trinity (>= ${source:Version})
Recommends: kde-trinity-i18n-zhcn
Provides: kile-trinity-i18n
diff --git a/debian/squeeze/applications/kima/debian/control b/debian/squeeze/applications/kima/debian/control
index d553a3e9b..3f2b78348 100644
--- a/debian/squeeze/applications/kima/debian/control
+++ b/debian/squeeze/applications/kima/debian/control
@@ -8,6 +8,8 @@ Standards-Version: 3.8.4
Package: kima-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: kima-trinity (<< 4:14.0.0)
+Breaks: kima-trinity (<< 4:14.0.0)
Description: kicker monitoring applet [Trinity]
This applet monitors various temperature,
frequency and fan sources in your kicker
diff --git a/debian/squeeze/applications/kio-apt/debian/control b/debian/squeeze/applications/kio-apt/debian/control
index 114c26b8b..46eec78e4 100644
--- a/debian/squeeze/applications/kio-apt/debian/control
+++ b/debian/squeeze/applications/kio-apt/debian/control
@@ -9,6 +9,8 @@ Standards-Version: 3.8.4
Package: kio-apt-trinity
Architecture: any
Depends: ${shlibs:Depends}, apt, adept-batch-trinity
+Replaces: kio-apt-trinity (<< 4:14.0.0)
+Breaks: kio-apt-trinity (<< 4:14.0.0)
Description: an apt-cache ioslave for Trinity
kio-apt is an ioslave which provides the apt:/ protocol. It
integrates apt-cache functionalities into Konqueror, making
diff --git a/debian/squeeze/applications/kio-locate/debian/control b/debian/squeeze/applications/kio-locate/debian/control
index 3313ed463..5c668f1bf 100644
--- a/debian/squeeze/applications/kio-locate/debian/control
+++ b/debian/squeeze/applications/kio-locate/debian/control
@@ -9,6 +9,8 @@ Standards-Version: 3.8.4
Package: kio-locate-trinity
Architecture: any
Depends: ${shlibs:Depends}
+Replaces: kio-locate-trinity (<< 4:14.0.0)
+Breaks: kio-locate-trinity (<< 4:14.0.0)
Description: kio-slave for the locate command [Trinity]
Adds support for the "locate:" and "locater:"
protocols to Konqueror and other KDE applications.
diff --git a/debian/squeeze/applications/kio-umountwrapper/debian/control b/debian/squeeze/applications/kio-umountwrapper/debian/control
index 03cd3f7fa..413c8c66b 100644
--- a/debian/squeeze/applications/kio-umountwrapper/debian/control
+++ b/debian/squeeze/applications/kio-umountwrapper/debian/control
@@ -8,6 +8,8 @@ Standards-Version: 3.8.4
Package: kio-umountwrapper-trinity
Architecture: any
Depends: ${shlibs:Depends}
+Replaces: kio-umountwrapper-trinity (<< 4:14.0.0)
+Breaks: kio-umountwrapper-trinity (<< 4:14.0.0)
Description: progress dialog for safely removing devices in Trinity.
Wrapper around kio_media_mountwrapper.
Provides a progress dialog for Safely Removing of devices in Trinity.
diff --git a/debian/squeeze/applications/kiosktool/debian/control b/debian/squeeze/applications/kiosktool/debian/control
index 68d0b7404..068639c25 100644
--- a/debian/squeeze/applications/kiosktool/debian/control
+++ b/debian/squeeze/applications/kiosktool/debian/control
@@ -9,6 +9,8 @@ Standards-Version: 3.8.4
Package: kiosktool-trinity
Architecture: any
Depends: ${shlibs:Depends}, tdesudo-trinity
+Replaces: kiosktool-trinity (<< 4:14.0.0)
+Breaks: kiosktool-trinity (<< 4:14.0.0)
Description: tool to configure the TDE kiosk framework
A Point&Click tool for system administrators to enable
TDE's KIOSK features or otherwise preconfigure TDE for
diff --git a/debian/squeeze/applications/kmplayer/debian/control b/debian/squeeze/applications/kmplayer/debian/control
index 41f5f695e..f182f5290 100644
--- a/debian/squeeze/applications/kmplayer/debian/control
+++ b/debian/squeeze/applications/kmplayer/debian/control
@@ -14,6 +14,8 @@ Homepage: http://kmplayer.kde.org
Package: kmplayer-trinity
Architecture: any
Depends: ${shlibs:Depends}, kmplayer-base-trinity (= ${binary:Version}), libxine1-x | libxine1 (<< 1.1.8-2)
+Replaces: kmplayer-trinity (<< 4:14.0.0)
+Breaks: kmplayer-trinity (<< 4:14.0.0)
Recommends: kmplayer-plugin-trinity (= ${binary:Version})
Suggests: ffmpeg, vdr, xawtv, mplayer
Description: media player for Trinity
@@ -35,6 +37,8 @@ Description: media player for Trinity
Package: kmplayer-base-trinity
Architecture: any
Section: kde
+Replaces: kmplayer-base-trinity (<< 4:14.0.0)
+Breaks: kmplayer-base-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: Base files for KMPlayer [Trinity]
Core files needed for KMPlayer.
@@ -44,6 +48,8 @@ Description: Base files for KMPlayer [Trinity]
Package: kmplayer-konq-plugins-trinity
Architecture: any
Section: kde
+Replaces: kmplayer-konq-plugins-trinity (<< 4:14.0.0)
+Breaks: kmplayer-konq-plugins-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, kmplayer-base-trinity (= ${binary:Version}), konqueror-trinity
Description: KMPlayer plugin for KHTML/Konqueror [Trinity]
This plugin enables audio/video playback inside konqueror, using Xine (with
@@ -54,6 +60,8 @@ Description: KMPlayer plugin for KHTML/Konqueror [Trinity]
Package: kmplayer-trinity-doc
Architecture: all
Section: kde
+Replaces: kmplayer-trinity-doc (<< 4:14.0.0)
+Breaks: kmplayer-trinity-doc (<< 4:14.0.0)
Depends: ${shlibs:Depends}, kmplayer-trinity
Description: Handbook for KMPlayer [Trinity]
Documention for KMPlayer, a basic audio/video viewer application for KDE.
diff --git a/debian/squeeze/applications/kmyfirewall/debian/control b/debian/squeeze/applications/kmyfirewall/debian/control
index 7003b4966..dfa0bd20f 100644
--- a/debian/squeeze/applications/kmyfirewall/debian/control
+++ b/debian/squeeze/applications/kmyfirewall/debian/control
@@ -9,6 +9,8 @@ Homepage: http://kmyfirewall.sourceforge.net/
Package: kmyfirewall-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: kmyfirewall-trinity (<< 4:14.0.0)
+Breaks: kmyfirewall-trinity (<< 4:14.0.0)
Description: iptables based firewall configuration tool for KDE [Trinity]
KMyFirewall attempts to make it easier to setup iptables based firewalls on
Linux systems. It will be the right tool if you like to have a so called
diff --git a/debian/squeeze/applications/kmymoney/debian/control b/debian/squeeze/applications/kmymoney/debian/control
index 30c1d33e2..316e96269 100644
--- a/debian/squeeze/applications/kmymoney/debian/control
+++ b/debian/squeeze/applications/kmymoney/debian/control
@@ -9,8 +9,9 @@ Standards-Version: 3.8.4
Package: kmymoney2-trinity
Architecture: any
-Depends: ${shlibs:Depends}, ${shlibs:Misc}, ${misc:Depends},
- kmymoney2-common-trinity (>= ${source:Version})
+Depends: ${shlibs:Depends}, ${shlibs:Misc}, ${misc:Depends}, kmymoney2-common-trinity (>= ${source:Version})
+Replaces: kmymoney2-trinity (<< 4:14.0.0)
+Breaks: kmymoney2-trinity (<< 4:14.0.0)
Recommends: kmymoney2-plugin-aqbanking-trinity
Description: personal finance manager for TDE
KMyMoney is the Personal Finance Manager for TDE. It operates similar to
@@ -21,6 +22,8 @@ Description: personal finance manager for TDE
Package: kmymoney2-common-trinity
Architecture: all
Depends: ${misc:Depends}
+Replaces: kmymoney2-common-trinity (<< 4:14.0.0)
+Breaks: kmymoney2-common-trinity (<< 4:14.0.0)
Recommends: kmymoney2-trinity (>= ${source:Version})
Description: KMyMoney architecture independent files
This package contains architecture independent files needed for KMyMoney to
@@ -30,6 +33,8 @@ Description: KMyMoney architecture independent files
Package: kmymoney2-trinity-dev
Section: libdevel
Architecture: any
+Replaces: kmymoney2-trinity-dev (<< 4:14.0.0)
+Breaks: kmymoney2-trinity-dev (<< 4:14.0.0)
Depends: ${misc:Depends}, kmymoney2-trinity (= ${binary:Version})
Description: KMyMoney development files
This package contains development files needed for KMyMoney plugins.
diff --git a/debian/squeeze/applications/knemo/debian/control b/debian/squeeze/applications/knemo/debian/control
index 41e259f13..81781eeb0 100644
--- a/debian/squeeze/applications/knemo/debian/control
+++ b/debian/squeeze/applications/knemo/debian/control
@@ -9,6 +9,8 @@ Standards-Version: 3.8.4
Package: knemo-trinity
Architecture: any
Depends: kicker-trinity, net-tools, ${shlibs:Depends}
+Replaces: knemo-trinity (<< 4:14.0.0)
+Breaks: knemo-trinity (<< 4:14.0.0)
Recommends: kcontrol-trinity, wireless-tools
Description: network interfaces monitor for the Trinity systray
KNemo displays an icon in the systray for every network interface.
diff --git a/debian/squeeze/applications/knetload/debian/control b/debian/squeeze/applications/knetload/debian/control
index 43ba42fd8..b7db52c53 100644
--- a/debian/squeeze/applications/knetload/debian/control
+++ b/debian/squeeze/applications/knetload/debian/control
@@ -9,6 +9,8 @@ Standards-Version: 3.8.4
Package: knetload-trinity
Architecture: any
Section: kde
+Replaces: knetload-trinity (<< 4:14.0.0)
+Breaks: knetload-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Conflicts: knetload
Suggests: kcpuload-trinity
diff --git a/debian/squeeze/applications/knetstats/debian/control b/debian/squeeze/applications/knetstats/debian/control
index 12c6974ee..06d91fef6 100644
--- a/debian/squeeze/applications/knetstats/debian/control
+++ b/debian/squeeze/applications/knetstats/debian/control
@@ -9,6 +9,8 @@ Homepage: http://knetstats.sourceforge.net/
Package: knetstats-trinity
Architecture: any
Depends: ${shlibs:Depends}
+Replaces: knetstats-trinity (<< 4:14.0.0)
+Breaks: knetstats-trinity (<< 4:14.0.0)
Description: network interfaces monitor for the Trinity systray
A simple KDE network monitor that show rx/tx LEDs of any
network interface on a system tray icon
diff --git a/debian/squeeze/applications/knetworkmanager.cmake/debian/control b/debian/squeeze/applications/knetworkmanager.cmake/debian/control
index 6e36a14dd..649c51085 100644
--- a/debian/squeeze/applications/knetworkmanager.cmake/debian/control
+++ b/debian/squeeze/applications/knetworkmanager.cmake/debian/control
@@ -25,6 +25,8 @@ Homepage: http://opensuse.org/Projects/KNetworkManager
Package: network-manager-tde
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.7.0)
+Replaces: network-manager-kde (<< 4:14.0.0)
+Breaks: network-manager-kde (<< 4:14.0.0)
Recommends: kwalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp
Provides: knetworkmanager-trinity
Conflicts: network-manager-kde
diff --git a/debian/squeeze/applications/knetworkmanager8/debian/control b/debian/squeeze/applications/knetworkmanager8/debian/control
index 49ac8454d..3136bba7f 100644
--- a/debian/squeeze/applications/knetworkmanager8/debian/control
+++ b/debian/squeeze/applications/knetworkmanager8/debian/control
@@ -26,6 +26,8 @@ Homepage: http://opensuse.org/Projects/KNetworkManager
Package: network-manager-kde-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.7.0), network-manager (<< 0.8.9)
+Replaces: network-manager-kde-trinity (<< 4:14.0.0)
+Breaks: network-manager-kde-trinity (<< 4:14.0.0)
Recommends: kwalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp
Provides: knetworkmanager-trinity
Conflicts: network-manager-kde
diff --git a/debian/squeeze/applications/knights/debian/control b/debian/squeeze/applications/knights/debian/control
index 2599fc08a..0e64bc23f 100644
--- a/debian/squeeze/applications/knights/debian/control
+++ b/debian/squeeze/applications/knights/debian/control
@@ -11,6 +11,8 @@ Homepage: http://knights.sourceforge.net/
Package: knights-trinity
Architecture: any
Depends: ${shlibs:Depends}, tdebase-kio-plugins-trinity
+Replaces: knights-trinity (<< 4:14.0.0)
+Breaks: knights-trinity (<< 4:14.0.0)
Suggests: gnuchess | crafty | sjeng, knights-themepack-trinity
Description: A chess interface for the K Desktop Environment [Trinity]
Knights aims to be the ultimate chess resource on your computer.
diff --git a/debian/squeeze/applications/knowit/debian/control b/debian/squeeze/applications/knowit/debian/control
index fa527e889..8f36965d7 100644
--- a/debian/squeeze/applications/knowit/debian/control
+++ b/debian/squeeze/applications/knowit/debian/control
@@ -10,6 +10,8 @@ Homepage: http://knowit.sourceforge.net/
Package: knowit-trinity
Architecture: any
Depends: ${shlibs:Depends}
+Replaces: knowit-trinity (<< 4:14.0.0)
+Breaks: knowit-trinity (<< 4:14.0.0)
Description: Tool for managing notes [Trinity]
KnowIt is a tool for managing notes which are organized in
tree-like hierarchy. It is similar to TuxCards,
diff --git a/debian/squeeze/applications/knutclient/debian/control b/debian/squeeze/applications/knutclient/debian/control
index 520f8eaf8..57a2f7bf5 100644
--- a/debian/squeeze/applications/knutclient/debian/control
+++ b/debian/squeeze/applications/knutclient/debian/control
@@ -10,6 +10,8 @@ Homepage: http://www.knut.noveradsl.cz/knutclient/
Package: knutclient-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: knutclient-trinity (<< 4:14.0.0)
+Breaks: knutclient-trinity (<< 4:14.0.0)
Description: A KDE GUI that displays UPS statistics from NUT's upsd [Trinity]
KNutClient monitors UPS statistics through the NUT (Network UPS Tools,
http://www.networkupstools.org/) framework on Linux and other systems. This
diff --git a/debian/squeeze/applications/koffice/debian/control b/debian/squeeze/applications/koffice/debian/control
index 93824f845..4aba97f07 100644
--- a/debian/squeeze/applications/koffice/debian/control
+++ b/debian/squeeze/applications/koffice/debian/control
@@ -3,7 +3,7 @@ Section: kde
Priority: optional
Maintainer: Timothy Pearson
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers
-Uploaders: Ana Beatriz Guerrero Lopez , Raúl Sánchez Siles
+Uploaders: Ana Beatriz Guerrero Lopez , Ral Snchez Siles
Build-Depends: cdbs (>= 0.4.52ubuntu18), debhelper (>= 5), binutils (>= 2.14.90.0.7), recode, docbook-to-man, gawk, gettext, flex, tdelibs4-trinity-dev (>= 4:3.4.3), libaspell-dev, libfontconfig1-dev, libopenexr-dev, libpaper-dev, libreadline5-dev | libreadline6-dev, libtiff4-dev, libwv2-dev (>= 0.2.2-4), libxml2-dev, libxslt1-dev, python-dev, ruby (>= 1.8.0), ruby1.8-dev, libwpd8-dev, libpqxx-dev, libmysqlclient15-dev | libmysqlclient16-dev, sharutils, bzip2, libpoppler-tqt-dev, libexif-dev, libasound2-dev, libogg-dev-la, automake, autoconf, libtool, libltdl-dev
Build-Depends-Indep: libtqtinterface-doc, graphviz, gsfonts-x11
Standards-Version: 3.8.4
@@ -12,6 +12,8 @@ Homepage: http://www.koffice.org
Package: koffice-trinity
Architecture: all
Section: kde
+Replaces: koffice-trinity (<< 4:14.0.0)
+Breaks: koffice-trinity (<< 4:14.0.0)
Depends: karbon-trinity (>= ${source:Version}), kchart-trinity (>= ${source:Version}), kexi-trinity (>= ${source:Version}), kformula-trinity (>= ${source:Version}), kivio-trinity (>= ${source:Version}), koshell-trinity (>= ${source:Version}), kplato-trinity (>= ${source:Version}), kpresenter-trinity (>= ${source:Version}), chalk-trinity (>= ${source:Version}), kspread-trinity (>= ${source:Version}), kugar-trinity (>= ${source:Version}), kword-trinity (>= ${source:Version}), kthesaurus-trinity (>= ${source:Version})
Suggests: koffice-i18n-trinity, koffice-trinity-dev (>= ${source:Version}), koffice-trinity-doc (>= ${source:Version}), koffice-trinity-doc-html (= ${source:Version})
Description: KDE Office Suite [Trinity]
@@ -24,6 +26,8 @@ Description: KDE Office Suite [Trinity]
Package: koffice-trinity-doc
Section: doc
Architecture: all
+Replaces: koffice-trinity-doc (<< 4:14.0.0)
+Breaks: koffice-trinity-doc (<< 4:14.0.0)
Description: developer documentation for the KDE Office Suite [Trinity]
This package contains documentation for the KDE Office Suite, of
use more for developers creating applications than regular users.
@@ -33,6 +37,8 @@ Description: developer documentation for the KDE Office Suite [Trinity]
Package: koffice-trinity-doc-html
Architecture: all
Section: doc
+Replaces: koffice-trinity-doc-html (<< 4:14.0.0)
+Breaks: koffice-trinity-doc-html (<< 4:14.0.0)
Suggests: konqueror-trinity | www-browser, koffice-trinity
Description: KDE Office Suite documentation in HTML format [Trinity]
KOffice is an integrated office suite for KDE, the K Desktop
@@ -53,6 +59,8 @@ Description: KDE Office Suite documentation in HTML format [Trinity]
Package: karbon-trinity
Architecture: any
Section: graphics
+Replaces: karbon-trinity (<< 4:14.0.0)
+Breaks: karbon-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, koffice-libs-trinity (<< ${KDE-Next-Version3})
Description: a vector graphics application for the KDE Office Suite
Karbon is a vector graphics application.
@@ -62,6 +70,8 @@ Description: a vector graphics application for the KDE Office Suite
Package: kchart-trinity
Architecture: any
Section: kde
+Replaces: kchart-trinity (<< 4:14.0.0)
+Breaks: kchart-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, koffice-libs-trinity (<< ${KDE-Next-Version3})
Recommends: khelpcenter-trinity | koffice-trinity-doc-html (= ${source:Version})
Description: a chart drawing program for the KDE Office Suite [Trinity]
@@ -73,6 +83,8 @@ Description: a chart drawing program for the KDE Office Suite [Trinity]
Package: kexi-trinity
Architecture: any
Section: kde
+Replaces: kexi-trinity (<< 4:14.0.0)
+Breaks: kexi-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, koffice-libs-trinity (<< ${KDE-Next-Version3})
Suggests: kexi-mdb-plugin-trinity
Description: integrated database environment for the KDE Office Suite [Trinity]
@@ -93,6 +105,8 @@ Description: integrated database environment for the KDE Office Suite [Trinity]
Package: kformula-trinity
Architecture: any
Section: kde
+Replaces: kformula-trinity (<< 4:14.0.0)
+Breaks: kformula-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, koffice-libs-trinity (<< ${KDE-Next-Version3})
Recommends: khelpcenter-trinity | koffice-trinity-doc-html (= ${source:Version})
Description: a formula editor for the KDE Office Suite [Trinity]
@@ -108,6 +122,8 @@ Description: a formula editor for the KDE Office Suite [Trinity]
Package: kivio-trinity
Architecture: any
Section: graphics
+Replaces: kivio-trinity (<< 4:14.0.0)
+Breaks: kivio-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, kivio-data-trinity (>> 1:1.4.90.2-1), kivio-data-trinity (>> ${KDE-Version3}), kivio-data-trinity (<< ${KDE-Next-Version3}), koffice-libs-trinity (<< ${KDE-Next-Version3})
Description: a flowcharting program for the KDE Office Suite [Trinity]
Kivio is a flowcharting program that offers basic flowcharting abilities,
@@ -119,6 +135,8 @@ Description: a flowcharting program for the KDE Office Suite [Trinity]
Package: kivio-data-trinity
Architecture: all
Section: graphics
+Replaces: kivio-data-trinity (<< 4:14.0.0)
+Breaks: kivio-data-trinity (<< 4:14.0.0)
Description: data files for Kivio flowcharting program [Trinity]
This package contains architecture-independent data files for Kivio,
the flowcharting program shipped with the KDE Office Suite.
@@ -130,6 +148,8 @@ Description: data files for Kivio flowcharting program [Trinity]
Package: koshell-trinity
Architecture: any
Section: kde
+Replaces: koshell-trinity (<< 4:14.0.0)
+Breaks: koshell-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, koffice-libs-trinity (<< ${KDE-Next-Version3})
Recommends: koffice-trinity, khelpcenter-trinity | koffice-trinity-doc-html (= ${source:Version})
Description: the KDE Office Suite workspace [Trinity]
@@ -141,6 +161,8 @@ Description: the KDE Office Suite workspace [Trinity]
Package: kplato-trinity
Architecture: any
Section: kde
+Replaces: kplato-trinity (<< 4:14.0.0)
+Breaks: kplato-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, koffice-libs-trinity (<< ${KDE-Next-Version3})
Recommends: khelpcenter-trinity | koffice-trinity-doc-html (= ${source:Version})
Description: an integrated project management and planning tool [Trinity]
@@ -153,6 +175,8 @@ Description: an integrated project management and planning tool [Trinity]
Package: kpresenter-trinity
Architecture: any
Section: kde
+Replaces: kpresenter-trinity (<< 4:14.0.0)
+Breaks: kpresenter-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, ${perl:Depends}, kpresenter-data-trinity (>> ${KDE-Version3}), kpresenter-data-trinity (<< ${KDE-Next-Version3}), koffice-libs-trinity (<< ${KDE-Next-Version3})
Recommends: khelpcenter-trinity | koffice-trinity-doc-html (= ${source:Version})
Description: a presentation program for the KDE Office Suite [Trinity]
@@ -165,6 +189,8 @@ Description: a presentation program for the KDE Office Suite [Trinity]
Package: kpresenter-data-trinity
Architecture: all
Section: kde
+Replaces: kpresenter-data-trinity (<< 4:14.0.0)
+Breaks: kpresenter-data-trinity (<< 4:14.0.0)
Description: data files for KPresenter presentation program [Trinity]
This package contains architecture-independent data files for KPresenter,
the presentation program shipped with the KDE Office Suite.
@@ -176,6 +202,8 @@ Description: data files for KPresenter presentation program [Trinity]
Package: chalk-trinity
Architecture: any
Section: kde
+Replaces: chalk-trinity (<< 4:14.0.0)
+Breaks: chalk-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, chalk-data-trinity (>> ${KDE-Version3}), chalk-data-trinity (<< ${KDE-Next-Version3}), koffice-libs-trinity (<< ${KDE-Next-Version3})
Recommends: dcraw, khelpcenter-trinity | koffice-trinity-doc-html (= ${source:Version})
Description: a pixel-based image manipulation program for the KDE Office Suite [Trinity]
@@ -187,6 +215,8 @@ Description: a pixel-based image manipulation program for the KDE Office Suite [
Package: chalk-data-trinity
Architecture: all
Section: kde
+Replaces: chalk-data-trinity (<< 4:14.0.0)
+Breaks: chalk-data-trinity (<< 4:14.0.0)
Description: data files for Chalk painting program [Trinity]
This package contains architecture-independent data files for Chalk,
the painting program shipped with the KDE Office Suite.
@@ -198,6 +228,8 @@ Description: data files for Chalk painting program [Trinity]
Package: kspread-trinity
Architecture: any
Section: kde
+Replaces: kspread-trinity (<< 4:14.0.0)
+Breaks: kspread-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, koffice-libs-trinity (<< ${KDE-Next-Version3})
Recommends: khelpcenter-trinity | koffice-trinity-doc-html (= ${source:Version})
Description: a spreadsheet for the KDE Office Suite [Trinity]
@@ -210,6 +242,8 @@ Description: a spreadsheet for the KDE Office Suite [Trinity]
Package: kugar-trinity
Architecture: any
Section: kde
+Replaces: kugar-trinity (<< 4:14.0.0)
+Breaks: kugar-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, koffice-libs-trinity (<< ${KDE-Next-Version3})
Recommends: khelpcenter-trinity | koffice-trinity-doc-html (= ${source:Version})
Description: a business report maker for the KDE Office Suite [Trinity]
@@ -224,6 +258,8 @@ Description: a business report maker for the KDE Office Suite [Trinity]
Package: kword-trinity
Architecture: any
Section: kde
+Replaces: kword-trinity (<< 4:14.0.0)
+Breaks: kword-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, kword-data-trinity (>> ${KDE-Version3}), kword-data-trinity (<< ${KDE-Next-Version3}), koffice-libs-trinity (<< ${KDE-Next-Version3})
Recommends: khelpcenter-trinity | koffice-trinity-doc-html (= ${source:Version})
Description: a word processor for the KDE Office Suite [Trinity]
@@ -237,6 +273,8 @@ Description: a word processor for the KDE Office Suite [Trinity]
Package: kword-data-trinity
Architecture: all
Section: kde
+Replaces: kword-data-trinity (<< 4:14.0.0)
+Breaks: kword-data-trinity (<< 4:14.0.0)
Description: data files for KWord word processor [Trinity]
This package contains architecture-independent data files for KWord,
the word processor shipped with the KDE Office Suite.
@@ -248,6 +286,8 @@ Description: data files for KWord word processor [Trinity]
Package: kthesaurus-trinity
Architecture: any
Section: kde
+Replaces: kthesaurus-trinity (<< 4:14.0.0)
+Breaks: kthesaurus-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, koffice-libs-trinity (<< ${KDE-Next-Version3})
Recommends: khelpcenter-trinity | koffice-trinity-doc-html (= ${source:Version})
Description: thesaurus for the KDE Office Suite [Trinity]
@@ -260,6 +300,8 @@ Description: thesaurus for the KDE Office Suite [Trinity]
Package: koffice-libs-trinity
Architecture: any
Section: libs
+Replaces: koffice-libs-trinity (<< 4:14.0.0)
+Breaks: koffice-libs-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, koffice-data-trinity (>> ${KDE-Version3}), koffice-data-trinity (<< ${KDE-Next-Version3})
Recommends: latex-xft-fonts, ruby, python
Suggests: wordnet, texlive-base
@@ -272,6 +314,8 @@ Description: common libraries and binaries for the KDE Office Suite [Trinity]
Package: koffice-data-trinity
Architecture: all
Section: libs
+Replaces: koffice-data-trinity (<< 4:14.0.0)
+Breaks: koffice-data-trinity (<< 4:14.0.0)
Recommends: khelpcenter-trinity | koffice-trinity-doc-html
Description: common shared data for the KDE Office Suite [Trinity]
This package provides the architecture-independent data that is shared
@@ -282,6 +326,8 @@ Description: common shared data for the KDE Office Suite [Trinity]
Package: koffice-trinity-dev
Architecture: any
Section: libdevel
+Replaces: koffice-trinity-dev (<< 4:14.0.0)
+Breaks: koffice-trinity-dev (<< 4:14.0.0)
Depends: koffice-libs-trinity (= ${binary:Version}), karbon-trinity (= ${binary:Version}), kchart-trinity (= ${binary:Version}), kexi-trinity (= ${binary:Version}), kformula-trinity (= ${binary:Version}), kivio-trinity (= ${binary:Version}), koshell-trinity (= ${binary:Version}), kplato-trinity (= ${binary:Version}), kpresenter-trinity (= ${binary:Version}), chalk-trinity (= ${binary:Version}), kspread-trinity (= ${binary:Version}), kthesaurus-trinity (= ${binary:Version}), kugar-trinity (= ${binary:Version}), kword-trinity (= ${binary:Version}), tdelibs4-trinity-dev
Description: common libraries for KOffice (development files) [Trinity]
This package provides the development files for the libraries that are
@@ -292,6 +338,8 @@ Description: common libraries for KOffice (development files) [Trinity]
Package: koffice-trinity-dbg
Section: libdevel
Architecture: any
+Replaces: koffice-trinity-dbg (<< 4:14.0.0)
+Breaks: koffice-trinity-dbg (<< 4:14.0.0)
Priority: extra
Depends: koffice-libs-trinity (= ${binary:Version})
Description: debugging symbols for koffice [Trinity]
diff --git a/debian/squeeze/applications/konversation/debian/control b/debian/squeeze/applications/konversation/debian/control
index 44b89e4d2..5fbefbb2f 100644
--- a/debian/squeeze/applications/konversation/debian/control
+++ b/debian/squeeze/applications/konversation/debian/control
@@ -12,6 +12,8 @@ Homepage: http://konversation.kde.org/
Package: konversation-trinity
Architecture: any
Depends: ${shlibs:Depends}
+Replaces: konversation-trinity (<< 4:14.0.0)
+Breaks: konversation-trinity (<< 4:14.0.0)
Recommends: python, ruby
Suggests: libsoap-lite-perl
Description: user friendly Internet Relay Chat (IRC) client for KDE [Trinity]
@@ -35,6 +37,8 @@ Description: user friendly Internet Relay Chat (IRC) client for KDE [Trinity]
Package: konversation-trinity-dbg
Architecture: any
Priority: extra
+Replaces: konversation-trinity-dbg (<< 4:14.0.0)
+Breaks: konversation-trinity-dbg (<< 4:14.0.0)
Depends: konversation-trinity (= ${binary:Version})
Recommends: tdelibs-trinity-dbg
Description: debugging symbols for konversation
diff --git a/debian/squeeze/applications/kopete-otr/debian/control b/debian/squeeze/applications/kopete-otr/debian/control
index 08ad0470c..ba54b5a52 100644
--- a/debian/squeeze/applications/kopete-otr/debian/control
+++ b/debian/squeeze/applications/kopete-otr/debian/control
@@ -10,6 +10,8 @@ Homepage: http://kopete-otr.follefuder.org/
Package: kopete-otr-trinity
Architecture: any
Depends: ${shlibs:Depends}
+Replaces: kopete-otr-trinity (<< 4:14.0.0)
+Breaks: kopete-otr-trinity (<< 4:14.0.0)
Description: Off-The-Record encryption for Kopete [Trinity]
This plugin enables Off-The-Record encryption for the KDE instant
messenger Kopete. Using this plugin you can encrypt chatsessions to other
diff --git a/debian/squeeze/applications/kpicosim/debian/control b/debian/squeeze/applications/kpicosim/debian/control
index fbcda31ad..ea7e0db48 100644
--- a/debian/squeeze/applications/kpicosim/debian/control
+++ b/debian/squeeze/applications/kpicosim/debian/control
@@ -8,6 +8,8 @@ Standards-Version: 3.8.4
Package: kpicosim-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: kpicosim-trinity (<< 4:14.0.0)
+Breaks: kpicosim-trinity (<< 4:14.0.0)
Description: IDE and simulator for the Xilinx PicoBlaze-3 [Trinity]
kpicosim is a development environment for the Xilinx
PicoBlaze-3 soft-core processor for the KDE Desktop (Linux).
diff --git a/debian/squeeze/applications/kpilot/debian/control b/debian/squeeze/applications/kpilot/debian/control
index 0b30e45f9..da2241070 100644
--- a/debian/squeeze/applications/kpilot/debian/control
+++ b/debian/squeeze/applications/kpilot/debian/control
@@ -12,6 +12,8 @@ Standards-Version: 3.8.4
Package: kpilot-trinity
Section: utils
Architecture: any
+Replaces: kpilot-trinity (<< 4:14.0.0)
+Breaks: kpilot-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, ${misc:Depends}, debconf (>= 0.5) | debconf-2.0
Suggests: knotes-trinity, korganizer-trinity
Description: TDE Palm Pilot hot-sync tool
diff --git a/debian/squeeze/applications/kpowersave.cmake/debian/control b/debian/squeeze/applications/kpowersave.cmake/debian/control
index d435507bd..1ec23555d 100644
--- a/debian/squeeze/applications/kpowersave.cmake/debian/control
+++ b/debian/squeeze/applications/kpowersave.cmake/debian/control
@@ -10,6 +10,8 @@ Homepage: http://sourceforge.net/projects/powersave/
Package: kpowersave-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, hal (>= 0.5.8.1)
+Replaces: kpowersave-trinity (<< 4:14.0.0)
+Breaks: kpowersave-trinity (<< 4:14.0.0)
Description: HAL based power management applet for Trinity
KPowersave is a TDE systray applet which allows to control the power
management settings and policies of your computer.
diff --git a/debian/squeeze/applications/kpowersave/debian/control b/debian/squeeze/applications/kpowersave/debian/control
index 4a54de6f4..45b18d711 100644
--- a/debian/squeeze/applications/kpowersave/debian/control
+++ b/debian/squeeze/applications/kpowersave/debian/control
@@ -11,6 +11,8 @@ Homepage: http://sourceforge.net/projects/powersave/
Package: kpowersave-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, hal (>= 0.5.8.1)
+Replaces: kpowersave-trinity (<< 4:14.0.0)
+Breaks: kpowersave-trinity (<< 4:14.0.0)
Description: HAL based power management applet for Trinity
KPowersave is a KDE systray applet which allows to control the power
management settings and policies of your computer.
diff --git a/debian/squeeze/applications/kradio/debian/control b/debian/squeeze/applications/kradio/debian/control
index 8bb777261..3631e61e3 100644
--- a/debian/squeeze/applications/kradio/debian/control
+++ b/debian/squeeze/applications/kradio/debian/control
@@ -9,6 +9,8 @@ Homepage: http://kradio.sourceforge.net/
Package: kradio-trinity
Architecture: any
Depends: ${shlibs:Depends}
+Replaces: kradio-trinity (<< 4:14.0.0)
+Breaks: kradio-trinity (<< 4:14.0.0)
Description: Comfortable Radio Application for KDE [Trinity]
KRadio is a comfortable radio application for KDE 3.x with support for
V4L and V4L2 radio cards drivers.
diff --git a/debian/squeeze/applications/krename/debian/control b/debian/squeeze/applications/krename/debian/control
index ed591e17f..a9a37b47c 100644
--- a/debian/squeeze/applications/krename/debian/control
+++ b/debian/squeeze/applications/krename/debian/control
@@ -9,6 +9,8 @@ Standards-Version: 3.8.4
Package: krename-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: krename-trinity (<< 4:14.0.0)
+Breaks: krename-trinity (<< 4:14.0.0)
Description: Powerful batch renamer for KDE 3.x [Trinity]
This package contains a very powerful batch file renamer for Trinity
which can rename a list of files based on a set of expressions.
diff --git a/debian/squeeze/applications/krusader/debian/control b/debian/squeeze/applications/krusader/debian/control
index 46be3e1c4..df68f5511 100644
--- a/debian/squeeze/applications/krusader/debian/control
+++ b/debian/squeeze/applications/krusader/debian/control
@@ -10,6 +10,8 @@ Homepage: http://krusader.sourceforge.net
Package: krusader-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: krusader-trinity (<< 4:14.0.0)
+Breaks: krusader-trinity (<< 4:14.0.0)
Suggests: md5deep | cfv, kedit-trinity, khexedit-trinity, konsole-trinity, kmail-trinity,
krename-trinity, kdiff3-trinity | kompare-trinity | xxdiff, ark-trinity, arj, bzip2, cpio, lha,
unrar | unrar-free | rar, rpm, unace, unzip, zip, p7zip, tdebase-trinity-bin,
@@ -36,6 +38,8 @@ Description: twin-panel (commander-style) file manager for KDE (and other deskto
Package: krusader-trinity-dbg
Section: devel
Architecture: any
+Replaces: krusader-trinity-dbg (<< 4:14.0.0)
+Breaks: krusader-trinity-dbg (<< 4:14.0.0)
Priority: extra
Depends: krusader-trinity (= ${binary:Version})
Description: debugging symbols for krusader-trinity
diff --git a/debian/squeeze/applications/ksplash-engine-moodin/debian/control b/debian/squeeze/applications/ksplash-engine-moodin/debian/control
index 9a0c66c80..25f0639e4 100644
--- a/debian/squeeze/applications/ksplash-engine-moodin/debian/control
+++ b/debian/squeeze/applications/ksplash-engine-moodin/debian/control
@@ -10,6 +10,8 @@ Standards-Version: 3.8.4
Package: ksplash-engine-moodin-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: ksplash-engine-moodin-trinity (<< 4:14.0.0)
+Breaks: ksplash-engine-moodin-trinity (<< 4:14.0.0)
Description: fading splash screen engine for Trinity
Heavily customizable engine for various types of themes.
.
diff --git a/debian/squeeze/applications/ksquirrel/debian/control b/debian/squeeze/applications/ksquirrel/debian/control
index 8a7621b84..d2c01e591 100644
--- a/debian/squeeze/applications/ksquirrel/debian/control
+++ b/debian/squeeze/applications/ksquirrel/debian/control
@@ -16,6 +16,8 @@ Standards-Version: 3.8.4
Package: ksquirrel-trinity
Architecture: any
Depends: libksquirrel0-trinity, ${shlibs:Depends}, ${misc:Depends}
+Replaces: ksquirrel-trinity (<< 4:14.0.0)
+Breaks: ksquirrel-trinity (<< 4:14.0.0)
Description: Powerful Trinity image viewer
KSquirrel is an image viewer for KDE with disk navigator, file tree,
multiple directory view, thumbnails, extended thumbnails, dynamic
diff --git a/debian/squeeze/applications/kstreamripper/debian/control b/debian/squeeze/applications/kstreamripper/debian/control
index bf57f140b..96ea4651d 100644
--- a/debian/squeeze/applications/kstreamripper/debian/control
+++ b/debian/squeeze/applications/kstreamripper/debian/control
@@ -8,6 +8,8 @@ Standards-Version: 3.8.4
Package: kstreamripper-trinity
Architecture: any
Depends: ${shlibs:Depends}, streamripper
+Replaces: kstreamripper-trinity (<< 4:14.0.0)
+Breaks: kstreamripper-trinity (<< 4:14.0.0)
Description: TDE frontend for streamripper
KStreamRipper is a small frontend for the streamripper command
line utility. Streamripper captures internet shoutcast radio streams
diff --git a/debian/squeeze/applications/ksystemlog/debian/control b/debian/squeeze/applications/ksystemlog/debian/control
index 9eeba2863..4dc7c09a5 100644
--- a/debian/squeeze/applications/ksystemlog/debian/control
+++ b/debian/squeeze/applications/ksystemlog/debian/control
@@ -10,6 +10,8 @@ Standards-Version: 3.8.4
Package: ksystemlog-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: ksystemlog-trinity (<< 4:14.0.0)
+Breaks: ksystemlog-trinity (<< 4:14.0.0)
Description: system log viewer tool for Trinity
ksystemlog is a system log viewer tool for Trinity.
.
diff --git a/debian/squeeze/applications/ktechlab/debian/control b/debian/squeeze/applications/ktechlab/debian/control
index a7711a595..7bc68b3c5 100644
--- a/debian/squeeze/applications/ktechlab/debian/control
+++ b/debian/squeeze/applications/ktechlab/debian/control
@@ -8,6 +8,8 @@ Standards-Version: 3.8.4
Package: ktechlab-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: ktechlab-trinity (<< 4:14.0.0)
+Breaks: ktechlab-trinity (<< 4:14.0.0)
Recommends: gputils
Description: circuit simulator for microcontrollers and electronics [Trinity]
KTechlab is a circuit simulator with a nice, clickable and discoverable
diff --git a/debian/squeeze/applications/ktorrent/debian/control b/debian/squeeze/applications/ktorrent/debian/control
index 38305d8ea..43bab9104 100644
--- a/debian/squeeze/applications/ktorrent/debian/control
+++ b/debian/squeeze/applications/ktorrent/debian/control
@@ -8,6 +8,8 @@ Standards-Version: 3.8.4
Package: ktorrent-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: ktorrent-trinity (<< 4:14.0.0)
+Breaks: ktorrent-trinity (<< 4:14.0.0)
Suggests: php5-cli
Recommends: tdebase-kio-plugins-trinity
Description: BitTorrent client for Trinity
diff --git a/debian/squeeze/applications/kuickshow/debian/control b/debian/squeeze/applications/kuickshow/debian/control
index a878557ad..3cf2ee2de 100644
--- a/debian/squeeze/applications/kuickshow/debian/control
+++ b/debian/squeeze/applications/kuickshow/debian/control
@@ -8,6 +8,8 @@ Standards-Version: 3.8.4
Package: kuickshow-trinity
Section: graphics
Architecture: any
+Replaces: kuickshow-trinity (<< 4:14.0.0)
+Breaks: kuickshow-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
Description: KDE image/slideshow viewer [Trinity]
diff --git a/debian/squeeze/applications/kvirc/debian/control b/debian/squeeze/applications/kvirc/debian/control
index fdb7cc1ae..8f5023ee6 100644
--- a/debian/squeeze/applications/kvirc/debian/control
+++ b/debian/squeeze/applications/kvirc/debian/control
@@ -4,13 +4,15 @@ Section: net
Priority: optional
Maintainer: Timothy Pearson
XSBC-Original-Maintainer: Debian KDE Extras Team
-Uploaders: Raúl Sánchez Siles
+Uploaders: Ral Snchez Siles
Standards-Version: 3.8.4
Homepage: http://kvirc.net/
Package: kvirc-trinity
Architecture: any
Depends: kvirc-data-trinity (= ${source:Version}), ${shlibs:Depends}
+Replaces: kvirc-trinity (<< 4:14.0.0)
+Breaks: kvirc-trinity (<< 4:14.0.0)
Description: Trinity based next generation IRC client with module support
A highly configurable graphical IRC client with an MDI interface,
built-in scripting language, support for IRC DCC, drag & drop file
@@ -24,6 +26,8 @@ Description: Trinity based next generation IRC client with module support
Package: kvirc-data-trinity
Section: net
Architecture: all
+Replaces: kvirc-data-trinity (<< 4:14.0.0)
+Breaks: kvirc-data-trinity (<< 4:14.0.0)
Depends: kvirc-trinity (>= ${source:Version})
Description: Data files for KVIrc
This package contains the architecture-independent data needed by KVIrc in
@@ -39,6 +43,8 @@ Description: Data files for KVIrc
Package: kvirc-trinity-dev
Section: devel
Architecture: any
+Replaces: kvirc-trinity-dev (<< 4:14.0.0)
+Breaks: kvirc-trinity-dev (<< 4:14.0.0)
Depends: kvirc-trinity (>= ${source:Version})
Description: Development files for KVIrc
This package contains KVIrc libraries and include files you need if you
diff --git a/debian/squeeze/applications/kvkbd/debian/control b/debian/squeeze/applications/kvkbd/debian/control
index 75efa3c37..e82a50439 100644
--- a/debian/squeeze/applications/kvkbd/debian/control
+++ b/debian/squeeze/applications/kvkbd/debian/control
@@ -9,6 +9,8 @@ Homepage: http://pan4os.info/main/index.php
Package: kvkbd-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: kvkbd-trinity (<< 4:14.0.0)
+Breaks: kvkbd-trinity (<< 4:14.0.0)
Description: Virtual keyboard for KDE [Trinity]
Virtual keyboard for KDE for use with accessibility. Application contains
a systray widget as well as a dockwidget.
diff --git a/debian/squeeze/applications/kvpnc/debian/control b/debian/squeeze/applications/kvpnc/debian/control
index 7b8ade852..6a8196662 100644
--- a/debian/squeeze/applications/kvpnc/debian/control
+++ b/debian/squeeze/applications/kvpnc/debian/control
@@ -9,6 +9,8 @@ Standards-Version: 3.8.4
Package: kvpnc-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, menu, net-tools, psmisc, tdebase-trinity-bin | gksu | sux, module-init-tools | modutils
+Replaces: kvpnc-trinity (<< 4:14.0.0)
+Breaks: kvpnc-trinity (<< 4:14.0.0)
Suggests: iptables, openssl, openvpn, racoon, vpnc, pptp-linux, openswan, xl2tpd, openct, opensc
Description: vpn clients frontend for TDE
KVpnc is a TDE frontend for various vpn clients.
diff --git a/debian/squeeze/applications/piklab/debian/control b/debian/squeeze/applications/piklab/debian/control
index 330a9b6e5..81db97ac2 100644
--- a/debian/squeeze/applications/piklab/debian/control
+++ b/debian/squeeze/applications/piklab/debian/control
@@ -10,6 +10,8 @@ Homepage: http://piklab.sourceforge.net/
Package: piklab-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: piklab-trinity (<< 4:14.0.0)
+Breaks: piklab-trinity (<< 4:14.0.0)
Recommends: gputils, libusb-dev
Suggests: sdcc (>= 2.5.0), sdcc-libraries
Description: IDE for PIC-microcontroller development [Trinity]
diff --git a/debian/squeeze/applications/potracegui/debian/control b/debian/squeeze/applications/potracegui/debian/control
index 9dcd0c545..01aaf4e52 100644
--- a/debian/squeeze/applications/potracegui/debian/control
+++ b/debian/squeeze/applications/potracegui/debian/control
@@ -10,6 +10,8 @@ Standards-Version: 3.8.4
Package: potracegui-trinity
Architecture: any
Depends: ${shlibs:Depends}, potrace
+Replaces: potracegui-trinity (<< 4:14.0.0)
+Breaks: potracegui-trinity (<< 4:14.0.0)
Suggests: autotrace
Description: KDE frontend for potrace [Trinity]
A KDE interface for the commandline tracing tools potrace and/or autotrace. It
diff --git a/debian/squeeze/applications/rosegarden/debian/control b/debian/squeeze/applications/rosegarden/debian/control
index 574dd3c2f..d29778110 100644
--- a/debian/squeeze/applications/rosegarden/debian/control
+++ b/debian/squeeze/applications/rosegarden/debian/control
@@ -11,6 +11,8 @@ Homepage: http://www.rosegardenmusic.com/
Package: rosegarden-trinity
Architecture: any
Depends: ${shlibs:Depends}, khelpcenter-trinity, rosegarden-data-trinity (= ${source:Version}), libxml-twig-perl, sndfile-programs, xterm, tdebase-trinity-bin, konqueror-trinity | www-browser, flac
+Replaces: rosegarden-trinity (<< 4:14.0.0)
+Breaks: rosegarden-trinity (<< 4:14.0.0)
Recommends: jackd, lilypond, swh-plugins | ladspa-plugin
Suggests: qjackctl
Description: music editor and MIDI/audio sequencer [Trinity]
@@ -22,6 +24,8 @@ Description: music editor and MIDI/audio sequencer [Trinity]
Package: rosegarden-data-trinity
Architecture: all
Recommends: rosegarden-trinity
+Replaces: rosegarden-data-trinity (<< 4:14.0.0)
+Breaks: rosegarden-data-trinity (<< 4:14.0.0)
Priority: optional
Description: music editor and MIDI/audio sequencer data files [Trinity]
Rosegarden is a KDE application which provides a mixed Audio/MIDI
diff --git a/debian/squeeze/applications/smartcardauth/debian/control b/debian/squeeze/applications/smartcardauth/debian/control
old mode 100755
new mode 100644
index 4ac2c0ff0..e264a68e3
--- a/debian/squeeze/applications/smartcardauth/debian/control
+++ b/debian/squeeze/applications/smartcardauth/debian/control
@@ -9,6 +9,8 @@ Standards-Version: 3.8.4
Package: smartcardauth
Architecture: any
Depends: pcsc-tools, pcscd-nodbus, initramfs-tools, libpcsc-perl, libpcsclite1, libccid, opensc, zenity, gksu
+Replaces: smartcardauth (<< 4:14.0.0)
+Breaks: smartcardauth (<< 4:14.0.0)
Conflicts: openct
Description: SmartCard Login and LUKS Decrypt, Setup Utility
This utility will allow you to set up your computer to accept a SmartCard as an authentication source for:
diff --git a/debian/squeeze/applications/smb4k/debian/control b/debian/squeeze/applications/smb4k/debian/control
index 361f06da3..ba0821187 100644
--- a/debian/squeeze/applications/smb4k/debian/control
+++ b/debian/squeeze/applications/smb4k/debian/control
@@ -9,6 +9,8 @@ Homepage: http://smb4k.berlios.de/
Package: smb4k-trinity
Architecture: any
Depends: ${shlibs:Depends}, samba-common, smbclient, smbfs
+Replaces: smb4k-trinity (<< 4:14.0.0)
+Breaks: smb4k-trinity (<< 4:14.0.0)
Recommends: super | sudo-trinity
Description: A Samba (SMB) share advanced browser for Trinity
Smb4K is a SMB (Windows) share browser for KDE. It uses the Samba software
diff --git a/debian/squeeze/applications/soundkonverter/debian/control b/debian/squeeze/applications/soundkonverter/debian/control
index 358be80a5..16ecbcabd 100644
--- a/debian/squeeze/applications/soundkonverter/debian/control
+++ b/debian/squeeze/applications/soundkonverter/debian/control
@@ -10,6 +10,8 @@ Homepage: http://www.kde-apps.org/content/show.php?content=29024
Package: soundkonverter-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: soundkonverter-trinity (<< 4:14.0.0)
+Breaks: soundkonverter-trinity (<< 4:14.0.0)
Recommends: cdda2wav, cdparanoia, faad, ffmpeg, flac, tdemultimedia-kio-plugins-trinity, mp3gain, mplayer, mppenc, speex, timidity, vorbis-tools, vorbisgain, wavpack
Suggests: soundkonverter-amarok-trinity
Description: audio converter frontend for Trinity
@@ -32,6 +34,8 @@ Description: audio converter frontend for Trinity
Package: soundkonverter-amarok-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, soundkonverter-trinity, amarok-trinity, ruby, libqt0-ruby1.8-trinity
+Replaces: soundkonverter-amarok-trinity (<< 4:14.0.0)
+Breaks: soundkonverter-amarok-trinity (<< 4:14.0.0)
Description: audio converter frontend for Trinity (Amarok script)
Amarok script for soundKonverter. It allows you to easily transcode files when
transferring them to your media device.
diff --git a/debian/squeeze/applications/tde-guidance/debian/control b/debian/squeeze/applications/tde-guidance/debian/control
index 364d23b2b..e14fab2bb 100644
--- a/debian/squeeze/applications/tde-guidance/debian/control
+++ b/debian/squeeze/applications/tde-guidance/debian/control
@@ -13,6 +13,8 @@ Standards-Version: 3.8.4
Package: tde-guidance-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, pytdeextensions-trinity, python-trinity-trinity, sysv-rc, guidance-backends-trinity, hwdata, python (>= 2.5), python-dev (>= 2.5)
+Replaces: kde-guidance-trinity (<< 4:14.0.0)
+Breaks: kde-guidance-trinity (<< 4:14.0.0)
Conflicts: guidance-power-manager, tde-guidance-powermanager
Provides: ${python:Provides}
Description: collection of KDE system administration tools for GNU/Linux [Trinity]
@@ -32,6 +34,8 @@ Description: collection of KDE system administration tools for GNU/Linux [Trinit
Package: guidance-backends-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, hwdata, python (>= 2.5), python-dev (>= 2.5)
+Replaces: guidance-backends-trinity (<< 4:14.0.0)
+Breaks: guidance-backends-trinity (<< 4:14.0.0)
Conflicts: guidance-power-manager, tde-guidance-powermanager
Provides: ${python:Provides}
Description: collection of system administration tools for GNU/Linux [Trinity]
@@ -43,6 +47,8 @@ Description: collection of system administration tools for GNU/Linux [Trinity]
Package: tde-guidance-powermanager-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, tde-guidance-trinity, python-trinity-trinity, python-dbus, hal, python-gobject, python (>= 2.5), python-dev (>= 2.5)
+Replaces: kde-guidance-powermanager-trinity (<< 4:14.0.0)
+Breaks: kde-guidance-powermanager-trinity (<< 4:14.0.0)
Conflicts: guidance-power-manager, tde-guidance-powermanager
Provides: ${python:Provides}
Description: HAL based power manager applet [Trinity]
diff --git a/debian/squeeze/applications/tde-style-lipstik/debian/control b/debian/squeeze/applications/tde-style-lipstik/debian/control
index cc8cd43be..5b79a0aed 100644
--- a/debian/squeeze/applications/tde-style-lipstik/debian/control
+++ b/debian/squeeze/applications/tde-style-lipstik/debian/control
@@ -8,6 +8,8 @@ Standards-Version: 3.8.4
Package: tde-style-lipstik-trinity
Section: kde
Architecture: any
+Replaces: kde-style-lipstik-trinity (<< 4:14.0.0)
+Breaks: kde-style-lipstik-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Lipstik style for TDE
Based on the plastik style, Lipstik is a purified style with many options to
diff --git a/debian/squeeze/applications/tde-style-qtcurve/debian/control b/debian/squeeze/applications/tde-style-qtcurve/debian/control
index 5974c91b8..ca85f86b5 100644
--- a/debian/squeeze/applications/tde-style-qtcurve/debian/control
+++ b/debian/squeeze/applications/tde-style-qtcurve/debian/control
@@ -9,6 +9,8 @@ Standards-Version: 3.8.4
Package: tde-style-qtcurve-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: kde-style-qtcurve-trinity (<< 4:14.0.0)
+Breaks: kde-style-qtcurve-trinity (<< 4:14.0.0)
Recommends: gtk2-engines-qtcurve
Provides: tde-style-qtcurve
Description: This is a set of widget styles for Trinity based apps
@@ -21,6 +23,8 @@ Description: This is a set of widget styles for Trinity based apps
Package: qtcurve-trinity
Architecture: any
Depends: tde-style-qtcurve-trinity, gtk2-engines-qtcurve
+Replaces: qtcurve-trinity (<< 4:14.0.0)
+Breaks: qtcurve-trinity (<< 4:14.0.0)
Description: This is a set of widget styles for Trinity and Gtk2 based apps
This is an empty dummy package which will drag the packages
tde-style-qtcurve and gtk2-engines-qtcurve in your system.
diff --git a/debian/squeeze/applications/tde-systemsettings/debian/control b/debian/squeeze/applications/tde-systemsettings/debian/control
index 4497e37e2..e6f064f55 100644
--- a/debian/squeeze/applications/tde-systemsettings/debian/control
+++ b/debian/squeeze/applications/tde-systemsettings/debian/control
@@ -8,6 +8,8 @@ Standards-Version: 3.8.4
Package: tde-systemsettings-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, kcontrol-trinity
+Replaces: kde-systemsettings-trinity (<< 4:14.0.0)
+Breaks: kde-systemsettings-trinity (<< 4:14.0.0)
Description: easy to use control centre for TDE
System preferences is a replacement for the TDE
Control Centre with an improved user interface.
diff --git a/debian/squeeze/applications/tdesudo/debian/control b/debian/squeeze/applications/tdesudo/debian/control
index 667a2a419..67646ec9f 100644
--- a/debian/squeeze/applications/tdesudo/debian/control
+++ b/debian/squeeze/applications/tdesudo/debian/control
@@ -8,6 +8,8 @@ Standards-Version: 3.8.4
Package: tdesudo-trinity
Architecture: any
Depends: ${shlibs:Depends}, sudo
+Replaces: kdesudo-trinity (<< 4:14.0.0)
+Breaks: kdesudo-trinity (<< 4:14.0.0)
Description: sudo frontend for Trinity
KdeSudo is a graphical frontend for the sudo utility.
It allows you to run programs as another user by entering your password.
diff --git a/debian/squeeze/applications/tdesvn/debian/control b/debian/squeeze/applications/tdesvn/debian/control
index 7776b1465..0c1f99451 100644
--- a/debian/squeeze/applications/tdesvn/debian/control
+++ b/debian/squeeze/applications/tdesvn/debian/control
@@ -9,6 +9,8 @@ Standards-Version: 3.8.4
Package: libsvnqt4-trinity
Section: libs
Architecture: any
+Replaces: libsvnqt4-trinity (<< 4:14.0.0)
+Breaks: libsvnqt4-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Qt wrapper library for subversion [Trinity]
This package provides svnqt, a Qt wrapper library around the
@@ -20,6 +22,8 @@ Description: Qt wrapper library for subversion [Trinity]
Package: libsvnqt-trinity-dev
Section: libdevel
Architecture: any
+Replaces: libsvnqt-trinity-dev (<< 4:14.0.0)
+Breaks: libsvnqt-trinity-dev (<< 4:14.0.0)
Depends: libsvnqt4-trinity (= ${binary:Version}), libqt3-mt-dev, libsvn-dev
Description: Qt wrapper library for subversion (development files) [Trinity]
This package contains the header files and symbolic links that developers
@@ -28,6 +32,8 @@ Description: Qt wrapper library for subversion (development files) [Trinity]
Package: tdesvn-trinity
Section: devel
Architecture: any
+Replaces: kdesvn-trinity (<< 4:14.0.0)
+Breaks: kdesvn-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, ${misc:Depends}, tdesvn-kio-plugins-trinity (= ${binary:Version})
Recommends: kompare-trinity, graphviz
Suggests: khelpcenter-trinity, kdiff3-trinity
@@ -42,6 +48,8 @@ Description: subversion client with tight KDE integration [Trinity]
Package: tdesvn-kio-plugins-trinity
Section: devel
Architecture: any
+Replaces: kdesvn-kio-plugins-trinity (<< 4:14.0.0)
+Breaks: kdesvn-kio-plugins-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: tdesdk-kio-plugins-trinity
Description: subversion I/O slaves for Trinity
diff --git a/debian/squeeze/applications/tellico/debian/control b/debian/squeeze/applications/tellico/debian/control
index a68d139b2..7cf6f01fd 100644
--- a/debian/squeeze/applications/tellico/debian/control
+++ b/debian/squeeze/applications/tellico/debian/control
@@ -10,6 +10,8 @@ Homepage: http://periapsis.org/tellico/
Package: tellico-trinity
Architecture: any
Depends: tellico-data-trinity (= ${source:Version}), tellico-scripts-trinity, ${shlibs:Depends}
+Replaces: tellico-trinity (<< 4:14.0.0)
+Breaks: tellico-trinity (<< 4:14.0.0)
Description: collection manager for books, videos, music [Trinity]
Tellico is a collection manager for KDE. It includes default collections for
books, bibliographies, comic books, videos, music, coins, stamps, trading
@@ -27,6 +29,8 @@ Description: collection manager for books, videos, music [Trinity]
Package: tellico-data-trinity
Architecture: all
Depends: tdelibs-data-trinity
+Replaces: tellico-data-trinity (<< 4:14.0.0)
+Breaks: tellico-data-trinity (<< 4:14.0.0)
Recommends: tellico-trinity
Suggests: python
Description: collection manager for books, videos, music [data] [Trinity]
@@ -49,6 +53,8 @@ Description: collection manager for books, videos, music [data] [Trinity]
Package: tellico-scripts-trinity
Architecture: all
Recommends: tellico-trinity
+Replaces: tellico-scripts-trinity (<< 4:14.0.0)
+Breaks: tellico-scripts-trinity (<< 4:14.0.0)
Suggests: python, ruby
Description: collection manager for books, videos, music [scripts] [Trinity]
Tellico is a collection manager for KDE. It includes default collections for
diff --git a/debian/squeeze/applications/twin-style-crystal/debian/control b/debian/squeeze/applications/twin-style-crystal/debian/control
index ca5489a04..9e966189c 100644
--- a/debian/squeeze/applications/twin-style-crystal/debian/control
+++ b/debian/squeeze/applications/twin-style-crystal/debian/control
@@ -9,6 +9,8 @@ Standards-Version: 3.8.4
Package: twin-style-crystal-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: kwin-style-crystal-trinity (<< 4:14.0.0)
+Breaks: kwin-style-crystal-trinity (<< 4:14.0.0)
Description: semi transparant window decoration for Trinity
Crystal offers you pseudo transparent titlebar, buttons and borders
transparent, so you can see more of your lovely background image
diff --git a/debian/squeeze/applications/wlassistant/debian/control b/debian/squeeze/applications/wlassistant/debian/control
index f6596b6c3..7eff62514 100644
--- a/debian/squeeze/applications/wlassistant/debian/control
+++ b/debian/squeeze/applications/wlassistant/debian/control
@@ -9,6 +9,8 @@ Standards-Version: 3.8.4
Package: wlassistant-trinity
Architecture: any
Depends: kicker-trinity, net-tools, wireless-tools, menu, ${shlibs:Depends}
+Replaces: wlassistant-trinity (<< 4:14.0.0)
+Breaks: wlassistant-trinity (<< 4:14.0.0)
Recommends: dhcp3-client | dhcp-client | dhcpcd
Description: User friendly KDE frontend for wireless network connection [Trinity]
Wireless Assistant scans for wireless access points and displays link quality,
diff --git a/debian/squeeze/applications/yakuake/debian/control b/debian/squeeze/applications/yakuake/debian/control
index 0ba3c1f17..8204e37de 100644
--- a/debian/squeeze/applications/yakuake/debian/control
+++ b/debian/squeeze/applications/yakuake/debian/control
@@ -10,6 +10,8 @@ Homepage: http://extragear.kde.org/apps/yakuake/
Package: yakuake-trinity
Architecture: any
Depends: ${shlibs:Depends}, konsole-trinity
+Replaces: yakuake-trinity (<< 4:14.0.0)
+Breaks: yakuake-trinity (<< 4:14.0.0)
Description: a Quake-style terminal emulator based on KDE Konsole technology [Trinity]
YaKuake is inspired from the terminal in the Quake game: when you press a key
(by default F12, but that can be changed) a terminal window slides down from
diff --git a/debian/squeeze/dependencies/arts/debian/control b/debian/squeeze/dependencies/arts/debian/control
index 57a7a33a1..9c9e910c3 100644
--- a/debian/squeeze/dependencies/arts/debian/control
+++ b/debian/squeeze/dependencies/arts/debian/control
@@ -3,7 +3,7 @@ Section: libs
Maintainer: Timothy Pearson
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers
Priority: optional
-Uploaders: Adeodato Simó , Ana Beatriz Guerrero Lopez , Fathi Boudra , Modestas Vainius
+Uploaders: Adeodato Sim , Ana Beatriz Guerrero Lopez , Fathi Boudra , Modestas Vainius
Build-Depends: cdbs (>= 0.4.48), debhelper (>= 6),
docbook-to-man, gawk, gettext, sharutils, texinfo,
libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
@@ -16,6 +16,8 @@ Standards-Version: 3.8.4
Package: arts-trinity
Architecture: all
Section: sound
+Replaces: arts-trinity (<< 4:14.0.0)
+Breaks: arts-trinity (<< 4:14.0.0)
Depends: libartsc0-trinity (>= ${source:Version}), libarts1c2a-trinity (>= ${source:Version})
Description: sound system from the official KDE release
KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -29,6 +31,8 @@ Description: sound system from the official KDE release
Package: libarts1c2a-trinity
Architecture: any
Section: libs
+Replaces: libarts1c2a-trinity (<< 4:14.0.0)
+Breaks: libarts1c2a-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: libarts1-akode
Description: aRts sound system core components
@@ -51,6 +55,8 @@ Description: aRts sound system core components
Package: libarts1-trinity-dev
Architecture: any
Section: libdevel
+Replaces: libarts1-trinity-dev (<< 4:14.0.0)
+Breaks: libarts1-trinity-dev (<< 4:14.0.0)
Depends: libarts1c2a-trinity (= ${binary:Version}), libartsc0-trinity-dev (= ${binary:Version}), ${libasound2-dev}, libaudio-dev, libaudiofile-dev, libesd0-dev, libglib2.0-dev, libogg-dev, libogg-dev-la, libvorbis-dev, libtqtinterface-dev
Description: development files for the aRts sound system core components
This package contains the header files needed to build applications that
@@ -62,6 +68,8 @@ Description: development files for the aRts sound system core components
Package: libartsc0-trinity
Architecture: any
Section: libs
+Replaces: libartsc0-trinity (<< 4:14.0.0)
+Breaks: libartsc0-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: aRts sound system C support library
This package contains the C bindings for the aRts sound daemon.
@@ -72,6 +80,8 @@ Description: aRts sound system C support library
Package: libartsc0-trinity-dev
Architecture: any
Section: libdevel
+Replaces: libartsc0-trinity-dev (<< 4:14.0.0)
+Breaks: libartsc0-trinity-dev (<< 4:14.0.0)
Depends: libartsc0-trinity (= ${binary:Version}), libglib2.0-dev
Description: development files for the aRts sound system C support library
This package contains the header files needed to build applications that
@@ -83,6 +93,8 @@ Description: development files for the aRts sound system C support library
Package: arts-trinity-dbg
Section: libdevel
Architecture: any
+Replaces: arts-trinity-dbg (<< 4:14.0.0)
+Breaks: arts-trinity-dbg (<< 4:14.0.0)
Priority: extra
Depends: libarts1c2a-trinity (= ${binary:Version})
Description: debugging symbols for arts
diff --git a/debian/squeeze/dependencies/avahi-tqt/debian/control b/debian/squeeze/dependencies/avahi-tqt/debian/control
index 607e76dd1..8b0c55500 100644
--- a/debian/squeeze/dependencies/avahi-tqt/debian/control
+++ b/debian/squeeze/dependencies/avahi-tqt/debian/control
@@ -23,6 +23,8 @@ Standards-Version: 3.9.1
Package: libavahi-tqt-1
Section: libs
Architecture: any
+Replaces: libavahi-tqt-1 (<< 4:14.0.0)
+Breaks: libavahi-tqt-1 (<< 4:14.0.0)
Depends: ${shlibs:Depends},
${misc:Depends}
Pre-Depends: ${misc:Pre-Depends}
@@ -40,6 +42,8 @@ Description: Avahi TQt integration library
Package: libavahi-tqt-dev
Section: libdevel
Architecture: any
+Replaces: libavahi-tqt-dev (<< 4:14.0.0)
+Breaks: libavahi-tqt-dev (<< 4:14.0.0)
Depends: libavahi-tqt-1 (= ${binary:Version}),
${misc:Depends},
libtqtinterface-dev,
@@ -52,4 +56,4 @@ Description: Development headers for the Avahi TQt integration library
print to, files to look at and people to talk to.
.
This package contains the development headers for the interface
- to integrate the Avahi libraries into a TQt main loop application.
\ No newline at end of file
+ to integrate the Avahi libraries into a TQt main loop application.
diff --git a/debian/squeeze/dependencies/dbus-1-tqt/debian/control b/debian/squeeze/dependencies/dbus-1-tqt/debian/control
index 9a6e652a4..36e73bbb1 100644
--- a/debian/squeeze/dependencies/dbus-1-tqt/debian/control
+++ b/debian/squeeze/dependencies/dbus-1-tqt/debian/control
@@ -8,6 +8,8 @@ Standards-Version: 3.8.3
Package: libdbus-1-tqt-dev
Section: libdevel
Architecture: any
+Replaces: libdbus-1-tqt-dev (<< 4:14.0.0)
+Breaks: libdbus-1-tqt-dev (<< 4:14.0.0)
Depends: libdbus-1-tqt (= ${binary:Version}), libdbus-1-dev (>= 0.90), libtqtinterface-dev
Description: dbus bindings for the Trinity Qt [TQt] interface
D-BUS is a message bus, used for sending messages between applications.
@@ -21,6 +23,8 @@ Description: dbus bindings for the Trinity Qt [TQt] interface
Package: libdbus-1-tqt
Section: libs
Architecture: any
+Replaces: libdbus-1-tqt (<< 4:14.0.0)
+Breaks: libdbus-1-tqt (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: dbus bindings for the Trinity Qt [TQt] interface
D-BUS is a message bus, used for sending messages between applications.
diff --git a/debian/squeeze/dependencies/dbus-tqt/debian/control b/debian/squeeze/dependencies/dbus-tqt/debian/control
index ca76e783a..cdf2d334a 100644
--- a/debian/squeeze/dependencies/dbus-tqt/debian/control
+++ b/debian/squeeze/dependencies/dbus-tqt/debian/control
@@ -2,16 +2,17 @@ Source: dbus-tqt
Section: devel
Priority: optional
Maintainer: Utopia Maintenance Team
-Uploaders: Sjoerd Simons , Sebastian Dröge
+Uploaders: Sjoerd Simons , Sebastian Drge
Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5.0.37.2), libtqtinterface-dev, libdbus-1-dev (>= 0.90), cmake
Standards-Version: 3.8.3
Package: libdbus-tqt-1-dev
Section: libdevel
Architecture: any
+Replaces: libdbus-tqt-1-dev (<< 4:14.0.0)
+Breaks: libdbus-tqt-1-dev (<< 4:14.0.0)
Depends: libdbus-tqt-1-1c2 (= ${Source-Version}), libdbus-1-dev (>= 0.90), libtqtinterface-dev
Conflicts: dbus-tqt-1-dev
-Replaces: dbus-tqt-1-dev
Description: simple interprocess messaging system (TQt interface)
D-BUS is a message bus, used for sending messages between applications.
Conceptually, it fits somewhere in between raw sockets and CORBA in
@@ -24,9 +25,10 @@ Description: simple interprocess messaging system (TQt interface)
Package: libdbus-tqt-1-1c2
Section: libs
Architecture: any
+Replaces: libdbus-tqt-1-1c2 (<< 4:14.0.0)
+Breaks: libdbus-tqt-1-1c2 (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Conflicts: dbus-tqt-1, dbus-tqt-1c2, libdbus-tqt-1-1
-Replaces: dbus-tqt-1, dbus-tqt-1c2, libdbus-tqt-1-1
Description: simple interprocess messaging system (TQt-based shared library)
D-BUS is a message bus, used for sending messages between applications.
Conceptually, it fits somewhere in between raw sockets and CORBA in
diff --git a/debian/squeeze/dependencies/libart-lgpl/debian/control b/debian/squeeze/dependencies/libart-lgpl/debian/control
index b797b51d4..d131211f3 100644
--- a/debian/squeeze/dependencies/libart-lgpl/debian/control
+++ b/debian/squeeze/dependencies/libart-lgpl/debian/control
@@ -7,7 +7,7 @@ Source: libart-lgpl
Section: devel
Priority: optional
Maintainer: Josselin Mouette
-Uploaders: Debian GNOME Maintainers , Loic Minier , Sebastian Dröge , Sebastien Bacher
+Uploaders: Debian GNOME Maintainers , Loic Minier , Sebastian Drge , Sebastien Bacher
Standards-Version: 3.8.4
Build-Depends: debhelper (>= 5),
gnome-pkg-tools (>= 0.7),
@@ -18,6 +18,8 @@ Build-Depends: debhelper (>= 5),
Package: libart-2.0-2
Architecture: any
Section: libs
+Replaces: libart-2.0-2 (<< 4:14.0.0)
+Breaks: libart-2.0-2 (<< 4:14.0.0)
Depends: ${misc:Depends},
${shlibs:Depends}
Description: Library of functions for 2D graphics - runtime files
@@ -30,6 +32,8 @@ Description: Library of functions for 2D graphics - runtime files
Package: libart-2.0-dev
Architecture: any
Section: libdevel
+Replaces: libart-2.0-dev (<< 4:14.0.0)
+Breaks: libart-2.0-dev (<< 4:14.0.0)
Depends: ${misc:Depends},
${shlibs:Depends},
libart-2.0-2 (= ${binary:Version}),
diff --git a/debian/squeeze/dependencies/python-tqt/debian/control b/debian/squeeze/dependencies/python-tqt/debian/control
index dffd4d77c..71f586675 100644
--- a/debian/squeeze/dependencies/python-tqt/debian/control
+++ b/debian/squeeze/dependencies/python-tqt/debian/control
@@ -10,6 +10,8 @@ Standards-Version: 3.8.4
Package: python-tqt
Architecture: any
Depends: ${shlibs:Depends}, ${python:Depends}, ${sip:Depends}, ${misc:Depends}
+Replaces: python-tqt (<< 4:14.0.0)
+Breaks: python-tqt (<< 4:14.0.0)
Suggests: python-tqt-gl, python-tqt-doc, libtqt3-mt-mysql|libtqt3-mt-odbc|libtqt3-mt-psql
Provides: ${python:Provides}
Description: TQt bindings for Python
@@ -25,6 +27,8 @@ Description: TQt bindings for Python
Package: python-tqt-dbg
Architecture: any
Priority: extra
+Replaces: python-tqt-dbg (<< 4:14.0.0)
+Breaks: python-tqt-dbg (<< 4:14.0.0)
Section: debug
Depends: ${shlibs:Depends}, python-dbg, python-tqt (= ${binary:Version}), python-sip-dbg, ${misc:Depends}
Description: TQt bindings for Python (debug extension)
@@ -37,6 +41,8 @@ Description: TQt bindings for Python (debug extension)
Package: python-tqt-gl
Architecture: any
Depends: ${shlibs:Depends}, ${python:Depends}, python-tqt (= ${binary:Version}), python-opengl (>= 2.0.1.09-2.2), ${misc:Depends}
+Replaces: python-tqt-gl (<< 4:14.0.0)
+Breaks: python-tqt-gl (<< 4:14.0.0)
Suggests: python-tqt-doc
Provides: ${python:Provides}
Description: TQt OpenGL bindings for Python
@@ -48,6 +54,8 @@ Description: TQt OpenGL bindings for Python
Package: python-tqt-gl-dbg
Priority: extra
Section: debug
+Replaces: python-tqt-gl-dbg (<< 4:14.0.0)
+Breaks: python-tqt-gl-dbg (<< 4:14.0.0)
Architecture: any
Depends: ${shlibs:Depends}, python-dbg, python-tqt-gl (= ${binary:Version}), python-tqt-dbg (= ${binary:Version}), ${misc:Depends}
Description: TQt OpenGL bindings for Python (debug extension)
@@ -61,6 +69,8 @@ Description: TQt OpenGL bindings for Python (debug extension)
Package: python-tqtext
Architecture: any
Depends: ${shlibs:Depends}, ${python:Depends}, python-tqt (= ${binary:Version}), ${misc:Depends}
+Replaces: python-tqtext (<< 4:14.0.0)
+Breaks: python-tqtext (<< 4:14.0.0)
Provides: ${python:Provides}
Description: TQt extensions for PyQt
PyQt Extensions. Contains:
@@ -71,6 +81,8 @@ Description: TQt extensions for PyQt
Package: python-tqtext-dbg
Priority: extra
Section: debug
+Replaces: python-tqtext-dbg (<< 4:14.0.0)
+Breaks: python-tqtext-dbg (<< 4:14.0.0)
Architecture: any
Depends: ${shlibs:Depends}, python-dbg, python-tqtext (= ${binary:Version}), python-tqt-dbg (= ${binary:Version}), ${misc:Depends}
Description: TQt debug extensions for PyQt
@@ -82,6 +94,8 @@ Description: TQt debug extensions for PyQt
Package: pytqt-tools
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: pytqt-tools (<< 4:14.0.0)
+Breaks: pytqt-tools (<< 4:14.0.0)
Description: pyuic and pylupdate for TQt
pyuic is the PyQt counterpart for TQt's uic. It takes an XML
user interface file and generates Python code.
@@ -92,7 +106,8 @@ Description: pyuic and pylupdate for TQt
Package: python-tqt-dev
Depends: ${python:Depends}, ${misc:Depends}
Suggests: python-sip-dev
-Replaces: python-tqt (<< 3.17.3-2)
+Replaces: python-tqt-dev (<< 4:14.0.0)
+Breaks: python-tqt-dev (<< 4:14.0.0)
Architecture: all
Description: TQt bindings for Python - Development files
Development .sip files with definitions of PyQt classes. They
@@ -102,6 +117,8 @@ Description: TQt bindings for Python - Development files
Package: python-tqt-doc
Section: doc
Architecture: all
+Replaces: python-tqt-doc (<< 4:14.0.0)
+Breaks: python-tqt-doc (<< 4:14.0.0)
Depends: ${misc:Depends}
Suggests: python-tqt
Description: TQt bindings for Python - Documentation and examples
diff --git a/debian/squeeze/dependencies/qt3/debian/control b/debian/squeeze/dependencies/qt3/debian/control
index 104af1e46..ee9afe53c 100644
--- a/debian/squeeze/dependencies/qt3/debian/control
+++ b/debian/squeeze/dependencies/qt3/debian/control
@@ -21,7 +21,8 @@ Vcs-Svn: svn://svn.debian.org/pkg-kde/trunk/packages/qt-x11-free
Package: libqt3-mt
Architecture: any
Section: libs
-Replaces: qt3-tools (<< 2:3.0.2-20020306-1), libqt3-helper, libqt3, libqt3c102-mt
+Replaces: libqt3-mt (<< 4:14.0.0)
+Breaks: libqt3-mt (<< 4:14.0.0)
Depends: ${shlibs:Depends}, fontconfig
Recommends: libgl1-mesa-glx | libgl1, libglu1-mesa | libglu1, libxmu6 (>= 4.3.0.dfsg.1-4)
Conflicts: libqt3c102-mt, libqui1-emb, libqt3c-mt
@@ -34,8 +35,9 @@ Description: Qt GUI Library (Threaded runtime version), Version 3
Package: libqt3-mt-mysql
Architecture: any
Section: libs
+Replaces: libqt3-mt-mysql (<< 4:14.0.0)
+Breaks: libqt3-mt-mysql (<< 4:14.0.0)
Depends: ${shlibs:Depends}
-Replaces: libqt3-mysql (<= 2:3.1.1+cvs.20021220-1), libqt3c102-mt-mysql
Conflicts: libqt3c102-mt-mysql, libqt3c-mt-mysql
Description: MySQL database driver for Qt3 (Threaded)
This package contains the threaded MySQL plugin for Qt3. Install it if
@@ -44,8 +46,9 @@ Description: MySQL database driver for Qt3 (Threaded)
Package: libqt3-mt-odbc
Architecture: any
Section: libs
+Replaces: libqt3-mt-odbc (<< 4:14.0.0)
+Breaks: libqt3-mt-odbc (<< 4:14.0.0)
Depends: ${shlibs:Depends}
-Replaces: libqt3-odbc (<= 2:3.1.1+cvs.20021220-1), libqt3c102-mt-odbc
Conflicts: libqt3c102-mt-odbc, libqt3c-mt-odbc
Description: ODBC database driver for Qt3 (Threaded)
This package contains the threaded ODBC plugin for Qt3. Install it if
@@ -54,8 +57,9 @@ Description: ODBC database driver for Qt3 (Threaded)
Package: libqt3-mt-psql
Architecture: any
Section: libs
+Replaces: libqt3-mt-psql (<< 4:14.0.0)
+Breaks: libqt3-mt-psql (<< 4:14.0.0)
Depends: ${shlibs:Depends}
-Replaces: libqt3-psql (<= 2:3.1.1+cvs.20021220-1), libqt3c102-mt-psql
Conflicts: libqt3c102-mt-psql, libqt3c-mt-psql
Description: PostgreSQL database driver for Qt3 (Threaded)
This package contains the threaded PostgreSQL plugin for Qt3.
@@ -77,9 +81,10 @@ Description: PostgreSQL database driver for Qt3 (Threaded)
Package: libqt3-mt-sqlite
Architecture: any
Section: libs
+Replaces: libqt3-mt-sqlite (<< 4:14.0.0)
+Breaks: libqt3-mt-sqlite (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Conflicts: libqt3c102-mt-sqlite
-Replaces: libqt3c102-mt-sqlite
Description: SQLite database driver for Qt3 (Threaded)
This package contains the threaded SQLite plugin for Qt3. Install
it if you intend to use or write Qt programs that are to access an
@@ -88,7 +93,8 @@ Description: SQLite database driver for Qt3 (Threaded)
Package: libqt3-mt-dev
Architecture: any
Section: libdevel
-Replaces: libqt-mt-dev, libqt3-dev, libqt3-helper, libqt3-headers (<= 3:3.1.1-3), libqt3-emb (<= 3:3.0.3-1)
+Replaces: libqt3-mt-dev (<< 4:14.0.0)
+Breaks: libqt3-mt-dev (<< 4:14.0.0)
Depends: libxext-dev (>= 4.3.0.dfsg.1-4), libxrandr-dev (>= 4.3.0.dfsg.1-4),
libsm-dev (>= 4.3.0.dfsg.1-4), libxmu-dev (>= 4.3.0.dfsg.1-4),
libice-dev (>= 4.3.0.dfsg.1-4), libx11-dev (>= 4.3.0.dfsg.1-4),
@@ -118,8 +124,9 @@ Description: Qt development files (Threaded)
Package: libqt3-headers
Architecture: any
Section: devel
+Replaces: libqt3-headers (<< 4:14.0.0)
+Breaks: libqt3-headers (<< 4:14.0.0)
Recommends: libqt3-mt-dev
-Replaces: libqt3-mt-dev, libqt3-dev, libqt3-plugins-headers
Description: Qt3 header files
This package contains all header files for libqt and libqt-mt which come
with Qt3. If you want to compile or develop programs which use Qt3, you
@@ -128,9 +135,10 @@ Description: Qt3 header files
Package: libqt3-compat-headers
Architecture: any
Section: devel
+Replaces: libqt3-compat-headers (<< 4:14.0.0)
+Breaks: libqt3-compat-headers (<< 4:14.0.0)
Depends: libqt3-headers (= ${binary:Version})
Recommends: libqt3-mt-dev
-Replaces: libqt3-mt-dev (<= 3:3.1.1-2), libqt3-dev (<= 3:3.1.1-2), libqt3-headers (<= 3:3.1.1-2)
Description: Qt 1.x and 2.x compatibility includes
This package contains header files that are intended for build
compatibility for applications that build with Qt3 but still use
@@ -143,9 +151,10 @@ Description: Qt 1.x and 2.x compatibility includes
Package: qt3-dev-tools
Architecture: any
Section: devel
+Replaces: qt3-dev-tools (<< 4:14.0.0)
+Breaks: qt3-dev-tools (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Recommends: libqt3-mt-dev
-Replaces: qt3-tools, libqt3-dev, libqt3-mt-dev, qt3-doc (<= 3:3.1.1-2)
Conflicts: libqt-dev (<< 3:2.3.2-10), uic (<= 3:2.3.2-9)
Description: Qt3 development tools
This package contains all tools that are necessary to build programs
@@ -155,9 +164,10 @@ Description: Qt3 development tools
Package: qt3-designer
Architecture: any
Section: devel
+Replaces: qt3-designer (<< 4:14.0.0)
+Breaks: qt3-designer (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Recommends: qt3-dev-tools
-Replaces: qt3-tools, libqt3-dev, libqt3-mt-dev, qt3-doc (= 3:3.3.4-8)
Suggests: qt3-assistant, qt3-doc
Conflicts: qt-designer (<= 3:2.3.2-9), qt-designer-doc
Description: Qt3 Designer
@@ -173,8 +183,9 @@ Description: Qt3 Designer
Package: qt3-apps-dev
Architecture: any
Section: devel
+Replaces: qt3-apps-dev (<< 4:14.0.0)
+Breaks: qt3-apps-dev (<< 4:14.0.0)
Depends: libqt3-mt-dev
-Replaces: qt3-tools, libqt3-dev, libqt3-mt-dev
Description: Qt3 Developer applications development files
This package is intended for developers who want to develop applications
using the additional static libraries that ship with the applications
@@ -187,9 +198,10 @@ Description: Qt3 Developer applications development files
Package: qt3-linguist
Architecture: any
Section: devel
+Replaces: qt3-linguist (<< 4:14.0.0)
+Breaks: qt3-linguist (<< 4:14.0.0)
Suggests: qt3-assistant
Depends: ${shlibs:Depends}
-Replaces: qt3-tools, libqt3-dev, libqt3-mt-dev, qt3-doc (= 3:3.3.4-8)
Description: The Qt3 Linguist
This package contains the Qt3 Linguist which provides translators a
tool perfect for translating any Qt-based application into other
@@ -199,8 +211,9 @@ Description: The Qt3 Linguist
Package: qt3-assistant
Architecture: any
Section: x11
+Replaces: qt3-assistant (<< 4:14.0.0)
+Breaks: qt3-assistant (<< 4:14.0.0)
Depends: ${shlibs:Depends}, qt3-doc
-Replaces: qt3-tools, libqt3-dev, libqt3-mt-dev
Description: The Qt3 assistant application
This package contains the Qt3 Assistant, an easy to use frontend for
the complete Qt3 documentation and serves as an online help viewer for
@@ -216,8 +229,9 @@ Description: The Qt3 assistant application
Package: qt3-qtconfig
Architecture: any
Section: x11
+Replaces: qt3-qtconfig (<< 4:14.0.0)
+Breaks: qt3-qtconfig (<< 4:14.0.0)
Depends: ${shlibs:Depends}
-Replaces: qt3-tools, libqt3-dev, libqt3-mt-dev
Description: The Qt3 Configuration Application
The Qt Configuration program allows endusers to configure the look
and behavior of any Qt3 application. It is mostly only necessary
@@ -230,9 +244,10 @@ Description: The Qt3 Configuration Application
Package: qt3-dev-tools-embedded
Architecture: any
Section: devel
+Replaces: qt3-dev-tools-embedded (<< 4:14.0.0)
+Breaks: qt3-dev-tools-embedded (<< 4:14.0.0)
Recommends: libqt3-mt-dev
Depends: ${shlibs:Depends}
-Replaces: qt3-tools, libqt3-dev, libqt3-mt-dev
Description: Tools to develop embedded Qt applications
This package contains applications only suitable for developing
applications with Qt Embedded and/or Qtopia. It provides the QVFB
@@ -243,9 +258,10 @@ Description: Tools to develop embedded Qt applications
Package: qt3-dev-tools-compat
Architecture: any
Section: devel
+Replaces: qt3-dev-tools-compat (<< 4:14.0.0)
+Breaks: qt3-dev-tools-compat (<< 4:14.0.0)
Recommends: libqt3-mt-dev
Depends: ${shlibs:Depends}
-Replaces: qt3-tools, libqt3-dev, libqt3-mt-dev
Description: Conversion utilities for Qt3 development
This package contains some older Qt tools (namely qt20fix qtrename140,
qm2ts, mergetr, findtr and msg2qm). These tools are needed only by
@@ -258,6 +274,8 @@ Description: Conversion utilities for Qt3 development
Package: libqt3-i18n
Architecture: all
Section: libs
+Replaces: libqt3-i18n (<< 4:14.0.0)
+Breaks: libqt3-i18n (<< 4:14.0.0)
Recommends: libqt3-mt
Description: i18n files for Qt3 library
This package contains the internationalization files for the Qt library.
@@ -267,8 +285,9 @@ Description: i18n files for Qt3 library
Package: qt3-doc
Architecture: all
Section: doc
+Replaces: qt3-doc (<< 4:14.0.0)
+Breaks: qt3-doc (<< 4:14.0.0)
Priority: extra
-Replaces: qt-doc
Suggests: libqt3-headers, qt3-assistant | www-browser
Description: Qt3 API documentation
This package contains the complete API documentation for Qt3.
@@ -279,6 +298,8 @@ Description: Qt3 API documentation
Package: qt3-examples
Architecture: all
Section: doc
+Replaces: qt3-examples (<< 4:14.0.0)
+Breaks: qt3-examples (<< 4:14.0.0)
Priority: extra
Depends: libqt3-mt-dev (>= ${binary:Version})
Suggests: qt3-apps-dev
@@ -290,10 +311,11 @@ Description: Examples for Qt3
Package: qt-x11-free-dbg
Section: libdevel
Architecture: any
+Replaces: qt-x11-free-dbg (<< 4:14.0.0)
+Breaks: qt-x11-free-dbg (<< 4:14.0.0)
Priority: extra
Depends: libqt3-mt (= ${binary:Version}), gdb
Conflicts: libqt3-mt-dbg
-Replaces: libqt3-mt-dbg
Description: debugging symbols for qt-x11-free binaries
This package contains the debugging symbols associated with qt-x11-free.
They will automatically be used by gdb for debugging Qt-related
diff --git a/debian/squeeze/dependencies/sip4-tqt/debian/control b/debian/squeeze/dependencies/sip4-tqt/debian/control
index 4aeb9923a..825f458eb 100644
--- a/debian/squeeze/dependencies/sip4-tqt/debian/control
+++ b/debian/squeeze/dependencies/sip4-tqt/debian/control
@@ -11,10 +11,11 @@ XS-Python-Version: all
Package: python-sip
Architecture: any
Section: python
+Replaces: python-sip (<< 4:14.0.0)
+Breaks: python-sip (<< 4:14.0.0)
Provides: ${python:Provides}, sip-api-7.0, sip-api-7.1
Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
Conflicts: python-sip4 (<< 4.10)
-Replaces: python-sip4 (<< 4.10)
Description: Python/C++ bindings generator runtime library
SIP is a tool for generating bindings for C++ classes with some ideas
borrowed from SWIG, but capable of tighter bindings because of its
@@ -23,11 +24,12 @@ Description: Python/C++ bindings generator runtime library
Package: python-sip-dbg
Priority: extra
Architecture: any
+Replaces: python-sip-dbg (<< 4:14.0.0)
+Breaks: python-sip-dbg (<< 4:14.0.0)
Section: debug
Provides: ${python:Provides}
Depends: python-sip (= ${binary:Version}), python-dbg, ${shlibs:Depends}, ${misc:Depends}
Conflicts: python-sip4-dbg (<< 4.10)
-Replaces: python-sip4-dbg (<< 4.10)
Description: Python/C++ bindings generator runtime library (debug extension)
SIP is a tool for generating bindings for C++ classes with some ideas
borrowed from SWIG, but capable of tighter bindings because of its
@@ -38,11 +40,12 @@ Description: Python/C++ bindings generator runtime library (debug extension)
Package: python-sip-dev
Architecture: any
Section: python
+Replaces: python-sip-dev (<< 4:14.0.0)
+Breaks: python-sip-dev (<< 4:14.0.0)
Depends: ${python:Depends}, python-sip (= ${binary:Version}), python-dev, ${shlibs:Depends}, libjs-jquery, ${misc:Depends}
Recommends: python-sip (>= ${source:Version})
Provides: python-sip4-dev, sip4
Conflicts: python-sip4-dev (<< 4.10), sip4 (<< 4.10)
-Replaces: python-sip4-dev (<< 4.10), sip4 (<< 4.10)
Description: Python/C++ bindings generator development files
SIP is a tool for generating bindings for C++ classes with some ideas
borrowed from SWIG, but capable of tighter bindings because of its
@@ -68,8 +71,9 @@ Description: Python/C++ bindings generator development files
Package: python-sip4
Architecture: all
Section: python
+Replaces: python-sip4 (<< 4:14.0.0)
+Breaks: python-sip4 (<< 4:14.0.0)
Depends: python-sip, ${misc:Depends}
-Breaks: python-ball (<= 1.3.1-2), python-ballview (<= 1.3.1-2), python-qwt5-qt4 (<= 5.2.1~cvs20091107+dfsg-2), python-qwt5-qt3 (<= 5.2.1~cvs20091107+dfsg-2), python-qwt3d-qt4 (<= 0.1.7~cvs20090625-3), python-qwt3d-qt3 (<= 0.1.7~cvs20090625-3), python-qscintilla2 (<= 2.4-5)
Description: Python/C++ bindings generator runtime library (transitional package)
SIP is a tool for generating bindings for C++ classes with some ideas
borrowed from SWIG, but capable of tighter bindings because of its
@@ -81,6 +85,8 @@ Description: Python/C++ bindings generator runtime library (transitional package
Package: sip4
Architecture: all
Section: python
+Replaces: sip4 (<< 4:14.0.0)
+Breaks: sip4 (<< 4:14.0.0)
Depends: python-sip-dev, ${misc:Depends}
Description: Python/C++ bindings generator (transitional package)
SIP is a tool for generating bindings for C++ classes with some ideas
@@ -93,6 +99,8 @@ Description: Python/C++ bindings generator (transitional package)
Package: python-sip4-dev
Architecture: all
Section: python
+Replaces: python-sip4-dev (<< 4:14.0.0)
+Breaks: python-sip4-dev (<< 4:14.0.0)
Depends: python-sip-dev, ${misc:Depends}
Description: Python/C++ bindings generator development files (transitional package)
SIP is a tool for generating bindings for C++ classes with some ideas
@@ -105,6 +113,8 @@ Description: Python/C++ bindings generator development files (transitional packa
Package: python-sip4-dbg
Architecture: all
Section: debug
+Replaces: python-sip4-dbg (<< 4:14.0.0)
+Breaks: python-sip4-dbg (<< 4:14.0.0)
Priority: extra
Depends: python-sip-dbg, ${misc:Depends}
Description: Python/C++ bindings generator runtime library (debug, transitional package)
diff --git a/debian/squeeze/dependencies/tqca-tls/debian/control b/debian/squeeze/dependencies/tqca-tls/debian/control
index 844290974..ecb53970a 100644
--- a/debian/squeeze/dependencies/tqca-tls/debian/control
+++ b/debian/squeeze/dependencies/tqca-tls/debian/control
@@ -8,6 +8,8 @@ Standards-Version: 3.8.4
Package: tqca-tls
Section: libs
Architecture: any
+Replaces: tqca-tls (<< 4:14.0.0)
+Breaks: tqca-tls (<< 4:14.0.0)
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: TLS plugin for the TQt Cryptographic Architecture (TQCA)
This is a plugin to provide SSL/TLS capability to programs that
diff --git a/debian/squeeze/dependencies/tqscintilla/debian/control b/debian/squeeze/dependencies/tqscintilla/debian/control
index a38122ffd..6f2c1e971 100644
--- a/debian/squeeze/dependencies/tqscintilla/debian/control
+++ b/debian/squeeze/dependencies/tqscintilla/debian/control
@@ -9,7 +9,8 @@ Standards-Version: 3.8.4
Package: libtqscintilla7
Section: libs
Architecture: any
-Replaces: libtqscintilla6
+Replaces: libtqscintilla7 (<< 4:14.0.0)
+Breaks: libtqscintilla7 (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: TQt source code editing component based on Scintilla
Scintilla is a free source code editing component. It has features found
@@ -21,6 +22,8 @@ Description: TQt source code editing component based on Scintilla
Package: libtqscintilla-dev
Section: libdevel
Architecture: all
+Replaces: libtqscintilla-dev (<< 4:14.0.0)
+Breaks: libtqscintilla-dev (<< 4:14.0.0)
Depends: libtqscintilla7 (>= ${source:Version})
Description: TQt source code editing component - development files
Scintilla is a free source code editing component. It has features found
@@ -33,6 +36,8 @@ Description: TQt source code editing component - development files
Package: libtqscintilla-doc
Section: doc
Architecture: all
+Replaces: libtqscintilla-doc (<< 4:14.0.0)
+Breaks: libtqscintilla-doc (<< 4:14.0.0)
Suggests: libtqscintilla-dev
Description: TQt source code editing component - documentation
Scintilla is a free source code editing component. It has features found
diff --git a/debian/squeeze/dependencies/tqt3/debian/control b/debian/squeeze/dependencies/tqt3/debian/control
index 2bd245709..377851559 100644
--- a/debian/squeeze/dependencies/tqt3/debian/control
+++ b/debian/squeeze/dependencies/tqt3/debian/control
@@ -19,7 +19,8 @@ Homepage: http://www.trinitydesktop.org
Package: libtqt3-mt
Architecture: any
Section: libs
-Replaces: tqt3-tools (<< 2:3.0.2-20020306-1), libtqt3-helper, libtqt3, libtqt3c102-mt
+Replaces: libtqt3-mt (<< 4:14.0.0)
+Breaks: libtqt3-mt (<< 4:14.0.0)
Depends: ${shlibs:Depends}, fontconfig
Recommends: libgl1-mesa-glx | libgl1, libglu1-mesa | libglu1, libxmu6 (>= 4.3.0.dfsg.1-4)
Conflicts: libtqt3c102-mt, libtqui1-emb, libtqt3c-mt
@@ -32,8 +33,9 @@ Description: TQt GUI Library (Threaded runtime version), Version 3
Package: libtqt3-mt-mysql
Architecture: any
Section: libs
+Replaces: libtqt3-mt-mysql (<< 4:14.0.0)
+Breaks: libtqt3-mt-mysql (<< 4:14.0.0)
Depends: ${shlibs:Depends}
-Replaces: libtqt3-mysql (<= 2:3.1.1+cvs.20021220-1), libtqt3c102-mt-mysql
Conflicts: libtqt3c102-mt-mysql, libtqt3c-mt-mysql
Description: MySQL database driver for TQt3 (Threaded)
This package contains the threaded MySQL plugin for TQt3. Install it if
@@ -42,8 +44,9 @@ Description: MySQL database driver for TQt3 (Threaded)
Package: libtqt3-mt-odbc
Architecture: any
Section: libs
+Replaces: libtqt3-mt-odbc (<< 4:14.0.0)
+Breaks: libtqt3-mt-odbc (<< 4:14.0.0)
Depends: ${shlibs:Depends}
-Replaces: libtqt3-odbc (<= 2:3.1.1+cvs.20021220-1), libtqt3c102-mt-odbc
Conflicts: libtqt3c102-mt-odbc, libtqt3c-mt-odbc
Description: ODBC database driver for TQt3 (Threaded)
This package contains the threaded ODBC plugin for TQt3. Install it if
@@ -52,8 +55,9 @@ Description: ODBC database driver for TQt3 (Threaded)
Package: libtqt3-mt-psql
Architecture: any
Section: libs
+Replaces: libtqt3-mt-psql (<< 4:14.0.0)
+Breaks: libtqt3-mt-psql (<< 4:14.0.0)
Depends: ${shlibs:Depends}
-Replaces: libtqt3-psql (<= 2:3.1.1+cvs.20021220-1), libtqt3c102-mt-psql
Conflicts: libtqt3c102-mt-psql, libtqt3c-mt-psql
Description: PostgreSQL database driver for TQt3 (Threaded)
This package contains the threaded PostgreSQL plugin for TQt3.
@@ -75,9 +79,10 @@ Description: PostgreSQL database driver for TQt3 (Threaded)
Package: libtqt3-mt-sqlite
Architecture: any
Section: libs
+Replaces: libtqt3-mt-sqlite (<< 4:14.0.0)
+Breaks: libtqt3-mt-sqlite (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Conflicts: libtqt3c102-mt-sqlite
-Replaces: libtqt3c102-mt-sqlite
Description: SQLite database driver for TQt3 (Threaded)
This package contains the threaded SQLite plugin for TQt3. Install
it if you intend to use or write TQt programs that are to access an
@@ -86,7 +91,8 @@ Description: SQLite database driver for TQt3 (Threaded)
Package: libtqt3-mt-dev
Architecture: any
Section: libdevel
-Replaces: libtqt-mt-dev, libtqt3-dev, libtqt3-helper, libtqt3-headers (<= 3:3.1.1-3), libtqt3-emb (<= 3:3.0.3-1)
+Replaces: libtqt3-mt-dev (<< 4:14.0.0)
+Breaks: libtqt3-mt-dev (<< 4:14.0.0)
Depends: libxext-dev (>= 4.3.0.dfsg.1-4), libxrandr-dev (>= 4.3.0.dfsg.1-4),
libsm-dev (>= 4.3.0.dfsg.1-4), libxmu-dev (>= 4.3.0.dfsg.1-4),
libice-dev (>= 4.3.0.dfsg.1-4), libx11-dev (>= 4.3.0.dfsg.1-4),
@@ -116,8 +122,9 @@ Description: TQt development files (Threaded)
Package: libtqt3-headers
Architecture: any
Section: devel
+Replaces: libtqt3-headers (<< 4:14.0.0)
+Breaks: libtqt3-headers (<< 4:14.0.0)
Recommends: libtqt3-mt-dev
-Replaces: libtqt3-mt-dev, libtqt3-dev, libtqt3-plugins-headers
Description: TQt3 header files
This package contains all header files for libqt and libtqt-mt which come
with TQt3. If you want to compile or develop programs which use TQt3, you
@@ -126,9 +133,10 @@ Description: TQt3 header files
Package: libtqt3-compat-headers
Architecture: any
Section: devel
+Replaces: libtqt3-compat-headers (<< 4:14.0.0)
+Breaks: libtqt3-compat-headers (<< 4:14.0.0)
Depends: libtqt3-headers (= ${binary:Version})
Recommends: libtqt3-mt-dev
-Replaces: libtqt3-mt-dev (<= 3:3.1.1-2), libtqt3-dev (<= 3:3.1.1-2), libtqt3-headers (<= 3:3.1.1-2)
Description: TQt 1.x and 2.x compatibility includes
This package contains header files that are intended for build
compatibility for applications that build with TQt3 but still use
@@ -141,9 +149,10 @@ Description: TQt 1.x and 2.x compatibility includes
Package: tqt3-dev-tools
Architecture: any
Section: devel
+Replaces: tqt3-dev-tools (<< 4:14.0.0)
+Breaks: tqt3-dev-tools (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Recommends: libtqt3-mt-dev
-Replaces: tqt3-tools, libtqt3-dev, libtqt3-mt-dev, tqt3-doc (<= 3:3.1.1-2)
Conflicts: libqt-dev (<< 3:2.3.2-10), uic (<= 3:2.3.2-9), qt3-dev-tools
Description: TQt3 development tools
This package contains all tools that are necessary to build programs
@@ -153,9 +162,10 @@ Description: TQt3 development tools
Package: tqt3-designer
Architecture: any
Section: devel
+Replaces: tqt3-designer (<< 4:14.0.0)
+Breaks: tqt3-designer (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Recommends: tqt3-dev-tools
-Replaces: tqt3-tools, libtqt3-dev, libtqt3-mt-dev, tqt3-doc (= 3:3.3.4-8)
Suggests: tqt3-assistant, tqt3-doc
Conflicts: qt-designer (<= 3:2.3.2-9), qt-designer-doc
Description: TQt3 Designer
@@ -171,8 +181,9 @@ Description: TQt3 Designer
Package: tqt3-apps-dev
Architecture: any
Section: devel
+Replaces: tqt3-apps-dev (<< 4:14.0.0)
+Breaks: tqt3-apps-dev (<< 4:14.0.0)
Depends: libtqt3-mt-dev
-Replaces: tqt3-tools, libtqt3-dev, libtqt3-mt-dev
Description: TQt3 Developer applications development files
This package is intended for developers who want to develop applications
using the additional static libraries that ship with the applications
@@ -185,9 +196,10 @@ Description: TQt3 Developer applications development files
Package: tqt3-linguist
Architecture: any
Section: devel
+Replaces: tqt3-linguist (<< 4:14.0.0)
+Breaks: tqt3-linguist (<< 4:14.0.0)
Suggests: tqt3-assistant
Depends: ${shlibs:Depends}
-Replaces: tqt3-tools, libtqt3-dev, libtqt3-mt-dev, tqt3-doc (= 3:3.3.4-8)
Description: The TQt3 Linguist
This package contains the TQt3 Linguist which provides translators a
tool perfect for translating any TQt-based application into other
@@ -197,8 +209,9 @@ Description: The TQt3 Linguist
Package: tqt3-assistant
Architecture: any
Section: x11
+Replaces: tqt3-assistant (<< 4:14.0.0)
+Breaks: tqt3-assistant (<< 4:14.0.0)
Depends: ${shlibs:Depends}, tqt3-doc
-Replaces: tqt3-tools, libtqt3-dev, libtqt3-mt-dev
Description: The TQt3 assistant application
This package contains the TQt3 Assistant, an easy to use frontend for
the complete TQt3 documentation and serves as an online help viewer for
@@ -214,8 +227,9 @@ Description: The TQt3 assistant application
Package: tqt3-qtconfig
Architecture: any
Section: x11
+Replaces: tqt3-qtconfig (<< 4:14.0.0)
+Breaks: tqt3-qtconfig (<< 4:14.0.0)
Depends: ${shlibs:Depends}
-Replaces: tqt3-tools, libtqt3-dev, libtqt3-mt-dev
Description: The TQt3 Configuration Application
The TQt Configuration program allows endusers to configure the look
and behavior of any TQt3 application. It is mostly only necessary
@@ -228,9 +242,10 @@ Description: The TQt3 Configuration Application
Package: tqt3-dev-tools-embedded
Architecture: any
Section: devel
+Replaces: tqt3-dev-tools-embedded (<< 4:14.0.0)
+Breaks: tqt3-dev-tools-embedded (<< 4:14.0.0)
Recommends: libtqt3-mt-dev
Depends: ${shlibs:Depends}
-Replaces: tqt3-tools, libtqt3-dev, libtqt3-mt-dev
Description: Tools to develop embedded TQt applications
This package contains applications only suitable for developing
applications with TQt Embedded and/or Qtopia. It provides the QVFB
@@ -241,9 +256,10 @@ Description: Tools to develop embedded TQt applications
Package: tqt3-dev-tools-compat
Architecture: any
Section: devel
+Replaces: tqt3-dev-tools-compat (<< 4:14.0.0)
+Breaks: tqt3-dev-tools-compat (<< 4:14.0.0)
Recommends: libtqt3-mt-dev
Depends: ${shlibs:Depends}
-Replaces: tqt3-tools, libtqt3-dev, libtqt3-mt-dev
Description: Conversion utilities for TQt3 development
This package contains some older TQt tools (namely qt20fix qtrename140,
qm2ts, mergetr, findtr and msg2qm). These tools are needed only by
@@ -256,6 +272,8 @@ Description: Conversion utilities for TQt3 development
Package: libtqt3-i18n
Architecture: all
Section: libs
+Replaces: libtqt3-i18n (<< 4:14.0.0)
+Breaks: libtqt3-i18n (<< 4:14.0.0)
Recommends: libtqt3-mt
Description: i18n files for TQt3 library
This package contains the internationalization files for the TQt library.
@@ -265,8 +283,9 @@ Description: i18n files for TQt3 library
Package: tqt3-doc
Architecture: all
Section: doc
+Replaces: tqt3-doc (<< 4:14.0.0)
+Breaks: tqt3-doc (<< 4:14.0.0)
Priority: extra
-Replaces: qt-doc
Suggests: libtqt3-headers, tqt3-assistant | www-browser
Description: TQt3 API documentation
This package contains the complete API documentation for TQt3.
@@ -277,6 +296,8 @@ Description: TQt3 API documentation
Package: tqt3-examples
Architecture: all
Section: doc
+Replaces: tqt3-examples (<< 4:14.0.0)
+Breaks: tqt3-examples (<< 4:14.0.0)
Priority: extra
Depends: libtqt3-mt-dev (>= ${binary:Version})
Suggests: tqt3-apps-dev
@@ -288,10 +309,11 @@ Description: Examples for TQt3
Package: tqt-x11-free-dbg
Section: libdevel
Architecture: any
+Replaces: tqt-x11-free-dbg (<< 4:14.0.0)
+Breaks: tqt-x11-free-dbg (<< 4:14.0.0)
Priority: extra
Depends: libtqt3-mt (= ${binary:Version}), gdb
Conflicts: libtqt3-mt-dbg
-Replaces: libtqt3-mt-dbg
Description: debugging symbols for tqt-x11-free binaries
This package contains the debugging symbols associated with tqt-x11-free.
They will automatically be used by gdb for debugging TQt-related
diff --git a/debian/squeeze/dependencies/tqtinterface/debian/control b/debian/squeeze/dependencies/tqtinterface/debian/control
index add9e1a72..a55f218b0 100644
--- a/debian/squeeze/dependencies/tqtinterface/debian/control
+++ b/debian/squeeze/dependencies/tqtinterface/debian/control
@@ -8,6 +8,8 @@ Standards-Version: 3.8.4
Package: libtqtinterface
Architecture: any
Section: libs
+Replaces: libtqtinterface (<< 4:14.0.0)
+Breaks: libtqtinterface (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: The Trinity Qt Interface Libraries
The Trinity Qt Interface is a library that abstracts Qt from Trinity
@@ -18,6 +20,8 @@ Description: The Trinity Qt Interface Libraries
Package: libtqtinterface-dev
Architecture: any
Section: libs
+Replaces: libtqtinterface-dev (<< 4:14.0.0)
+Breaks: libtqtinterface-dev (<< 4:14.0.0)
Depends: ${shlibs:Depends} libtqtinterface (>= ${Source-Version}), libavahi-tqt-dev, tqt3-apps-dev
Description: The Trinity Qt Interface Libraries (Development Files)
The Trinity Qt Interface is a library that abstracts Qt from Trinity
@@ -28,6 +32,8 @@ Description: The Trinity Qt Interface Libraries (Development Files)
Package: libtqtinterface-doc
Architecture: any
Section: libs
+Replaces: libtqtinterface-doc (<< 4:14.0.0)
+Breaks: libtqtinterface-doc (<< 4:14.0.0)
Depends: ${shlibs:Depends} libtqtinterface (>= ${Source-Version}), tqt3-doc
Description: The Trinity Qt Interface Libraries (Debug Files)
The Trinity Qt Interface is a library that abstracts Qt from Trinity
@@ -38,6 +44,8 @@ Description: The Trinity Qt Interface Libraries (Debug Files)
Package: libtqtinterface-dbg
Architecture: any
Section: libs
+Replaces: libtqtinterface-dbg (<< 4:14.0.0)
+Breaks: libtqtinterface-dbg (<< 4:14.0.0)
Depends: ${shlibs:Depends} libtqtinterface (>= ${Source-Version}), tqt-x11-free-dbg
Description: The Trinity Qt Interface Libraries (Debug Files)
The Trinity Qt Interface is a library that abstracts Qt from Trinity
diff --git a/debian/squeeze/libraries/kipi-plugins/debian/control b/debian/squeeze/libraries/kipi-plugins/debian/control
old mode 100755
new mode 100644
index fd3f5bf67..7f9285239
--- a/debian/squeeze/libraries/kipi-plugins/debian/control
+++ b/debian/squeeze/libraries/kipi-plugins/debian/control
@@ -12,9 +12,10 @@ Standards-Version: 3.8.4
Homepage: http://www.kipi-plugins.org/
Package: kipi-plugins-trinity
-Replaces: digikamplugins-trinity
Architecture: any
Depends: ${shlibs:Depends}
+Replaces: kipi-plugins-trinity (<< 4:14.0.0)
+Breaks: kipi-plugins-trinity (<< 4:14.0.0)
Recommends: k3b-trinity, graphicsmagick-imagemagick-compat (>=1.1.7) | imagemagick (>=5.4.8), kmail-trinity, tdeprint-trinity, sane-utils, kooka-trinity, konqueror-trinity, mpg123
Suggests: gimp, gallery, kipi-plugins-trinity-doc
Enhances: digikam-trinity, kphotoalbum-trinity, showimg, gwenview-trinity
@@ -66,6 +67,8 @@ Description: image manipulation/handling plugins for KIPI aware programs [Trinit
Package: kipi-plugins-trinity-doc
Architecture: all
Section: doc
+Replaces: kipi-plugins-trinity-doc (<< 4:14.0.0)
+Breaks: kipi-plugins-trinity-doc (<< 4:14.0.0)
Depends: khelpcenter-trinity
Suggests: kipi-plugins-trinity
Description: kipi-plugins documentation [Trinity]
diff --git a/debian/squeeze/libraries/libkdcraw/debian/control b/debian/squeeze/libraries/libkdcraw/debian/control
index e203a0c28..aa86aa433 100644
--- a/debian/squeeze/libraries/libkdcraw/debian/control
+++ b/debian/squeeze/libraries/libkdcraw/debian/control
@@ -13,6 +13,8 @@ Homepage: http://www.kipi-plugins.org/
Package: libkdcraw3-trinity-dev
Section: libdevel
Architecture: any
+Replaces: libkdcraw3-trinity-dev (<< 4:14.0.0)
+Breaks: libkdcraw3-trinity-dev (<< 4:14.0.0)
Depends: libkdcraw3-trinity (= ${binary:Version}), pkg-config
Conflicts: libkdcraw-dev
Description: RAW picture decoding C++ library (development) [Trinity]
@@ -25,6 +27,8 @@ Description: RAW picture decoding C++ library (development) [Trinity]
Package: libkdcraw3-trinity
Section: libs
Architecture: any
+Replaces: libkdcraw3-trinity (<< 4:14.0.0)
+Breaks: libkdcraw3-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: Raw picture decoding C++ library (runtime) [Trinity]
C++ interface around dcraw binary program used to decode RAW
diff --git a/debian/squeeze/libraries/libkexiv2/debian/control b/debian/squeeze/libraries/libkexiv2/debian/control
index 59490c655..6edfde91d 100644
--- a/debian/squeeze/libraries/libkexiv2/debian/control
+++ b/debian/squeeze/libraries/libkexiv2/debian/control
@@ -11,6 +11,8 @@ Homepage: http://www.kipi-plugins.org/
Package: libkexiv2-3-trinity-dev
Section: libdevel
Architecture: any
+Replaces: libkexiv2-3-trinity-dev (<< 4:14.0.0)
+Breaks: libkexiv2-3-trinity-dev (<< 4:14.0.0)
Depends: libkexiv2-3-trinity (= ${binary:Version}), pkg-config
Description: Qt like interface for the libexiv2 library (development) [Trinity]
libkexif2-dev contains development files and documentation for libkexiv2
@@ -21,6 +23,8 @@ Description: Qt like interface for the libexiv2 library (development) [Trinity]
Package: libkexiv2-3-trinity
Section: libs
Architecture: any
+Replaces: libkexiv2-3-trinity (<< 4:14.0.0)
+Breaks: libkexiv2-3-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: Qt like interface for the libexiv2 library (runtime) [Trinity]
libkexif2 contains the library of libkexiv2.
diff --git a/debian/squeeze/libraries/libkipi/debian/control b/debian/squeeze/libraries/libkipi/debian/control
index 9824298b4..ffc736fab 100644
--- a/debian/squeeze/libraries/libkipi/debian/control
+++ b/debian/squeeze/libraries/libkipi/debian/control
@@ -9,6 +9,8 @@ Standards-Version: 3.8.4
Package: libkipi0-trinity-dev
Provides: libkipi-trinity-dev
Conflicts: libkipi-trinity-dev
+Replaces: libkipi0-trinity-dev (<< 4:14.0.0)
+Breaks: libkipi0-trinity-dev (<< 4:14.0.0)
Section: libdevel
Architecture: any
Depends: libkipi0-trinity (= ${Source-Version}), pkg-config
@@ -26,6 +28,8 @@ Description: library for apps that want to use kipi-plugins (development version
Package: libkipi0-trinity
Conflicts: libkipi0c2-trinity
Section: libs
+Replaces: libkipi0-trinity (<< 4:14.0.0)
+Breaks: libkipi0-trinity (<< 4:14.0.0)
Architecture: any
Depends: ${shlibs:Depends}
Description: library for apps that want to use kipi-plugins (runtime version) [Trinity]
diff --git a/debian/squeeze/libraries/libksquirrel/debian/control b/debian/squeeze/libraries/libksquirrel/debian/control
index 8fc0ef737..1d03926a0 100644
--- a/debian/squeeze/libraries/libksquirrel/debian/control
+++ b/debian/squeeze/libraries/libksquirrel/debian/control
@@ -14,12 +14,16 @@ Homagepage: http://ksquirrel.sourceforge.net
Package: libksquirrel0-trinity
Architecture: any
Depends: ${shlibs:Depends}
+Replaces: libksquirrel0-trinity (<< 4:14.0.0)
+Breaks: libksquirrel0-trinity (<< 4:14.0.0)
Description: Trinity image viewer
Runtime libraries for KSquirrel.
Package: libksquirrel-trinity-dev
Section: libdevel
Architecture: any
+Replaces: libksquirrel-trinity-dev (<< 4:14.0.0)
+Breaks: libksquirrel-trinity-dev (<< 4:14.0.0)
Depends: ${shlibs:Depends}, libksquirrel0-trinity (= ${binary:Version})
Description: Trinity image viewer
Development libraries for KSquirrel.
@@ -27,5 +31,7 @@ Description: Trinity image viewer
Package: libksquirrel-tools-trinity
Architecture: any
Depends: ${shlibs:Depends}, libksquirrel0-trinity (= ${binary:Version})
+Replaces: libksquirrel-tools-trinity (<< 4:14.0.0)
+Breaks: libksquirrel-tools-trinity (<< 4:14.0.0)
Description: Trinity image viewer
Tools for KSquirrel.
diff --git a/debian/squeeze/libraries/libtqt-perl/debian/changelog b/debian/squeeze/libraries/libtqt-perl/debian/changelog
index 78d64b05a..c5a93479e 100644
--- a/debian/squeeze/libraries/libtqt-perl/debian/changelog
+++ b/debian/squeeze/libraries/libtqt-perl/debian/changelog
@@ -46,7 +46,7 @@ libqt-perl (3.008-3) unstable; urgency=low
* debian/compat, debian/control, debian/examples, debian/manpages,
debian/rules: Repackaged using dh-make and cdbs. Closes: #463089.
* debian/control, debian/rules: Using chrpath to remove rpath.
- * config.h.in, PerlQt/bin/pqtapi, PerlQt/bin/pqtsh: Removed previously
+ * config.h.in, PerlTQt/bin/pqtapi, PerlTQt/bin/pqtsh: Removed previously
automatically added changes.
* debian/watch: Added.
diff --git a/debian/squeeze/libraries/libtqt-perl/debian/control b/debian/squeeze/libraries/libtqt-perl/debian/control
index 3277f09e6..3bef4f1d3 100644
--- a/debian/squeeze/libraries/libtqt-perl/debian/control
+++ b/debian/squeeze/libraries/libtqt-perl/debian/control
@@ -3,13 +3,15 @@ Section: perl
Priority: optional
Maintainer: Timothy Pearson
XSBC-Original-Maintainer: Bart Martens
-Build-Depends: cdbs, debhelper (>= 5), autotools-dev, libtqtinterface-dev, perl (>= 5.8.0), automake, autoconf, kdelibs4-trinity-dev, libsmokeqt-trinity-dev, chrpath, libtool (>= 1.5.2)
+Build-Depends: cdbs, debhelper (>= 5), autotools-dev, libtqtinterface-dev, perl (>= 5.8.0), automake, autoconf, tdelibs4-trinity-dev, libsmokeqt-trinity-dev, chrpath, libtool (>= 1.5.2)
Build-Conflicts: libtqt-perl
Standards-Version: 3.8.4
Package: libtqt-perl
Architecture: any
Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}
+Replaces: libtqt-perl (<< 4:14.0.0)
+Breaks: libtqt-perl (<< 4:14.0.0)
Description: Perl bindings for the TQt library
This module lets you use the TQt library from Perl.
It provides an object-oriented interface and is easy to use.
diff --git a/debian/squeeze/libraries/libtqt-perl/debian/docs b/debian/squeeze/libraries/libtqt-perl/debian/docs
index 83bf44358..60566c90c 100644
--- a/debian/squeeze/libraries/libtqt-perl/debian/docs
+++ b/debian/squeeze/libraries/libtqt-perl/debian/docs
@@ -1,3 +1,3 @@
README
TODO
-PerlQt/tutorials
+PerlTQt/tutorials
diff --git a/debian/squeeze/libraries/libtqt-perl/debian/examples b/debian/squeeze/libraries/libtqt-perl/debian/examples
index f60bcd7e0..50594b81e 100644
--- a/debian/squeeze/libraries/libtqt-perl/debian/examples
+++ b/debian/squeeze/libraries/libtqt-perl/debian/examples
@@ -1 +1 @@
-PerlQt/examples/*
+PerlTQt/examples/*
diff --git a/debian/squeeze/libraries/libtqt-perl/debian/pqtapi.1 b/debian/squeeze/libraries/libtqt-perl/debian/pqtapi.1
index 009ac1643..f6005623a 100644
--- a/debian/squeeze/libraries/libtqt-perl/debian/pqtapi.1
+++ b/debian/squeeze/libraries/libtqt-perl/debian/pqtapi.1
@@ -1,6 +1,6 @@
.TH PERLQT 1 "July 31, 2002"
.SH NAME
-pqtapi \- PerlQt introspection tool
+pqtapi \- PerlTQt introspection tool
.SH SYNOPSIS
.B pqtapi
.RI " [ " -r " " " ] [ " " ]
@@ -10,14 +10,14 @@ This manual page documents briefly the
.B pqtapi
command.
.PP
-\fBpqtapi\fP is a PerlQt Introspection tool.
+\fBpqtapi\fP is a PerlTQt Introspection tool.
For example:
$ pqtapi -ir 'setpoint.* int'
void QCanvasLine::setPoints(int, int, int, int)
void QPointArray::setPoint(uint, int, int)
-For more information, please see the documentation on the PerlQt website
+For more information, please see the documentation on the PerlTQt website
http://perlqt.sourceforge.net/
.SH OPTIONS
diff --git a/debian/squeeze/libraries/libtqt-perl/debian/pqtsh.1 b/debian/squeeze/libraries/libtqt-perl/debian/pqtsh.1
index 402884ba5..19c7a93a0 100644
--- a/debian/squeeze/libraries/libtqt-perl/debian/pqtsh.1
+++ b/debian/squeeze/libraries/libtqt-perl/debian/pqtsh.1
@@ -1,6 +1,6 @@
.TH PERLQT 1 "July 31, 2002"
.SH NAME
-pqtsh \- PerlQt Graphical shell
+pqtsh \- PerlTQt Graphical shell
.SH SYNOPSIS
.B pqtsh
@@ -10,10 +10,10 @@ This manual page documents briefly the
command.
.PP
\fBpqtsh\fP is a graphical shell that can be used to test and experiment
-with the PerlQt api interactively. It is fairly self-explanatory and includes
+with the PerlTQt api interactively. It is fairly self-explanatory and includes
an interactive example (Help -> Example).
-For more information, please see the documentation on the PerlQt website
+For more information, please see the documentation on the PerlTQt website
http://perlqt.sourceforge.net/
.SH AUTHOR
diff --git a/debian/squeeze/libraries/libtqt-perl/debian/puic.1 b/debian/squeeze/libraries/libtqt-perl/debian/puic.1
index b83219b02..671bd97fd 100644
--- a/debian/squeeze/libraries/libtqt-perl/debian/puic.1
+++ b/debian/squeeze/libraries/libtqt-perl/debian/puic.1
@@ -32,7 +32,7 @@ command.
file created with the Qt Designer package. This will generate the package
defined in the UI file and a basic main package for testing purposes.
-For more information, please see the documentation on the PerlQt website
+For more information, please see the documentation on the PerlTQt website
http://perlqt.sourceforge.net/
.SH OPTIONS
diff --git a/debian/squeeze/libraries/libtqt-perl/debian/rules b/debian/squeeze/libraries/libtqt-perl/debian/rules
index 6a7885e21..7bf57d40b 100755
--- a/debian/squeeze/libraries/libtqt-perl/debian/rules
+++ b/debian/squeeze/libraries/libtqt-perl/debian/rules
@@ -16,7 +16,7 @@ SAVERESTORE=\
puic/Makefile.in \
smoke/Makefile.in \
smoke/qt/Makefile.in \
- PerlQt/bin \
+ PerlTQt/bin \
DEB_AUTO_UPDATE_AUTOCONF := 2.61
@@ -47,7 +47,7 @@ build/libtqt-perl::
chrpath -d puic/puic
clean::
- rm -f PerlQt/bin/.exists
+ rm -f PerlTQt/bin/.exists
for f in $(SAVERESTORE) ; do [ ! -e $$f.d-r-orig ] || ( rm -rf $$f && mv $$f.d-r-orig $$f ) ; done
rm -f pre-build-stamp
diff --git a/debian/squeeze/libraries/libtqt-perl/debian/watch b/debian/squeeze/libraries/libtqt-perl/debian/watch
index 2dfa7626d..18c470968 100644
--- a/debian/squeeze/libraries/libtqt-perl/debian/watch
+++ b/debian/squeeze/libraries/libtqt-perl/debian/watch
@@ -1,2 +1,2 @@
version=3
-http://sf.net/perlqt/PerlQt-([^b]+)\.tar\.gz
+http://sf.net/perlqt/PerlTQt-([^b]+)\.tar\.gz
diff --git a/debian/squeeze/libraries/mlt++/debian/control b/debian/squeeze/libraries/mlt++/debian/control
index 3ded7ab8a..6d9df2be3 100644
--- a/debian/squeeze/libraries/mlt++/debian/control
+++ b/debian/squeeze/libraries/mlt++/debian/control
@@ -10,6 +10,8 @@ Build-Depends: debhelper (>= 5), libmlt-trinity-dev (>= 0.2.4.svn20071228), auto
Package: libmlt++0.2.5-trinity
Architecture: any
Depends: ${shlibs:Depends}
+Replaces: libmlt++0.2.5-trinity (<< 4:14.0.0)
+Breaks: libmlt++0.2.5-trinity (<< 4:14.0.0)
Provides: libmlt++-trinity
Description: An open source multimedia framework (C++ wrapper) [Trinity]
MLT is an open source multimedia framework, designed and developed for
@@ -27,6 +29,8 @@ Description: An open source multimedia framework (C++ wrapper) [Trinity]
Package: libmlt++-trinity-dev
Section: libdevel
Architecture: any
+Replaces: libmlt++-trinity-dev (<< 4:14.0.0)
+Breaks: libmlt++-trinity-dev (<< 4:14.0.0)
Depends: libmlt++0.2.5-trinity (= ${binary:Version}), libmlt-trinity-dev (>= 0.2.4.svn20071228)
Description: An open source multimedia framework (C++ wrapper) [Trinity]
MLT is an open source multimedia framework, designed and developed for
diff --git a/debian/squeeze/libraries/mlt/debian/control b/debian/squeeze/libraries/mlt/debian/control
index b905822f7..09621eccf 100644
--- a/debian/squeeze/libraries/mlt/debian/control
+++ b/debian/squeeze/libraries/mlt/debian/control
@@ -15,6 +15,8 @@ Build-Depends: debhelper (>= 5), libdv4-dev, libquicktime-dev (>= 2:1.0.0),
Package: libmlt0.2.5-trinity
Architecture: any
Depends: ${shlibs:Depends}, libmlt-data
+Replaces: libmlt0.2.5-trinity (<< 4:14.0.0)
+Breaks: libmlt0.2.5-trinity (<< 4:14.0.0)
Provides: libmlt-trinity
Description: An open source multimedia framework - Core files [Trinity]
MLT is an open source multimedia framework, designed and developed for
@@ -30,6 +32,8 @@ Description: An open source multimedia framework - Core files [Trinity]
Package: libmiracle0.2.5-trinity
Architecture: any
Depends: ${shlibs:Depends}, libmlt0.2.5-trinity (= ${binary:Version}), libvalerie0.2.5-trinity (= ${binary:Version})
+Replaces: libmiracle0.2.5-trinity (<< 4:14.0.0)
+Breaks: libmiracle0.2.5-trinity (<< 4:14.0.0)
Description: An open source multimedia framework - Core files [Trinity]
MLT is an open source multimedia framework, designed and developed for
television broadcasting. It provides a toolkit for broadcasters, video
@@ -43,6 +47,8 @@ Description: An open source multimedia framework - Core files [Trinity]
Package: libvalerie0.2.5-trinity
Architecture: any
Depends: ${shlibs:Depends}, libmlt0.2.5-trinity (= ${binary:Version}), libmiracle0.2.5-trinity (= ${binary:Version})
+Replaces: libvalerie0.2.5-trinity (<< 4:14.0.0)
+Breaks: libvalerie0.2.5-trinity (<< 4:14.0.0)
Description: An open source multimedia framework - Core files [Trinity]
MLT is an open source multimedia framework, designed and developed for
television broadcasting. It provides a toolkit for broadcasters, video
@@ -57,6 +63,8 @@ Description: An open source multimedia framework - Core files [Trinity]
Package: libmlt-trinity-dev
Section: libdevel
Architecture: any
+Replaces: libmlt-trinity-dev (<< 4:14.0.0)
+Breaks: libmlt-trinity-dev (<< 4:14.0.0)
Depends: libmlt0.2.5-trinity (= ${binary:Version}), libmiracle0.2.5-trinity (= ${binary:Version}), libvalerie0.2.5-trinity (= ${binary:Version})
Provides: libmiracle-trinity-dev, libvalerie-trinity-dev
Description: An open source multimedia framework - Development files [Trinity]
diff --git a/debian/squeeze/libraries/pytdeextensions/debian/control b/debian/squeeze/libraries/pytdeextensions/debian/control
index 0ec05cc9d..139709f0d 100644
--- a/debian/squeeze/libraries/pytdeextensions/debian/control
+++ b/debian/squeeze/libraries/pytdeextensions/debian/control
@@ -11,6 +11,8 @@ Standards-Version: 3.8.4
Package: pytdeextensions-trinity
Architecture: all
Depends: ${python:Depends}
+Replaces: pykdeextensions-trinity (<< 4:14.0.0)
+Breaks: pykdeextensions-trinity (<< 4:14.0.0)
Conflicts: pytdeextensions
Provides: ${python:Provides}
Description: Python packages to support KDE applications (scripts) [Trinity]
@@ -22,6 +24,8 @@ Description: Python packages to support KDE applications (scripts) [Trinity]
Package: libpythonize0-trinity-dev
Architecture: any
Section: libdevel
+Replaces: libpythonize0-trinity-dev (<< 4:14.0.0)
+Breaks: libpythonize0-trinity-dev (<< 4:14.0.0)
Depends: libpythonize0-trinity (= ${binary:Version}), python-dev
Description: Python packages to support KDE applications (development) [Trinity]
PyKDE Extensions is a collection of software and Python packages
@@ -34,6 +38,8 @@ Description: Python packages to support KDE applications (development) [Trinity]
Package: libpythonize0-trinity
Architecture: any
Section: libs
+Replaces: libpythonize0-trinity (<< 4:14.0.0)
+Breaks: libpythonize0-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: libpythonize0
Description: Python packages to support KDE applications (library) [Trinity]
diff --git a/debian/squeeze/libraries/python-trinity/debian/control b/debian/squeeze/libraries/python-trinity/debian/control
index c1f13e757..afacf68ee 100644
--- a/debian/squeeze/libraries/python-trinity/debian/control
+++ b/debian/squeeze/libraries/python-trinity/debian/control
@@ -12,6 +12,8 @@ XS-Python-Version: all
Package: python-trinity-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${python:Depends}, python-tqt
+Replaces: python-trinity-trinity (<< 4:14.0.0)
+Breaks: python-trinity-trinity (<< 4:14.0.0)
XB-Python-Version: ${python:Versions}
Provides: ${python:Provides}
Conflicts: python-trinity-trinity
@@ -23,6 +25,8 @@ Description: Trinity bindings for Python [Trinity]
Package: python-trinity-trinity-dbg
Priority: extra
Architecture: any
+Replaces: python-trinity-trinity-dbg (<< 4:14.0.0)
+Breaks: python-trinity-trinity-dbg (<< 4:14.0.0)
Depends: python-trinity-trinity (= ${binary:Version}), python-dbg, python-tqt-dbg, ${shlibs:Depends}
XB-Python-Version: ${python:Versions}
Description: Trinity bindings for Python (debug extensions) [Trinity]
@@ -35,6 +39,8 @@ Description: Trinity bindings for Python (debug extensions) [Trinity]
Package: python-trinity-trinity-dev
Section: python
Architecture: all
+Replaces: python-trinity-trinity-dev (<< 4:14.0.0)
+Breaks: python-trinity-trinity-dev (<< 4:14.0.0)
Depends: pytqt-tools, ${python:Depends}
XB-Python-Version: ${python:Versions}
Description: Trinity bindings for Python - Development files and scripts [Trinity]
@@ -47,6 +53,8 @@ Description: Trinity bindings for Python - Development files and scripts [Trinit
Package: python-trinity-trinity-doc
Section: doc
Architecture: all
+Replaces: python-trinity-trinity-doc (<< 4:14.0.0)
+Breaks: python-trinity-trinity-doc (<< 4:14.0.0)
Description: Documentation and examples for PyKDE [Trinity]
General documentation and examples for PyKDE providing programming
tips and working code you can use to learn from.
diff --git a/debian/squeeze/metapackages/sudo-trinity/debian/control b/debian/squeeze/metapackages/sudo-trinity/debian/control
old mode 100755
new mode 100644
index ce61db602..6505a3e51
--- a/debian/squeeze/metapackages/sudo-trinity/debian/control
+++ b/debian/squeeze/metapackages/sudo-trinity/debian/control
@@ -9,5 +9,7 @@ Standards-Version: 3.8.4
Package: sudo-trinity
Architecture: all
Depends: sudo
+Replaces: sudo-trinity (<< 4:14.0.0)
+Breaks: sudo-trinity (<< 4:14.0.0)
Description: TDE sudo
- TDE configuration files for sudo
\ No newline at end of file
+ TDE configuration files for sudo
diff --git a/debian/squeeze/tde-i18n/debian/control b/debian/squeeze/tde-i18n/debian/control
index 1c1486752..f4bcf47de 100644
--- a/debian/squeeze/tde-i18n/debian/control
+++ b/debian/squeeze/tde-i18n/debian/control
@@ -9,6 +9,8 @@ Standards-Version: 3.8.4
Package: tde-i18n-af-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-af-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-af-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -19,6 +21,8 @@ Description: Afrikaans (af) internationalized (i18n) files for KDE
Package: tde-i18n-ar-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-ar-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-ar-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity-trinity
@@ -29,6 +33,8 @@ Description: Arabic (ar) internationalized (i18n) files for KDE
Package: tde-i18n-az-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-az-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-az-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -39,6 +45,8 @@ Description: Azerbaijani (az) internationalized (i18n) files for KDE
Package: tde-i18n-be-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-be-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-be-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -49,6 +57,8 @@ Description: Belarusian (be) internationalized (i18n) files for KDE
Package: tde-i18n-bg-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-bg-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-bg-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -59,6 +69,8 @@ Description: Bulgarian (bg) internationalized (i18n) files for KDE
Package: tde-i18n-bn-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-bn-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-bn-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -69,6 +81,8 @@ Description: Bengali (bn) internationalized (i18n) files for KDE
Package: tde-i18n-br-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-br-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-br-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -79,6 +93,8 @@ Description: Breton (br) internationalized (i18n) files for KDE
Package: tde-i18n-bs-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-bs-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-bs-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -89,6 +105,8 @@ Description: Bosnian (bs) internationalized (i18n) files for KDE
Package: tde-i18n-ca-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-ca-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-ca-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -99,6 +117,8 @@ Description: Catalan (ca) internationalized (i18n) files for KDE
Package: tde-i18n-cs-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-cs-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-cs-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -109,6 +129,8 @@ Description: Czech (cs) internationalized (i18n) files for KDE
Package: tde-i18n-csb-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-csb-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-csb-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -119,6 +141,8 @@ Description: Kashubian (csb) internationalized (i18n) files for KDE
Package: tde-i18n-cy-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-cy-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-cy-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -129,6 +153,8 @@ Description: Welsh (cy) internationalized (i18n) files for KDE
Package: tde-i18n-da-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-da-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-da-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -139,6 +165,8 @@ Description: Danish (da) internationalized (i18n) files for KDE
Package: tde-i18n-de-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-de-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-de-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -149,6 +177,8 @@ Description: German (de) internationalized (i18n) files for KDE
Package: tde-i18n-el-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-el-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-el-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -159,6 +189,8 @@ Description: Greek (el) internationalized (i18n) files for KDE
Package: tde-i18n-engb-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-engb-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-engb-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -169,6 +201,8 @@ Description: British English (en_GB) internationalized (i18n) files for KDE
Package: tde-i18n-eo-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-eo-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-eo-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -179,6 +213,8 @@ Description: Esperanto (eo) internationalized (i18n) files for KDE
Package: tde-i18n-es-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-es-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-es-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -189,6 +225,8 @@ Description: Spanish (es) internationalized (i18n) files for KDE
Package: tde-i18n-et-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-et-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-et-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -199,6 +237,8 @@ Description: Estonian (et) internationalized (i18n) files for KDE
Package: tde-i18n-eu-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-eu-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-eu-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -209,6 +249,8 @@ Description: Basque (eu) internationalized (i18n) files for KDE
Package: tde-i18n-fa-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-fa-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-fa-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -219,6 +261,8 @@ Description: Farsi (Persian) (fa) internationalized (i18n) files for KDE
Package: tde-i18n-fi-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-fi-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-fi-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -229,6 +273,8 @@ Description: Finnish (fi) internationalized (i18n) files for KDE
Package: tde-i18n-fr-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-fr-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-fr-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -239,6 +285,8 @@ Description: French (fr) internationalized (i18n) files for KDE
Package: tde-i18n-fy-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-fy-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-fy-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -249,6 +297,8 @@ Description: Frisian (fy) internationalized (i18n) files for KDE
Package: tde-i18n-ga-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-ga-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-ga-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -259,6 +309,8 @@ Description: Irish Gaelic (ga) internationalized (i18n) files for KDE
Package: tde-i18n-gl-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-gl-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-gl-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -269,6 +321,8 @@ Description: Galician (gl) internationalized (i18n) files for KDE
Package: tde-i18n-he-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-he-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-he-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -279,6 +333,8 @@ Description: Hebrew (he) internationalized (i18n) files for KDE
Package: tde-i18n-hi-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-hi-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-hi-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -289,6 +345,8 @@ Description: Hindi (hi) internationalized (i18n) files for KDE
Package: tde-i18n-hr-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-hr-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-hr-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -299,6 +357,8 @@ Description: Croatian (hr) internationalized (i18n) files for KDE
Package: tde-i18n-hu-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-hu-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-hu-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -309,6 +369,8 @@ Description: Hungarian (hu) internationalized (i18n) files for KDE
Package: tde-i18n-is-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-is-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-is-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -319,6 +381,8 @@ Description: Icelandic (is) internationalized (i18n) files for KDE
Package: tde-i18n-it-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-it-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-it-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -329,6 +393,8 @@ Description: Italian (it) internationalized (i18n) files for KDE
Package: tde-i18n-ja-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-ja-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-ja-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -339,6 +405,8 @@ Description: Japanese (ja) internationalized (i18n) files for KDE
Package: tde-i18n-kk-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-kk-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-kk-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -349,6 +417,8 @@ Description: Kazakh (kk) internationalized (i18n) files for KDE
Package: tde-i18n-km-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-km-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-km-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -359,6 +429,8 @@ Description: Khmer (km) internationalized (i18n) files for KDE
Package: tde-i18n-ko-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-ko-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-ko-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -369,6 +441,8 @@ Description: Korean (ko) internationalized (i18n) files for KDE
Package: tde-i18n-lt-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-lt-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-lt-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -379,6 +453,8 @@ Description: Lithuanian (lt) internationalized (i18n) files for KDE
Package: tde-i18n-lv-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-lv-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-lv-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -389,6 +465,8 @@ Description: Latvian (lv) internationalized (i18n) files for KDE
Package: tde-i18n-mk-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-mk-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-mk-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -399,6 +477,8 @@ Description: Macedonian (mk) internationalized (i18n) files for KDE
Package: tde-i18n-mn-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-mn-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-mn-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -409,6 +489,8 @@ Description: Mongolian (mn) internationalized (i18n) files for KDE
Package: tde-i18n-ms-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-ms-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-ms-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -419,6 +501,8 @@ Description: Malay (ms) internationalized (i18n) files for KDE
Package: tde-i18n-nb-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-nb-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-nb-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity, tde-i18n-no
@@ -429,6 +513,8 @@ Description: Norwegian Bookmal (nb) internationalized (i18n) files for KDE
Package: tde-i18n-nds-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-nds-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-nds-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -439,6 +525,8 @@ Description: Low Saxon (nds) internationalized (i18n) files for KDE
Package: tde-i18n-nl-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-nl-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-nl-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -449,6 +537,8 @@ Description: Dutch (nl) internationalized (i18n) files for KDE
Package: tde-i18n-nn-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-nn-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-nn-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Description: Norwegian Nynorsk (nn) internationalized (i18n) files for KDE
@@ -458,6 +548,8 @@ Description: Norwegian Nynorsk (nn) internationalized (i18n) files for KDE
Package: tde-i18n-pa-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-pa-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-pa-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -468,6 +560,8 @@ Description: Punjabi (pa) internationalized (i18n) files for KDE
Package: tde-i18n-pl-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-pl-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-pl-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -478,6 +572,8 @@ Description: Polish (pl) internationalized (i18n) files for KDE
Package: tde-i18n-pt-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-pt-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-pt-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -488,6 +584,8 @@ Description: Portuguese (pt) internationalized (i18n) files for KDE
Package: tde-i18n-ptbr-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-ptbr-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-ptbr-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -498,6 +596,8 @@ Description: Brazilian Portuguese (pt_BR) internationalized (i18n) files for KDE
Package: tde-i18n-ro-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-ro-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-ro-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -508,6 +608,8 @@ Description: Romanian (ro) internationalized (i18n) files for KDE
Package: tde-i18n-ru-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-ru-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-ru-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -518,6 +620,8 @@ Description: Russian (ru) internationalized (i18n) files for KDE
Package: tde-i18n-rw-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-rw-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-rw-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -528,6 +632,8 @@ Description: Kinyarwanda (rw) internationalized (i18n) files for KDE
Package: tde-i18n-se-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-se-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-se-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -538,6 +644,8 @@ Description: Northern Sami (se) internationalized (i18n) files for KDE
Package: tde-i18n-sk-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-sk-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-sk-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -548,6 +656,8 @@ Description: Slovak (sk) internationalized (i18n) files for KDE
Package: tde-i18n-sl-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-sl-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-sl-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -558,6 +668,8 @@ Description: Slovenian (sl) internationalized (i18n) files for KDE
Package: tde-i18n-sr-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-sr-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-sr-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -568,6 +680,8 @@ Description: Serbian (sr) internationalized (i18n) files for KDE
Package: tde-i18n-ss-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-ss-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-ss-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -578,6 +692,8 @@ Description: Swati (ss) internationalized (i18n) files for KDE
Package: tde-i18n-srlatin-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-srlatin-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-srlatin-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -588,6 +704,8 @@ Description: Latin Serbian (sr@Latn) internationalized (i18n) files for KDE
Package: tde-i18n-sv-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-sv-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-sv-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -598,6 +716,8 @@ Description: Swedish (sv) internationalized (i18n) files for KDE
Package: tde-i18n-ta-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-ta-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-ta-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -608,6 +728,8 @@ Description: Tamil (ta) internationalized (i18n) files for KDE
Package: tde-i18n-te-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-te-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-te-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -618,6 +740,8 @@ Description: Telugu (te) internationalized (i18n) files for KDE
Package: tde-i18n-tg-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-tg-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-tg-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -628,6 +752,8 @@ Description: Tajik (tg) internationalized (i18n) files for KDE
Package: tde-i18n-th-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-th-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-th-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -638,6 +764,8 @@ Description: Thai (th) internationalized (i18n) files for KDE
Package: tde-i18n-tr-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-tr-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-tr-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -648,6 +776,8 @@ Description: Turkish (tr) internationalized (i18n) files for KDE
Package: tde-i18n-uk-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-uk-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-uk-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -658,6 +788,8 @@ Description: Ukrainian (uk) internationalized (i18n) files for KDE
Package: tde-i18n-uz-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-uz-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-uz-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -669,6 +801,8 @@ Description: Uzbek (uz) internationalized (i18n) files for KDE
Package: tde-i18n-uzcyrillic-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-uzcyrillic-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-uzcyrillic-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -679,6 +813,8 @@ Description: Cyrillic Uzbek (uz@cyrillic) internationalized (i18n) files for KDE
Package: tde-i18n-vi-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-vi-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-vi-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -689,6 +825,8 @@ Description: Vietnamese (vi) internationalized (i18n) files for KDE
Package: tde-i18n-wa-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-wa-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-wa-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -699,6 +837,8 @@ Description: Walloon (wa) internationalized (i18n) files for KDE
Package: tde-i18n-zhcn-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-zhcn-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-zhcn-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
@@ -709,6 +849,8 @@ Description: Chinese Simplified (zh_CN) internationalized (i18n) files for KDE
Package: tde-i18n-zhtw-trinity
Architecture: all
Section: kde
+Replaces: kde-i18n-zhtw-trinity (<< 4:14.0.0)
+Breaks: kde-i18n-zhtw-trinity (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity
Suggests: kde
Provides: tde-i18n-trinity
diff --git a/debian/squeeze/tdeaccessibility/debian/control b/debian/squeeze/tdeaccessibility/debian/control
index fc7c8579e..0adaaa9f0 100644
--- a/debian/squeeze/tdeaccessibility/debian/control
+++ b/debian/squeeze/tdeaccessibility/debian/control
@@ -10,6 +10,8 @@ Standards-Version: 3.8.4
Package: tdeaccessibility-trinity
Section: kde
Architecture: all
+Replaces: kdeaccessibility-trinity (<< 4:14.0.0)
+Breaks: kdeaccessibility-trinity (<< 4:14.0.0)
Depends: kmag-trinity (>= ${Source-Version}), kmousetool-trinity (>= ${Source-Version}), kmouth-trinity (>= ${Source-Version}), kbstate-trinity (>= ${Source-Version}), ksayit-trinity (>= ${Source-Version}), kttsd-trinity (>= ${Source-Version})
Recommends: kde-icons-mono-trinity (>= ${Source-Version})
Suggests: kttsd-contrib-plugins-trinity (>= ${Source-Version}), tdeaccessibility-trinity-doc-html (>= ${Source-Version})
@@ -27,6 +29,8 @@ Description: accessibility packages from the official Trinity release
Package: tdeaccessibility-trinity-doc-html
Architecture: all
Section: doc
+Replaces: kdeaccessibility-trinity-doc-html (<< 4:14.0.0)
+Breaks: kdeaccessibility-trinity-doc-html (<< 4:14.0.0)
Suggests: konqueror-trinity | www-browser, tdebase-trinity
Description: KDE accessibility documentation in HTML format
By default the modules provided by KDE only provide their documentation
@@ -45,6 +49,8 @@ Description: KDE accessibility documentation in HTML format
Package: kde-icons-mono-trinity
Section: kde
Architecture: all
+Replaces: kde-icons-mono-trinity (<< 4:14.0.0)
+Breaks: kde-icons-mono-trinity (<< 4:14.0.0)
Description: a monochromatic icons theme for KDE
A monochromatic icon theme for KDE, designed for accessibility purposes.
.
@@ -54,6 +60,8 @@ Description: a monochromatic icons theme for KDE
Package: kbstate-trinity
Section: utils
Architecture: any
+Replaces: kbstate-trinity (<< 4:14.0.0)
+Breaks: kbstate-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
Description: a keyboard status applet for KDE
@@ -65,6 +73,8 @@ Description: a keyboard status applet for KDE
Package: kmag-trinity
Section: utils
Architecture: any
+Replaces: kmag-trinity (<< 4:14.0.0)
+Breaks: kmag-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
Description: a screen magnifier for KDE
@@ -81,6 +91,8 @@ Description: a screen magnifier for KDE
Package: kmousetool-trinity
Section: utils
Architecture: any
+Replaces: kmousetool-trinity (<< 4:14.0.0)
+Breaks: kmousetool-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
Description: KDE mouse manipulation tool for the disabled
@@ -94,6 +106,8 @@ Description: KDE mouse manipulation tool for the disabled
Package: kmouth-trinity
Section: utils
Architecture: any
+Replaces: kmouth-trinity (<< 4:14.0.0)
+Breaks: kmouth-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
Description: a type-and-say KDE frontend for speech synthesizers
@@ -108,6 +122,8 @@ Description: a type-and-say KDE frontend for speech synthesizers
Package: ksayit-trinity
Section: utils
Architecture: any
+Replaces: ksayit-trinity (<< 4:14.0.0)
+Breaks: ksayit-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
Description: a frontend for the KDE Text-to-Speech system
@@ -120,6 +136,8 @@ Description: a frontend for the KDE Text-to-Speech system
Package: kttsd-trinity
Section: utils
Architecture: any
+Replaces: kttsd-trinity (<< 4:14.0.0)
+Breaks: kttsd-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Recommends: ksayit-trinity (= ${Source-Version}) | kmouth-trinity (= ${Source-Version}), festival | flite | epos
Suggests: kttsd-contrib-plugins-trinity (= ${Source-Version})
@@ -138,6 +156,8 @@ Description: a Text-to-Speech system for KDE
Package: kttsd-contrib-plugins-trinity
Section: utils
Architecture: any
+Replaces: kttsd-contrib-plugins-trinity (<< 4:14.0.0)
+Breaks: kttsd-contrib-plugins-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: the KDE Text-to-Speech system
kttsd synthetizer plugins that depends on non-free software :
@@ -152,6 +172,8 @@ Description: the KDE Text-to-Speech system
Package: tdeaccessibility-trinity-dbg
Section: libdevel
Architecture: any
+Replaces: kdeaccessibility-trinity-dbg (<< 4:14.0.0)
+Breaks: kdeaccessibility-trinity-dbg (<< 4:14.0.0)
Depends: tdelibs-trinity-dbg
Priority: extra
Description: debugging symbols for tdeaccessibility-trinity
diff --git a/debian/squeeze/tdeaddons/debian/control b/debian/squeeze/tdeaddons/debian/control
index f2fec99ec..1cdd28ec6 100644
--- a/debian/squeeze/tdeaddons/debian/control
+++ b/debian/squeeze/tdeaddons/debian/control
@@ -10,6 +10,8 @@ Standards-Version: 3.8.4
Package: tdeaddons-trinity
Architecture: all
Section: kde
+Replaces: kdeaddons-trinity (<< 4:14.0.0)
+Breaks: kdeaddons-trinity (<< 4:14.0.0)
Depends: atlantikdesigner-trinity (>= ${Source-Version}), kaddressbook-plugins-trinity (>= ${Source-Version}), kate-plugins-trinity (>= ${Source-Version}), tdeaddons-kfile-plugins-trinity (>= ${Source-Version}), kicker-applets-trinity (>= ${Source-Version}), konq-plugins-trinity (>= ${Source-Version}), ksig-trinity (>= ${Source-Version}), noatun-plugins-trinity (>= ${Source-Version})
Suggests: tdeaddons-trinity-doc-html
Description: add-on plugins and applets provided with Trinity
@@ -24,6 +26,8 @@ Description: add-on plugins and applets provided with Trinity
Package: tdeaddons-trinity-doc-html
Architecture: all
Section: doc
+Replaces: kdeaddons-trinity-doc-html (<< 4:14.0.0)
+Breaks: kdeaddons-trinity-doc-html (<< 4:14.0.0)
Suggests: konqueror-trinity | www-browser, tdeaddons-trinity
Description: KDE add-ons documentation in HTML format
By default the modules provided by KDE only provide their documentation
@@ -42,6 +46,8 @@ Description: KDE add-ons documentation in HTML format
Package: atlantikdesigner-trinity
Architecture: any
Section: games
+Replaces: atlantikdesigner-trinity (<< 4:14.0.0)
+Breaks: atlantikdesigner-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Enhances: atlantik-trinity
Description: game board designer for Atlantik
@@ -59,6 +65,8 @@ Description: game board designer for Atlantik
Package: kaddressbook-plugins-trinity
Architecture: any
Section: kde
+Replaces: kaddressbook-plugins-trinity (<< 4:14.0.0)
+Breaks: kaddressbook-plugins-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: kworldclock-trinity, khelpcenter-trinity, tdeaddons-trinity-doc-html
Enhances: kaddressbook-trinity
@@ -76,6 +84,8 @@ Description: plugins for KAddressBook, the Trinity address book
Package: kate-plugins-trinity
Architecture: any
Section: editors
+Replaces: kate-plugins-trinity (<< 4:14.0.0)
+Breaks: kate-plugins-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, tidy
Suggests: khelpcenter-trinity, tdeaddons-trinity-doc-html, kaddressbook-trinity
Enhances: kate-trinity
@@ -95,6 +105,8 @@ Description: plugins for Kate, the KDE Advanced Text Editor
Package: tdeaddons-kfile-plugins-trinity
Architecture: any
Section: kde
+Replaces: kdeaddons-kfile-plugins-trinity (<< 4:14.0.0)
+Breaks: kdeaddons-kfile-plugins-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Provides: renamedlg-plugins-trinity
Description: Trinity file dialog plugins for text files and folders
@@ -114,6 +126,8 @@ Description: Trinity file dialog plugins for text files and folders
Package: kicker-applets-trinity
Architecture: any
Section: kde
+Replaces: kicker-applets-trinity (<< 4:14.0.0)
+Breaks: kicker-applets-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, kicker-trinity
Suggests: xmms-kde-trinity, khelpcenter-trinity, tdeaddons-trinity-doc-html
Provides: ktimemon-trinity
@@ -135,6 +149,8 @@ Description: applets for Kicker, the Trinity panel
Package: knewsticker-scripts-trinity
Architecture: all
Section: kde
+Replaces: knewsticker-scripts-trinity (<< 4:14.0.0)
+Breaks: knewsticker-scripts-trinity (<< 4:14.0.0)
Depends: ${perl:Depends}, python, libfinance-quote-perl, libmime-perl, libnews-nntpclient-perl, libwww-perl
Recommends: knewsticker-trinity
Enhances: knewsticker-trinity
@@ -152,6 +168,8 @@ Description: scripts for KNewsTicker, the Trinity news ticker
Package: konq-plugins-trinity
Architecture: any
Section: kde
+Replaces: konq-plugins-trinity (<< 4:14.0.0)
+Breaks: konq-plugins-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, libjpeg-progs, python, rsync, unison
Recommends: akregator-trinity, ark-trinity, imagemagick
Suggests: khelpcenter-trinity, tdeaddons-trinity-doc-html
@@ -179,6 +197,8 @@ Description: plugins for Konqueror, the Trinity file/web/doc browser
Package: ksig-trinity
Architecture: any
Section: kde
+Replaces: ksig-trinity (<< 4:14.0.0)
+Breaks: ksig-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: kmail-trinity
Enhances: kmail-trinity
@@ -198,6 +218,8 @@ Description: graphical tool for managing multiple email signatures
Package: noatun-plugins-trinity
Architecture: any
Section: sound
+Replaces: noatun-plugins-trinity (<< 4:14.0.0)
+Breaks: noatun-plugins-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Enhances: noatun-trinity
Description: plugins for Noatun, the Trinity media player
@@ -215,6 +237,8 @@ Description: plugins for Noatun, the Trinity media player
Package: tdeaddons-trinity-dbg
Section: libdevel
Architecture: any
+Replaces: kdeaddons-trinity-dbg (<< 4:14.0.0)
+Breaks: kdeaddons-trinity-dbg (<< 4:14.0.0)
Depends: tdelibs-trinity-dbg
Priority: extra
Description: debugging symbols for tdeaddons-trinity
diff --git a/debian/squeeze/tdeadmin/debian/control b/debian/squeeze/tdeadmin/debian/control
index fcf54e33e..76819b941 100644
--- a/debian/squeeze/tdeadmin/debian/control
+++ b/debian/squeeze/tdeadmin/debian/control
@@ -10,6 +10,8 @@ Standards-Version: 3.8.4
Package: tdeadmin-trinity
Section: kde
Architecture: all
+Replaces: kdeadmin-trinity (<< 4:14.0.0)
+Breaks: kdeadmin-trinity (<< 4:14.0.0)
Depends: kcron-trinity (>= ${Source-Version}), kdat-trinity (>= ${Source-Version}), tdeadmin-kfile-plugins-trinity (>= ${Source-Version}), knetworkconf-trinity (>= ${Source-Version}), kpackage-trinity (>= ${Source-Version}), ksysv-trinity (>= ${Source-Version}), kuser-trinity (>= ${Source-Version})
Recommends: lilo-config-trinity (>= ${Source-Version})
Suggests: tdeadmin-trinity-doc-html (>= ${Source-Version})
@@ -25,6 +27,8 @@ Description: system administration tools from the official Trinity release
Package: tdeadmin-trinity-doc-html
Architecture: all
Section: doc
+Replaces: kdeadmin-trinity-doc-html (<< 4:14.0.0)
+Breaks: kdeadmin-trinity-doc-html (<< 4:14.0.0)
Suggests: konqueror-trinity | www-browser, tdebase-trinity
Description: KDE administration documentation in HTML format
By default the modules provided by KDE only provide their documentation
@@ -43,6 +47,8 @@ Description: KDE administration documentation in HTML format
Package: kcron-trinity
Section: admin
Architecture: any
+Replaces: kcron-trinity (<< 4:14.0.0)
+Breaks: kcron-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
Description: the Trinity crontab editor
@@ -55,6 +61,8 @@ Description: the Trinity crontab editor
Package: kdat-trinity
Section: admin
Architecture: any
+Replaces: kdat-trinity (<< 4:14.0.0)
+Breaks: kdat-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
Description: a Trinity tape backup tool
@@ -74,6 +82,8 @@ Description: a Trinity tape backup tool
Package: tdeadmin-kfile-plugins-trinity
Section: kde
Architecture: any
+Replaces: kdeadmin-kfile-plugins-trinity (<< 4:14.0.0)
+Breaks: kdeadmin-kfile-plugins-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: Trinity file metainfo plugins for deb and rpm files
File metainfo plugins for deb and rpm package files.
@@ -84,6 +94,8 @@ Description: Trinity file metainfo plugins for deb and rpm files
Package: knetworkconf-trinity
Section: kde
Architecture: any
+Replaces: knetworkconf-trinity (<< 4:14.0.0)
+Breaks: knetworkconf-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: Trinity network configuration tool
This is a KDE control center module to configure TCP/IP settings. It
@@ -95,6 +107,8 @@ Description: Trinity network configuration tool
Package: kpackage-trinity
Section: admin
Architecture: any
+Replaces: kpackage-trinity (<< 4:14.0.0)
+Breaks: kpackage-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Recommends: rpm
Suggests: khelpcenter-trinity
@@ -109,6 +123,8 @@ Description: Trinity package management tool
Package: ksysv-trinity
Section: admin
Architecture: any
+Replaces: ksysv-trinity (<< 4:14.0.0)
+Breaks: ksysv-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
Description: Trinity SysV-style init configuration editor
@@ -121,6 +137,8 @@ Description: Trinity SysV-style init configuration editor
Package: kuser-trinity
Section: admin
Architecture: any
+Replaces: kuser-trinity (<< 4:14.0.0)
+Breaks: kuser-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
Description: Trinity user/group administration tool
@@ -132,6 +150,8 @@ Description: Trinity user/group administration tool
Package: lilo-config-trinity
Section: kde
Architecture: none
+Replaces: lilo-config-trinity (<< 4:14.0.0)
+Breaks: lilo-config-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, kcontrol-trinity
Recommends: tdebase-trinity-bin
Suggests: lilo
@@ -148,6 +168,8 @@ Description: Trinity frontend for lilo configuration
Package: tdeadmin-trinity-dbg
Section: libdevel
Architecture: any
+Replaces: kdeadmin-trinity-dbg (<< 4:14.0.0)
+Breaks: kdeadmin-trinity-dbg (<< 4:14.0.0)
Depends: tdelibs-trinity-dbg
Priority: extra
Description: debugging symbols for tdeadmin-trinity
diff --git a/debian/squeeze/tdeartwork/debian/control b/debian/squeeze/tdeartwork/debian/control
index a4bb8764b..510797e8e 100644
--- a/debian/squeeze/tdeartwork/debian/control
+++ b/debian/squeeze/tdeartwork/debian/control
@@ -11,6 +11,8 @@ Standards-Version: 3.8.4
Package: tdeartwork-trinity
Architecture: all
Section: kde
+Replaces: kdeartwork-trinity (<< 4:14.0.0)
+Breaks: kdeartwork-trinity (<< 4:14.0.0)
Depends: tdeartwork-misc-trinity (>= ${Source-Version}), tdeartwork-emoticons-trinity (>= ${Source-Version}), tdeartwork-style-trinity (>= ${Source-Version}), tdeartwork-theme-icon-trinity (>= ${Source-Version}), tdeartwork-theme-window-trinity (>= ${Source-Version}), kdewallpapers-trinity (>= ${Source-Version}), kscreensaver-trinity (>= ${Source-Version})
Recommends: kscreensaver-xsavers-trinity
Description: themes, styles and more from the official Trinity release
@@ -28,6 +30,8 @@ Description: themes, styles and more from the official Trinity release
Package: tdeartwork-emoticons-trinity
Architecture: all
Section: kde
+Replaces: kdeartwork-emoticons-trinity (<< 4:14.0.0)
+Breaks: kdeartwork-emoticons-trinity (<< 4:14.0.0)
Enhances: kopete-trinity
Description: emoticon collections for KDE chat clients
This package contains several collections of emoticons used by official
@@ -39,6 +43,8 @@ Description: emoticon collections for KDE chat clients
Package: tdeartwork-misc-trinity
Architecture: all
Section: kde
+Replaces: kdeartwork-misc-trinity (<< 4:14.0.0)
+Breaks: kdeartwork-misc-trinity (<< 4:14.0.0)
Suggests: kworldclock
Description: various multimedia goodies released with KDE
This package contains miscellaneous multimedia goodies for KDE.
@@ -50,6 +56,8 @@ Description: various multimedia goodies released with KDE
Package: tdeartwork-style-trinity
Architecture: any
Section: kde
+Replaces: kdeartwork-style-trinity (<< 4:14.0.0)
+Breaks: kdeartwork-style-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: widget styles released with Trinity
This package contains additional widget styles for Trinity. Widget styles
@@ -63,8 +71,9 @@ Description: widget styles released with Trinity
Package: tdeartwork-theme-icon-trinity
Architecture: all
Section: kde
+Replaces: kdeartwork-theme-icon-trinity (<< 4:14.0.0)
+Breaks: kdeartwork-theme-icon-trinity (<< 4:14.0.0)
Recommends: kdesktop-trinity, kicker-trinity
-Replaces: tdelibs-data-trinity (<< 4:3.5)
Description: icon themes released with Trinity
This package contains additional icon themes for Trinity. Icon themes can be
used to customise the appearance of standard icons throughout KDE. They
@@ -76,6 +85,8 @@ Description: icon themes released with Trinity
Package: tdeartwork-theme-window-trinity
Architecture: any
Section: kde
+Replaces: kdeartwork-theme-window-trinity (<< 4:14.0.0)
+Breaks: kdeartwork-theme-window-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: window decoration themes released with Trinity
This package contains additional window decoration themes for Trinity. Window
@@ -89,8 +100,9 @@ Description: window decoration themes released with Trinity
Package: kdewallpapers-trinity
Architecture: all
Section: kde
+Replaces: kdewallpapers-trinity (<< 4:14.0.0)
+Breaks: kdewallpapers-trinity (<< 4:14.0.0)
Suggests: twin-trinity | x-window-manager
-Replaces: tdebase-data-trinity (<< 4:3.5)
Description: wallpapers released with Trinity
This package contains additional wallpapers for Trinity. Wallpapers can be
applied using the background manager in the KDE Control Centre.
@@ -101,6 +113,8 @@ Description: wallpapers released with Trinity
Package: kscreensaver-trinity
Architecture: any
Section: kde
+Replaces: kscreensaver-trinity (<< 4:14.0.0)
+Breaks: kscreensaver-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, tdebase-trinity-bin
Recommends: twin-trinity, kscreensaver-xsavers-trinity (= ${Source-Version})
Description: additional screen savers released with Trinity
@@ -118,6 +132,8 @@ Description: additional screen savers released with Trinity
Package: kscreensaver-xsavers-trinity
Architecture: any
Section: kde
+Replaces: kscreensaver-xsavers-trinity (<< 4:14.0.0)
+Breaks: kscreensaver-xsavers-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, tdebase-trinity-bin, xscreensaver-data
Recommends: twin-trinity, kscreensaver-trinity (= ${Source-Version}), xscreensaver-gl
Suggests: kscreensaver-xsavers-webcollage-trinity
@@ -139,6 +155,8 @@ Description: Trinity hooks for standard xscreensavers
Package: kscreensaver-xsavers-webcollage-trinity
Architecture: all
Section: kde
+Replaces: kscreensaver-xsavers-webcollage-trinity (<< 4:14.0.0)
+Breaks: kscreensaver-xsavers-webcollage-trinity (<< 4:14.0.0)
Depends: kscreensaver-xsavers-extra-trinity, miscfiles | wordlist, netpbm
Description: webcollage screensaver Trinity hook
This package give access to the webcollage screensaver through the Trinity
@@ -162,6 +180,8 @@ Description: webcollage screensaver Trinity hook
Package: kscreensaver-xsavers-extra-trinity
Architecture: all
Section: kde
+Replaces: kscreensaver-xsavers-extra-trinity (<< 4:14.0.0)
+Breaks: kscreensaver-xsavers-extra-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, kscreensaver-xsavers-trinity, xscreensaver-data-extra, xscreensaver-gl-extra, rss-glx, fireflies
Recommends: twin-trinity, kscreensaver-trinity (= ${Source-Version})
Description: Trinity hooks for standard xscreensavers
@@ -180,6 +200,8 @@ Description: Trinity hooks for standard xscreensavers
Package: tdeartwork-trinity-dbg
Section: libdevel
Architecture: any
+Replaces: kdeartwork-trinity-dbg (<< 4:14.0.0)
+Breaks: kdeartwork-trinity-dbg (<< 4:14.0.0)
Depends: tdelibs-trinity-dbg
Priority: extra
Description: debugging symbols for tdeartwork-trinity
diff --git a/debian/squeeze/tdebase/debian/control b/debian/squeeze/tdebase/debian/control
index 28d7b6ba9..77a5ca2dc 100644
--- a/debian/squeeze/tdebase/debian/control
+++ b/debian/squeeze/tdebase/debian/control
@@ -12,6 +12,8 @@ Standards-Version: 3.8.4
Package: tdebase-trinity
Section: kde
Architecture: all
+Replaces: kdebase-trinity (<< 4:14.0.0)
+Breaks: kdebase-trinity (<< 4:14.0.0)
Depends: kappfinder-trinity (>= ${Source-Version}), kate-trinity (>= ${Source-Version}), kcontrol-trinity (>= ${Source-Version}), tdebase-trinity-bin (>= ${Source-Version}), tdebase-data-trinity (>= ${Source-Version}), tdebase-kio-plugins-trinity (>= ${Source-Version}), kdepasswd-trinity (>= ${Source-Version}), tdeprint-trinity (>= ${Source-Version}), kdesktop-trinity (>= ${Source-Version}), kfind-trinity (>= ${Source-Version}), khelpcenter-trinity (>= ${Source-Version}), kicker-trinity (>= ${Source-Version}), klipper-trinity (>= ${Source-Version}), kmenuedit-trinity (>= ${Source-Version}), konqueror-nsplugins-trinity (>= ${Source-Version}), konqueror-trinity (>= ${Source-Version}), konsole-trinity (>= ${Source-Version}), kpager-trinity (>= ${Source-Version}), kpersonalizer-trinity (>= ${Source-Version}), ksmserver-trinity (>= ${Source-Version}), ksplash-trinity (>= ${Source-Version}), ksysguard-trinity (>= ${Source-Version}), ktip-trinity (>= ${Source-Version}), twin-trinity (>= ${Source-Version}), libkonq4-trinity (>= ${Source-Version}), hal-trinity | kfreebsd-gnu | hurd, xcalib
Recommends: kdm-trinity (>= ${Source-Version}), tdebase-runtime-data-common-trinity, libtqt3-integration-trinity
Suggests: tdebase-trinity-doc-html (>= ${Source-Version})
@@ -29,6 +31,8 @@ Description: base components from the official KDE release
Package: tdebase-runtime-data-common-trinity
Section: kde
Architecture: all
+Replaces: kdebase-runtime-data-common-trinity (<< 4:14.0.0)
+Breaks: kdebase-runtime-data-common-trinity (<< 4:14.0.0)
Depends: tdebase-trinity
Description: Shared common files for Trinity and KDE4
.
@@ -38,8 +42,9 @@ Description: Shared common files for Trinity and KDE4
Package: kappfinder-trinity
Section: kde
Architecture: any
+Replaces: kappfinder-trinity (<< 4:14.0.0)
+Breaks: kappfinder-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
-Replaces: tdebase-trinity (<< 4:3.0.0)
Description: non-KDE application finder for KDE
kappfinder searches your workstation for many common applications and
creates menu entries for them.
@@ -50,10 +55,11 @@ Description: non-KDE application finder for KDE
Package: kate-trinity
Section: editors
Architecture: any
+Replaces: kate-trinity (<< 4:14.0.0)
+Breaks: kate-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Recommends: kregexpeditor-trinity
Suggests: aspell | ispell | hspell, kate-plugins-trinity, khelpcenter-trinity, konsole-trinity
-Replaces: tdebase-trinity-doc (<< 4:3.0.0)
Description: advanced text editor for KDE
Kate is a multi document editor, based on a rewritten version of the kwrite
editing widget of KDE.
@@ -80,11 +86,12 @@ Description: advanced text editor for KDE
Package: kcontrol-trinity
Section: kde
Architecture: any
+Replaces: kcontrol-trinity (<< 4:14.0.0)
+Breaks: kcontrol-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, tdebase-data-trinity (>> ${KDE-Version3}), tdebase-data-trinity (<< ${KDE-Next-Version3}), usbutils
Recommends: udev
Suggests: khelpcenter-trinity, ntpdate | ntp-simple
Conflicts: tdebase-libs-trinity (<< 4:3.0.0)
-Replaces: tdebase-trinity (<< 4:3.0.0), tdebase-trinity-doc (<< 4:3.0.0), tdebase-libs-trinity (<< 4:3.0.0), konqueror-trinity (<< 4:3.0.0)
Description: control center for KDE
The KDE Control Center provides you with a centralized and convenient
way to configure all of your KDE settings.
@@ -103,10 +110,11 @@ Description: control center for KDE
Package: tdebase-trinity-bin
Section: kde
Architecture: any
+Replaces: kdebase-trinity-bin (<< 4:14.0.0)
+Breaks: kdebase-trinity-bin (<< 4:14.0.0)
Depends: ${shlibs:Depends}, libpam-runtime (>= 0.76-14)
Suggests: khelpcenter-trinity, gdb
Conflicts: tdebase-libs-trinity (<< 4:3.0.0), kdm-trinity (<< 4:3.4.1-2), tdebase-workspace-data-trinity (<< 7:3.5.0)
-Replaces: kcontrol-trinity (<< 4:3.3.0), tdebase-trinity (<< 4:3.0.0), tdebase-trinity-doc (<< 4:3.0.0), tdebase-libs-trinity (<< 4:3.0.0), kscreensaver-trinity (<< 4:3.0.0), kdm-trinity (= 4:3.3.2-1b)
Description: core binaries for the KDE base module
This package contains miscellaneous programs needed by other
KDE applications, particularly those in the KDE base module.
@@ -117,8 +125,9 @@ Description: core binaries for the KDE base module
Package: tdebase-data-trinity
Section: kde
Architecture: all
+Replaces: kdebase-data-trinity (<< 4:14.0.0)
+Breaks: kdebase-data-trinity (<< 4:14.0.0)
Conflicts: kcontrol-trinity (<< 4:3.4.2-1), twin-trinity (<< 4:3.4.2-1), kicker-trinity (<< 4:3.4.2-1)
-Replaces: tdebase-trinity (<< 4:3.0.0), tdeedu-data-trinity (<< 4:3.4.0), tdelibs-data-trinity (<< 4:3.3.0), kdewallpapers-trinity (<< 4:3.0.0), kcontrol-trinity (<< 4:3.5.5a.dfsg.1-1ubuntu18)
Description: shared data files for the KDE base module
This package contains the architecture-independent shared data files
needed for a basic KDE desktop installation.
@@ -129,8 +138,9 @@ Description: shared data files for the KDE base module
Package: tdebase-trinity-dev
Section: devel
Architecture: any
+Replaces: kdebase-trinity-dev (<< 4:14.0.0)
+Breaks: kdebase-trinity-dev (<< 4:14.0.0)
Depends: kate-trinity (= ${Source-Version}), kcontrol-trinity (= ${Source-Version}), tdebase-trinity-bin (= ${Source-Version}), tdeprint-trinity (= ${Source-Version}), kdesktop-trinity (= ${Source-Version}), khelpcenter-trinity (= ${Source-Version}), kicker-trinity (= ${Source-Version}), klipper-trinity (= ${Source-Version}), kmenuedit-trinity (= ${Source-Version}), konqueror-nsplugins-trinity (= ${Source-Version}), konqueror-trinity (= ${Source-Version}), konsole-trinity (= ${Source-Version}), ksmserver-trinity (= ${Source-Version}), ksplash-trinity (= ${Source-Version}), ksysguard-trinity (= ${Source-Version}), twin-trinity (= ${Source-Version}), tdelibs4-trinity-dev (>= 4:3.5.8)
-Replaces: kate-trinity (<< 4:3.0.0), tdebase-trinity (<< 4:3.0.0), konqueror-trinity (<< 4:3.0.0)
Description: development files for the KDE base module
This package contains headers and other development files needed to
compile software based on the KDE base module.
@@ -141,7 +151,8 @@ Description: development files for the KDE base module
Package: tdebase-trinity-doc
Section: doc
Architecture: all
-Replaces: libkonq4-trinity-dev (<< 4:3.2.0)
+Replaces: kdebase-trinity-doc (<< 4:14.0.0)
+Breaks: kdebase-trinity-doc (<< 4:14.0.0)
Description: developer documentation for the KDE base module
This package contains documentation for the KDE base module, of
use more for developers creating applications than regular users.
@@ -152,6 +163,8 @@ Description: developer documentation for the KDE base module
Package: tdebase-trinity-doc-html
Architecture: all
Section: doc
+Replaces: kdebase-trinity-doc-html (<< 4:14.0.0)
+Breaks: kdebase-trinity-doc-html (<< 4:14.0.0)
Suggests: konqueror-trinity | www-browser, tdebase-trinity
Description: KDE base documentation in HTML format
By default the modules provided by KDE only provide their documentation
@@ -170,11 +183,12 @@ Description: KDE base documentation in HTML format
Package: tdebase-kio-plugins-trinity
Section: kde
Architecture: any
+Replaces: kdebase-kio-plugins-trinity (<< 4:14.0.0)
+Breaks: kdebase-kio-plugins-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, kdesktop-trinity, libsasl2-modules, psmisc, cryptsetup, man-db (>= 2.5.1-1)
Recommends: hal-trinity, pmount, kamera-trinity, tdemultimedia-kio-plugins-trinity
Suggests: khelpcenter-trinity, mtools
Conflicts: tdebase-libs-trinity (<< 4:3.0.0), mediamanager
-Replaces: tdebase-trinity (<< 4:3.0.0), tdebase-trinity-doc (<< 4:3.0.0), tdebase-libs-trinity (<< 4:3.0.0), konqueror-trinity (<< 4:3.0.0), tdebase-trinity-bin (<< 4:3.5.5a.dfsg.1-1ubuntu18), tdebase-data-trinity (<< 4:3.5.8-2ubuntu18)
Description: core I/O slaves for KDE
This package includes the base kioslaves. They include, amongst many
others, file, http, ftp, smtp, pop and imap.
@@ -191,6 +205,8 @@ Description: core I/O slaves for KDE
Package: kdepasswd-trinity
Section: utils
Architecture: any
+Replaces: kdepasswd-trinity (<< 4:14.0.0)
+Breaks: kdepasswd-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: password changer for KDE
This is a simple application which allows users to change their
@@ -202,10 +218,11 @@ Description: password changer for KDE
Package: tdeprint-trinity
Section: utils
Architecture: any
+Replaces: kdeprint-trinity (<< 4:14.0.0)
+Breaks: kdeprint-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, enscript, poster, psutils
Recommends: kghostview-trinity | postscript-viewer
Suggests: khelpcenter-trinity, efax | hylafax-client | mgetty-fax, smbclient
-Replaces: tdebase-trinity (<< 4:3.0.0), tdebase-trinity-doc (<< 4:3.0.0)
Description: print system for KDE
This package contains the KDE printing subsystem. It can use CUPS,
lpd-ng or the traditional lpd. It also includes support for fax and
@@ -221,8 +238,9 @@ Description: print system for KDE
Package: kdesktop-trinity
Section: kde
Architecture: any
+Replaces: kdesktop-trinity (<< 4:14.0.0)
+Breaks: kdesktop-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, tdebase-trinity-bin (= ${Source-Version}), eject, xdg-user-dirs
-Replaces: tdebase-trinity (<< 4:3.0.0), konqueror-trinity (<< 4:3.0.0)
Description: miscellaneous binaries and files for the KDE desktop
This package contains miscellaneous binaries and files integral to
the KDE desktop.
@@ -233,6 +251,8 @@ Description: miscellaneous binaries and files for the KDE desktop
Package: kdm-trinity
Section: kde
Architecture: any
+Replaces: kdm-trinity (<< 4:14.0.0)
+Breaks: kdm-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, tdebase-trinity-bin (= ${Source-Version}), tdebase-data-trinity (>> ${KDE-Version3}), tdebase-data-trinity (<< ${KDE-Next-Version3}), debconf (>= 1.2.9) | debconf-2.0, libpam-runtime (>= 0.76-14), xbase-clients
Recommends: logrotate, xserver-xorg
Suggests: khelpcenter-trinity, ksmserver-trinity (= ${Source-Version}), kdepasswd-trinity (= ${Source-Version}), menu
@@ -259,10 +279,11 @@ Description: X display manager for KDE
Package: kfind-trinity
Section: utils
Architecture: any
+Replaces: kfind-trinity (<< 4:14.0.0)
+Breaks: kfind-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
Conflicts: tdebase-libs-trinity (<< 4:3.0.0)
-Replaces: tdebase-trinity (<< 4:3.0.0), tdebase-libs-trinity (<< 4:3.0.0)
Description: file-find utility for KDE
kfind can be used to find files and directories on your
workstations.
@@ -273,9 +294,10 @@ Description: file-find utility for KDE
Package: khelpcenter-trinity
Section: kde
Architecture: any
+Replaces: khelpcenter-trinity (<< 4:14.0.0)
+Breaks: khelpcenter-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: htdig
-Replaces: tdebase-trinity-doc (<< 4:3.0.0), konqueror-trinity (<< 4:3.0.0)
Description: help center for KDE
The KDE Help Center provides documentation on how to use the KDE desktop.
.
@@ -288,10 +310,11 @@ Description: help center for KDE
Package: kicker-trinity
Section: kde
Architecture: any
+Replaces: kicker-trinity (<< 4:14.0.0)
+Breaks: kicker-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, tdebase-data-trinity (>> ${KDE-Version3}), tdebase-data-trinity (<< ${KDE-Next-Version3})
Suggests: khelpcenter-trinity, kicker-applets-trinity, menu
Conflicts: tdebase-libs-trinity (<< 4:3.0.0)
-Replaces: tdebase-trinity (<< 4:3.0.0), tdebase-trinity-doc (<< 4:3.0.0), tdebase-libs-trinity (<< 4:3.0.0), konqueror-trinity (<< 4:3.0.0)
Description: desktop panel for KDE
Kicker provides the KDE panel on you desktop. It can be used as a
program launcher and can load plugins to provide additional
@@ -303,9 +326,10 @@ Description: desktop panel for KDE
Package: klipper-trinity
Section: kde
Architecture: any
+Replaces: klipper-trinity (<< 4:14.0.0)
+Breaks: klipper-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
-Replaces: tdebase-trinity (<< 4:3.0.0), tdebase-trinity-doc (<< 4:3.0.0)
Description: clipboard utility for Trinity
klipper provides standard clipboard functions (cut and paste, history
saving) plus additional features, like the ability to offer actions to
@@ -318,9 +342,10 @@ Description: clipboard utility for Trinity
Package: kmenuedit-trinity
Section: kde
Architecture: any
+Replaces: kmenuedit-trinity (<< 4:14.0.0)
+Breaks: kmenuedit-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
-Replaces: tdebase-trinity (<< 4:3.0.0), tdebase-trinity-doc (<< 4:3.0.0)
Description: menu editor for KDE
The KDE menu editor allows you to make customisations to the KDE menu
structure.
@@ -331,11 +356,12 @@ Description: menu editor for KDE
Package: konqueror-trinity
Section: web
Architecture: any
+Replaces: konqueror-trinity (<< 4:14.0.0)
+Breaks: konqueror-trinity (<< 4:14.0.0)
Provides: info-browser, man-browser, www-browser, konqueror
Depends: ${shlibs:Depends}, kcontrol-trinity (= ${Source-Version}), tdebase-kio-plugins-trinity (= ${Source-Version}), kdesktop-trinity (= ${Source-Version}), kfind-trinity (= ${Source-Version}), konqueror-nsplugins-trinity
Suggests: khelpcenter-trinity, konq-plugins-trinity, ksvg-trinity, gij-4.1, libgcj7-awt, libjessie-java
Conflicts: tdebase-audiolibs-trinity (<< 4:3.0.0), tdebase-libs-trinity (<< 4:3.0.0)
-Replaces: tdebase-trinity (<< 4:3.0.0), tdebase-audiolibs-trinity (<< 4:3.0.0), tdebase-trinity-doc (<< 4:3.0.0), tdebase-libs-trinity (<< 4:3.0.0)
Description: KDE's advanced file manager, web browser and document viewer
Konqueror is the file manager for the K Desktop Environment.
It supports basic file management on local UNIX filesystems,
@@ -363,8 +389,9 @@ Description: KDE's advanced file manager, web browser and document viewer
Package: konqueror-nsplugins-trinity
Section: utils
Architecture: any
+Replaces: konqueror-nsplugins-trinity (<< 4:14.0.0)
+Breaks: konqueror-nsplugins-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, konqueror-trinity
-Replaces: konqueror-trinity (<< 4:3.0.0)
Description: Netscape plugin support for Konqueror
This package includes support for Netscape plugins in Konqueror.
.
@@ -374,8 +401,9 @@ Description: Netscape plugin support for Konqueror
Package: konsole-trinity
Section: kde
Architecture: any
+Replaces: konsole-trinity (<< 4:14.0.0)
+Breaks: konsole-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
-Replaces: tdebase-trinity (<< 4:3.0.0)
Suggests: khelpcenter-trinity
Provides: x-terminal-emulator
Description: X terminal emulator for KDE
@@ -400,9 +428,10 @@ Description: X terminal emulator for KDE
Package: kpager-trinity
Section: kde
Architecture: any
+Replaces: kpager-trinity (<< 4:14.0.0)
+Breaks: kpager-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
-Replaces: tdebase-trinity (<< 4:3.0.0), tdebase-trinity-doc (<< 4:3.0.0)
Description: desktop pager for KDE
This package contains KDE's desktop pager, which displays your virtual
desktops iconically in a window, along with icons of any running
@@ -414,8 +443,9 @@ Description: desktop pager for KDE
Package: kpersonalizer-trinity
Section: kde
Architecture: any
+Replaces: kpersonalizer-trinity (<< 4:14.0.0)
+Breaks: kpersonalizer-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, tdebase-data-trinity (>> ${KDE-Version3}), tdebase-data-trinity (<< ${KDE-Next-Version3})
-Replaces: tdebase-trinity (<< 4:3.0.0)
Description: installation personalizer for KDE
KDE Personalizer is the application that configures the KDE desktop for you.
It's a very useful wizard that allows you to quickly change the KDE desktop to
@@ -428,10 +458,11 @@ Description: installation personalizer for KDE
Package: ksmserver-trinity
Section: kde
Architecture: any
+Replaces: ksmserver-trinity (<< 4:14.0.0)
+Breaks: ksmserver-trinity (<< 4:14.0.0)
Provides: x-session-manager
Depends: ${shlibs:Depends}, tdebase-runtime-data-common-trinity, twin-trinity (= ${Source-Version}) | x-window-manager
Recommends: kpersonalizer-trinity (= ${Source-Version})
-Replaces: tdebase-trinity (<< 4:3.0.0)
Description: session manager for KDE
This package contains the KDE session manager. It is responsible for
restoring your KDE session on login. It is also needed to properly
@@ -449,9 +480,10 @@ Description: session manager for KDE
Package: ksplash-trinity
Section: kde
Architecture: any
+Replaces: ksplash-trinity (<< 4:14.0.0)
+Breaks: ksplash-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, tdebase-data-trinity (>> ${KDE-Version3}), tdebase-data-trinity (<< ${KDE-Next-Version3})
Suggests: khelpcenter-trinity
-Replaces: tdebase-trinity (<< 4:3.0.0)
Description: the KDE splash screen
This package includes the KDE Splash screen, which is seen when
a KDE session is launched.
@@ -462,10 +494,11 @@ Description: the KDE splash screen
Package: ksysguard-trinity
Section: utils
Architecture: any
+Replaces: ksysguard-trinity (<< 4:14.0.0)
+Breaks: ksysguard-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, ksysguardd-trinity (= ${Source-Version})
Suggests: khelpcenter-trinity
Conflicts: kpm-trinity (<< 4:3.0.0)
-Replaces: tdebase-trinity (<< 4:3.0.0), tdebase-trinity-doc (<< 4:3.0.0), kpm (<< 4:3.0.0)
Description: system guard for KDE
KDE System Guard allows you to monitor various statistics about your
computer.
@@ -476,8 +509,9 @@ Description: system guard for KDE
Package: ksysguardd-trinity
Section: utils
Architecture: any
+Replaces: ksysguardd-trinity (<< 4:14.0.0)
+Breaks: ksysguardd-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
-Replaces: tdebase-trinity (<< 4:3.0.0)
Description: system guard daemon for KDE
KDE System Guard Daemon is the daemon part of ksysguard. The daemon can
be installed on a remote machine to enable ksysguard on another machine
@@ -489,8 +523,9 @@ Description: system guard daemon for KDE
Package: ktip-trinity
Section: kde
Architecture: any
+Replaces: ktip-trinity (<< 4:14.0.0)
+Breaks: ktip-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
-Replaces: tdebase-trinity (<< 4:3.0.0)
Description: useful tips for KDE
ktip provides many useful tips on using KDE when you log in.
.
@@ -500,10 +535,11 @@ Description: useful tips for KDE
Package: twin-trinity
Section: kde
Architecture: any
+Replaces: kwin-trinity (<< 4:14.0.0)
+Breaks: kwin-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Provides: x-window-manager
Suggests: tdebase-trinity-bin (= ${Source-Version}), tdebase-data-trinity (>> ${KDE-Version3}), tdebase-data-trinity (<< ${KDE-Next-Version3}), kdesktop-trinity (= ${Source-Version}), kicker-trinity (= ${Source-Version}), kpager-trinity (= ${Source-Version}), kpersonalizer-trinity (= ${Source-Version}), ksmserver-trinity (= ${Source-Version}), ksplash-trinity (= ${Source-Version})
-Replaces: tdeartwork-theme-window-trinity (<< 4:3.4.0), tdebase-trinity (<< 4:3.0.0)
Conflicts: kde-window-manager-trinity (<< 7:3.5.0)
Description: the KDE window manager
This package contains the default X window manager for KDE.
@@ -514,9 +550,10 @@ Description: the KDE window manager
Package: libkonq4-trinity
Section: libs
Architecture: any
+Replaces: libkonq4-trinity (<< 4:14.0.0)
+Breaks: libkonq4-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Conflicts: tdebase-libs-trinity (<< 4:3.0.0)
-Replaces: tdebase-libs-trinity (<< 4:3.0.0), konqueror-trinity (<< 4:3.0.0)
Description: core libraries for Konqueror
These libraries are used by several KDE applications, most notably
Konqueror and the kdesktop package.
@@ -527,6 +564,8 @@ Description: core libraries for Konqueror
Package: libtqt3-integration-trinity
Section: libs
Architecture: any
+Replaces: libtqt3-integration-trinity (<< 4:14.0.0)
+Breaks: libtqt3-integration-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: Integration library between TQt3 and TDE
These libraries allow you to use TDE dialogs in native TQt3 applications.
@@ -537,9 +576,10 @@ Description: Integration library between TQt3 and TDE
Package: libkonq4-trinity-dev
Section: libdevel
Architecture: any
+Replaces: libkonq4-trinity-dev (<< 4:14.0.0)
+Breaks: libkonq4-trinity-dev (<< 4:14.0.0)
Depends: libkonq4-trinity (= ${Source-Version}), tdelibs4-trinity-dev (>= 4:3.5.8)
Conflicts: libkonq-trinity-dev (<< 4:3.0.0), libkonq3-trinity (<< 4:3.0.0)
-Replaces: tdebase-dev (<< 4:3.0.0), libkonq-dev (<< 4:3.0.0), libkonq3 (<< 4:3.0.0)
Description: development files for Konqueror's core libraries
This package contains headers and other development files for the core
Konqueror libraries.
@@ -550,6 +590,8 @@ Description: development files for Konqueror's core libraries
Package: tdebase-trinity-dbg
Section: libdevel
Architecture: any
+Replaces: kdebase-trinity-dbg (<< 4:14.0.0)
+Breaks: kdebase-trinity-dbg (<< 4:14.0.0)
Priority: extra
Depends: libkonq4-trinity (= ${Source-Version}), tdelibs-trinity-dbg
Description: debugging symbols for tdebase
diff --git a/debian/squeeze/tdebindings/debian/control b/debian/squeeze/tdebindings/debian/control
index bd52bed60..55d1ec903 100644
--- a/debian/squeeze/tdebindings/debian/control
+++ b/debian/squeeze/tdebindings/debian/control
@@ -9,12 +9,14 @@ Section: devel
Priority: optional
Maintainer: Timothy Pearson
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers
-Uploaders: Adeodato Simó , Ana Beatriz Guerrero Lopez , Ricardo Cardenes , Sune Vuorela
+Uploaders: Adeodato Sim , Ana Beatriz Guerrero Lopez , Ricardo Cardenes , Sune Vuorela
Standards-Version: 3.8.4
Package: tdebindings-java-trinity
Section: libs
Architecture: all
+Replaces: kdebindings-java-trinity (<< 4:14.0.0)
+Breaks: kdebindings-java-trinity (<< 4:14.0.0)
Depends: libdcop3-java-trinity (= ${source:Version}), libqt3-java-trinity (= ${source:Version}), libtrinity-java-trinity (= ${source:Version})
Description: TDE Java bindings metapackage [Trinity]
A metapackage depending on all TDE, Qt and DCOP bindings libraries
@@ -25,6 +27,8 @@ Description: TDE Java bindings metapackage [Trinity]
Package: libdcop3-java-trinity
Architecture: all
Section: libs
+Replaces: libdcop3-java-trinity (<< 4:14.0.0)
+Breaks: libdcop3-java-trinity (<< 4:14.0.0)
Depends: libdcop3-jni-trinity (>> ${KDE-Version3}), libdcop3-jni-trinity (<< ${KDE-Next-Version3}), gij | java1-runtime | java2-runtime
Description: DCOP bindings for Java [Trinity]
This package contains the Java classes necessary to run Java programs
@@ -36,6 +40,8 @@ Description: DCOP bindings for Java [Trinity]
Package: libdcop3-jni-trinity
Architecture: amd64 i386 ia64 powerpc s390 sparc
Section: libs
+Replaces: libdcop3-jni-trinity (<< 4:14.0.0)
+Breaks: libdcop3-jni-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: DCOP bindings for Java ( Native libraries ) [Trinity]
This package contains the shared libraries and scripts necessary to
@@ -48,6 +54,8 @@ Description: DCOP bindings for Java ( Native libraries ) [Trinity]
Package: libdcop3-java-trinity-dev
Architecture: amd64 i386 ia64 powerpc s390 sparc
Section: libdevel
+Replaces: libdcop3-java-trinity-dev (<< 4:14.0.0)
+Breaks: libdcop3-java-trinity-dev (<< 4:14.0.0)
Depends: libdcop3-java-trinity (>> ${KDE-Version3}), libdcop3-java-trinity (<< ${KDE-Next-Version3})
Description: DCOP bindings for Java (dcopidl2java program) [Trinity]
This package contains the dcopidl2java program which generates Java
@@ -60,6 +68,8 @@ Description: DCOP bindings for Java (dcopidl2java program) [Trinity]
Package: libqt3-java-trinity
Architecture: all
Section: libs
+Replaces: libqt3-java-trinity (<< 4:14.0.0)
+Breaks: libqt3-java-trinity (<< 4:14.0.0)
Depends: libqt3-jni-trinity (>> ${KDE-Version3}), libqt3-jni-trinity (<< ${KDE-Next-Version3}), gij | java1-runtime | java2-runtime
Suggests: juic-trinity
Description: Java bindings for Qt [Trinity]
@@ -75,6 +85,8 @@ Description: Java bindings for Qt [Trinity]
Package: libqt3-jni-trinity
Architecture: amd64 i386 ia64 powerpc s390 sparc
Section: libs
+Replaces: libqt3-jni-trinity (<< 4:14.0.0)
+Breaks: libqt3-jni-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: Java bindings for Qt ( Native libraries ) [Trinity]
This package contains the shared libraries necessary to run Java
@@ -86,6 +98,8 @@ Description: Java bindings for Qt ( Native libraries ) [Trinity]
Package: libtrinity-java-trinity
Architecture: all
Section: libs
+Replaces: libtrinity-java-trinity (<< 4:14.0.0)
+Breaks: libtrinity-java-trinity (<< 4:14.0.0)
Depends: libtrinity-jni-trinity (>> ${KDE-Version3}), libtrinity-jni-trinity (<< ${KDE-Next-Version3}), gij | java1-runtime | java2-runtime
Description: tdelibs bindings for Java [Trinity]
This package contains the Java classes necessary to run Java programs
@@ -100,6 +114,8 @@ Description: tdelibs bindings for Java [Trinity]
Package: libtrinity-jni-trinity
Architecture: amd64 i386 ia64 powerpc s390 sparc
Section: libs
+Replaces: libtrinity-jni-trinity (<< 4:14.0.0)
+Breaks: libtrinity-jni-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: tdelibs bindings for java ( Native libraries ) [Trinity]
This package contains the shared libraries necessary to run Java
@@ -111,6 +127,8 @@ Description: tdelibs bindings for java ( Native libraries ) [Trinity]
Package: libsmokeqt1-trinity
Architecture: any
Section: libs
+Replaces: libsmokeqt1-trinity (<< 4:14.0.0)
+Breaks: libsmokeqt1-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: SMOKE Binding Library to Qt
The "Scripting Meta Object Kompiler Engine" library is used by
@@ -122,6 +140,8 @@ Description: SMOKE Binding Library to Qt
Package: libsmokeqt-trinity-dev
Architecture: any
Section: libdevel
+Replaces: libsmokeqt-trinity-dev (<< 4:14.0.0)
+Breaks: libsmokeqt-trinity-dev (<< 4:14.0.0)
Depends: libsmokeqt1-trinity (= ${binary:Version})
Description: SMOKE Binding Library to Qt - Development Files
The "Scripting Meta Object Kompiler Engine" library is used by
@@ -137,6 +157,8 @@ Description: SMOKE Binding Library to Qt - Development Files
Package: libsmokekde1-trinity
Architecture: any
Section: libs
+Replaces: libsmokekde1-trinity (<< 4:14.0.0)
+Breaks: libsmokekde1-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: SMOKE Binding Library to TDE
The "Scripting Meta Object Kompiler Engine" library is used by
@@ -148,6 +170,8 @@ Description: SMOKE Binding Library to TDE
Package: libsmokekde-trinity-dev
Architecture: any
Section: libdevel
+Replaces: libsmokekde-trinity-dev (<< 4:14.0.0)
+Breaks: libsmokekde-trinity-dev (<< 4:14.0.0)
Depends: libsmokekde1-trinity (= ${binary:Version})
Description: SMOKE Binding Library to TDE - Development Files
The "Scripting Meta Object Kompiler Engine" library is used by
@@ -163,6 +187,8 @@ Description: SMOKE Binding Library to TDE - Development Files
Package: python-dcop-trinity
Architecture: any
Section: python
+Replaces: python-dcop-trinity (<< 4:14.0.0)
+Breaks: python-dcop-trinity (<< 4:14.0.0)
Depends: ${python:Depends}, ${shlibs:Depends}
Provides: ${python:Provides}
Description: DCOP bindings for Python
@@ -176,6 +202,8 @@ Description: DCOP bindings for Python
Package: libkjsembed1-trinity
Architecture: any
Section: libs
+Replaces: libkjsembed1-trinity (<< 4:14.0.0)
+Breaks: libkjsembed1-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: Embedded JavaScript library
This package contains the shared libraries necessary to run programs
@@ -187,6 +215,8 @@ Description: Embedded JavaScript library
Package: libkjsembed-trinity-dev
Architecture: any
Section: libdevel
+Replaces: libkjsembed-trinity-dev (<< 4:14.0.0)
+Breaks: libkjsembed-trinity-dev (<< 4:14.0.0)
Depends: libkjsembed1-trinity (= ${binary:Version})
Description: Embedded JavaScript library (Development files)
This package contains the header files and symbolic links necessary
@@ -202,6 +232,8 @@ Description: Embedded JavaScript library (Development files)
Package: kjscmd-trinity
Architecture: any
Section: interpreters
+Replaces: kjscmd-trinity (<< 4:14.0.0)
+Breaks: kjscmd-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: A script interpreter using the TDE JavaScript library
This package contains the kjscmd program, which is a standalone
@@ -212,6 +244,8 @@ Description: A script interpreter using the TDE JavaScript library
Package: juic-trinity
Architecture: all
Section: libdevel
+Replaces: juic-trinity (<< 4:14.0.0)
+Breaks: juic-trinity (<< 4:14.0.0)
Depends: xsltproc
Recommends: libqt3-java-trinity
Suggests: qt3-designer
@@ -227,6 +261,8 @@ Description: The Qt Java UI Compiler
Package: libkorundum0-ruby1.8-trinity
Architecture: any
Section: interpreters
+Replaces: libkorundum0-ruby1.8-trinity (<< 4:14.0.0)
+Breaks: libkorundum0-ruby1.8-trinity (<< 4:14.0.0)
Depends: libqt0-ruby1.8-trinity (= ${binary:Version}), ${shlibs:Depends}
Description: TDE bindings for Ruby [Trinity]
This package contains the files necessary for running and developing
@@ -240,6 +276,8 @@ Description: TDE bindings for Ruby [Trinity]
Package: libqt0-ruby1.8-trinity
Architecture: any
Section: interpreters
+Replaces: libqt0-ruby1.8-trinity (<< 4:14.0.0)
+Breaks: libqt0-ruby1.8-trinity (<< 4:14.0.0)
Depends: ruby1.8, ${shlibs:Depends}
Description: Qt bindings for Ruby [Trinity]
This package contains the files necessary for running and developing
@@ -253,6 +291,8 @@ Description: Qt bindings for Ruby [Trinity]
Package: tde-xparts-extras-trinity
Architecture: any
Depends: ${shlibs:Depends}
+Replaces: kde-xparts-extras-trinity (<< 4:14.0.0)
+Breaks: kde-xparts-extras-trinity (<< 4:14.0.0)
Description: Extra xparts for TDE [Trinity]
This package contains extra xparts-based modules for Trinity
This includes the mozilla-konqueror plugin
diff --git a/debian/squeeze/tdeedu/debian/control b/debian/squeeze/tdeedu/debian/control
index 4f9345340..a8afe7c5a 100644
--- a/debian/squeeze/tdeedu/debian/control
+++ b/debian/squeeze/tdeedu/debian/control
@@ -10,6 +10,8 @@ Standards-Version: 3.8.4
Package: tdeedu-trinity
Architecture: all
Section: kde
+Replaces: kdeedu-trinity (<< 4:14.0.0)
+Breaks: kdeedu-trinity (<< 4:14.0.0)
Depends: blinken-trinity (>= ${Source-Version}), kalzium-trinity (>= ${Source-Version}), kanagram-trinity (>= ${Source-Version}), kbruch-trinity (>= ${Source-Version}), tdeedu-data-trinity (>= ${Source-Version}), keduca-trinity (>= ${Source-Version}), kgeography-trinity (>= ${Source-Version}), khangman-trinity (>= ${Source-Version}), kig-trinity (>= ${Source-Version}), kiten-trinity (>= ${Source-Version}), klatin-trinity (>= ${Source-Version}), klettres-trinity (>= ${Source-Version}), kmplot-trinity (>= ${Source-Version}), kpercentage-trinity (>= ${Source-Version}), kstars-trinity (>= ${Source-Version}), ktouch-trinity (>= ${Source-Version}), kturtle-trinity (>= ${Source-Version}), kverbos-trinity (>= ${Source-Version}), kvoctrain-trinity (>= ${Source-Version}), kwordquiz-trinity (>= ${Source-Version}), indi-trinity (>= ${Source-Version})
Suggests: tdeedu-trinity-doc-html
Description: educational apps from the official Trinity release
@@ -24,6 +26,8 @@ Description: educational apps from the official Trinity release
Package: tdeedu-data-trinity
Architecture: all
Section: kde
+Replaces: kdeedu-data-trinity (<< 4:14.0.0)
+Breaks: kdeedu-data-trinity (<< 4:14.0.0)
Description: shared data for Trinity educational applications
This package contains shared data necessary for running the
educational applications provided with KDE (the K Desktop
@@ -35,6 +39,8 @@ Description: shared data for Trinity educational applications
Package: tdeedu-trinity-dbg
Architecture: any
Priority: extra
+Replaces: kdeedu-trinity-dbg (<< 4:14.0.0)
+Breaks: kdeedu-trinity-dbg (<< 4:14.0.0)
Depends: tdelibs-trinity-dbg
Section: libdevel
Description: debugging symbols for tdeedu-trinity
@@ -45,6 +51,8 @@ Description: debugging symbols for tdeedu-trinity
Package: tdeedu-trinity-doc-html
Architecture: all
Section: doc
+Replaces: kdeedu-trinity-doc-html (<< 4:14.0.0)
+Breaks: kdeedu-trinity-doc-html (<< 4:14.0.0)
Suggests: konqueror-trinity | www-browser, tdeedu-trinity
Description: Trinity edutainment documentation in HTML format
By default the educational applications provided with KDE (the K
@@ -64,6 +72,8 @@ Description: Trinity edutainment documentation in HTML format
Package: blinken-trinity
Architecture: any
Section: games
+Replaces: blinken-trinity (<< 4:14.0.0)
+Breaks: blinken-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, ttf-sjfonts, tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3})
Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
Description: Trinity version of the Simon Says electronic memory game
@@ -82,6 +92,8 @@ Description: Trinity version of the Simon Says electronic memory game
Package: kalzium-trinity
Architecture: any
Section: science
+Replaces: kalzium-trinity (<< 4:14.0.0)
+Breaks: kalzium-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, kalzium-data-trinity (>> ${KDE-Version3}), kalzium-data-trinity (<< ${KDE-Next-Version3}), tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3})
Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
Description: chemistry teaching tool for Trinity
@@ -107,6 +119,8 @@ Description: chemistry teaching tool for Trinity
Package: kalzium-data-trinity
Architecture: all
Section: science
+Replaces: kalzium-data-trinity (<< 4:14.0.0)
+Breaks: kalzium-data-trinity (<< 4:14.0.0)
Description: data files for Kalzium
This package contains architecture-independent data files for
Kalzium, the KDE periodic table application. This includes pictures
@@ -121,6 +135,8 @@ Description: data files for Kalzium
Package: kanagram-trinity
Architecture: any
Section: games
+Replaces: kanagram-trinity (<< 4:14.0.0)
+Breaks: kanagram-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3})
Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
Description: letter order game for Trinity
@@ -142,6 +158,8 @@ Description: letter order game for Trinity
Package: kbruch-trinity
Architecture: any
Section: math
+Replaces: kbruch-trinity (<< 4:14.0.0)
+Breaks: kbruch-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3})
Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
Description: fraction calculation teaching tool for Trinity
@@ -155,6 +173,8 @@ Description: fraction calculation teaching tool for Trinity
Package: keduca-trinity
Architecture: any
Section: kde
+Replaces: keduca-trinity (<< 4:14.0.0)
+Breaks: keduca-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3})
Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
Description: interactive form-based tests for Trinity
@@ -167,6 +187,8 @@ Description: interactive form-based tests for Trinity
Package: kgeography-trinity
Architecture: any
Section: kde
+Replaces: kgeography-trinity (<< 4:14.0.0)
+Breaks: kgeography-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, kgeography-data-trinity (>> ${KDE-Version3}), kgeography-data-trinity (<< ${KDE-Next-Version3}), tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3})
Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
Description: Geography learning tool for Trinity
@@ -181,6 +203,8 @@ Description: Geography learning tool for Trinity
Package: kgeography-data-trinity
Architecture: all
Section: kde
+Replaces: kgeography-data-trinity (<< 4:14.0.0)
+Breaks: kgeography-data-trinity (<< 4:14.0.0)
Description: data files for KGeography
This package contains architecture-independent data files for
KGeography, the geography learning tool for KDE. This includes map
@@ -194,6 +218,8 @@ Description: data files for KGeography
Package: khangman-trinity
Architecture: any
Section: games
+Replaces: khangman-trinity (<< 4:14.0.0)
+Breaks: khangman-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, ttf-dustin, tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3})
Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
Description: the classical hangman game for Trinity
@@ -212,6 +238,8 @@ Description: the classical hangman game for Trinity
Package: kig-trinity
Architecture: any
Section: math
+Replaces: kig-trinity (<< 4:14.0.0)
+Breaks: kig-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3})
Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
Description: interactive geometry program for KDE
@@ -238,6 +266,8 @@ Description: interactive geometry program for KDE
Package: kiten-trinity
Architecture: any
Section: kde
+Replaces: kiten-trinity (<< 4:14.0.0)
+Breaks: kiten-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3}), ttf-kochi-gothic | ttf-kochi-mincho
Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
Description: Japanese reference/study tool for Trinity
@@ -253,6 +283,8 @@ Description: Japanese reference/study tool for Trinity
Package: klatin-trinity
Architecture: any
Section: kde
+Replaces: klatin-trinity (<< 4:14.0.0)
+Breaks: klatin-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3})
Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
Description: application to help revise/teach Latin
@@ -276,6 +308,8 @@ Description: application to help revise/teach Latin
Package: klettres-trinity
Architecture: any
Section: kde
+Replaces: klettres-trinity (<< 4:14.0.0)
+Breaks: klettres-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, klettres-data-trinity (>> ${KDE-Version3}), klettres-data-trinity (<< ${KDE-Next-Version3}), tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3})
Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
Description: foreign alphabet tutor for Trinity
@@ -293,7 +327,8 @@ Description: foreign alphabet tutor for Trinity
Package: klettres-data-trinity
Architecture: all
Section: kde
-Replaces: klettres-trinity (<< 4:3.2.0.1)
+Replaces: klettres-data-trinity (<< 4:14.0.0)
+Breaks: klettres-data-trinity (<< 4:14.0.0)
Description: data files for KLettres foreign alphabet tutor
This package contains architecture-independent data files for
KLettres, the foreign alphabet tutor for KDE. This includes sound
@@ -307,6 +342,8 @@ Description: data files for KLettres foreign alphabet tutor
Package: kmplot-trinity
Architecture: any
Section: math
+Replaces: kmplot-trinity (<< 4:14.0.0)
+Breaks: kmplot-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3})
Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
Description: mathematical function plotter for Trinity
@@ -329,6 +366,8 @@ Description: mathematical function plotter for Trinity
Package: kpercentage-trinity
Architecture: any
Section: math
+Replaces: kpercentage-trinity (<< 4:14.0.0)
+Breaks: kpercentage-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3})
Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
Description: percentage calculation teaching tool for Trinity
@@ -345,6 +384,8 @@ Description: percentage calculation teaching tool for Trinity
Package: kstars-trinity
Architecture: any
Section: science
+Replaces: kstars-trinity (<< 4:14.0.0)
+Breaks: kstars-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, kstars-data-trinity (>> ${KDE-Version3}), kstars-data-trinity (<< ${KDE-Next-Version3}), tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3}), indi-trinity (= ${Source-Version})
Suggests: konqueror-trinity, khelpcenter-trinity, tdeedu-trinity-doc-html
Description: desktop planetarium for Trinity
@@ -366,7 +407,8 @@ Description: desktop planetarium for Trinity
Package: kstars-data-trinity
Architecture: all
Section: science
-Replaces: kstars-trinity (<< 4:3.2.0.1)
+Replaces: kstars-data-trinity (<< 4:14.0.0)
+Breaks: kstars-data-trinity (<< 4:14.0.0)
Description: data files for KStars desktop planetarium
This package contains architecture-independent data files for KStars,
the graphical desktop planetarium for KDE. This includes star
@@ -380,6 +422,8 @@ Description: data files for KStars desktop planetarium
Package: ktouch-trinity
Architecture: any
Section: kde
+Replaces: ktouch-trinity (<< 4:14.0.0)
+Breaks: ktouch-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3})
Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
Description: touch typing tutor for Trinity
@@ -398,6 +442,8 @@ Description: touch typing tutor for Trinity
Package: kturtle-trinity
Architecture: any
Section: devel
+Replaces: kturtle-trinity (<< 4:14.0.0)
+Breaks: kturtle-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3})
Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
Description: educational Logo programming environment
@@ -424,6 +470,8 @@ Description: educational Logo programming environment
Package: kverbos-trinity
Architecture: any
Section: kde
+Replaces: kverbos-trinity (<< 4:14.0.0)
+Breaks: kverbos-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3})
Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
Description: Spanish verb form study application for Trinity
@@ -441,6 +489,8 @@ Description: Spanish verb form study application for Trinity
Package: kvoctrain-trinity
Architecture: any
Section: kde
+Replaces: kvoctrain-trinity (<< 4:14.0.0)
+Breaks: kvoctrain-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, ${perl:Depends}, libwww-perl, tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3})
Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
Description: vocabulary trainer for Trinity
@@ -465,6 +515,8 @@ Description: vocabulary trainer for Trinity
Package: kwordquiz-trinity
Architecture: any
Section: kde
+Replaces: kwordquiz-trinity (<< 4:14.0.0)
+Breaks: kwordquiz-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3})
Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
Description: flashcard and vocabulary learning program for Trinity
@@ -482,6 +534,8 @@ Description: flashcard and vocabulary learning program for Trinity
Package: libtdeedu3-trinity
Architecture: any
Section: libs
+Replaces: libkdeedu3-trinity (<< 4:14.0.0)
+Breaks: libkdeedu3-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: library for use with Trinity educational apps
The KDE-based library libtdeedu is used with educational
@@ -494,6 +548,8 @@ Description: library for use with Trinity educational apps
Package: libtdeedu-trinity-dev
Architecture: any
Section: libdevel
+Replaces: libkdeedu-trinity-dev (<< 4:14.0.0)
+Breaks: libkdeedu-trinity-dev (<< 4:14.0.0)
Depends: libtdeedu3-trinity (= ${Source-Version}), tdelibs4-trinity-dev (>= 4:3.5.8)
Description: development files for Trinity educational library
The KDE-based library libtdeedu is used with educational
@@ -508,9 +564,10 @@ Description: development files for Trinity educational library
Package: libkiten1-trinity
Architecture: any
Section: libs
+Replaces: libkiten1-trinity (<< 4:14.0.0)
+Breaks: libkiten1-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, edict, kanjidic
Recommends: ttf-kochi-gothic | ttf-kochi-mincho
-Replaces: kiten (<< 4:3.4.0)
Description: library for Kiten Japanese reference/study tool
Kiten is a Japanese reference/study tool for KDE. The library
libkiten contains portions of Kiten that may be useful for other
@@ -527,6 +584,8 @@ Description: library for Kiten Japanese reference/study tool
Package: libkiten-trinity-dev
Architecture: any
Section: libdevel
+Replaces: libkiten-trinity-dev (<< 4:14.0.0)
+Breaks: libkiten-trinity-dev (<< 4:14.0.0)
Depends: libkiten1-trinity (= ${Source-Version}), tdelibs4-trinity-dev (>= 4:3.5.8)
Description: development files for Kiten library
Kiten is a Japanese reference/study tool for KDE. The library
@@ -543,8 +602,9 @@ Description: development files for Kiten library
Package: indi-trinity
Architecture: any
Section: science
+Replaces: indi-trinity (<< 4:14.0.0)
+Breaks: indi-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
-Replaces: kstars-trinity (<< 4:3.5.4-2)
Description: Instrument Neutral Distributed Interface for astronomical devices
INDI is an Instrument Neutral Distributed Interface control protocol for
astronomical devices, which provides a framework that decouples low level
diff --git a/debian/squeeze/tdegames/debian/control b/debian/squeeze/tdegames/debian/control
index 547fa7398..9f634b9b7 100644
--- a/debian/squeeze/tdegames/debian/control
+++ b/debian/squeeze/tdegames/debian/control
@@ -11,6 +11,8 @@ Standards-Version: 3.8.4
Package: tdegames-trinity
Architecture: all
Section: kde
+Replaces: kdegames-trinity (<< 4:14.0.0)
+Breaks: kdegames-trinity (<< 4:14.0.0)
Depends: atlantik-trinity (>= ${Source-Version}), kasteroids-trinity (>= ${Source-Version}), katomic-trinity (>= ${Source-Version}), kbackgammon-trinity (>= ${Source-Version}), kbattleship-trinity (>= ${Source-Version}), kblackbox-trinity (>= ${Source-Version}), kbounce-trinity (>= ${Source-Version}), kenolaba-trinity (>= ${Source-Version}), kfouleggs-trinity (>= ${Source-Version}), kgoldrunner-trinity (>= ${Source-Version}), kjumpingcube-trinity (>= ${Source-Version}), klickety-trinity (>= ${Source-Version}), klines-trinity (>= ${Source-Version}), kmahjongg-trinity (>= ${Source-Version}), kmines-trinity (>= ${Source-Version}), knetwalk-trinity (>= ${Source-Version}), kolf-trinity (>= ${Source-Version}), konquest-trinity (>= ${Source-Version}), kpat-trinity (>= ${Source-Version}), kpoker-trinity (>= ${Source-Version}), kreversi-trinity (>= ${Source-Version}), ksame-trinity (>= ${Source-Version}), kshisen-trinity (>= ${Source-Version}), ksirtet-trinity (>= ${Source-Version}), ksmiletris-trinity (>= ${Source-Version}), ksnake-trinity (>= ${Source-Version}), ksokoban-trinity (>= ${Source-Version}), kspaceduel-trinity (>= ${Source-Version}), ktron-trinity (>= ${Source-Version}), ktuberling-trinity (>= ${Source-Version}), twin4-trinity (>= ${Source-Version}), lskat-trinity (>= ${Source-Version})
Suggests: tdegames-trinity-doc-html (>= ${Source-Version}), khelpcenter-trinity
Description: games from the official Trinity release
@@ -25,6 +27,8 @@ Description: games from the official Trinity release
Package: tdegames-trinity-doc-html
Architecture: all
Section: doc
+Replaces: kdegames-trinity-doc-html (<< 4:14.0.0)
+Breaks: kdegames-trinity-doc-html (<< 4:14.0.0)
Suggests: konqueror-trinity | www-browser, tdegames-trinity
Description: KDE games documentation in HTML format
By default the games provided with KDE (the K Desktop Environment)
@@ -43,6 +47,8 @@ Description: KDE games documentation in HTML format
Package: libtdegames1-trinity
Architecture: any
Section: games
+Replaces: libkdegames1-trinity (<< 4:14.0.0)
+Breaks: libkdegames1-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: Trinity games library and common files
This library provides a common infrastructure for several of the
@@ -56,6 +62,8 @@ Description: Trinity games library and common files
Package: tdegames-trinity-dbg
Architecture: any
Depends: tdelibs-trinity-dbg
+Replaces: kdegames-trinity-dbg (<< 4:14.0.0)
+Breaks: kdegames-trinity-dbg (<< 4:14.0.0)
Priority: extra
Section: kde
Description: debugging symbols for tdegames
@@ -66,6 +74,8 @@ Description: debugging symbols for tdegames
Package: libtdegames-trinity-dev
Architecture: any
Section: libdevel
+Replaces: libkdegames-trinity-dev (<< 4:14.0.0)
+Breaks: libkdegames-trinity-dev (<< 4:14.0.0)
Depends: tdelibs4-trinity-dev (>= 4:3.5.1), libtdegames1-trinity (= ${Source-Version})
Description: Trinity games library headers
This package is necessary if you want to develop your own games using
@@ -77,6 +87,8 @@ Description: Trinity games library headers
Package: libtdegames-trinity-doc
Architecture: all
Section: doc
+Replaces: libkdegames-trinity-doc (<< 4:14.0.0)
+Breaks: libkdegames-trinity-doc (<< 4:14.0.0)
Recommends: tdelibs4-trinity-doc, libtqtinterface-doc
Suggests: konqueror-trinity | www-browser, libtdegames-trinity-dev
Description: API documentation for the Trinity games library
@@ -89,6 +101,8 @@ Description: API documentation for the Trinity games library
Package: tdegames-card-data-trinity
Architecture: all
Section: games
+Replaces: kdegames-card-data-trinity (<< 4:14.0.0)
+Breaks: kdegames-card-data-trinity (<< 4:14.0.0)
Description: Card decks for Trinity games
Several different collections of card images for use by KDE games.
.
@@ -98,6 +112,8 @@ Description: Card decks for Trinity games
Package: atlantik-trinity
Architecture: any
Section: games
+Replaces: atlantik-trinity (<< 4:14.0.0)
+Breaks: atlantik-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: atlantikdesigner-trinity, monopd
Description: KDE client for Monopoly-like network games
@@ -113,6 +129,8 @@ Description: KDE client for Monopoly-like network games
Package: atlantik-trinity-dev
Architecture: any
Section: devel
+Replaces: atlantik-trinity-dev (<< 4:14.0.0)
+Breaks: atlantik-trinity-dev (<< 4:14.0.0)
Priority: extra
Depends: ${shlibs:Depends}, atlantik-trinity (= ${Source-Version}), libtdegames-trinity-dev (= ${Source-Version})
Description: Development files for Atlantik
@@ -125,6 +143,8 @@ Description: Development files for Atlantik
Package: kasteroids-trinity
Architecture: any
Section: games
+Replaces: kasteroids-trinity (<< 4:14.0.0)
+Breaks: kasteroids-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: Asteroids for Trinity
You know this game. It is based on Warwick Allison's QwSpriteField
@@ -140,6 +160,8 @@ Description: Asteroids for Trinity
Package: katomic-trinity
Architecture: any
Section: games
+Replaces: katomic-trinity (<< 4:14.0.0)
+Breaks: katomic-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: Atomic Entertainment game for Trinity
This is a puzzle game, in which the object is to assemble a molecule
@@ -153,6 +175,8 @@ Description: Atomic Entertainment game for Trinity
Package: kbackgammon-trinity
Architecture: any
Section: games
+Replaces: kbackgammon-trinity (<< 4:14.0.0)
+Breaks: kbackgammon-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: gnubg
Description: A Backgammon game for Trinity
@@ -168,6 +192,8 @@ Description: A Backgammon game for Trinity
Package: kbattleship-trinity
Architecture: any
Section: games
+Replaces: kbattleship-trinity (<< 4:14.0.0)
+Breaks: kbattleship-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: Battleship game for Trinity
This is an implementation of the Battleship game. Each player tries
@@ -181,6 +207,8 @@ Description: Battleship game for Trinity
Package: kblackbox-trinity
Architecture: any
Section: games
+Replaces: kblackbox-trinity (<< 4:14.0.0)
+Breaks: kblackbox-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: A simple logical game for the Trinity project
KBlackBox is a game of hide and seek played on an grid of boxes. Your
@@ -196,6 +224,8 @@ Description: A simple logical game for the Trinity project
Package: kbounce-trinity
Architecture: any
Section: games
+Replaces: kbounce-trinity (<< 4:14.0.0)
+Breaks: kbounce-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: Jezzball clone for the K Desktop Environment
This is a clone of the popular Jezzball game originally created by
@@ -221,6 +251,8 @@ Description: Jezzball clone for the K Desktop Environment
Package: kenolaba-trinity
Architecture: any
Section: games
+Replaces: kenolaba-trinity (<< 4:14.0.0)
+Breaks: kenolaba-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: Enolaba board game for Trinity
kenolaba is a simple board strategy game that is played by two
@@ -238,6 +270,8 @@ Description: Enolaba board game for Trinity
Package: kfouleggs-trinity
Architecture: any
Section: games
+Replaces: kfouleggs-trinity (<< 4:14.0.0)
+Breaks: kfouleggs-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: A KDE clone of the Japanese PuyoPuyo game
KFouleggs is a clone of the Japanese PuyoPuyo game, with advanced
@@ -251,6 +285,8 @@ Description: A KDE clone of the Japanese PuyoPuyo game
Package: kgoldrunner-trinity
Architecture: any
Section: games
+Replaces: kgoldrunner-trinity (<< 4:14.0.0)
+Breaks: kgoldrunner-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: A Trinity clone of the Loderunner arcade game
KGoldrunner, a game of action and puzzle solving. Run through the
@@ -274,6 +310,8 @@ Description: A Trinity clone of the Loderunner arcade game
Package: kjumpingcube-trinity
Architecture: any
Section: games
+Replaces: kjumpingcube-trinity (<< 4:14.0.0)
+Breaks: kjumpingcube-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: Tactical one or two player game
KJumpingCube is a simple tactical game. You can play it against the
@@ -289,6 +327,8 @@ Description: Tactical one or two player game
Package: klickety-trinity
Architecture: any
Section: games
+Replaces: klickety-trinity (<< 4:14.0.0)
+Breaks: klickety-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: A Clickomania-like game for Trinity
Klickety is an adaptation of the (perhaps) well-known Clickomania
@@ -300,6 +340,8 @@ Description: A Clickomania-like game for Trinity
Package: klines-trinity
Architecture: any
Section: games
+Replaces: klines-trinity (<< 4:14.0.0)
+Breaks: klines-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: Color lines for Trinity
KLines is a simple game. It is played by one player, so there is only
@@ -320,6 +362,8 @@ Description: Color lines for Trinity
Package: kmahjongg-trinity
Architecture: any
Section: games
+Replaces: kmahjongg-trinity (<< 4:14.0.0)
+Breaks: kmahjongg-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: the classic mahjongg game for Trinity project
Your mission in this game is to remove all tiles from the game board. A
@@ -332,6 +376,8 @@ Description: the classic mahjongg game for Trinity project
Package: kmines-trinity
Architecture: any
Section: games
+Replaces: kmines-trinity (<< 4:14.0.0)
+Breaks: kmines-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: Minesweeper for Trinity
KMines is the classic Minesweeper game. You must uncover all the
@@ -349,6 +395,8 @@ Description: Minesweeper for Trinity
Package: knetwalk-trinity
Architecture: any
Section: games
+Replaces: knetwalk-trinity (<< 4:14.0.0)
+Breaks: knetwalk-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: A game for system administrators
This game presents the player with a rectangular field consisting of
@@ -362,6 +410,8 @@ Description: A game for system administrators
Package: kolf-trinity
Architecture: any
Section: games
+Replaces: kolf-trinity (<< 4:14.0.0)
+Breaks: kolf-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: Minigolf game for KDE
This is a minigolf game for KDE that allows you to go through different
@@ -373,6 +423,8 @@ Description: Minigolf game for KDE
Package: kolf-trinity-dev
Architecture: any
Section: devel
+Replaces: kolf-trinity-dev (<< 4:14.0.0)
+Breaks: kolf-trinity-dev (<< 4:14.0.0)
Priority: extra
Depends: ${shlibs:Depends}, kolf-trinity (= ${Source-Version}), libtdegames-trinity-dev (= ${Source-Version})
Description: Development files for Kolf
@@ -385,6 +437,8 @@ Description: Development files for Kolf
Package: konquest-trinity
Architecture: any
Section: games
+Replaces: konquest-trinity (<< 4:14.0.0)
+Breaks: konquest-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: KDE based GNU-Lactic Konquest game
This the KDE version of Gnu-Lactic Konquest, a multi-player strategy
@@ -397,6 +451,8 @@ Description: KDE based GNU-Lactic Konquest game
Package: kpat-trinity
Architecture: any
Section: games
+Replaces: kpat-trinity (<< 4:14.0.0)
+Breaks: kpat-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, tdebase-data-trinity, tdegames-card-data-trinity
Description: Trinity solitaire patience game
KPatience is a collection of 14 card games. All the games are single
@@ -408,6 +464,8 @@ Description: Trinity solitaire patience game
Package: kpoker-trinity
Architecture: any
Section: games
+Replaces: kpoker-trinity (<< 4:14.0.0)
+Breaks: kpoker-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, tdegames-card-data-trinity
Description: Trinity based Poker clone
KPoker is a KDE compliant clone of those highly addictive pocket
@@ -419,6 +477,8 @@ Description: Trinity based Poker clone
Package: kreversi-trinity
Architecture: any
Section: games
+Replaces: kreversi-trinity (<< 4:14.0.0)
+Breaks: kreversi-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: Reversi for Trinity
Reversi is a simple strategy game that is played by two
@@ -434,6 +494,8 @@ Description: Reversi for Trinity
Package: ksame-trinity
Architecture: any
Section: games
+Replaces: ksame-trinity (<< 4:14.0.0)
+Breaks: ksame-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: SameGame for Trinity
KSame is a simple game. It's played by one player, so there is only
@@ -447,6 +509,8 @@ Description: SameGame for Trinity
Package: kshisen-trinity
Architecture: any
Section: games
+Replaces: kshisen-trinity (<< 4:14.0.0)
+Breaks: kshisen-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: Shisen-Sho for Trinity
KShisen-Sho is a single-player-game similar to Mahjongg and uses the
@@ -460,6 +524,8 @@ Description: Shisen-Sho for Trinity
Package: ksirtet-trinity
Architecture: any
Section: games
+Replaces: ksirtet-trinity (<< 4:14.0.0)
+Breaks: ksirtet-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: Tetris and Puyo-Puyo games for Trinity
This program is a clone of the well known game Tetris. You must fit
@@ -477,6 +543,8 @@ Description: Tetris and Puyo-Puyo games for Trinity
Package: ksmiletris-trinity
Architecture: any
Section: games
+Replaces: ksmiletris-trinity (<< 4:14.0.0)
+Breaks: ksmiletris-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: Tetris like game for Trinity
This is a game with falling blocks composed of different types of
@@ -489,6 +557,8 @@ Description: Tetris like game for Trinity
Package: ksnake-trinity
Architecture: any
Section: games
+Replaces: ksnake-trinity (<< 4:14.0.0)
+Breaks: ksnake-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: Snake Race for Trinity
Snake Race is a game of speed and agility. You are a hungry snake and
@@ -500,6 +570,8 @@ Description: Snake Race for Trinity
Package: ksokoban-trinity
Architecture: any
Section: games
+Replaces: ksokoban-trinity (<< 4:14.0.0)
+Breaks: ksokoban-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: Sokoban game for Trinity
The first sokoban game was created in 1982 by Hiroyuki Imabayashi at
@@ -527,6 +599,8 @@ Description: Sokoban game for Trinity
Package: kspaceduel-trinity
Architecture: any
Section: games
+Replaces: kspaceduel-trinity (<< 4:14.0.0)
+Breaks: kspaceduel-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: Arcade two-player space game for Trinity
KSpaceduel is an space arcade game for two players.
@@ -542,6 +616,8 @@ Description: Arcade two-player space game for Trinity
Package: ktron-trinity
Architecture: any
Section: games
+Replaces: ktron-trinity (<< 4:14.0.0)
+Breaks: ktron-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: Tron clone for the K Desktop Environment
The object of the game is to avoid running into walls, your own tail,
@@ -553,6 +629,8 @@ Description: Tron clone for the K Desktop Environment
Package: ktuberling-trinity
Architecture: any
Section: games
+Replaces: ktuberling-trinity (<< 4:14.0.0)
+Breaks: ktuberling-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: Potato Guy for Trinity
KTuberling is a game intended for small children. Of course, it may
@@ -577,6 +655,8 @@ Description: Potato Guy for Trinity
Package: twin4-trinity
Architecture: any
Section: games
+Replaces: kwin4-trinity (<< 4:14.0.0)
+Breaks: kwin4-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: Connect Four clone for Trinity
Four wins is a game for two players. Each player is represented by a
@@ -596,6 +676,8 @@ Description: Connect Four clone for Trinity
Package: lskat-trinity
Architecture: any
Section: games
+Replaces: lskat-trinity (<< 4:14.0.0)
+Breaks: lskat-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, tdegames-card-data-trinity
Description: Lieutnant Skat card game for Trinity
Lieutnant Skat (from German Offiziersskat) is a card game for two
diff --git a/debian/squeeze/tdegraphics/debian/control b/debian/squeeze/tdegraphics/debian/control
index 615d3f793..f1b9cc0a7 100644
--- a/debian/squeeze/tdegraphics/debian/control
+++ b/debian/squeeze/tdegraphics/debian/control
@@ -10,6 +10,8 @@ Standards-Version: 3.8.4
Package: tdegraphics-trinity
Section: kde
Architecture: all
+Replaces: kdegraphics-trinity (<< 4:14.0.0)
+Breaks: kdegraphics-trinity (<< 4:14.0.0)
Depends: kamera-trinity (>= ${source:Version}), kcoloredit-trinity (>= ${source:Version}), tdegraphics-kfile-plugins-trinity (>= ${source:Version}), kdvi-trinity (>= ${source:Version}), kfax-trinity (>= ${source:Version}), kfaxview-trinity (>= ${source:Version}), kgamma-trinity (>= ${source:Version}), kghostview-trinity (>= ${source:Version}), kiconedit-trinity (>= ${source:Version}), kmrml-trinity (>= ${source:Version}), kolourpaint-trinity (>= ${source:Version}), kooka-trinity (>= ${source:Version}), kpdf-trinity (>= ${source:Version}), kpovmodeler-trinity (>= ${source:Version}), kruler-trinity (>= ${source:Version}), ksnapshot-trinity (>= ${source:Version}), ksvg-trinity (>= ${source:Version}), kview-trinity (>= ${source:Version}), kviewshell-trinity (>= ${source:Version}), libkscan1-trinity (>= ${source:Version})
Suggests: tdegraphics-trinity-doc-html (>= ${source:Version})
Description: graphics apps from the official Trinity release
@@ -24,6 +26,8 @@ Description: graphics apps from the official Trinity release
Package: tdegraphics-trinity-doc-html
Architecture: all
Section: doc
+Replaces: kdegraphics-trinity-doc-html (<< 4:14.0.0)
+Breaks: kdegraphics-trinity-doc-html (<< 4:14.0.0)
Suggests: konqueror-trinity | www-browser, tdebase-trinity
Description: KDE graphics documentation in HTML format
By default the modules provided by KDE only provide their documentation
@@ -42,6 +46,8 @@ Description: KDE graphics documentation in HTML format
Package: kamera-trinity
Section: graphics
Architecture: any
+Replaces: kamera-trinity (<< 4:14.0.0)
+Breaks: kamera-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
Description: digital camera io_slave for Konqueror
@@ -54,6 +60,8 @@ Description: digital camera io_slave for Konqueror
Package: kcoloredit-trinity
Section: graphics
Architecture: any
+Replaces: kcoloredit-trinity (<< 4:14.0.0)
+Breaks: kcoloredit-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
Description: a color palette editor and color picker for KDE
@@ -66,6 +74,8 @@ Description: a color palette editor and color picker for KDE
Package: tdegraphics-trinity-dev
Section: devel
Architecture: any
+Replaces: kdegraphics-trinity-dev (<< 4:14.0.0)
+Breaks: kdegraphics-trinity-dev (<< 4:14.0.0)
Depends: kghostview-trinity (= ${binary:Version}), kmrml-trinity (= ${binary:Version}), kpovmodeler-trinity (= ${binary:Version}), ksvg-trinity (= ${binary:Version}), kview-trinity (= ${binary:Version}), kviewshell-trinity (= ${binary:Version}), tdelibs4-trinity-dev (>= 4:3.5.8)
Description: development files for the KDE graphics module
This package contains headers and other development files for the KDE
@@ -77,6 +87,8 @@ Description: development files for the KDE graphics module
Package: tdegraphics-kfile-plugins-trinity
Section: kde
Architecture: any
+Replaces: kdegraphics-kfile-plugins-trinity (<< 4:14.0.0)
+Breaks: kdegraphics-kfile-plugins-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: KDE metainfo plugins for graphic files
This packages provides meta information for graphic files (file sizes,
@@ -88,9 +100,10 @@ Description: KDE metainfo plugins for graphic files
Package: kdvi-trinity
Section: graphics
Architecture: any
+Replaces: kdvi-trinity (<< 4:14.0.0)
+Breaks: kdvi-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, texlive-fonts-recommended
Suggests: khelpcenter-trinity
-Replaces: tdebase-data-trinity (<< 4:3.3.91)
Description: dvi viewer for KDE
This program and KPart allow the user to display *.DVI files from TeX.
.
@@ -100,6 +113,8 @@ Description: dvi viewer for KDE
Package: kfax-trinity
Section: graphics
Architecture: any
+Replaces: kfax-trinity (<< 4:14.0.0)
+Breaks: kfax-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, libtiff-tools
Description: G3/G4 fax viewer for Trinity
A fax viewer for Trinity, supporting the display of raw and tiffed fax images
@@ -111,6 +126,8 @@ Description: G3/G4 fax viewer for Trinity
Package: kfaxview-trinity
Section: graphics
Architecture: any
+Replaces: kfaxview-trinity (<< 4:14.0.0)
+Breaks: kfaxview-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: G3/G4 fax viewer for Trinity using kviewshell
A fax viewer for Trinity, supporting the display of raw and tiffed fax images
@@ -125,6 +142,8 @@ Description: G3/G4 fax viewer for Trinity using kviewshell
Package: kgamma-trinity
Section: graphics
Architecture: any
+Replaces: kgamma-trinity (<< 4:14.0.0)
+Breaks: kgamma-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
Description: gamma correction module for the Trinity Control Center
@@ -140,6 +159,8 @@ Description: gamma correction module for the Trinity Control Center
Package: kghostview-trinity
Section: graphics
Architecture: any
+Replaces: kghostview-trinity (<< 4:14.0.0)
+Breaks: kghostview-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, ghostscript
Suggests: khelpcenter-trinity
Provides: postscript-viewer, pdf-viewer
@@ -157,6 +178,8 @@ Description: PostScript viewer for Trinity
Package: kiconedit-trinity
Section: graphics
Architecture: any
+Replaces: kiconedit-trinity (<< 4:14.0.0)
+Breaks: kiconedit-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
Description: an icon editor for Trinity
@@ -168,6 +191,8 @@ Description: an icon editor for Trinity
Package: kmrml-trinity
Section: kde
Architecture: any
+Replaces: kmrml-trinity (<< 4:14.0.0)
+Breaks: kmrml-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Recommends: gnuift
Description: a Konqueror plugin for searching pictures
@@ -182,6 +207,8 @@ Description: a Konqueror plugin for searching pictures
Package: kolourpaint-trinity
Section: graphics
Architecture: any
+Replaces: kolourpaint-trinity (<< 4:14.0.0)
+Breaks: kolourpaint-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
Description: a simple paint program for Trinity
@@ -205,6 +232,8 @@ Description: a simple paint program for Trinity
Package: kooka-trinity
Section: graphics
Architecture: any
+Replaces: kooka-trinity (<< 4:14.0.0)
+Breaks: kooka-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Recommends: ocrad | gocr
Suggests: khelpcenter-trinity
@@ -229,6 +258,8 @@ Description: scanner program for Trinity
Package: kpdf-trinity
Section: graphics
Architecture: any
+Replaces: kpdf-trinity (<< 4:14.0.0)
+Breaks: kpdf-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Recommends: kghostview-trinity (= ${binary:Version})
Suggests: khelpcenter-trinity
@@ -244,6 +275,8 @@ Description: PDF viewer for Trinity
Package: kpovmodeler-trinity
Section: graphics
Architecture: any
+Replaces: kpovmodeler-trinity (<< 4:14.0.0)
+Breaks: kpovmodeler-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity, povray
Description: a graphical editor for povray scenes
@@ -267,6 +300,8 @@ Description: a graphical editor for povray scenes
Package: kruler-trinity
Section: graphics
Architecture: any
+Replaces: kruler-trinity (<< 4:14.0.0)
+Breaks: kruler-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
Description: a screen ruler and color measurement tool for Trinity
@@ -278,9 +313,10 @@ Description: a screen ruler and color measurement tool for Trinity
Package: ksnapshot-trinity
Section: graphics
Architecture: any
+Replaces: ksnapshot-trinity (<< 4:14.0.0)
+Breaks: ksnapshot-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
-Replaces: tdebase-data-trinity (<< 4:3.3.91)
Description: screenshot utility for Trinity
KSnapshot is a simple applet for taking screenshots. It is capable of
capturing images of either the whole desktop or just a single window.
@@ -292,6 +328,8 @@ Description: screenshot utility for Trinity
Package: ksvg-trinity
Section: graphics
Architecture: any
+Replaces: ksvg-trinity (<< 4:14.0.0)
+Breaks: ksvg-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: SVG viewer for Trinity
KSVG allows you view SVG (scalable vector graphics) files. This package
@@ -304,6 +342,8 @@ Description: SVG viewer for Trinity
Package: kview-trinity
Section: graphics
Architecture: any
+Replaces: kview-trinity (<< 4:14.0.0)
+Breaks: kview-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
Description: simple image viewer/converter for Trinity
@@ -317,6 +357,8 @@ Description: simple image viewer/converter for Trinity
Package: kviewshell-trinity
Section: graphics
Architecture: any
+Replaces: kviewshell-trinity (<< 4:14.0.0)
+Breaks: kviewshell-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: generic framework for viewer applications in Trinity
KViewShell is a generic viewing framework that allows the graphical
@@ -332,6 +374,8 @@ Description: generic framework for viewer applications in Trinity
Package: libkscan-trinity-dev
Section: libdevel
Architecture: any
+Replaces: libkscan-trinity-dev (<< 4:14.0.0)
+Breaks: libkscan-trinity-dev (<< 4:14.0.0)
Depends: libkscan1-trinity (= ${binary:Version}), tdelibs4-trinity-dev (>= 4:3.5.8)
Description: development files for the Trinity scanner library
This package contains development files for Trinity's scanner library.
@@ -342,6 +386,8 @@ Description: development files for the Trinity scanner library
Package: libkscan1-trinity
Section: libs
Architecture: any
+Replaces: libkscan1-trinity (<< 4:14.0.0)
+Breaks: libkscan1-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: scanner library for Trinity
KScan is KDE's scanner library. It's used by kooka and by koffice currently.
@@ -354,6 +400,8 @@ Description: scanner library for Trinity
Package: libpoppler-tqt
Section: net
Architecture: any
+Replaces: libpoppler-tqt (<< 4:14.0.0)
+Breaks: libpoppler-tqt (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: TQt support for Poppler
TQt support library for Poppler.
@@ -365,6 +413,8 @@ Description: TQt support for Poppler
Package: libpoppler-tqt-dev
Section: net
Architecture: any
+Replaces: libpoppler-tqt-dev (<< 4:14.0.0)
+Breaks: libpoppler-tqt-dev (<< 4:14.0.0)
Depends: ${shlibs:Depends}, libpoppler-dev, libpoppler-tqt
Description: Development files for TQt support for Poppler
Development files of TQt support library for Poppler.
@@ -376,6 +426,8 @@ Description: Development files for TQt support for Poppler
Package: tdegraphics-trinity-dbg
Section: libdevel
Architecture: any
+Replaces: kdegraphics-trinity-dbg (<< 4:14.0.0)
+Breaks: kdegraphics-trinity-dbg (<< 4:14.0.0)
Priority: extra
Depends: tdelibs-trinity-dbg, libkscan1-trinity (= ${binary:Version})
Description: debugging symbols for tdegraphics
diff --git a/debian/squeeze/tdelibs/debian/control b/debian/squeeze/tdelibs/debian/control
index c539fdb5f..1ec5ceced 100644
--- a/debian/squeeze/tdelibs/debian/control
+++ b/debian/squeeze/tdelibs/debian/control
@@ -3,7 +3,7 @@ Section: libs
Priority: optional
Maintainer: Timothy Pearson
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers
-Uploaders: Adeodato Simó , Ana Beatriz Guerrero Lopez , Daniel Schepler , Fathi Boudra , Sune Vuorela
+Uploaders: Adeodato Sim , Ana Beatriz Guerrero Lopez , Daniel Schepler , Fathi Boudra , Sune Vuorela
Build-Depends: cdbs (>= 0.4.41ubuntu2), debhelper (>= 5.0.31), autotools-dev,
binutils (>= 2.14.90.0.7), docbook-to-man, gawk, gettext,
libart-2.0-dev (>= 2.3.17), libarts1-trinity-dev (>= 1.5.0), libacl1-dev,
@@ -15,7 +15,7 @@ Build-Depends: cdbs (>= 0.4.41ubuntu2), debhelper (>= 5.0.31), autotools-dev,
libtiff4-dev (>= 3.7.3-1), libavahi-client-dev (>= 0.4),
libxml2-dev, libxml2-utils, libxslt1-dev,
sharutils, texinfo, libogg-dev-la, libtqtinterface-dev,
- gettext-kde, lsb-release, base-files, sudo,
+ gettext-kde, lsb-release, base-files, sudo, libr-dev,
cmake, libltdl-dev
Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11
Standards-Version: 3.8.3
@@ -23,6 +23,8 @@ Standards-Version: 3.8.3
Package: tdelibs-trinity
Section: libs
Architecture: all
+Replaces: kdelibs-trinity (<< 4:14.0.0)
+Breaks: kdelibs-trinity (<< 4:14.0.0)
Provides: tdelibs
Depends: tdelibs4c2a-trinity (>= ${Source-Version}),
tdelibs-data-trinity (>= ${Source-Version})
@@ -39,13 +41,10 @@ Description: core libraries from the official Trinity release
Package: tdelibs-data-trinity
Section: libs
Architecture: all
+Replaces: kdelibs-data-trinity (<< 4:14.0.0)
+Breaks: kdelibs-data-trinity (<< 4:14.0.0)
Depends: hicolor-icon-theme
Provides: tdelibs-data
-Replaces: tdeartwork-style-trinity (<< 7:3.4.0), konq-plugins-trinity (<< 7:3.4.0),
- ksvg-trinity (<< 7:3.4.0), kpackage-trinity (<< 4:3.4.2), kicker-trinity (<< 4:3.5-rc1),
- kttsd-trinity (<< 4:3.5-rc1), tdevelop3-data-trinity (<< 4:3.3.0), libdjvulibre1,
- libdjvulibre15 (<< 3.5.16-2), krita (= 1:1.4.90.1-1), digikam-trinity (<< 0.8.1-3),
- kaffeine-trinity (<< 0.8.1-3)
Description: core shared data for all TDE applications
This package contains all the architecture independent data files
commonly used by TDE applications. You need these data files to run
@@ -57,15 +56,14 @@ Description: core shared data for all TDE applications
Package: tdelibs4c2a-trinity
Section: libs
Architecture: any
+Replaces: kdelibs4c2a-trinity (<< 4:14.0.0)
+Breaks: kdelibs4c2a-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, tdelibs-data-trinity,
tdelibs-data-trinity, perl, xbase-clients,
launchpad-integration, sudo
Recommends: xdg-user-dirs
Suggests: fam, perl-suid
Conflicts: tdelibs4-trinity, tdelibs4c2-trinity (>> 4:1.0.0), tdelibs-bin-trinity (<< 4:3.3.3), tdelibs4-trinity-dev (<< 4:3.5.7.dfsg.1-6)
-Replaces: tdelibs4-trinity, tdeartwork-style-trinity,
- kcontrol-trinity, tdelibs-bin-trinity (<< 4:3.5.3-1),
- tdelibs4-trinity-dev (= 4:3.5.7.dfsg.1-5)
Description: core libraries and binaries for all TDE applications
This package contains all the shared libraries and common core binaries
used by all TDE applications. You need these libraries and binaries to
@@ -80,6 +78,8 @@ Description: core libraries and binaries for all TDE applications
Package: tdelibs4-trinity-dev
Section: libdevel
Architecture: any
+Replaces: kdelibs4-trinity-dev (<< 4:14.0.0)
+Breaks: kdelibs4-trinity-dev (<< 4:14.0.0)
Depends: tdelibs4c2a-trinity (= ${Source-Version}), libart-2.0-dev (>= 2.3.17),
libarts1-trinity-dev (>= 1.5.0), ${libasound2-dev}, libacl1-dev, libattr1-dev,
libaspell-dev, hspell, libbz2-dev, libcupsys2-dev,
@@ -88,9 +88,8 @@ Depends: tdelibs4c2a-trinity (= ${Source-Version}), libart-2.0-dev (>= 2.3.17),
libsasl2-dev, libssl-dev, libxcomposite-dev,
libtiff4-dev (>= 3.7.3-1), libxml2-dev, libxml2-utils, libxslt1-dev,
libavahi-client-dev (>= 0.4), libtqtinterface-dev,
- gettext-kde
+ gettext-kde, libr-dev
Provides: tdelibs-trinity-dev
-Replaces: tdebase-trinity-dev (<< 7:3.4.0), tdelibs4c2a-trinity (<< 4:3.5.8-3ubuntu2)
Description: development files for the TDE core libraries
This package contains all the headers and other related files needed
to compile TDE applications, or develop applications which use the
@@ -102,6 +101,8 @@ Description: development files for the TDE core libraries
Package: tdelibs4-trinity-doc
Section: doc
Architecture: all
+Replaces: kdelibs4-trinity-doc (<< 4:14.0.0)
+Breaks: kdelibs4-trinity-doc (<< 4:14.0.0)
Provides: tdelibs-trinity-doc
Description: developer documentation for the TDE core libraries
This package contains documentation for the core TDE libraries, of
@@ -114,9 +115,10 @@ Description: developer documentation for the TDE core libraries
Package: tdelibs-trinity-dbg
Section: libdevel
Architecture: any
+Replaces: kdelibs-trinity-dbg (<< 4:14.0.0)
+Breaks: kdelibs-trinity-dbg (<< 4:14.0.0)
Priority: extra
Conflicts: tdelibs4-trinity-dbg, tdelibs4c2-trinity-dbg, tdelibs4c2a-trinity-dbg
-Replaces: tdelibs4-trinity-dbg, tdelibs4c2-trinity-dbg, tdelibs4c2a-trinity-dbg
Depends: tdelibs4c2a-trinity (= ${Source-Version}), libtqtinterface-dbg, libc6-dbg [amd64]
Description: debugging symbols for tdelibs
This package contains the debugging symbols associated with tdelibs.
diff --git a/debian/squeeze/tdelibs/debian/rules b/debian/squeeze/tdelibs/debian/rules
index 119f2a4fe..73323de78 100755
--- a/debian/squeeze/tdelibs/debian/rules
+++ b/debian/squeeze/tdelibs/debian/rules
@@ -21,7 +21,7 @@ version=Debian Package $(DEB_VERSION)
DEB_OPT_FLAG += -DDEBIAN_VERSION=$(DEB_VERSION)
DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/kde" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" \
--DWITH_LIBART="ON" -DWITH_LIBIDN="ON" -DWITH_TIFF="ON" -DWITH_JASPER="ON" -DWITH_OPENEXR="ON" -DWITH_AVAHI="ON" -DWITH_ASPELL="ON" -DWITH_HSPELL="ON"
+-DWITH_LIBART="ON" -DWITH_LIBIDN="ON" -DWITH_TIFF="ON" -DWITH_JASPER="ON" -DWITH_OPENEXR="ON" -DWITH_AVAHI="ON" -DWITH_ASPELL="ON" -DWITH_HSPELL="ON" -DWITH_ELFICON="ON"
# Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to
# never build in parallel, regardless of DEB_BUILD_OPTIONS.
diff --git a/debian/squeeze/tdelibs/debian/tdelibs4c2a-trinity.install b/debian/squeeze/tdelibs/debian/tdelibs4c2a-trinity.install
index 91c12cb5b..3887f606d 100644
--- a/debian/squeeze/tdelibs/debian/tdelibs4c2a-trinity.install
+++ b/debian/squeeze/tdelibs/debian/tdelibs4c2a-trinity.install
@@ -50,6 +50,7 @@ debian/tmp/opt/trinity/bin/lnusertemp
debian/tmp/opt/trinity/bin/make_driver_db_cups
debian/tmp/opt/trinity/bin/make_driver_db_lpr
debian/tmp/opt/trinity/bin/meinproc
+debian/tmp/opt/trinity/bin/tdelfeditor
debian/tmp/opt/trinity/bin/start_tdeinit
debian/tmp/opt/trinity/bin/start_tdeinit_wrapper
debian/tmp/opt/trinity/lib/trinity/cupsdconf.la
@@ -314,3 +315,6 @@ debian/tmp/opt/trinity/lib/libkwalletclient.so.1
debian/tmp/opt/trinity/lib/libkwalletclient.so.1.0.1
debian/tmp/opt/trinity/lib/libvcard.so.0
debian/tmp/opt/trinity/lib/libvcard.so.0.0.0
+debian/tmp/opt/trinity/share/services/kfile_elf.desktop
+debian/tmp/opt/trinity/lib/trinity/kfile_elf.so
+debian/tmp/opt/trinity/lib/trinity/kfile_elf.la
diff --git a/debian/squeeze/tdemultimedia/debian/control b/debian/squeeze/tdemultimedia/debian/control
index ef581ed59..6cdd95e02 100644
--- a/debian/squeeze/tdemultimedia/debian/control
+++ b/debian/squeeze/tdemultimedia/debian/control
@@ -10,6 +10,8 @@ Standards-Version: 3.8.4
Package: tdemultimedia-trinity
Section: kde
Architecture: all
+Replaces: kdemultimedia-trinity (<< 4:14.0.0)
+Breaks: kdemultimedia-trinity (<< 4:14.0.0)
Depends: artsbuilder-trinity (>= ${Source-Version}), juk-trinity (>= ${Source-Version}), kaboodle-trinity (>= ${Source-Version}), kaudiocreator-trinity (>= ${Source-Version}), tdemultimedia-kappfinder-data-trinity (>= ${Source-Version}), tdemultimedia-kfile-plugins-trinity (>= ${Source-Version}), tdemultimedia-kio-plugins-trinity (>= ${Source-Version}), kmid-trinity (>= ${Source-Version}), kmix-trinity (>= ${Source-Version}), krec-trinity (>= ${Source-Version}), kscd-trinity (>= ${Source-Version}), libarts1-akode-trinity (>= ${Source-Version}), libarts1-audiofile-trinity (>= ${Source-Version}), libarts1-mpeglib-trinity (>= ${Source-Version}), libarts1-xine-trinity (>= ${Source-Version}), mpeglib-trinity (>= ${Source-Version}), noatun-trinity (>= ${Source-Version})
Suggests: tdemultimedia-trinity-doc-html (>= ${Source-Version})
Description: multimedia apps from the official Trinity release
@@ -27,9 +29,10 @@ Description: multimedia apps from the official Trinity release
Package: tdemultimedia-trinity-dev
Section: devel
Architecture: any
+Replaces: kdemultimedia-trinity-dev (<< 4:14.0.0)
+Breaks: kdemultimedia-trinity-dev (<< 4:14.0.0)
Depends: tdelibs4-trinity-dev (>= 4:3.5.7), artsbuilder-trinity (= ${Source-Version}), tdemultimedia-kio-plugins-trinity (= ${Source-Version}), kmid-trinity (= ${Source-Version}), kmix-trinity (= ${Source-Version}), krec-trinity (= ${Source-Version}), kscd-trinity (= ${Source-Version}), libarts1-akode-trinity (= ${Source-Version}), libarts1-mpeglib-trinity (= ${Source-Version}), libkcddb1-trinity (= ${Source-Version}), mpeglib-trinity (= ${Source-Version}), noatun-trinity (= ${Source-Version})
Conflicts: libmpeg-trinity-dev
-Replaces: artsbuilder-trinity (<< 4:3.0.0), mpeglib-trinity (<< 4:3.0.0), noatun-trinity (<< 4:3.0.0)
Description: development files for the Trinity multimedia module
Development files and headers for the Trinity multimedia module.
.
@@ -39,6 +42,8 @@ Description: development files for the Trinity multimedia module
Package: tdemultimedia-trinity-doc-html
Architecture: all
Section: doc
+Replaces: kdemultimedia-trinity-doc-html (<< 4:14.0.0)
+Breaks: kdemultimedia-trinity-doc-html (<< 4:14.0.0)
Suggests: konqueror-trinity | www-browser, tdebase-trinity
Description: Trinity multimedia documentation in HTML format
By default the modules provided by KDE only provide their documentation
@@ -57,9 +62,10 @@ Description: Trinity multimedia documentation in HTML format
Package: artsbuilder-trinity
Section: sound
Architecture: any
+Replaces: artsbuilder-trinity (<< 4:14.0.0)
+Breaks: artsbuilder-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
-Replaces: tdebase-data-trinity (<< 4:3.3.91), tdemultimedia-dev-trinity (<< 4:3.5.0-2)
Description: synthesizer designer for aRts
This is the analog Realtime synthesizer's graphical design tool.
.
@@ -69,6 +75,8 @@ Description: synthesizer designer for aRts
Package: juk-trinity
Section: kde
Architecture: any
+Replaces: juk-trinity (<< 4:14.0.0)
+Breaks: juk-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
Description: music organizer and player for Trinity
@@ -95,6 +103,8 @@ Description: music organizer and player for Trinity
Package: kaboodle-trinity
Section: sound
Architecture: any
+Replaces: kaboodle-trinity (<< 4:14.0.0)
+Breaks: kaboodle-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Recommends: libarts1-xine-trinity
Suggests: khelpcenter-trinity
@@ -108,6 +118,8 @@ Description: light, embedded media player for Trinity
Package: kaudiocreator-trinity
Section: sound
Architecture: any
+Replaces: kaudiocreator-trinity (<< 4:14.0.0)
+Breaks: kaudiocreator-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, tdemultimedia-kio-plugins-trinity (= ${Source-Version})
Recommends: vorbis-tools, flac
Suggests: lame
@@ -122,8 +134,9 @@ Description: CD ripper and audio encoder frontend for Trinity
Package: tdemultimedia-kfile-plugins-trinity
Section: kde
Architecture: any
+Replaces: kdemultimedia-kfile-plugins-trinity (<< 4:14.0.0)
+Breaks: kdemultimedia-kfile-plugins-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
-Replaces: tdemultimedia-kio-plugins (<< 4:3.4.1-1)
Description: au/avi/m3u/mp3/ogg/wav plugins for kfile
au/avi/m3u/mp3/ogg/wav file metainformation plugins for Trinity.
.
@@ -133,6 +146,8 @@ Description: au/avi/m3u/mp3/ogg/wav plugins for kfile
Package: tdemultimedia-kappfinder-data-trinity
Section: kde
Architecture: any
+Replaces: kdemultimedia-kappfinder-data-trinity (<< 4:14.0.0)
+Breaks: kdemultimedia-kappfinder-data-trinity (<< 4:14.0.0)
Depends: kappfinder-trinity
Description: multimedia data for kappfinder-trinity
This package provides data on multimedia applications for kappfinder-trinity.
@@ -143,9 +158,10 @@ Description: multimedia data for kappfinder-trinity
Package: tdemultimedia-kio-plugins-trinity
Section: kde
Architecture: any
+Replaces: kdemultimedia-kio-plugins-trinity (<< 4:14.0.0)
+Breaks: kdemultimedia-kio-plugins-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: lame
-Replaces: tdebase-kio-plugins-trinity (<< 4:3.4.0)
Description: enables the browsing of audio CDs under Konqueror
This package allow audio CDs to be browsed like a file system using
Konqueror and the audiocd:/ URL.
@@ -156,6 +172,8 @@ Description: enables the browsing of audio CDs under Konqueror
Package: kmid-trinity
Section: sound
Architecture: any
+Replaces: kmid-trinity (<< 4:14.0.0)
+Breaks: kmid-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
Description: MIDI/karaoke player for Trinity
@@ -167,6 +185,8 @@ Description: MIDI/karaoke player for Trinity
Package: kmix-trinity
Section: sound
Architecture: any
+Replaces: kmix-trinity (<< 4:14.0.0)
+Breaks: kmix-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
Provides: x-audio-mixer
@@ -179,6 +199,8 @@ Description: sound mixer applet for Trinity
Package: krec-trinity
Section: sound
Architecture: any
+Replaces: krec-trinity (<< 4:14.0.0)
+Breaks: krec-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
Description: sound recorder utility for Trinity
@@ -190,6 +212,8 @@ Description: sound recorder utility for Trinity
Package: kscd-trinity
Section: sound
Architecture: any
+Replaces: kscd-trinity (<< 4:14.0.0)
+Breaks: kscd-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter
Description: audio CD player for Trinity
@@ -201,8 +225,9 @@ Description: audio CD player for Trinity
Package: libarts1-akode-trinity
Section: libs
Architecture: any
+Replaces: libarts1-akode-trinity (<< 4:14.0.0)
+Breaks: libarts1-akode-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
-Replaces: libakode2-trinity (<< 2-beta3-2), akode-trinity
Description: akode plugin for aRts
This package contains akode plugins for aRts.
.
@@ -212,6 +237,8 @@ Description: akode plugin for aRts
Package: libarts1-audiofile-trinity
Section: libs
Architecture: any
+Replaces: libarts1-audiofile-trinity (<< 4:14.0.0)
+Breaks: libarts1-audiofile-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: audiofile plugin for aRts
This package contains audiofile plugins for aRts.
@@ -222,6 +249,8 @@ Description: audiofile plugin for aRts
Package: libarts1-mpeglib-trinity
Section: libs
Architecture: any
+Replaces: libarts1-mpeglib-trinity (<< 4:14.0.0)
+Breaks: libarts1-mpeglib-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: mpeglib plugin for aRts, supporting mp3 and mpeg audio/video
This package contains the mpeglib aRts plugin, supporting mp3 and mpeg
@@ -235,6 +264,8 @@ Description: mpeglib plugin for aRts, supporting mp3 and mpeg audio/video
Package: libarts1-xine-trinity
Section: libs
Architecture: any
+Replaces: libarts1-xine-trinity (<< 4:14.0.0)
+Breaks: libarts1-xine-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: aRts plugin enabling xine support
This package contains aRts' xine plugin, allowing the use of the xine
@@ -246,6 +277,8 @@ Description: aRts plugin enabling xine support
Package: libkcddb1-trinity
Section: libs
Architecture: any
+Replaces: libkcddb1-trinity (<< 4:14.0.0)
+Breaks: libkcddb1-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: CDDB library for Trinity
The Trinity native CDDB (CD Data Base) library, providing easy access to Audio
@@ -258,9 +291,10 @@ Description: CDDB library for Trinity
Package: mpeglib-trinity
Section: libs
Architecture: any
+Replaces: mpeglib-trinity (<< 4:14.0.0)
+Breaks: mpeglib-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Recommends: libarts1-mpeglib-trinity (= ${Source-Version})
-Replaces: tdemultimedia-trinity-dev (<< 4:3.5.2-1)
Description: MP3 and MPEG-1 audio and video library
mpeglib is a MPEG-1 and MP3 audio and video library. It supports
MPEG-1 audio (layers 1, 2, 3), MPEG-1 video, MPEG-1 system layer,
@@ -272,6 +306,8 @@ Description: MP3 and MPEG-1 audio and video library
Package: noatun-trinity
Section: sound
Architecture: any
+Replaces: noatun-trinity (<< 4:14.0.0)
+Breaks: noatun-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity, noatun-plugins-trinity
Description: media player for Trinity
@@ -284,6 +320,8 @@ Description: media player for Trinity
Package: tdemultimedia-trinity-dbg
Section: libdevel
Architecture: any
+Replaces: kdemultimedia-trinity-dbg (<< 4:14.0.0)
+Breaks: kdemultimedia-trinity-dbg (<< 4:14.0.0)
Priority: extra
Depends: tdelibs-trinity-dbg, libkcddb1-trinity (= ${Source-Version})
Description: debugging symbols for tdemultimedia
diff --git a/debian/squeeze/tdenetwork/debian/control b/debian/squeeze/tdenetwork/debian/control
index 2a120d709..1ce66043d 100644
--- a/debian/squeeze/tdenetwork/debian/control
+++ b/debian/squeeze/tdenetwork/debian/control
@@ -10,6 +10,8 @@ Standards-Version: 3.8.4
Package: tdenetwork-trinity
Section: kde
Architecture: all
+Replaces: kdenetwork-trinity (<< 4:14.0.0)
+Breaks: kdenetwork-trinity (<< 4:14.0.0)
Depends: dcoprss-trinity (>= ${Source-Version}), tdenetwork-kfile-plugins-trinity (>= ${Source-Version}), kdict-trinity (>= ${Source-Version}), kdnssd-trinity (>= ${Source-Version}), kget-trinity (>= ${Source-Version}), knewsticker-trinity (>= ${Source-Version}), kopete-trinity (>= ${Source-Version}), kpf-trinity (>= ${Source-Version}), kppp-trinity (>= ${Source-Version}), krdc-trinity (>= ${Source-Version}), krfb-trinity (>= ${Source-Version}), ksirc-trinity (>= ${Source-Version}), kwifimanager-trinity (>= ${Source-Version}), librss1-trinity (>= ${Source-Version})
Recommends: tdenetwork-filesharing-trinity (>= ${Source-Version}), ktalkd-trinity (>= ${Source-Version}), lisa-trinity (>= ${Source-Version})
Suggests: tdenetwork-trinity-doc-html (>= ${Source-Version})
@@ -25,6 +27,8 @@ Description: network-related apps from the official Trinity release
Package: dcoprss-trinity
Section: net
Architecture: any
+Replaces: dcoprss-trinity (<< 4:14.0.0)
+Breaks: dcoprss-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: RSS utilities for Trinity
tdenetwork-dcoprss is a RSS to DCOP bridge, allowing all
@@ -40,6 +44,8 @@ Description: RSS utilities for Trinity
Package: tdenetwork-trinity-doc-html
Architecture: all
Section: doc
+Replaces: kdenetwork-trinity-doc-html (<< 4:14.0.0)
+Breaks: kdenetwork-trinity-doc-html (<< 4:14.0.0)
Suggests: konqueror-trinity | www-browser, tdebase-trinity
Description: Trinity network documentation in HTML format
By default the modules provided by KDE only provide their documentation
@@ -58,6 +64,8 @@ Description: Trinity network documentation in HTML format
Package: tdenetwork-kfile-plugins-trinity
Section: kde
Architecture: any
+Replaces: kdenetwork-kfile-plugins-trinity (<< 4:14.0.0)
+Breaks: kdenetwork-kfile-plugins-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Enhances: konqueror-trinity
Description: torrent metainfo plugin for Trinity
@@ -72,9 +80,10 @@ Description: torrent metainfo plugin for Trinity
Package: tdenetwork-filesharing-trinity
Section: net
Architecture: any
+Replaces: kdenetwork-filesharing-trinity (<< 4:14.0.0)
+Breaks: kdenetwork-filesharing-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Recommends: perl-suid
-Replaces: kcontrol-trinity (<< 4:3.3.0)
Description: network filesharing configuration module for Trinity
This package provides a KDE Control Center module to configure
NFS and Samba.
@@ -85,10 +94,11 @@ Description: network filesharing configuration module for Trinity
Package: kdict-trinity
Section: net
Architecture: any
+Replaces: kdict-trinity (<< 4:14.0.0)
+Breaks: kdict-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
Provides: dict-client-trinity
-Replaces: tdebase-data-trinity (<< 4:3.4.0)
Description: dictionary client for Trinity
KDict is an advanced KDE graphical client for the DICT Protocol, with full
Unicode support. It enables you to search through dictionary databases for a
@@ -101,6 +111,8 @@ Description: dictionary client for Trinity
Package: kget-trinity
Section: net
Architecture: any
+Replaces: kget-trinity (<< 4:14.0.0)
+Breaks: kget-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
Description: download manager for Trinity
@@ -117,6 +129,8 @@ Description: download manager for Trinity
Package: knewsticker-trinity
Section: kde
Architecture: any
+Replaces: knewsticker-trinity (<< 4:14.0.0)
+Breaks: knewsticker-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, kicker-trinity
Suggests: khelpcenter-trinity, knewsticker-scripts-trinity
Description: news ticker applet for Trinity
@@ -132,10 +146,11 @@ Description: news ticker applet for Trinity
Package: kopete-trinity
Section: kde
Architecture: any
+Replaces: kopete-trinity (<< 4:14.0.0)
+Breaks: kopete-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Recommends: qca-tls
Suggests: tdeartwork-emoticons-trinity, khelpcenter-trinity, imagemagick, gnupg, gnomemeeting
-Replaces: konversation-trinity (<= 0.14.0-4), sim (<= 0.9.3-2)
Description: instant messenger for Trinity
Kopete is an instant messenger program which can communicate with a variety
of IM systems, such as Yahoo, ICQ, MSN, IRC and Jabber.
@@ -154,6 +169,8 @@ Description: instant messenger for Trinity
Package: kpf-trinity
Section: net
Architecture: any
+Replaces: kpf-trinity (<< 4:14.0.0)
+Breaks: kpf-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
Description: public fileserver for Trinity
@@ -168,6 +185,8 @@ Description: public fileserver for Trinity
Package: kppp-trinity
Section: net
Architecture: any
+Replaces: kppp-trinity (<< 4:14.0.0)
+Breaks: kppp-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, ppp
Suggests: khelpcenter-trinity
Description: modem dialer and ppp frontend for Trinity
@@ -185,6 +204,8 @@ Description: modem dialer and ppp frontend for Trinity
Package: krdc-trinity
Section: net
Architecture: any
+Replaces: krdc-trinity (<< 4:14.0.0)
+Breaks: krdc-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
Recommends: rdesktop
@@ -199,6 +220,8 @@ Description: Remote Desktop Connection for Trinity
Package: krfb-trinity
Section: net
Architecture: any
+Replaces: krfb-trinity (<< 4:14.0.0)
+Breaks: krfb-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
Description: Desktop Sharing for Trinity
@@ -215,6 +238,8 @@ Description: Desktop Sharing for Trinity
Package: ksirc-trinity
Section: net
Architecture: any
+Replaces: ksirc-trinity (<< 4:14.0.0)
+Breaks: ksirc-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, ${perl:Depends}
Recommends: libio-socket-ssl-perl
Suggests: khelpcenter-trinity
@@ -231,12 +256,13 @@ Description: IRC client for Trinity
Package: ktalkd-trinity
Section: net
Priority: extra
+Replaces: ktalkd-trinity (<< 4:14.0.0)
+Breaks: ktalkd-trinity (<< 4:14.0.0)
Architecture: any
Depends: ${shlibs:Depends}, netbase, update-inetd
Recommends: talk, ytalk
Suggests: khelpcenter-trinity
Provides: talkd-trinity
-Replaces: talkd-trinity
Description: talk daemon for Trinity
KTalkd is an enhanced talk daemon - a program to handle incoming talk
requests, announce them and allow you to respond to it using a talk
@@ -249,6 +275,8 @@ Description: talk daemon for Trinity
Package: kwifimanager-trinity
Section: net
Architecture: any
+Replaces: kwifimanager-trinity (<< 4:14.0.0)
+Breaks: kwifimanager-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, wireless-tools
Suggests: khelpcenter-trinity
Description: wireless lan manager for Trinity
@@ -263,6 +291,8 @@ Description: wireless lan manager for Trinity
Package: librss1-trinity
Section: libs
Architecture: any
+Replaces: librss1-trinity (<< 4:14.0.0)
+Breaks: librss1-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: RSS library for Trinity
This is the runtime package for programs that use the KDE RSS library.
@@ -275,8 +305,9 @@ Description: RSS library for Trinity
Package: tdenetwork-trinity-dev
Section: devel
Architecture: any
+Replaces: kdenetwork-trinity-dev (<< 4:14.0.0)
+Breaks: kdenetwork-trinity-dev (<< 4:14.0.0)
Depends: kdict-trinity (= ${Source-Version}), kopete-trinity (= ${Source-Version}), ksirc-trinity (= ${Source-Version}), librss1-trinity (= ${Source-Version}), tdelibs4-trinity-dev (>= 4:3.5.8)
-Replaces: librss1-trinity-dev, kdict-trinity (<< 4:3.5.0-3)
Description: development files for the Trinity network module
This is the development package which contains the headers for the KDE RSS
library as well as the Kopete chat client, as well as miscellaneous
@@ -288,9 +319,10 @@ Description: development files for the Trinity network module
Package: lisa-trinity
Section: net
Architecture: any
+Replaces: lisa-trinity (<< 4:14.0.0)
+Breaks: lisa-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity, samba-common
-Replaces: konqueror-trinity (<< 4:3.3.0)
Description: LAN information server for Trinity
LISa is intended to provide KDE with a kind of "network neighborhood"
but relying only on the TCP/IP protocol.
@@ -301,6 +333,8 @@ Description: LAN information server for Trinity
Package: kdnssd-trinity
Section: net
Architecture: any
+Replaces: kdnssd-trinity (<< 4:14.0.0)
+Breaks: kdnssd-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Recommends: avahi-daemon
Suggests: avahi-autoipd | zeroconf
@@ -314,6 +348,8 @@ Description: Zeroconf support for KDE
Package: tdenetwork-trinity-dbg
Section: libdevel
Architecture: any
+Replaces: kdenetwork-trinity-dbg (<< 4:14.0.0)
+Breaks: kdenetwork-trinity-dbg (<< 4:14.0.0)
Priority: extra
Depends: librss1-trinity (= ${Source-Version}), tdelibs-trinity-dbg
Description: debugging symbols for tdenetwork-trinity
diff --git a/debian/squeeze/tdepim/debian/control b/debian/squeeze/tdepim/debian/control
index 5a742326e..848ece787 100644
--- a/debian/squeeze/tdepim/debian/control
+++ b/debian/squeeze/tdepim/debian/control
@@ -20,6 +20,8 @@ Standards-Version: 3.8.4
Package: tdepim-trinity
Section: kde
Architecture: all
+Replaces: kdepim-trinity (<< 4:14.0.0)
+Breaks: kdepim-trinity (<< 4:14.0.0)
Depends: akregator-trinity (>= ${Source-Version}), kaddressbook-trinity (>= ${Source-Version}), kalarm-trinity (>= ${Source-Version}), kandy-trinity (>= ${Source-Version}), karm-trinity (>= ${Source-Version}), tdepim-kfile-plugins-trinity (>= ${Source-Version}), tdepim-kio-plugins-trinity (>= ${Source-Version}), tdepim-kresources-trinity (>= ${Source-Version}), tdepim-wizards-trinity (>= ${Source-Version}), kitchensync-trinity (>= ${Source-Version}), kleopatra-trinity (>= ${Source-Version}), kmail-trinity (>= ${Source-Version}), kmailcvt-trinity (>= ${Source-Version}), knode-trinity (>= ${Source-Version}), knotes-trinity (>= ${Source-Version}), konsolekalendar-trinity (>= ${Source-Version}), kontact-trinity (>= ${Source-Version}), korganizer-trinity (>= ${Source-Version}), korn-trinity (>= ${Source-Version}), ktnef-trinity (>= ${Source-Version}), libindex0-trinity (>= ${Source-Version}), libkcal2b-trinity (>= ${Source-Version}), libtdepim1a-trinity (>= ${Source-Version}), libkgantt0-trinity (>= ${Source-Version}), libkleopatra1-trinity (>= ${Source-Version}), libkpimexchange1-trinity (>= ${Source-Version}), libkpimidentities1-trinity (>= ${Source-Version}), libksieve0-trinity (>= ${Source-Version}), libktnef1-trinity (>= ${Source-Version}), libmimelib1c2a-trinity (>= ${Source-Version})
Suggests: tdepim-trinity-doc-html
Description: Personal Information Management apps from the official Trinity release
@@ -36,6 +38,8 @@ Description: Personal Information Management apps from the official Trinity rele
Package: tdepim-trinity-dbg
Priority: extra
Section: libdevel
+Replaces: kdepim-trinity-dbg (<< 4:14.0.0)
+Breaks: kdepim-trinity-dbg (<< 4:14.0.0)
Depends: tdelibs-trinity-dbg
Architecture: any
Description: debugging symbols for tdepim-trinity
@@ -46,8 +50,9 @@ Description: debugging symbols for tdepim-trinity
Package: tdepim-trinity-dev
Section: devel
Architecture: any
+Replaces: kdepim-trinity-dev (<< 4:14.0.0)
+Breaks: kdepim-trinity-dev (<< 4:14.0.0)
Depends: kaddressbook-trinity (= ${Source-Version}), kalarm-trinity (= ${Source-Version}), tdepim-kresources-trinity (= ${Source-Version}), kmail-trinity (= ${Source-Version}), knotes-trinity (= ${Source-Version}), kontact-trinity (= ${Source-Version}), korganizer-trinity (= ${Source-Version}), libkpimidentities1-trinity (= ${Source-Version}), libkcal2-trinity-dev (= ${Source-Version}), libtdepim1-trinity-dev (= ${Source-Version}), libkgantt0-trinity-dev (= ${Source-Version}), libkleopatra1-trinity-dev (= ${Source-Version}), libkpimexchange1-trinity-dev (= ${Source-Version}), libksieve0-trinity-dev (= ${Source-Version}), libktnef1-trinity-dev (= ${Source-Version}), libmimelib1-trinity-dev (= ${Source-Version})
-Replaces: libkcal2-trinity-dev (<< 4:3.4.1), libmimelib1-trinity-dev (<< 4:3.4.2)
Description: KDE Personal Information Management [development]
This package contains development files needed to compile tdepim applications.
.
@@ -59,6 +64,8 @@ Description: KDE Personal Information Management [development]
Package: tdepim-trinity-doc
Section: doc
Architecture: all
+Replaces: kdepim-trinity-doc (<< 4:14.0.0)
+Breaks: kdepim-trinity-doc (<< 4:14.0.0)
Suggests: konqueror-trinity | www-browser, doc-base
Description: KDE Personal Information Management library documentation
KDE core library documentation. You need this documentation to develop KDE PIM
@@ -72,6 +79,8 @@ Description: KDE Personal Information Management library documentation
Package: tdepim-trinity-doc-html
Section: doc
Architecture: all
+Replaces: kdepim-trinity-doc-html (<< 4:14.0.0)
+Breaks: kdepim-trinity-doc-html (<< 4:14.0.0)
Suggests: konqueror-trinity | www-browser, tdepim-trinity
Description: KDE PIM documentation in HTML format
By default the Personal Information Management applications provided with
@@ -88,6 +97,8 @@ Description: KDE PIM documentation in HTML format
Package: akregator-trinity
Section: web
Architecture: any
+Replaces: akregator-trinity (<< 4:14.0.0)
+Breaks: akregator-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: RSS feed aggregator for KDE
aKregator is a fast, lightweight, and intuitive feed reader program
@@ -102,8 +113,9 @@ Description: RSS feed aggregator for KDE
Package: kaddressbook-trinity
Section: utils
Architecture: any
+Replaces: kaddressbook-trinity (<< 4:14.0.0)
+Breaks: kaddressbook-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
-Replaces: kontact-trinity (<< 4:3.5.7-1ubuntu5)
Conflicts: kontact-trinity (<< 4:3.5.7-1ubuntu5)
Suggests: tdepim-kresources-trinity, tdebase-kio-plugins-trinity
Description: KDE NG addressbook application
@@ -118,6 +130,8 @@ Description: KDE NG addressbook application
Package: kalarm-trinity
Section: kde
Architecture: any
+Replaces: kalarm-trinity (<< 4:14.0.0)
+Breaks: kalarm-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: kmix-trinity, kttsd-trinity
Description: Trinity alarm message, command and email scheduler
@@ -141,6 +155,8 @@ Description: Trinity alarm message, command and email scheduler
Package: kandy-trinity
Section: utils
Architecture: any
+Replaces: kandy-trinity (<< 4:14.0.0)
+Breaks: kandy-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: Trinity mobile phone utility
At the moment Kandy is more or less a terminal program with some special
@@ -156,7 +172,8 @@ Description: Trinity mobile phone utility
Package: karm-trinity
Section: utils
Architecture: any
-Replaces: kontact-trinity (<< 4:3.5.7-1ubuntu5)
+Replaces: karm-trinity (<< 4:14.0.0)
+Breaks: karm-trinity (<< 4:14.0.0)
Conflicts: kontact-trinity (<< 4:3.5.7-1ubuntu5)
Depends: ${shlibs:Depends}
Description: Trinity time tracker tool
@@ -169,6 +186,8 @@ Description: Trinity time tracker tool
Package: tdepim-kfile-plugins-trinity
Section: kde
Architecture: any
+Replaces: kdepim-kfile-plugins-trinity (<< 4:14.0.0)
+Breaks: kdepim-kfile-plugins-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: KDE File dialog plugins for palm and vcf files
File dialog plugins for palm and vcf files.
@@ -179,8 +198,9 @@ Description: KDE File dialog plugins for palm and vcf files
Package: tdepim-kio-plugins-trinity
Section: kde
Architecture: any
+Replaces: kdepim-kio-plugins-trinity (<< 4:14.0.0)
+Breaks: kdepim-kio-plugins-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
-Replaces: tdebase-kio-plugins-trinity (<< 4:3.4.0)
Description: Trinity pim I/O Slaves
This package includes the pim kioslaves. This includes imap4, sieve,
and mbox.
@@ -191,8 +211,9 @@ Description: Trinity pim I/O Slaves
Package: tdepim-kresources-trinity
Section: kde
Architecture: any
+Replaces: kdepim-kresources-trinity (<< 4:14.0.0)
+Breaks: kdepim-kresources-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
-Replaces: libkcal2a-trinity (<< 4:3.4.1), kaddressbook-trinity (<< 4:3.4.1), knotes-trinity (<< 4:3.4.1)
Recommends: ${shlibs:Recommends}, korganizer-trinity
Suggests: knotes-trinity
Description: Trinity pim resource plugins
@@ -206,8 +227,9 @@ Description: Trinity pim resource plugins
Package: tdepim-wizards-trinity
Section: kde
Architecture: any
+Replaces: kdepim-wizards-trinity (<< 4:14.0.0)
+Breaks: kdepim-wizards-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
-Replaces: tdepim-trinity-dev (<< 4:3.4.1-2)
Suggests: egroupware
Description: Trinity server configuration wizards
This package contains KDE-based wizards for configuring eGroupware,
@@ -219,10 +241,11 @@ Description: Trinity server configuration wizards
Package: kitchensync-trinity
Section: kde
Architecture: any
+Replaces: kitchensync-trinity (<< 4:14.0.0)
+Breaks: kitchensync-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: konqueror-trinity
Conflicts: kdebluetooth-irmcsync-trinity (<< 0.99+1.0beta2-4.1), ksync-trinity
-Replaces: ksync-trinity
Description: Synchronization framework
This package contains a synchronization framework, still under heavy
development (?). Kitchensync uses opensync.
@@ -233,6 +256,8 @@ Description: Synchronization framework
Package: kleopatra-trinity
Section: net
Architecture: any
+Replaces: kleopatra-trinity (<< 4:14.0.0)
+Breaks: kleopatra-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, gnupg-agent, gnupg2, gpgsm, dirmngr, pinentry-qt | pinentry-x11
Description: Trinity Certificate Manager
Kleopatra is the KDE tool for managing X.509 certificates in the gpgsm
@@ -244,11 +269,12 @@ Description: Trinity Certificate Manager
Package: kmail-trinity
Section: mail
Architecture: any
+Replaces: kmail-trinity (<< 4:14.0.0)
+Breaks: kmail-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, ${perl:Depends}, tdepim-kio-plugins-trinity, tdebase-kio-plugins-trinity, gpgsm, gnupg-agent, pinentry-qt | pinentry-x11
Recommends: procmail
Suggests: gnupg, gnupg-agent, pinentry-qt | pinentry-x11, kaddressbook-trinity, kleopatra-trinity, spamassassin | bogofilter | annoyance-filter | spambayes | bsfilter | crm114, clamav | f-prot-installer
Conflicts: kontact-trinity (<< 4:3.5.7-1ubuntu5)
-Replaces: tdepim-trinity-dev (<< 4:3.4.0), tdebase-trinity-data (<< 4:3.4.0), kontact-trinity (<< 4:3.5.7-1ubuntu5)
Provides: imap-client, mail-reader
Description: Trinity Email client
KMail is a fully-featured email client that fits nicely into the KDE
@@ -266,6 +292,8 @@ Description: Trinity Email client
Package: kmailcvt-trinity
Section: mail
Architecture: any
+Replaces: kmailcvt-trinity (<< 4:14.0.0)
+Breaks: kmailcvt-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, kmail-trinity
Description: Trinity KMail mail folder converter
Converts mail folders to KMail format. Formats supported for import
@@ -277,8 +305,9 @@ Description: Trinity KMail mail folder converter
Package: knode-trinity
Section: news
Architecture: any
+Replaces: knode-trinity (<< 4:14.0.0)
+Breaks: knode-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
-Replaces: tdepim-trinity-dev (<< 4:3.4.0), kontact-trinity (<< 4:3.5.7-1ubuntu2)
Provides: news-reader
Description: Trinity news reader
KNode is an easy-to-use, convenient newsreader. It is intended to be usable
@@ -292,9 +321,10 @@ Description: Trinity news reader
Package: knotes-trinity
Section: kde
Architecture: any
+Replaces: knotes-trinity (<< 4:14.0.0)
+Breaks: knotes-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: tdepim-kresources-trinity
-Replaces: kontact-trinity (<< 4:3.5.7-1ubuntu5)
Conflicts: kontact-trinity (<< 4:3.5.7-1ubuntu5)
Description: Trinity sticky notes
KNotes is a program that lets you write sticky notes. The notes are saved
@@ -307,6 +337,8 @@ Description: Trinity sticky notes
Package: kode-trinity
Section: devel
Architecture: any
+Replaces: kode-trinity (<< 4:14.0.0)
+Breaks: kode-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: Helper library for programmatic generation of C++ code
This package includes a program kode for generation of C++ template files
@@ -319,6 +351,8 @@ Description: Helper library for programmatic generation of C++ code
Package: konsolekalendar-trinity
Section: kde
Architecture: any
+Replaces: konsolekalendar-trinity (<< 4:14.0.0)
+Breaks: konsolekalendar-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: Trinity konsole personal organizer
KonsoleKalendar is a command-line interface to KDE calendars.
@@ -331,10 +365,11 @@ Description: Trinity konsole personal organizer
Package: kontact-trinity
Section: kde
Architecture: any
+Replaces: kontact-trinity (<< 4:14.0.0)
+Breaks: kontact-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, kmail-trinity, korganizer-trinity, kaddressbook-trinity
Recommends: ${shlibs:Recommends}, kmail-trinity, knode-trinity, knotes-trinity
Suggests: ${shlibs:Suggests}, akregator-trinity, knewsticker-trinity, kweather-trinity, gnokii
-Replaces: akregator-trinity (<< 4:3.4.0), akregator-kontact-plugin-trinity
Conflicts: akregator-kontact-plugin-trinity
Description: Trinity pim application
Kontact is the integrated solution to your personal information management
@@ -350,9 +385,10 @@ Description: Trinity pim application
Package: korganizer-trinity
Section: kde
Architecture: any
+Replaces: korganizer-trinity (<< 4:14.0.0)
+Breaks: korganizer-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, ${perl:Depends}
Recommends: kghostview-trinity
-Replaces: kontact-trinity (<< 4:3.5.7-1ubuntu5)
Conflicts: kontact-trinity (<< 4:3.5.7-1ubuntu5)
Description: Trinity personal organizer
This package contains KOrganizer, a calendar and scheduling program.
@@ -372,6 +408,8 @@ Description: Trinity personal organizer
Package: korn-trinity
Section: kde
Architecture: any
+Replaces: korn-trinity (<< 4:14.0.0)
+Breaks: korn-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, tdepim-kio-plugins-trinity, tdebase-kio-plugins-trinity
Description: Trinity mail checker
Korn is a KDE mail checker that can display a small summary in the Kicker
@@ -387,6 +425,8 @@ Description: Trinity mail checker
Package: ktnef-trinity
Section: kde
Architecture: any
+Replaces: ktnef-trinity (<< 4:14.0.0)
+Breaks: ktnef-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: Trinity TNEF viewer
The TNEF File Viewer allows you to handle mail attachments using the TNEF
@@ -399,6 +439,8 @@ Description: Trinity TNEF viewer
Package: libindex0-trinity
Section: libs
Architecture: any
+Replaces: libindex0-trinity (<< 4:14.0.0)
+Breaks: libindex0-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: Trinity indexing library
This library provides text indexing and is currently used by KMail
@@ -412,6 +454,8 @@ Description: Trinity indexing library
Package: libindex0-trinity-dev
Section: libdevel
Architecture: any
+Replaces: libindex0-trinity-dev (<< 4:14.0.0)
+Breaks: libindex0-trinity-dev (<< 4:14.0.0)
Depends: libindex0-trinity (= ${Source-Version})
Description: Trinity indexing library [development]
This library provides text indexing and is currently used by KMail
@@ -426,10 +470,11 @@ Description: Trinity indexing library [development]
Package: libkcal2b-trinity
Section: libs
Architecture: any
+Replaces: libkcal2b-trinity (<< 4:14.0.0)
+Breaks: libkcal2b-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Recommends: ${shlibs:Recommends}
Conflicts: libkcal2-trinity, libkcal2a-trinity
-Replaces: libkcal2a-trinity
Suggests: tdepim-kresources-trinity
Description: Trinity calendaring library
This library provides a C++ API for handling the vCalendar and iCalendar
@@ -443,8 +488,9 @@ Description: Trinity calendaring library
Package: libkcal2-trinity-dev
Section: libdevel
Architecture: any
+Replaces: libkcal2-trinity-dev (<< 4:14.0.0)
+Breaks: libkcal2-trinity-dev (<< 4:14.0.0)
Depends: libkcal2b-trinity (= ${Source-Version}), libtdepim1-trinity-dev (= ${Source-Version}), libktnef1-trinity-dev (= ${Source-Version})
-Replaces: tdepim-trinity-dev (<= 4:3.5.4-1)
Description: Trinity calendaring library [development]
This library provides a C++ API for handling the vCalendar and iCalendar
formats.
@@ -458,8 +504,9 @@ Description: Trinity calendaring library [development]
Package: libtdepim1a-trinity
Section: libs
Architecture: any
+Replaces: libkdepim1a-trinity (<< 4:14.0.0)
+Breaks: libkdepim1a-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
-Replaces: akregator-trinity (<< 4:3.4.0), libtdepim1-trinity, korganizer-trinity (<< 4:3.5.7-1ubuntu3)
Description: Trinity PIM library
This is the runtime package for programs that use the libtdepim-trinity library.
.
@@ -469,8 +516,9 @@ Description: Trinity PIM library
Package: libtdepim1-trinity-dev
Section: libdevel
Architecture: any
+Replaces: libkdepim1-trinity-dev (<< 4:14.0.0)
+Breaks: libkdepim1-trinity-dev (<< 4:14.0.0)
Depends: libtdepim1a-trinity (= ${Source-Version}), tdelibs4-trinity-dev (>= 4:3.5.7)
-Replaces: tdepim-trinity-dev (<< 4:3.4.1)
Description: Trinity PIM library [development]
This is the development package which contains the headers for the libtdepim-trinity
library.
@@ -481,6 +529,8 @@ Description: Trinity PIM library [development]
Package: libkgantt0-trinity
Section: libs
Architecture: any
+Replaces: libkgantt0-trinity (<< 4:14.0.0)
+Breaks: libkgantt0-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: Trinity gantt charting library
This is the runtime package for programs that use the libkgantt-trinity library.
@@ -491,6 +541,8 @@ Description: Trinity gantt charting library
Package: libkgantt0-trinity-dev
Section: libdevel
Architecture: any
+Replaces: libkgantt0-trinity-dev (<< 4:14.0.0)
+Breaks: libkgantt0-trinity-dev (<< 4:14.0.0)
Depends: libkgantt0-trinity (= ${Source-Version}), libtdepim1-trinity-dev (= ${Source-Version})
Description: Trinity gantt charting library [development]
This is the development package which contains the headers for the libkgantt-trinity
@@ -502,9 +554,10 @@ Description: Trinity gantt charting library [development]
Package: libkleopatra1-trinity
Section: libs
Architecture: any
+Replaces: libkleopatra1-trinity (<< 4:14.0.0)
+Breaks: libkleopatra1-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, ${perl:Depends}, gnupg
Conflicts: libkleopatra0-trinity
-Replaces: libtdenetwork2-trinity3, libkleopatra0a-trinity
Description: KDE GnuPG interface libraries
This library is used by several KDE applications to interface to the
GnuPG program.
@@ -517,9 +570,10 @@ Description: KDE GnuPG interface libraries
Package: libkleopatra1-trinity-dev
Section: libdevel
Architecture: any
+Replaces: libkleopatra1-trinity-dev (<< 4:14.0.0)
+Breaks: libkleopatra1-trinity-dev (<< 4:14.0.0)
Depends: libkleopatra1-trinity (= ${Source-Version}), libtdepim1-trinity-dev (= ${Source-Version})
Conflicts: libkleopatra0-trinity-dev
-Replaces: libkleopatra0-trinity-dev
Description: Trinity GnuPG interface libraries [development]
This library is used by several KDE applications to interface to the
GnuPG program.
@@ -533,9 +587,10 @@ Description: Trinity GnuPG interface libraries [development]
Package: libkmime2-trinity
Section: libs
Architecture: any
+Replaces: libkmime2-trinity (<< 4:14.0.0)
+Breaks: libkmime2-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Conflicts: libmimelib1a-trinity
-Replaces: libmimelib1a-trinity
Description: Trinity MIME interface library
This library provides a C++ interface to MIME messages, parsing them into
an object tree.
@@ -546,6 +601,8 @@ Description: Trinity MIME interface library
Package: libkpimexchange1-trinity
Section: libs
Architecture: any
+Replaces: libkpimexchange1-trinity (<< 4:14.0.0)
+Breaks: libkpimexchange1-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: Trinity PIM Exchange library
This is the runtime package for programs that use the libkpimexchange-trinity
@@ -557,6 +614,8 @@ Description: Trinity PIM Exchange library
Package: libkpimexchange1-trinity-dev
Section: libdevel
Architecture: any
+Replaces: libkpimexchange1-trinity-dev (<< 4:14.0.0)
+Breaks: libkpimexchange1-trinity-dev (<< 4:14.0.0)
Depends: libkpimexchange1-trinity (= ${Source-Version}), libkcal2-trinity-dev (= ${Source-Version}), libtdepim1-trinity-dev (= ${Source-Version})
Description: Trinity PIM Exchange library [development]
This is the development package which contains the headers for the
@@ -568,6 +627,8 @@ Description: Trinity PIM Exchange library [development]
Package: libkpimidentities1-trinity
Section: libs
Architecture: any
+Replaces: libkpimidentities1-trinity (<< 4:14.0.0)
+Breaks: libkpimidentities1-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: Trinity PIM user identity information library
This library provides information to KDE programs about user identity,
@@ -582,6 +643,8 @@ Description: Trinity PIM user identity information library
Package: libksieve0-trinity
Section: libs
Architecture: any
+Replaces: libksieve0-trinity (<< 4:14.0.0)
+Breaks: libksieve0-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: Trinity mail/news message filtering library
This is the runtime package for programs that use the libksieve-trinity library.
@@ -592,6 +655,8 @@ Description: Trinity mail/news message filtering library
Package: libksieve0-trinity-dev
Section: libdevel
Architecture: any
+Replaces: libksieve0-trinity-dev (<< 4:14.0.0)
+Breaks: libksieve0-trinity-dev (<< 4:14.0.0)
Depends: libksieve0-trinity (= ${Source-Version}), libtdepim1-trinity-dev (= ${Source-Version})
Description: Trinity mail/news message filtering library [development]
This is the development package which contains the headers for the libksieve-trinity
@@ -603,8 +668,9 @@ Description: Trinity mail/news message filtering library [development]
Package: libktnef1-trinity
Section: libs
Architecture: any
+Replaces: libktnef1-trinity (<< 4:14.0.0)
+Breaks: libktnef1-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
-Replaces: ktnef-trinity (<< 4:3.4.0)
Description: Library for handling KTNEF email attachments
This library handles mail attachments using the TNEF format. These
attachments are usually found in mails coming from Microsoft mail
@@ -619,8 +685,9 @@ Description: Library for handling KTNEF email attachments
Package: libktnef1-trinity-dev
Section: libdevel
Architecture: any
+Replaces: libktnef1-trinity-dev (<< 4:14.0.0)
+Breaks: libktnef1-trinity-dev (<< 4:14.0.0)
Depends: libktnef1-trinity (= ${Source-Version}), libtdepim1-trinity-dev (= ${Source-Version})
-Replaces: tdepim-trinity-dev (<< 4:3.4.0)
Description: KTNEF handler library [development]
This library handles mail attachments using the TNEF format. These
attachments are usually found in mails coming from Microsoft mail
@@ -636,9 +703,10 @@ Description: KTNEF handler library [development]
Package: libmimelib1c2a-trinity
Section: libs
Architecture: any
+Replaces: libmimelib1c2a-trinity (<< 4:14.0.0)
+Breaks: libmimelib1c2a-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Conflicts: libmimelib1a-trinity
-Replaces: libmimelib1a-trinity
Description: Trinity mime library
This library is used by several Trinity applications to handle mime types.
.
@@ -650,6 +718,8 @@ Description: Trinity mime library
Package: libmimelib1-trinity-dev
Section: libdevel
Architecture: any
+Replaces: libmimelib1-trinity-dev (<< 4:14.0.0)
+Breaks: libmimelib1-trinity-dev (<< 4:14.0.0)
Depends: libmimelib1c2a-trinity (= ${Source-Version})
Description: Trinity mime library [development]
This library is used by several KDE applications to handle mime types.
diff --git a/debian/squeeze/tdesdk/debian/control b/debian/squeeze/tdesdk/debian/control
index e4d5dbb0d..39fea60bc 100644
--- a/debian/squeeze/tdesdk/debian/control
+++ b/debian/squeeze/tdesdk/debian/control
@@ -14,6 +14,8 @@ Standards-Version: 3.8.4
Package: tdesdk-trinity
Architecture: all
Section: kde
+Replaces: kdesdk-trinity (<< 4:14.0.0)
+Breaks: kdesdk-trinity (<< 4:14.0.0)
Depends: cervisia-trinity (>= ${Source-Version}), kapptemplate-trinity (>= ${Source-Version}), kbabel-trinity (>= ${Source-Version}), kbugbuster-trinity (>= ${Source-Version}), kcachegrind-trinity (>= ${Source-Version}), tdesdk-kfile-plugins-trinity (>= ${Source-Version}), tdesdk-kio-plugins-trinity (>= ${Source-Version}) | tdesvn-kio-plugins-trinity, tdesdk-misc-trinity (>= ${Source-Version}), tdesdk-scripts-trinity, kmtrace-trinity (>= ${Source-Version}), kompare-trinity (>= ${Source-Version}), kspy-trinity (>= ${Source-Version}), kuiviewer-trinity (>= ${Source-Version}), kunittest-trinity (>= ${Source-Version}), poxml-trinity (>= ${Source-Version}), umbrello-trinity (>= ${Source-Version})
Suggests: kcachegrind-converters-trinity, kbabel-trinity-dev, tdesdk-trinity-doc-html
Description: software development kit from the official Trinity release
@@ -28,8 +30,9 @@ Description: software development kit from the official Trinity release
Package: tdesdk-trinity-doc-html
Architecture: all
Section: doc
+Replaces: kdesdk-trinity-doc-html (<< 4:14.0.0)
+Breaks: kdesdk-trinity-doc-html (<< 4:14.0.0)
Suggests: konqueror-trinity | www-browser, tdesdk-trinity
-Replaces: cervisia-trinity (<< 4:3.2.0), kbabel-trinity (<< 4:3.2.0), kbugbuster-trinity (<< 4:3.2.0), kompare-trinity (<< 4:3.2.0)
Description: Trinity Software Development Kit documentation in HTML format
By default the modules provided by KDE only provide their documentation
in KDE docbook format, which can only be read by Konqueror or KHelpCenter.
@@ -47,6 +50,8 @@ Description: Trinity Software Development Kit documentation in HTML format
Package: cervisia-trinity
Architecture: any
Section: devel
+Replaces: cervisia-trinity (<< 4:14.0.0)
+Breaks: cervisia-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity, tdesdk-trinity-doc-html
Conflicts: cervisia
@@ -65,6 +70,8 @@ Description: a graphical CVS front end for Trinity
Package: kapptemplate-trinity
Architecture: all
Section: devel
+Replaces: kapptemplate-trinity (<< 4:14.0.0)
+Breaks: kapptemplate-trinity (<< 4:14.0.0)
Conflicts: kapptemplate
Recommends: automake1.9 | automaken, tdelibs4-trinity-dev (>= 4:3.5.8)
Description: creates a framework to develop a Trinity application
@@ -79,6 +86,8 @@ Description: creates a framework to develop a Trinity application
Package: kbabel-trinity
Architecture: any
Section: devel
+Replaces: kbabel-trinity (<< 4:14.0.0)
+Breaks: kbabel-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Conflicts: kbabel
Recommends: gettext
@@ -100,9 +109,10 @@ Description: PO-file editing suite for Trinity
Package: kbabel-trinity-dev
Architecture: any
Section: libdevel
+Replaces: kbabel-trinity-dev (<< 4:14.0.0)
+Breaks: kbabel-trinity-dev (<< 4:14.0.0)
Depends: kbabel-trinity (= ${Source-Version}), tdelibs4-trinity-dev (>= 4:3.5.8)
Conflicts: kbabel
-Replaces: kbabel-trinity (<< 4:3.0.8-0)
Description: PO-file editing suite for Trinity (development files)
This is a suite of programs for editing gettext message files (PO-files).
It is designed to help you translate fast and consistently.
@@ -122,6 +132,8 @@ Description: PO-file editing suite for Trinity (development files)
Package: kbugbuster-trinity
Architecture: any
Section: devel
+Replaces: kbugbuster-trinity (<< 4:14.0.0)
+Breaks: kbugbuster-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Conflicts: kbugbuster
Suggests: khelpcenter-trinity
@@ -136,6 +148,8 @@ Description: a front end for the Trinity bug tracking system
Package: kcachegrind-trinity
Architecture: any
Section: devel
+Replaces: kcachegrind-trinity (<< 4:14.0.0)
+Breaks: kcachegrind-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Conflicts: kcachegrind
Recommends: valgrind-callgrind-trinity | valgrind-calltree-trinity, graphviz
@@ -155,6 +169,8 @@ Description: visualisation tool for valgrind profiling output
Package: kcachegrind-converters-trinity
Architecture: all
Section: devel
+Replaces: kcachegrind-converters-trinity (<< 4:14.0.0)
+Breaks: kcachegrind-converters-trinity (<< 4:14.0.0)
Depends: ${perl:Depends}, php5-cli, python
Conflicts: kcachegrind-converters
Recommends: kcachegrind-trinity
@@ -173,6 +189,8 @@ Description: format converters for KCachegrind profiling visualisation tool
Package: tdesdk-kfile-plugins-trinity
Architecture: any
Section: kde
+Replaces: kdesdk-kfile-plugins-trinity (<< 4:14.0.0)
+Breaks: kdesdk-kfile-plugins-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Conflicts: tdesdk-kfile-plugins
Description: Trinity file dialog plugins for software development files
@@ -186,11 +204,12 @@ Description: Trinity file dialog plugins for software development files
Package: tdesdk-misc-trinity
Architecture: any
Section: devel
+Replaces: kdesdk-misc-trinity (<< 4:14.0.0)
+Breaks: kdesdk-misc-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Recommends: libqt3-mt-dev | libqt3-dev
Suggests: gimp | xpaint
Conflicts: kdepalettes-trinity (<= 4:3.1.0-1), scheck-trinity (<< 4:3.2.0-0), tdesdk-misc
-Replaces: kdepalettes-trinity (<= 4:3.1.0-1), scheck-trinity (<< 4:3.2.0-0), tdevelop3-plugins-trinity (<= 4:3.2.0-3)
Description: various goodies from the Trinity Software Development Kit
This package contains miscellaneous goodies provided with the official
KDE release to assist with KDE software development.
@@ -207,11 +226,12 @@ Description: various goodies from the Trinity Software Development Kit
Package: tdesdk-scripts-trinity
Architecture: all
Section: devel
+Replaces: kdesdk-scripts-trinity (<< 4:14.0.0)
+Breaks: kdesdk-scripts-trinity (<< 4:14.0.0)
Depends: ${perl:Depends}, python
Recommends: automake1.9 | automaken, cvs, gawk
Suggests: khelpcenter-trinity, tdesdk-trinity-doc-html, dmalloc, gdb, tdelibs4-trinity-doc, qt3-doc, valgrind, devscripts
Enhances: kate-trinity
-Replaces: tdevelop-trinity (<< 1:1.4.0-3.2)
Description: a set of useful development scripts for Trinity
This package contains a number of scripts which can be used to help in
developing KDE-based applications. Many of these scripts however are
@@ -230,6 +250,8 @@ Description: a set of useful development scripts for Trinity
Package: kmtrace-trinity
Architecture: any
Section: devel
+Replaces: kmtrace-trinity (<< 4:14.0.0)
+Breaks: kmtrace-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, less
Conflicts: kmtrace
Description: a Trinity memory leak tracer
@@ -242,6 +264,8 @@ Description: a Trinity memory leak tracer
Package: kompare-trinity
Architecture: any
Section: devel
+Replaces: kompare-trinity (<< 4:14.0.0)
+Breaks: kompare-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Conflicts: kompare
Suggests: khelpcenter-trinity
@@ -256,6 +280,8 @@ Description: a Trinity GUI for viewing differences between files
Package: kspy-trinity
Architecture: any
Section: devel
+Replaces: kspy-trinity (<< 4:14.0.0)
+Breaks: kspy-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, tdelibs4-trinity-dev (>= 4:3.5.8)
Conflicts: kspy
Description: examines the internal state of a Qt/KDE app
@@ -276,6 +302,8 @@ Description: examines the internal state of a Qt/KDE app
Package: kuiviewer-trinity
Architecture: any
Section: devel
+Replaces: kuiviewer-trinity (<< 4:14.0.0)
+Breaks: kuiviewer-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Conflicts: kuiviewer
Suggests: qt3-designer
@@ -292,9 +320,10 @@ Description: viewer for Qt Designer user interface files
Package: libcvsservice0-trinity
Architecture: any
Section: libs
+Replaces: libcvsservice0-trinity (<< 4:14.0.0)
+Breaks: libcvsservice0-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, cvs
Conflicts: libcvsservice0
-Replaces: cervisia-trinity (<< 4:3.2.0)
Description: DCOP service for accessing CVS repositories
This library provides a DCOP service for accessing and working with
remote CVS repositories. Applications may link with this library to
@@ -309,9 +338,10 @@ Description: DCOP service for accessing CVS repositories
Package: libcvsservice-trinity-dev
Architecture: any
Section: libdevel
+Replaces: libcvsservice-trinity-dev (<< 4:14.0.0)
+Breaks: libcvsservice-trinity-dev (<< 4:14.0.0)
Depends: libcvsservice0-trinity (= ${Source-Version}), tdelibs4-trinity-dev (>= 4:3.5.8)
Conflicts: libcvsservice-dev
-Replaces: cervisia-trinity (<< 4:3.2.0)
Description: development files for CVS DCOP service
The library libcvsservice provides a DCOP service for accessing and
working with remote CVS repositories. Applications may link with this
@@ -327,6 +357,8 @@ Description: development files for CVS DCOP service
Package: poxml-trinity
Architecture: any
Section: devel
+Replaces: poxml-trinity (<< 4:14.0.0)
+Breaks: poxml-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Conflicts: poxml
Description: tools for using PO-files to translate DocBook XML files
@@ -342,10 +374,11 @@ Description: tools for using PO-files to translate DocBook XML files
Package: umbrello-trinity
Architecture: any
Section: devel
+Replaces: umbrello-trinity (<< 4:14.0.0)
+Breaks: umbrello-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity, tdesdk-trinity-doc-html
Conflicts: umbrello-manual-trinity (<< 20040311), umbrello
-Replaces: umbrello-manual-trinity (<< 20040311)
Description: UML modelling tool and code generator
Umbrello UML Modeller is a Unified Modelling Language editor for KDE.
With UML you can create diagrams of software and other systems in an
@@ -362,9 +395,10 @@ Description: UML modelling tool and code generator
Package: tdesdk-kio-plugins-trinity
Architecture: any
Section: devel
+Replaces: kdesdk-kio-plugins-trinity (<< 4:14.0.0)
+Breaks: kdesdk-kio-plugins-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, subversion
Conflicts: tdesdk-kio-plugins
-Replaces: tdesdk-misc-trinity (<< 4:3.5.0)
Description: subversion ioslave for Trinity
This package provides easy access to remote SVN repositories from within
Konqueror, and KDE generally, by browsing them as if they were a
@@ -376,6 +410,8 @@ Description: subversion ioslave for Trinity
Package: kunittest-trinity
Architecture: any
Section: devel
+Replaces: kunittest-trinity (<< 4:14.0.0)
+Breaks: kunittest-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Conflicts: kunittest
Suggests: tdelibs4-trinity-doc
@@ -392,6 +428,8 @@ Description: unit testing library for Trinity
Package: tdesdk-trinity-dbg
Section: libdevel
Architecture: any
+Replaces: kdesdk-trinity-dbg (<< 4:14.0.0)
+Breaks: kdesdk-trinity-dbg (<< 4:14.0.0)
Priority: extra
Depends: tdelibs-trinity-dbg, libcvsservice-trinity-dev (= ${Source-Version}), kbabel-trinity-dev (= ${Source-Version})
Conflicts: tdesdk-dbg
diff --git a/debian/squeeze/tdetoys/debian/control b/debian/squeeze/tdetoys/debian/control
index d6abe3fcc..7388f1dbd 100644
--- a/debian/squeeze/tdetoys/debian/control
+++ b/debian/squeeze/tdetoys/debian/control
@@ -10,6 +10,8 @@ Standards-Version: 3.8.4
Package: tdetoys-trinity
Architecture: all
Section: kde
+Replaces: kdetoys-trinity (<< 4:14.0.0)
+Breaks: kdetoys-trinity (<< 4:14.0.0)
Depends: amor-trinity (>= ${Source-Version}), eyesapplet-trinity (>= ${Source-Version}), fifteenapplet-trinity (>= ${Source-Version}), kmoon-trinity (>= ${Source-Version}), kodo-trinity (>= ${Source-Version}), kteatime-trinity (>= ${Source-Version}), ktux-trinity (>= ${Source-Version}), kweather-trinity (>= ${Source-Version}), kworldclock-trinity (>= ${Source-Version})
Suggests: tdetoys-trinity-doc-html (>= ${Source-Version})
Description: toys from the official Trinity release
@@ -24,8 +26,9 @@ Description: toys from the official Trinity release
Package: tdetoys-trinity-doc-html
Architecture: all
Section: doc
+Replaces: kdetoys-trinity-doc-html (<< 4:14.0.0)
+Breaks: kdetoys-trinity-doc-html (<< 4:14.0.0)
Suggests: konqueror-trinity | www-browser, tdetoys-trinity
-Replaces: amor-trinity (<< 4:2.2.0-0), kmoon-trinity (<< 4:2.2.0-0), kodo-trinity (<< 4:2.2.0-0), kteatime-trinity (<< 4:2.2.0-0), kweather-trinity (<< 4:3.0.0-0), kworldclock-trinity (<< 4:2.2.0-0)
Description: Trinity toys documentation in HTML format
By default the modules provided by KDE only provide their documentation
in KDE docbook format, which can only be read by Konqueror or KHelpCenter.
@@ -43,11 +46,12 @@ Description: Trinity toys documentation in HTML format
Package: amor-trinity
Architecture: any
Section: games
+Replaces: amor-trinity (<< 4:14.0.0)
+Breaks: amor-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Recommends: twin-trinity
Suggests: khelpcenter-trinity
Conflicts: task-tdetoys-trinity
-Replaces: tdetoys-trinity (<< 4:3.0.1-0), task-tdetoys-trinity
Description: a Trinity creature for your desktop
AMOR stands for Amusing Misuse Of Resources. It provides several different
characters who prance around your X screen doing tricks and giving you tips.
@@ -61,10 +65,11 @@ Description: a Trinity creature for your desktop
Package: eyesapplet-trinity
Architecture: any
Section: kde
+Replaces: eyesapplet-trinity (<< 4:14.0.0)
+Breaks: eyesapplet-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Recommends: kicker-trinity
Conflicts: task-tdetoys-trinity
-Replaces: tdetoys-trinity (<< 4:3.0.1-0), task-tdetoys-trinity
Description: eyes applet for Trinity
An applet for the KDE panel containing a pair of eyes that follow your mouse
around the screen.
@@ -75,6 +80,8 @@ Description: eyes applet for Trinity
Package: fifteenapplet-trinity
Architecture: any
Section: kde
+Replaces: fifteenapplet-trinity (<< 4:14.0.0)
+Breaks: fifteenapplet-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Recommends: kicker-trinity
Description: fifteen pieces puzzle for Trinity
@@ -88,11 +95,12 @@ Description: fifteen pieces puzzle for Trinity
Package: kmoon-trinity
Architecture: any
Section: kde
+Replaces: kmoon-trinity (<< 4:14.0.0)
+Breaks: kmoon-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Recommends: kicker-trinity
Suggests: khelpcenter-trinity
Conflicts: task-tdetoys-trinity
-Replaces: tdetoys-trinity (<< 4:3.0.1-0), task-tdetoys-trinity
Description: moon phase indicator for Trinity
An applet for the KDE panel that displays the current phase of the moon.
.
@@ -102,10 +110,11 @@ Description: moon phase indicator for Trinity
Package: kodo-trinity
Architecture: any
Section: games
+Replaces: kodo-trinity (<< 4:14.0.0)
+Breaks: kodo-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
Conflicts: task-tdetoys-trinity
-Replaces: tdetoysv (<< 4:3.0.1-0), task-tdetoys-trinity
Description: mouse odometer for Trinity
KOdometer measures your desktop mileage. It tracks the movement of your mouse
pointer across your desktop and renders it in inches/feet/miles! It can
@@ -117,10 +126,11 @@ Description: mouse odometer for Trinity
Package: kteatime-trinity
Architecture: any
Section: kde
+Replaces: kteatime-trinity (<< 4:14.0.0)
+Breaks: kteatime-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, kicker-trinity
Suggests: khelpcenter-trinity
Conflicts: task-tdetoys-trinity
-Replaces: tdetoys-trinity (<< 4:3.0.1-0), task-tdetoys-trinity
Description: Trinity utility for making a fine cup of tea
KTeaTime is a handy timer for steeping tea. No longer will you have to
guess at how long it takes for your tea to be ready. Simply select the
@@ -139,10 +149,11 @@ Description: Trinity utility for making a fine cup of tea
Package: ktux-trinity
Architecture: any
Section: kde
+Replaces: ktux-trinity (<< 4:14.0.0)
+Breaks: ktux-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: twin-trinity
Conflicts: task-tdetoys-trinity
-Replaces: tdetoys-trinity (<< 4:3.0.1-0), task-tdetoys-trinity
Description: Tux screensaver for Trinity
A neat Tux-in-a-spaceship screensaver for the K Desktop Environment (KDE).
.
@@ -152,6 +163,8 @@ Description: Tux screensaver for Trinity
Package: kweather-trinity
Architecture: any
Section: kde
+Replaces: kweather-trinity (<< 4:14.0.0)
+Breaks: kweather-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Recommends: kicker-trinity
Suggests: khelpcenter-trinity
@@ -170,10 +183,11 @@ Description: weather display applet for Trinity
Package: kworldclock-trinity
Architecture: any
Section: games
+Replaces: kworldclock-trinity (<< 4:14.0.0)
+Breaks: kworldclock-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: tdeartwork-misc-trinity, kicker-trinity, kdesktop-trinity, khelpcenter-trinity
Conflicts: task-tdetoys-trinity, kworldwatch-trinity (<= 4:2.2-beta1-1)
-Replaces: tdetoys-trinity (<< 4:3.0.1-0), task-tdetoys-trinity, kworldwatch-trinity (<= 4:2.2-beta1-1)
Provides: kworldwatch-trinity
Description: earth watcher for Trinity
Displays where in the world it is light and dark depending on time, as
@@ -189,6 +203,8 @@ Description: earth watcher for Trinity
Package: tdetoys-trinity-dbg
Section: libdevel
Architecture: any
+Replaces: kdetoys-trinity-dbg (<< 4:14.0.0)
+Breaks: kdetoys-trinity-dbg (<< 4:14.0.0)
Depends: tdelibs-trinity-dbg
Priority: extra
Description: debugging symbols for tdetoys-trinity
diff --git a/debian/squeeze/tdeutils/debian/control b/debian/squeeze/tdeutils/debian/control
index bd4eb1525..2c965d3c9 100644
--- a/debian/squeeze/tdeutils/debian/control
+++ b/debian/squeeze/tdeutils/debian/control
@@ -11,6 +11,8 @@ Standards-Version: 3.8.4
Package: tdeutils-trinity
Section: kde
Architecture: all
+Replaces: kdeutils-trinity (<< 4:14.0.0)
+Breaks: kdeutils-trinity (<< 4:14.0.0)
Depends: ark-trinity (>= ${Source-Version}), kcalc-trinity (>= ${Source-Version}), kcharselect-trinity (>= ${Source-Version}), kdelirc-trinity (>= ${Source-Version}), kdessh-trinity (>= ${Source-Version}), kdf-trinity (>= ${Source-Version}), kedit-trinity (>= ${Source-Version}), kfloppy-trinity (>= ${Source-Version}), kgpg-trinity (>= ${Source-Version}), khexedit-trinity (>= ${Source-Version}), kjots-trinity (>= ${Source-Version}), klaptopdaemon-trinity (>= ${Source-Version}) | kpowersave-trinity, kmilo-trinity (>= ${Source-Version}), kregexpeditor-trinity (>= ${Source-Version}), ksim-trinity (>= ${Source-Version}), ktimer-trinity (>= ${Source-Version}), kwalletmanager-trinity (>= ${Source-Version}), superkaramba-trinity (>= ${Source-Version})
Suggests: tdeutils-trinity-doc-html (>= ${Source-Version})
Description: general purpose utilities from the official Trinity release
@@ -25,6 +27,8 @@ Description: general purpose utilities from the official Trinity release
Package: tdeutils-trinity-doc
Section: doc
Architecture: all
+Replaces: kdeutils-trinity-doc (<< 4:14.0.0)
+Breaks: kdeutils-trinity-doc (<< 4:14.0.0)
Description: developer documentation for the KDE utilities module
This package contains documentation for the KDE utilities module, of
use more for developers creating applications than regular users.
@@ -35,6 +39,8 @@ Description: developer documentation for the KDE utilities module
Package: tdeutils-trinity-doc-html
Architecture: all
Section: doc
+Replaces: kdeutils-trinity-doc-html (<< 4:14.0.0)
+Breaks: kdeutils-trinity-doc-html (<< 4:14.0.0)
Suggests: konqueror-trinity | www-browser, tdebase-trinity
Description: Trinity utilities documentation in HTML format
By default the modules provided by KDE only provide their documentation
@@ -53,6 +59,8 @@ Description: Trinity utilities documentation in HTML format
Package: tdeutils-trinity-dev
Section: utils
Architecture: any
+Replaces: kdeutils-trinity-dev (<< 4:14.0.0)
+Breaks: kdeutils-trinity-dev (<< 4:14.0.0)
Depends: ark-trinity (= ${Source-Version}), kcalc-trinity (= ${Source-Version}), kdelirc-trinity (= ${Source-Version}), kedit-trinity (= ${Source-Version}), khexedit-trinity (= ${Source-Version}), klaptopdaemon-trinity (= ${Source-Version}), kmilo-trinity (= ${Source-Version}), kregexpeditor-trinity (= ${Source-Version}), ksim-trinity (= ${Source-Version}), tdelibs4-trinity-dev (>= 4:3.5.8)
Description: development files for the Trinity utilities module
This package contains development files needed to compile tdeutils
@@ -64,10 +72,11 @@ Description: development files for the Trinity utilities module
Package: ark-trinity
Section: utils
Architecture: any
+Replaces: ark-trinity (<< 4:14.0.0)
+Breaks: ark-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Recommends: ncompress, unzip, zip, zoo, bzip2, p7zip-full, xz-utils, lzma
Suggests: khelpcenter-trinity, rar, unrar | unrar-free
-Replaces: tdebase-data-trinity (<< 4:3.3.91)
Description: graphical archiving tool for Trinity
Ark is a graphical program for managing various archive formats within the
KDE environment. Archives can be viewed, extracted, created and modified
@@ -86,9 +95,10 @@ Description: graphical archiving tool for Trinity
Package: kcalc-trinity
Section: utils
Architecture: any
+Replaces: kcalc-trinity (<< 4:14.0.0)
+Breaks: kcalc-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
-Replaces: tdebase-data-trinity (<< 4:3.3.91)
Description: calculator for Trinity
KCalc is KDE's scientific calculator.
.
@@ -104,6 +114,8 @@ Description: calculator for Trinity
Package: kcharselect-trinity
Section: utils
Architecture: any
+Replaces: kcharselect-trinity (<< 4:14.0.0)
+Breaks: kcharselect-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
Description: character selector for Trinity
@@ -115,6 +127,8 @@ Description: character selector for Trinity
Package: kdelirc-trinity
Section: utils
Architecture: any
+Replaces: kdelirc-trinity (<< 4:14.0.0)
+Breaks: kdelirc-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
Description: infrared control for Trinity
@@ -126,6 +140,8 @@ Description: infrared control for Trinity
Package: kdessh-trinity
Section: kde
Architecture: any
+Replaces: kdessh-trinity (<< 4:14.0.0)
+Breaks: kdessh-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, openssh-client | ssh-client
Description: ssh frontend for Trinity
This package contains KDE's frontend for ssh.
@@ -136,6 +152,8 @@ Description: ssh frontend for Trinity
Package: kdf-trinity
Section: utils
Architecture: any
+Replaces: kdf-trinity (<< 4:14.0.0)
+Breaks: kdf-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
Description: disk space utility for Trinity
@@ -150,6 +168,8 @@ Description: disk space utility for Trinity
Package: kedit-trinity
Section: editors
Architecture: any
+Replaces: kedit-trinity (<< 4:14.0.0)
+Breaks: kedit-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
Description: basic text editor for Trinity
@@ -166,6 +186,8 @@ Description: basic text editor for Trinity
Package: kfloppy-trinity
Section: utils
Architecture: any
+Replaces: kfloppy-trinity (<< 4:14.0.0)
+Breaks: kfloppy-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, dosfstools
Suggests: khelpcenter-trinity
Description: floppy formatter for KDE
@@ -178,6 +200,8 @@ Description: floppy formatter for KDE
Package: kgpg-trinity
Section: kde
Architecture: any
+Replaces: kgpg-trinity (<< 4:14.0.0)
+Breaks: kgpg-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, konsole-trinity (>= 4:3.5.8), gnupg
Suggests: khelpcenter-trinity
Description: GnuPG frontend for Trinity
@@ -201,6 +225,8 @@ Description: GnuPG frontend for Trinity
Package: khexedit-trinity
Section: utils
Architecture: any
+Replaces: khexedit-trinity (<< 4:14.0.0)
+Breaks: khexedit-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
Description: Trinity hex editor
@@ -214,6 +240,8 @@ Description: Trinity hex editor
Package: kjots-trinity
Section: utils
Architecture: any
+Replaces: kjots-trinity (<< 4:14.0.0)
+Breaks: kjots-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
Description: note taking utility for Trinity
@@ -226,6 +254,8 @@ Description: note taking utility for Trinity
Package: klaptopdaemon-trinity
Section: kde
Architecture: any
+Replaces: klaptopdaemon-trinity (<< 4:14.0.0)
+Breaks: klaptopdaemon-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
Description: battery monitoring and management for laptops using KDE
@@ -238,6 +268,8 @@ Description: battery monitoring and management for laptops using KDE
Package: kmilo-trinity
Section: utils
Architecture: any
+Replaces: kmilo-trinity (<< 4:14.0.0)
+Breaks: kmilo-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Description: laptop special keys support for Trinity
KMilo lets you use the special keys on some keyboards and laptops.
@@ -252,6 +284,8 @@ Description: laptop special keys support for Trinity
Package: kmilo-legacy-trinity
Section: utils
Architecture: any
+Replaces: kmilo-legacy-trinity (<< 4:14.0.0)
+Breaks: kmilo-legacy-trinity (<< 4:14.0.0)
Depends: kmilo-trinity, ${shlibs:Depends}
Description: non-standard plugins for KMilo
KMilo lets you use the special keys on some keyboards and laptops.
@@ -268,6 +302,8 @@ Description: non-standard plugins for KMilo
Package: kregexpeditor-trinity
Section: kde
Architecture: any
+Replaces: kregexpeditor-trinity (<< 4:14.0.0)
+Breaks: kregexpeditor-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
Description: graphical regular expression editor plugin for Trinity
@@ -280,6 +316,8 @@ Description: graphical regular expression editor plugin for Trinity
Package: ksim-trinity
Section: utils
Architecture: any
+Replaces: ksim-trinity (<< 4:14.0.0)
+Breaks: ksim-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
Description: system information monitor for Trinity
@@ -293,6 +331,8 @@ Description: system information monitor for Trinity
Package: ktimer-trinity
Section: utils
Architecture: any
+Replaces: ktimer-trinity (<< 4:14.0.0)
+Breaks: ktimer-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
Description: timer utility for Trinity
@@ -306,6 +346,8 @@ Description: timer utility for Trinity
Package: kwalletmanager-trinity
Section: utils
Architecture: any
+Replaces: kwalletmanager-trinity (<< 4:14.0.0)
+Breaks: kwalletmanager-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
Description: wallet manager for Trinity
@@ -319,6 +361,8 @@ Description: wallet manager for Trinity
Package: superkaramba-trinity
Section: kde
Architecture: any
+Replaces: superkaramba-trinity (<< 4:14.0.0)
+Breaks: superkaramba-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
Conflicts: karamba-trinity
@@ -341,6 +385,8 @@ Description: a program based on karamba improving the eyecandy of KDE
Package: tdeutils-trinity-dbg
Section: libdevel
Architecture: any
+Replaces: kdeutils-trinity-dbg (<< 4:14.0.0)
+Breaks: kdeutils-trinity-dbg (<< 4:14.0.0)
Depends: tdelibs-trinity-dbg
Priority: extra
Description: debugging symbols for tdeutils-trinity
diff --git a/debian/squeeze/tdevelop/debian/control b/debian/squeeze/tdevelop/debian/control
index a90bc00bf..fce6ef3c6 100644
--- a/debian/squeeze/tdevelop/debian/control
+++ b/debian/squeeze/tdevelop/debian/control
@@ -2,13 +2,15 @@ Source: tdevelop-trinity
Section: kde
Priority: optional
Maintainer: Timothy Pearson
-XSBC-Original-Maintainer: Jeremy Lainé
+XSBC-Original-Maintainer: Jeremy Lain
Build-Depends: cdbs (>= 0.4.38), debhelper (>= 5), tdelibs4-trinity-dev (>= 4:3.5.10), gettext, tdelibs4-trinity-doc, libtqtinterface-doc, flex, python, libcvsservice-trinity-dev (>= 4:3.5.10), groff-base, libsvn-dev, libaprutil1-dev, libdb-dev, automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Package: tdevelop-trinity
Architecture: any
Depends: ${shlibs:Depends}, tdevelop-data-trinity (>= ${source:Version}), tdebase-trinity-bin
+Replaces: kdevelop-trinity (<< 4:14.0.0)
+Breaks: kdevelop-trinity (<< 4:14.0.0)
Recommends: tdevelop-trinity-doc, make, libtool, autoconf, automaken, gdb (>= 6.4)
Suggests: libtqtinterface-dev, tdelibs4-trinity-dev, sgmltools-lite, gettext, ark-trinity, kbabel-trinity, kiconedit-trinity, tdesdk-scripts-trinity, graphviz, tdebase-kio-plugins-trinity, exuberant-ctags, khelpcenter-trinity, tdelibs4-trinity-doc, libtqtinterface-doc, konsole-trinity, cmake, ruby, python
Description: An IDE for Unix/X11
@@ -25,6 +27,8 @@ Description: An IDE for Unix/X11
Package: tdevelop-trinity-doc
Section: doc
Architecture: all
+Replaces: kdevelop-trinity-doc (<< 4:14.0.0)
+Breaks: kdevelop-trinity-doc (<< 4:14.0.0)
Description: An IDE for Unix/X11 - documentation
KDevelop is an easy to use Integrated Development Environment
for developing C/C++ applications under X11. It features
@@ -40,6 +44,8 @@ Description: An IDE for Unix/X11 - documentation
Package: tdevelop-data-trinity
Architecture: all
+Replaces: kdevelop-data-trinity (<< 4:14.0.0)
+Breaks: kdevelop-data-trinity (<< 4:14.0.0)
Description: An IDE for Unix/X11 - data
KDevelop is an easy to use Integrated Development Environment
for developing C/C++ applications under X11. It features
@@ -56,6 +62,8 @@ Description: An IDE for Unix/X11 - data
Package: tdevelop-trinity-dev
Architecture: any
Depends: tdevelop-trinity (= ${binary:Version}), tdelibs4-trinity-dev
+Replaces: kdevelop-trinity-dev (<< 4:14.0.0)
+Breaks: kdevelop-trinity-dev (<< 4:14.0.0)
Description: An IDE for Unix/X11 - development files
KDevelop is an easy to use Integrated Development Environment
for developing C/C++ applications under X11. It features
diff --git a/debian/squeeze/tdewebdev/debian/control b/debian/squeeze/tdewebdev/debian/control
index cc0ac365c..d98b6a46f 100644
--- a/debian/squeeze/tdewebdev/debian/control
+++ b/debian/squeeze/tdewebdev/debian/control
@@ -3,7 +3,7 @@ Section: web
Priority: optional
Maintainer: Timothy Pearson
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers
-Uploaders: Adeodato Simó , Ana Beatriz Guerrero Lopez , Armin Berres , Sune Vuorela
+Uploaders: Adeodato Sim , Ana Beatriz Guerrero Lopez , Armin Berres , Sune Vuorela
Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5), autotools-dev, gawk, gettext, tdelibs4-trinity-dev, libreadline5-dev | libreadline6-dev, libxml2-dev, libxslt1-dev, sharutils, texinfo, automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Homepage: http://trinity.pearsoncomputing.net
@@ -11,6 +11,8 @@ Homepage: http://trinity.pearsoncomputing.net
Package: tdewebdev-trinity
Architecture: all
Section: kde
+Replaces: kdewebdev-trinity (<< 4:14.0.0)
+Breaks: kdewebdev-trinity (<< 4:14.0.0)
Depends: quanta-trinity (>= ${source:Version}), kfilereplace-trinity (>= ${source:Version}), kimagemapeditor-trinity (>= ${source:Version}), klinkstatus-trinity (>= ${source:Version}), kommander-trinity (>= ${source:Version}), kxsldbg-trinity (>= ${source:Version})
Suggests: kommander-trinity-dev (>= ${source:Version}), tdewebdev-trinity-doc-html (>= ${source:Version})
Description: web development apps from the official KDE release [Trinity]
@@ -25,6 +27,8 @@ Description: web development apps from the official KDE release [Trinity]
Package: tdewebdev-trinity-doc-html
Architecture: all
Section: doc
+Replaces: kdewebdev-trinity-doc-html (<< 4:14.0.0)
+Breaks: kdewebdev-trinity-doc-html (<< 4:14.0.0)
Suggests: konqueror-trinity | www-browser, tdewebdev-trinity
Description: KDE web development documentation in HTML format [Trinity]
By default the modules provided by KDE only provide their documentation
@@ -43,6 +47,8 @@ Description: KDE web development documentation in HTML format [Trinity]
Package: quanta-trinity
Architecture: any
Section: web
+Replaces: quanta-trinity (<< 4:14.0.0)
+Breaks: quanta-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, kfilereplace-trinity, klinkstatus-trinity, kommander-trinity, quanta-data-trinity, tidy
Recommends: cervisia, gnupg, kompare-trinity, kxsldbg-trinity, docbook-defguide
Suggests: gubed, kimagemapeditor-trinity, wget, khelpcenter-trinity, php-doc
@@ -66,6 +72,8 @@ Description: web development environment for KDE [Trinity]
Package: quanta-data-trinity
Architecture: all
Section: web
+Replaces: quanta-data-trinity (<< 4:14.0.0)
+Breaks: quanta-data-trinity (<< 4:14.0.0)
Recommends: quanta-trinity (= ${source:Version})
Description: data files for Quanta Plus web development environment [Trinity]
This package contains architecture-independent data files for Quanta
@@ -80,6 +88,8 @@ Description: data files for Quanta Plus web development environment [Trinity]
Package: kfilereplace-trinity
Architecture: any
Section: kde
+Replaces: kfilereplace-trinity (<< 4:14.0.0)
+Breaks: kfilereplace-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: quanta-trinity
Description: batch search-and-replace component for KDE [Trinity]
@@ -97,6 +107,8 @@ Description: batch search-and-replace component for KDE [Trinity]
Package: kimagemapeditor-trinity
Architecture: any
Section: editors
+Replaces: kimagemapeditor-trinity (<< 4:14.0.0)
+Breaks: kimagemapeditor-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: quanta-trinity
Description: HTML image map editor for KDE [Trinity]
@@ -110,6 +122,8 @@ Description: HTML image map editor for KDE [Trinity]
Package: klinkstatus-trinity
Architecture: any
Section: web
+Replaces: klinkstatus-trinity (<< 4:14.0.0)
+Breaks: klinkstatus-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: quanta-trinity, khelpcenter-trinity
Description: web link validity checker for KDE [Trinity]
@@ -126,6 +140,8 @@ Description: web link validity checker for KDE [Trinity]
Package: kommander-trinity
Architecture: any
Section: kde
+Replaces: kommander-trinity (<< 4:14.0.0)
+Breaks: kommander-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, gettext
Suggests: kommander-trinity-dev, quanta-trinity, khelpcenter-trinity
Description: visual dialog builder and executor tool [Trinity]
@@ -153,6 +169,8 @@ Description: visual dialog builder and executor tool [Trinity]
Package: kommander-trinity-dev
Architecture: any
Section: libdevel
+Replaces: kommander-trinity-dev (<< 4:14.0.0)
+Breaks: kommander-trinity-dev (<< 4:14.0.0)
Depends: kommander-trinity (= ${binary:Version}), tdelibs4-dev (>= 4:3.5.8)
Description: development files for Kommander [Trinity]
This package contains the headers and other development files for
@@ -170,6 +188,8 @@ Description: development files for Kommander [Trinity]
Package: kxsldbg-trinity
Architecture: any
Section: text
+Replaces: kxsldbg-trinity (<< 4:14.0.0)
+Breaks: kxsldbg-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: quanta-trinity, khelpcenter-trinity
Description: graphical XSLT debugger for KDE [Trinity]
@@ -187,6 +207,8 @@ Description: graphical XSLT debugger for KDE [Trinity]
Package: tdewebdev-trinity-dbg
Section: libdevel
Architecture: any
+Replaces: kdewebdev-trinity-dbg (<< 4:14.0.0)
+Breaks: kdewebdev-trinity-dbg (<< 4:14.0.0)
Depends: tdelibs-trinity-dbg
Priority: extra
Description: debugging symbols for tdewebdev [Trinity]
diff --git a/redhat/extras/ksensors/ksensors-0.7.3-18-lmsensors_2x_fix.patch b/redhat/extras/ksensors/ksensors-0.7.3-18-lmsensors_2x_fix.patch
new file mode 100644
index 000000000..99a681ffc
--- /dev/null
+++ b/redhat/extras/ksensors/ksensors-0.7.3-18-lmsensors_2x_fix.patch
@@ -0,0 +1,14 @@
+--- ksensors-0.7.3/src/lmsensor.cpp.ORI 2011-12-22 06:57:39.285341486 -0500
++++ ksensors-0.7.3/src/lmsensor.cpp 2011-12-22 06:58:33.596092430 -0500
+@@ -43,7 +43,11 @@
+ char *label = NULL;
+ QString uniqueSensorName;
+
++#if SENSORS_API_VERSION < 0x400 /* libsensor 3 code */
++ uniqueSensorName.sprintf("%s_%d_%d.%s", chip_name->prefix, chip_name->bus, chip_name->addr, main_name);
++#else
+ uniqueSensorName.sprintf("%s_%d_%d.%s", chip_name->prefix, chip_name->bus.nr, chip_name->addr, main_name);
++#endif
+ setName(uniqueSensorName.latin1());
+
+ #if SENSORS_API_VERSION < 0x400 /* libsensor 3 code */
diff --git a/redhat/extras/ksensors/ksensors_0.7.3-18.diff.gz b/redhat/extras/ksensors/ksensors_0.7.3-18.diff.gz
new file mode 100644
index 000000000..1ea0e2152
Binary files /dev/null and b/redhat/extras/ksensors/ksensors_0.7.3-18.diff.gz differ
diff --git a/redhat/extras/ksensors/ksensors_0.7.3_naming.diff b/redhat/extras/ksensors/ksensors_0.7.3_naming.diff
new file mode 100644
index 000000000..7e503d1b8
--- /dev/null
+++ b/redhat/extras/ksensors/ksensors_0.7.3_naming.diff
@@ -0,0 +1,61 @@
+--- ksensors-0.7.3.orig/src/lmsensor.cpp 2008-11-16 20:38:33.000000000 +0100
++++ ksensors-0.7.3/src/lmsensor.cpp 2008-11-16 20:27:16.000000000 +0100
+@@ -40,9 +40,12 @@ bool LMSensor::init(const sensors_featur
+ const sensors_chip_name *chip_name= getChipName();
+ const char* main_name = (*data)->name;
+ feature= (*data)->number;
+- char *label;
+- QString str;
++ char *label = NULL;
++ QString uniqueSensorName;
+
++ uniqueSensorName.sprintf("%s_%d_%d.%s", chip_name->prefix, chip_name->bus.nr, chip_name->addr, main_name);
++ setName(uniqueSensorName.latin1());
++
+ #if SENSORS_API_VERSION < 0x400 /* libsensor 3 code */
+ bool min_found=false;
+ bool max_found=false;
+@@ -98,12 +101,18 @@ bool LMSensor::init(const sensors_featur
+ min= -16;
+ }
+
+- str.sprintf("%s.%s", chip_name->prefix, main_name);
+- setName( str.latin1() );
+-
+ sensors_get_label(*chip_name,feature,&label);
+- setDescription(QString(label));
+-
++ if (label)
++ {
++ setDescription(QString(label));
++ delete label;
++ label = NULL;
++ }
++ else
++ {
++ setDescription(uniqueSensorName.latin1());
++ }
++
+ if(min_found)
+ min = valMin;
+
+@@ -189,14 +198,15 @@ bool LMSensor::init(const sensors_featur
+ return false;
+ }
+
+- str.sprintf("%s.%s", chip_name->prefix, main_name);
+- setName( str.latin1() );
+-
+ label = sensors_get_label(chip_name, feature_data);
+ if (label)
+- setDescription(QString(label));
++ {
++ setDescription(QString(label));
++ delete label;
++ label = NULL;
++ }
+ else
+- setDescription( str.latin1() );
++ setDescription( uniqueSensorName.latin1() );
+
+ #endif /* libsensors3 / libsensors4 code */
diff --git a/redhat/extras/ksensors/trinity-ksensors.spec b/redhat/extras/ksensors/trinity-ksensors.spec
index 7b0f5c20d..529d2623e 100644
--- a/redhat/extras/ksensors/trinity-ksensors.spec
+++ b/redhat/extras/ksensors/trinity-ksensors.spec
@@ -6,22 +6,29 @@
Name: trinity-ksensors
Version: 0.7.3
-Release: 19p1%{?dist}
+Release: 19p2%{?dist}
+
Summary: KDE frontend to lm_sensors
Group: Applications/System
License: GPLv2+
URL: http://ksensors.sourceforge.net/
+
Source0: http://downloads.sourceforge.net/ksensors/ksensors-%{version}.tar.gz
-Patch1: ksensors-desktop.patch
-Patch2: http://ftp.debian.org/debian/pool/main/k/ksensors/ksensors_0.7.3-15.diff.gz
-Patch3: ksensors-0.7.3-po.patch
-Patch4: ksensors-0.7.3-fix-min-max.patch
-Patch5: ksensors-0.7.3-lm_sensors-3.x.patch
+
+# Debian (upstream) patch
+Patch2: http://ftp.debian.org/debian/pool/main/k/ksensors/ksensors_0.7.3-18.diff.gz
+
+# Fix building on TDE
Patch6: ksensors-0.7.3-trinity.patch
+
+# Fix 'lmsensor.cpp' for older lm_sensors API (< 3.x)
+Patch7: ksensors-0.7.3-18-lmsensors_2x_fix.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: trinity-kdelibs-devel
BuildRequires: lm_sensors-devel gettext desktop-file-utils
Requires: hicolor-icon-theme
+
# Keep archs in sync with lm_sensors
ExcludeArch: s390 s390x
@@ -33,42 +40,39 @@ temperatures with KSensors.
%prep
%setup -q -n ksensors-%{version}
-%patch1 -p1 -z .desktop
%patch2 -p1
-%patch3 -p1 -z .po
-%patch4 -p1 -z .minmax
-%patch5 -p1 -z .lm_sensors3x
%patch6 -p1
-sed -i -e 's|$(kde_datadir)/sounds|$(kde_sounddir)|' src/sounds/Makefile.*
+%patch7 -p1
+%__sed -i -e 's|$(kde_datadir)/sounds|$(kde_sounddir)|' src/sounds/Makefile.*
for f in ChangeLog LIESMICH LISEZMOI ; do
iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
done
%build
-unset QTDIR ; . %{_sysconfdir}/profile.d/qt.sh
+unset QTDIR ; . /etc/profile.d/qt.sh
%configure \
--disable-dependency-tracking \
--disable-rpath \
--with-extra-includes=%{_includedir}/tqt
-make %{?_smp_mflags}
+%__make %{?_smp_mflags}
%install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+%__rm -rf $RPM_BUILD_ROOT
+%__make install DESTDIR=$RPM_BUILD_ROOT
desktop-file-install --vendor fedora --mode 644 --delete-original \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
$RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/ksensors.desktop
-install -dm 755 $RPM_BUILD_ROOT%{_datadir}/autostart
-ln -s ../applications/fedora-ksensors.desktop \
+%__install -dm 755 $RPM_BUILD_ROOT%{_datadir}/autostart
+%__ln_s ../applications/fedora-ksensors.desktop \
$RPM_BUILD_ROOT%{_datadir}/autostart
-rm -rf $RPM_BUILD_ROOT%{_docdir}/HTML
+%__rm -rf $RPM_BUILD_ROOT%{_docdir}/HTML
%find_lang ksensors
%clean
-rm -rf $RPM_BUILD_ROOT
+%__rm -rf $RPM_BUILD_ROOT
%post
@@ -100,6 +104,9 @@ done
%changelog
+* Thu Dec 22 2011 Francois Andriot - 0.7.3-19p2
+- Update Debian patch to -18 release
+
* Mon Nov 07 2011 Francois Andriot - 0.7.3-19p1
- Rebuilt for RHEL 6, RHEL 5, Fedora 15 with TDE 3.5.13
diff --git a/redhat/extras/trinity-live/fedora-live-tde-base.ks b/redhat/extras/trinity-live/fedora-live-tde-base.ks
index ed912dfff..827a0b2bf 100644
--- a/redhat/extras/trinity-live/fedora-live-tde-base.ks
+++ b/redhat/extras/trinity-live/fedora-live-tde-base.ks
@@ -51,7 +51,7 @@ if [ -e /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png ] ; then
cp /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png /usr/share/apps/kdm/faces/fedora.face.icon
fi
-# make liveuser use KDE
+# make liveuser use TDE
echo "/opt/trinity/bin/startkde" > /home/liveuser/.xsession
chmod a+x /home/liveuser/.xsession
chown liveuser:liveuser /home/liveuser/.xsession
@@ -95,19 +95,9 @@ sed -i 's/PRELINKING=yes/PRELINKING=no/' /etc/sysconfig/prelink
EOF
+### TDE LIVECD specific features ###
+
# Sets 'nm-applet' to run automatically
-mkdir -p /home/liveuser/.trinity/Autostart
-cat </home/liveuser/.trinity/Autostart/nm-applet
-#!/bin/sh
-
-# Waits until kicker is started, so that
-# nm-applet can dock correctly.
-while ! pidof kicker; do
- sleep 1
-done
-sleep 3
-/usr/bin/nm-applet
-EOF
-chmod +x /home/liveuser/.trinity/Autostart/nm-applet
+ln -sf /usr/share/applications/nm-applet.desktop /opt/trinity/share/autostart/nm-applet.desktop
%end
diff --git a/redhat/extras/trinity-live/fedora-livecd-tde.ks b/redhat/extras/trinity-live/fedora-livecd-tde.ks
index 88ab2f91a..efc379f6a 100644
--- a/redhat/extras/trinity-live/fedora-livecd-tde.ks
+++ b/redhat/extras/trinity-live/fedora-livecd-tde.ks
@@ -10,10 +10,6 @@
%include fedora-live-tde-base.ks
%include fedora-live-minimization.ks
-# 3rd party for VLC
-#repo --name=atrpms --baseurl=http://dl.atrpms.net/f$releasever-$basearch/atrpms/stable
-
-
%packages
# Additional packages that are not default in trinity-desktop but useful
trinity-desktop-extras
@@ -21,33 +17,36 @@ trinity-live-openbox
# Some TDE applications
trinity-amarok
-#trinity-digikam
+trinity-digikam
trinity-dolphin
+trinity-gtk-qt-engine
trinity-gwenview
trinity-k3b
trinity-kaffeine
+trinity-kasablanca
trinity-kbookreader
+trinity-kde-style-lipstik
+trinity-kgtk-qt3
+trinity-kio-umountwrapper
+trinity-kwin-style-crystal
#trinity-knetworkmanager
trinity-konversation
+trinity-kpowersave
trinity-ksensors
trinity-kstreamripper
+trinity-smb4k
trinity-yakuake
# Some TDE translations
trinity-kde-i18n-French
#trinity-kde-i18n-German
-trinity-kde-i18n-Spanish
+#trinity-kde-i18n-Spanish
trinity-kde-i18n-Chinese-Big5
-# 3rd party stuff
-#vlc
# Fedora stuff
fuse
liveusb-creator
-#wlassistant
-#wicd
-#wicd-gtk
### more desktop stuff
diff --git a/redhat/extras/trinity-live/trinity-live.spec b/redhat/extras/trinity-live/trinity-live.spec
index 95733ae80..89f09e7f9 100644
--- a/redhat/extras/trinity-live/trinity-live.spec
+++ b/redhat/extras/trinity-live/trinity-live.spec
@@ -2,7 +2,7 @@
%if "%{?version}" == ""
%define version 3.5.13
%endif
-%define release 1
+%define release 2
%define _datadir %{_usr}/share
@@ -67,8 +67,7 @@ EOF
%__install -m 644 %{SOURCE1} %{?buildroot}%{_datadir}/spin-kickstarts
# Openbox
-%__mkdir_p "%{?buildroot}/usr/local/bin"
-%__install -m 755 openbox "%{?buildroot}/usr/local/bin"
+%__install -D -m 755 openbox "%{?buildroot}/usr/local/bin/openbox"
%files
@@ -80,5 +79,10 @@ EOF
%changelog
+* Mon Dec 02 2011 Francois Andriot - 3.5.13-2
+- More TDE 3.5.13 specific visual settings
+- Updates all packages to fix TDE bugs
+- Add more applications
+
* Wed Nov 09 2011 Francois Andriot - 3.5.13-1
- Initial build
diff --git a/redhat/kde-i18n/kde-i18n-3.5.13-add_zh_TW_translations.patch b/redhat/kde-i18n/kde-i18n-3.5.13-add_zh_TW_translations.patch
new file mode 100644
index 000000000..11b9fe1ca
--- /dev/null
+++ b/redhat/kde-i18n/kde-i18n-3.5.13-add_zh_TW_translations.patch
@@ -0,0 +1,136888 @@
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/entry.desktop kde-i18n-zh_TW-3.5.10/messages/entry.desktop
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/entry.desktop 2008-08-19 20:43:27.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/entry.desktop 2011-11-11 15:45:03.000000000 +0100
+@@ -83,5 +83,5 @@
+ Name[wa]=Chinwès
+ Name[zh_CN]=繁体中文
+ Name[zh_HK]=繁體中文
+-Name[zh_TW]=繁體中文
++Name[zh_TW]=傳統字漢語
+ Name[zu]=Isi-Shayina
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaccessibility/kbstateapplet.po kde-i18n-zh_TW-3.5.10/messages/kdeaccessibility/kbstateapplet.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaccessibility/kbstateapplet.po 2006-07-22 10:04:31.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdeaccessibility/kbstateapplet.po 2011-11-11 15:45:17.000000000 +0100
+@@ -6,8 +6,7 @@
+ "Project-Id-Version: kbstateapplet\n"
+ "POT-Creation-Date: 2005-10-02 02:46+0200\n"
+ "PO-Revision-Date: 2006-06-06 10:17+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Traditional Chinese \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -128,15 +127,15 @@
+
+ #: kbstate.cpp:158
+ msgid "Configure AccessX Features..."
+-msgstr "設定 AccessX 功能..."
++msgstr "設定 AccessX 功能…"
+
+ #: kbstate.cpp:159
+ msgid "Configure Keyboard..."
+-msgstr "設定鍵盤..."
++msgstr "設定鍵盤…"
+
+ #: kbstate.cpp:160
+ msgid "Configure Mouse..."
+-msgstr "設定滑鼠..."
++msgstr "設定滑鼠…"
+
+ #: kbstate.cpp:572 kbstate.cpp:586 kbstate.cpp:590 kbstate.cpp:1030
+ msgid ""
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaccessibility/kmag.po kde-i18n-zh_TW-3.5.10/messages/kdeaccessibility/kmag.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaccessibility/kmag.po 2006-07-22 10:04:31.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdeaccessibility/kmag.po 2011-11-11 15:45:17.000000000 +0100
+@@ -6,8 +6,7 @@
+ "Project-Id-Version: kmag\n"
+ "POT-Creation-Date: 2006-05-28 04:04+0200\n"
+ "PO-Revision-Date: 2006-06-19 09:03+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Chinese Traditional \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -120,14 +119,15 @@
+
+ #: kmag.cpp:136
+ msgid ""
+-"Clicking on this icon will start / stop "
+-"updating of the display. Stopping the update will zero the processing power "
+-"required (CPU usage)"
+-msgstr "點選此圖示會開始/停止更新顯示。停止更新會讓 CPU 使用率歸零。"
++"Clicking on this icon will start / stop updating of the "
++"display. Stopping the update will zero the processing power required (CPU "
++"usage)"
++msgstr ""
++"點選此圖示會開始/停止更新顯示。停止更新會讓 CPU 使用率歸零。"
+
+ #: kmag.cpp:140
+ msgid "&Save Snapshot As..."
+-msgstr "儲存畫面快照為(&S)..."
++msgstr "儲存畫面快照為(&S)…"
+
+ #: kmag.cpp:142
+ msgid "Saves the zoomed view to an image file."
+@@ -147,8 +147,8 @@
+
+ #: kmag.cpp:153
+ msgid ""
+-"Click on this button to copy the current zoomed view to the clipboard which you "
+-"can paste in other applications."
++"Click on this button to copy the current zoomed view to the clipboard which "
++"you can paste in other applications."
+ msgstr "點選此鍵以複製目前的放大畫面到剪貼簿中,您可以貼到其它的應用程式中。"
+
+ #: kmag.cpp:154
+@@ -263,7 +263,8 @@
+
+ #: kmag.cpp:205
+ msgid ""
+-"In this mode the area around the mouse is magnified to the bottom screen edge."
++"In this mode the area around the mouse is magnified to the bottom screen "
++"edge."
+ msgstr "在這個模式下,滑鼠周邊的區域會放大到底端螢幕邊緣。"
+
+ #: kmag.cpp:207
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaccessibility/kmousetool.po kde-i18n-zh_TW-3.5.10/messages/kdeaccessibility/kmousetool.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaccessibility/kmousetool.po 2006-07-22 10:04:31.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdeaccessibility/kmousetool.po 2011-11-11 15:45:17.000000000 +0100
+@@ -9,7 +9,7 @@
+ "Project-Id-Version: kmousetool\n"
+ "POT-Creation-Date: 2005-02-17 01:26+0100\n"
+ "PO-Revision-Date: 2003-07-14 21:32+0800\n"
+-"Last-Translator: Keng-Tso Ou \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Chinese (traditional) \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -33,7 +33,9 @@
+ "There are unsaved changes in the active module.\n"
+ "Do you want to apply the changes before closing the configuration window or "
+ "discard the changes?"
+-msgstr "目前的模組有未儲存的變更。
您想要在關閉設定視窗前 套用這些變更或者捨棄這些變更?"
++msgstr ""
++"目前的模組有未儲存的變更。
您想要在關閉設定視窗前 套用這些變更或者捨棄這些"
++"變更?"
+
+ #: kmousetool.cpp:560
+ msgid "Closing Configuration Window"
+@@ -44,7 +46,9 @@
+ "There are unsaved changes in the active module.\n"
+ "Do you want to apply the changes before quitting KMousetool or discard the "
+ "changes?"
+-msgstr "目前的模組有未儲存的變更。
您想要在離開KMousetool前 套用這些變更或者捨棄這些變更?"
++msgstr ""
++"目前的模組有未儲存的變更。
您想要在離開KMousetool前 套用這些變更或者捨棄這"
++"些變更?"
+
+ #: kmousetool.cpp:579
+ msgid "Quitting KMousetool"
+@@ -52,7 +56,7 @@
+
+ #: kmousetool.cpp:616
+ msgid "&Configure KMouseTool..."
+-msgstr "設定 KMouseTool...(&C)"
++msgstr "設定 KMouseTool…(&C)"
+
+ #: kmousetool.cpp:619
+ msgid "KMousetool &Handbook"
+@@ -150,9 +154,11 @@
+ #: rc.cpp:39
+ #, no-c-format
+ msgid ""
+-"KMouseTool will run as a background application after you close this dialog. To "
+-"change the settings again, restart KMouseTool or use the KDE system tray."
+-msgstr "KMouseTool 在您關閉這個對話框後,將在背景中執行。要再改變設定,請重新啟動 KMouseTool 或者使用 KDE 系統工具列。"
++"KMouseTool will run as a background application after you close this dialog. "
++"To change the settings again, restart KMouseTool or use the KDE system tray."
++msgstr ""
++"KMouseTool 在您關閉這個對話框後,將在背景中執行。要再改變設定,請重新啟動 "
++"KMouseTool 或者使用 KDE 系統工具列。"
+
+ #~ msgid "Start"
+ #~ msgstr "開始"
+@@ -176,14 +182,39 @@
+ #~ msgid "Please enter a number between %1 and %2 for the dwell time."
+ #~ msgstr "請輸入介於 %1 和 %2 之間的數字為停留時間。"
+
+-#~ msgid "KMouseTool is written and maintained by Jeff Roush.
For more information, see the man page for kmousetool or the KDE documentation, both of which should have been installed with the program, or see www.mousetool.com.
This program is licensed under the GPL. In addition, by using this program, you agree not to hold the author of the program responsible for any damage it may cause.
"
+-#~ msgstr "KMouseTool撰寫者及維護者為Jeff Roush.
想獲取更多資訊,請參見kmousetool的man page 或者KDE文件,這兩者應該都已隨程式一同安裝,或者參閱 www.mousetool.com.
這個程式是 以GPL的形式授權。另外,使用這個程式表示您同意不追究作者任何因使用這個程式所導致損害的 責任。
"
++#~ msgid ""
++#~ "KMouseTool is written and maintained by Jeff Roush.
For more information, see "
++#~ "the man page for kmousetool or the KDE documentation, both of "
++#~ "which should have been installed with the program, or see www.mousetool.com.
This program "
++#~ "is licensed under the GPL. In addition, by using this program, you agree "
++#~ "not to hold the author of the program responsible for any damage it may "
++#~ "cause.
"
++#~ msgstr ""
++#~ "KMouseTool撰寫者及維護者為Jeff Roush.
想獲取更多資訊,請參見kmousetool的man "
++#~ "page 或者KDE文件,這兩者應該都已隨程式一同安裝,或者參閱 www.mousetool.com.
這個程式是 以GPL的形式"
++#~ "授權。另外,使用這個程式表示您同意不追究作者任何因使用這個程式所導致損害"
++#~ "的 責任。
"
+
+-#~ msgid "If you have any ideas on how to improve this program, post them to the KDE Accessibility Mailing List, or send them directly to me, at Jeff Roush. "
+-#~ msgstr "如果您有任何改善這個程式的想法,請將您的想法貼到KDE Accessibility Mailing List,或者直接將您的想法直接寄給作者Jeff Roush. "
++#~ msgid ""
++#~ "If you have any ideas on how to improve this program, post them to the "
++#~ "KDE Accessibility Mailing List, or send them directly to me, at Jeff Roush. "
++#~ msgstr ""
++#~ "如果您有任何改善這個程式的想法,請將您的想法貼到KDE Accessibility Mailing "
++#~ "List,或者直接將您的想法直接寄給作者Jeff Roush. "
+
+-#~ msgid "This program is distributed under the GPL, the GNU Public License.
A copy of this license should have been installed along with the program.
"
+-#~ msgstr "本程式是以GPL(GNU Public License)形式散佈。
這個授權書的副本應該已隨同程式安裝。
"
++#~ msgid ""
++#~ "This program is distributed under the GPL, the GNU Public License."
++#~ "p>
A copy of this license should have been installed along with the "
++#~ "program.
"
++#~ msgstr ""
++#~ "本程式是以GPL(GNU Public License)形式散布。
這個授權書的副本應該"
++#~ "已隨同程式安裝。
"
+
+ #~ msgid "KMouseTool Version %1"
+ #~ msgstr "KMouseTool 版本 %1"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaccessibility/kmouth.po kde-i18n-zh_TW-3.5.10/messages/kdeaccessibility/kmouth.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaccessibility/kmouth.po 2006-07-22 10:04:31.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdeaccessibility/kmouth.po 2011-11-11 15:45:17.000000000 +0100
+@@ -7,8 +7,7 @@
+ "Project-Id-Version: kmouth\n"
+ "POT-Creation-Date: 2005-07-24 01:41+0200\n"
+ "PO-Revision-Date: 2006-06-06 10:14+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Traditional Chinese \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -62,39 +61,39 @@
+
+ #: wordcompletion/wordlist.cpp:109 wordcompletion/wordlist.cpp:291
+ msgid "Parsing the KDE documentation..."
+-msgstr "分析 KDE 文件..."
++msgstr "分析 KDE 文件…"
+
+ #: wordcompletion/wordlist.cpp:238
+ msgid "Merging dictionaries..."
+-msgstr "合併字典..."
++msgstr "合併字典…"
+
+ #: wordcompletion/wordlist.cpp:305
+ msgid "Parsing file..."
+-msgstr "分析檔案..."
++msgstr "分析檔案…"
+
+ #: wordcompletion/wordlist.cpp:315
+ msgid "Parsing directory..."
+-msgstr "分析資料夾..."
++msgstr "分析資料夾…"
+
+ #: wordcompletion/wordlist.cpp:504
+ msgid "Performing spell check..."
+-msgstr "進行拼字檢查..."
++msgstr "進行拼字檢查…"
+
+ #. i18n: file wordcompletion/kdedocsourceui.ui line 68
+ #: rc.cpp:292 wordcompletion/kdedocsourceui.ui.h:14
+ #, no-c-format
+ msgid ""
+ "With this combo box you select which of the installed languages is used for "
+-"creating the new dictionary. KMouth will only parse documentation files of this "
+-"language."
++"creating the new dictionary. KMouth will only parse documentation files of "
++"this language."
+ msgstr "您可以在此選擇要建立新字典的語言。KMouth 將只分析此語言的文件檔。"
+
+ #. i18n: file wordcompletion/creationsourcedetailsui.ui line 144
+ #: rc.cpp:241 wordcompletion/creationsourcedetailsui.ui.h:15
+ #, no-c-format
+ msgid ""
+-"With this combo box you decide which language should be associated with the new "
+-"dictionary."
++"With this combo box you decide which language should be associated with the "
++"new dictionary."
+ msgstr "您可以在此決定新字典使用的語言。"
+
+ #: wordcompletion/creationsourcedetailsui.ui.h:18
+@@ -134,8 +133,8 @@
+ #: wordcompletion/dictionarycreationwizard.cpp:64
+ #: wordcompletion/dictionarycreationwizard.cpp:66
+ msgid ""
+-"With this input field you specify which directory you want to load for creating "
+-"the new dictionary."
++"With this input field you specify which directory you want to load for "
++"creating the new dictionary."
+ msgstr "您可以在此指定您要載入哪個字典以建立新字典。"
+
+ #: wordcompletion/dictionarycreationwizard.cpp:238
+@@ -186,7 +185,7 @@
+
+ #: kmouth.cpp:98
+ msgid "&Open as History..."
+-msgstr "開啟為歷史紀錄(&O)..."
++msgstr "開啟為歷史紀錄(&O)…"
+
+ #: kmouth.cpp:99 kmouth.cpp:100
+ msgid "Opens an existing file as history"
+@@ -194,15 +193,15 @@
+
+ #: kmouth.cpp:102
+ msgid "Save &History As..."
+-msgstr "另存歷史紀錄為(&H)..."
++msgstr "另存歷史紀錄為(&H)…"
+
+ #: kmouth.cpp:103 kmouth.cpp:104
+ msgid "Saves the actual history as..."
+-msgstr "另存目前的歷史紀錄為..."
++msgstr "另存目前的歷史紀錄為…"
+
+ #: kmouth.cpp:106
+ msgid "&Print History..."
+-msgstr "列印歷史紀錄(&P)..."
++msgstr "列印歷史紀錄(&P)…"
+
+ #: kmouth.cpp:107 kmouth.cpp:108
+ msgid "Prints out the actual history"
+@@ -218,10 +217,12 @@
+
+ #: kmouth.cpp:117
+ msgid ""
+-"Cuts the selected section and puts it to the clipboard. If there is some text "
+-"selected in the edit field it is placed it on the clipboard. Otherwise the "
+-"selected sentences in the history (if any) are placed on the clipboard."
+-msgstr "剪下選取至剪貼簿。如果編輯區有本文被選取,它將被剪貼到剪貼簿。否則在歷史紀錄中被選取的句子(如果有的話)將被剪貼到剪貼簿。"
++"Cuts the selected section and puts it to the clipboard. If there is some "
++"text selected in the edit field it is placed it on the clipboard. Otherwise "
++"the selected sentences in the history (if any) are placed on the clipboard."
++msgstr ""
++"剪下選取至剪貼簿。如果編輯區有本文被選取,它將被剪貼到剪貼簿。否則在歷史紀錄"
++"中被選取的句子(如果有的話)將被剪貼到剪貼簿。"
+
+ #: kmouth.cpp:120
+ msgid "Copies the selected section to the clipboard"
+@@ -229,10 +230,12 @@
+
+ #: kmouth.cpp:121
+ msgid ""
+-"Copies the selected section to the clipboard. If there is some text selected in "
+-"the edit field it is copied to the clipboard. Otherwise the selected sentences "
+-"in the history (if any) are copied to the clipboard."
+-msgstr "複製選取至剪貼簿。如果編輯區有本文被選取,它將被複製到剪貼簿。否則在歷史紀錄中被選取的句子(如果有的話)將被複製到剪貼簿。"
++"Copies the selected section to the clipboard. If there is some text selected "
++"in the edit field it is copied to the clipboard. Otherwise the selected "
++"sentences in the history (if any) are copied to the clipboard."
++msgstr ""
++"複製選取至剪貼簿。如果編輯區有本文被選取,它將被複製到剪貼簿。否則在歷史紀錄"
++"中被選取的句子(如果有的話)將被複製到剪貼簿。"
+
+ #: kmouth.cpp:124 phrasebook/phrasebookdialog.cpp:371
+ #: phrasebook/phrasebookdialog.cpp:372
+@@ -258,11 +261,13 @@
+ "Speaks the currently active sentence(s). If there is some text in the edit "
+ "field it is spoken. Otherwise the selected sentences in the history (if any) "
+ "are spoken."
+-msgstr "朗讀目前動態中的句子。如果編輯區內有文字,它將會被朗讀。否則歷史紀錄中的句子(如果有的話)將會被朗讀。"
++msgstr ""
++"朗讀目前動態中的句子。如果編輯區內有文字,它將會被朗讀。否則歷史紀錄中的句子"
++"(如果有的話)將會被朗讀。"
+
+ #: kmouth.cpp:132
+ msgid "&Edit..."
+-msgstr "編輯(&E)..."
++msgstr "編輯(&E)…"
+
+ #: kmouth.cpp:137 kmouth.cpp:138
+ msgid "Enables/disables the toolbar"
+@@ -282,7 +287,7 @@
+
+ #: kmouth.cpp:148
+ msgid "&Configure KMouth..."
+-msgstr "設定 Kmouth(&C)..."
++msgstr "設定 Kmouth(&C)…"
+
+ #: kmouth.cpp:149 kmouth.cpp:150
+ msgid "Opens the configuration dialog"
+@@ -333,35 +338,35 @@
+
+ #: kmouth.cpp:207 kmouth.cpp:309
+ msgid "Opening file..."
+-msgstr "正在開啟檔案..."
++msgstr "正在開啟檔案…"
+
+ #: kmouth.cpp:317
+ msgid "Saving history with a new filename..."
+-msgstr "以新檔名儲存歷史紀錄..."
++msgstr "以新檔名儲存歷史紀錄…"
+
+ #: kmouth.cpp:326
+ msgid "Printing..."
+-msgstr "正在列印..."
++msgstr "正在列印…"
+
+ #: kmouth.cpp:339
+ msgid "Exiting..."
+-msgstr "正在退出..."
++msgstr "正在退出…"
+
+ #: kmouth.cpp:373
+ msgid "Toggling menubar..."
+-msgstr "切換選單列..."
++msgstr "切換選單列…"
+
+ #: kmouth.cpp:385
+ msgid "Toggling toolbar..."
+-msgstr "切換工具列..."
++msgstr "切換工具列…"
+
+ #: kmouth.cpp:402
+ msgid "Toggling phrasebook bar..."
+-msgstr "切換片語書列..."
++msgstr "切換片語書列…"
+
+ #: kmouth.cpp:419
+ msgid "Toggle the statusbar..."
+-msgstr "切換狀態列..."
++msgstr "切換狀態列…"
+
+ #: _translatorinfo.cpp:1
+ msgid ""
+@@ -415,7 +420,8 @@
+ msgid ""
+ "This combo box specifies whether selected phrases of the phrase book are "
+ "immediately spoken or just inserted into the edit field."
+-msgstr "這個下拉式清單方塊指定片語書中所選取的片語是要立即朗讀或者是插入到編輯區。"
++msgstr ""
++"這個下拉式清單方塊指定片語書中所選取的片語是要立即朗讀或者是插入到編輯區。"
+
+ #. i18n: file preferencesui.ui line 75
+ #: rc.cpp:24 rc.cpp:113
+@@ -500,7 +506,8 @@
+ #: rc.cpp:74 rc.cpp:77 rc.cpp:163 rc.cpp:166
+ #, no-c-format
+ msgid ""
+-"This combo box specifies which character encoding is used for passing the text."
++"This combo box specifies which character encoding is used for passing the "
++"text."
+ msgstr "這個下拉式清單方塊指定傳遞本文時用的字元編碼。"
+
+ #. i18n: file texttospeechconfigurationui.ui line 141
+@@ -527,13 +534,13 @@
+ #: rc.cpp:89 rc.cpp:178
+ #, no-c-format
+ msgid ""
+-"This check box specifies KMouth tries to use the KTTSD speech service prior to "
+-"calling the speech synthesizer directly. The KTTSD speech service is a KDE "
+-"daemon which gives KDE applications a standardized interface for speech "
++"This check box specifies KMouth tries to use the KTTSD speech service prior "
++"to calling the speech synthesizer directly. The KTTSD speech service is a "
++"KDE daemon which gives KDE applications a standardized interface for speech "
+ "synthesis and is currently developed in CVS."
+ msgstr ""
+-"勾選此選項的話,KMouth 會試著先使用 KTTSD 語音服務,而不是直接呼叫語音合成器。KTTSD 語音服務提供 KDE "
+-"應用程式一個標準化的語音合成介面,並且正在開發中。"
++"勾選此選項的話,KMouth 會試著先使用 KTTSD 語音服務,而不是直接呼叫語音合成"
++"器。KTTSD 語音服務提供 KDE 應用程式一個標準化的語音合成介面,並且正在開發中。"
+
+ #. i18n: file phrasebook/buttonboxui.ui line 16
+ #: rc.cpp:181
+@@ -551,8 +558,8 @@
+ #: rc.cpp:187 rc.cpp:208
+ #, no-c-format
+ msgid ""
+-"With this line edit you define the name of a sub-phrasebook or the contents of "
+-"a phrase."
++"With this line edit you define the name of a sub-phrasebook or the contents "
++"of a phrase."
+ msgstr "您可以在此定義片語書的名稱,或是片語的內容。"
+
+ #. i18n: file phrasebook/buttonboxui.ui line 63
+@@ -565,8 +572,8 @@
+ #: rc.cpp:193
+ #, no-c-format
+ msgid ""
+-"If you select this option then the selected phrase will not be reachable by a "
+-"keyboard shortcut."
++"If you select this option then the selected phrase will not be reachable by "
++"a keyboard shortcut."
+ msgstr "如果選擇此選項,所選取的片語就不能使用鍵盤快速鍵。"
+
+ #. i18n: file phrasebook/buttonboxui.ui line 74
+@@ -582,7 +589,9 @@
+ "If you select this option then the selected phrase will be reachable by a "
+ "keyboard shortcut. You can change the shortcut with the button next to this "
+ "option."
+-msgstr "如果選取此選項,所選取的片語可以使用鍵盤快速鍵。您可以用按鍵來改變快速鍵定義。"
++msgstr ""
++"如果選取此選項,所選取的片語可以使用鍵盤快速鍵。您可以用按鍵來改變快速鍵定"
++"義。"
+
+ #. i18n: file phrasebook/buttonboxui.ui line 85
+ #: rc.cpp:202
+@@ -615,8 +624,8 @@
+ #: rc.cpp:220 rc.cpp:232
+ #, no-c-format
+ msgid ""
+-"With this combo box you select the character encoding used to load text files. "
+-"This combo box is not used for XML files or for dictionary files."
++"With this combo box you select the character encoding used to load text "
++"files. This combo box is not used for XML files or for dictionary files."
+ msgstr "您可以在此選擇要載入文字檔的字元編碼。這不是用於 XML 檔或字典檔。"
+
+ #. i18n: file wordcompletion/creationsourcedetailsui.ui line 68
+@@ -629,16 +638,16 @@
+ #: rc.cpp:226 rc.cpp:229
+ #, no-c-format
+ msgid ""
+-"With this input field you specify which file you want to load for creating the "
+-"new dictionary."
++"With this input field you specify which file you want to load for creating "
++"the new dictionary."
+ msgstr "您可以在此指定您要載入以建立新字典的檔案。"
+
+ #. i18n: file wordcompletion/creationsourcedetailsui.ui line 125
+ #: rc.cpp:235 rc.cpp:286
+ #, no-c-format
+ msgid ""
+-"With this input field you select the OpenOffice.org directory that will be used "
+-"to spellcheck the words of the new dictionary."
++"With this input field you select the OpenOffice.org directory that will be "
++"used to spellcheck the words of the new dictionary."
+ msgstr "您可以在此選擇要用於拼字檢查的 OpenOffice.org 字典。"
+
+ #. i18n: file wordcompletion/creationsourcedetailsui.ui line 141
+@@ -659,7 +668,8 @@
+ msgid ""
+ "If you select this box a new dictionary is created by either loading a "
+ "dictionary file or by counting the individual words in a text."
+-msgstr "如果選取此選項,會以載入一個字典檔或計算本文中個別單字的方式建立新字典。"
++msgstr ""
++"如果選取此選項,會以載入一個字典檔或計算本文中個別單字的方式建立新字典。"
+
+ #. i18n: file wordcompletion/creationsourceui.ui line 38
+ #: rc.cpp:250
+@@ -685,14 +695,15 @@
+ #: rc.cpp:259
+ #, no-c-format
+ msgid ""
+-"If you select this box a new dictionary is created by loading a file. You may "
+-"either select an XML file, a standard text file or a file containing a word "
+-"completion dictionary. If you select a standard text file or an XML file the "
+-"frequentness of the individual words is detected by simply counting the "
+-"occurrences of each word."
++"If you select this box a new dictionary is created by loading a file. You "
++"may either select an XML file, a standard text file or a file containing a "
++"word completion dictionary. If you select a standard text file or an XML "
++"file the frequentness of the individual words is detected by simply counting "
++"the occurrences of each word."
+ msgstr ""
+-"選取此選項的話,會以載入檔案的方式建立新字典。您可以指定一個 XML 檔,一個標準的文字檔,或是一個含有文字補完字典的檔案。如果選取標準文字檔或 XML "
+-"檔,會以計算單字出現的次數來偵測單字頻率。"
++"選取此選項的話,會以載入檔案的方式建立新字典。您可以指定一個 XML 檔,一個標準"
++"的文字檔,或是一個含有文字補完字典的檔案。如果選取標準文字檔或 XML 檔,會以計"
++"算單字出現的次數來偵測單字頻率。"
+
+ #. i18n: file wordcompletion/creationsourceui.ui line 82
+ #: rc.cpp:262
+@@ -707,7 +718,9 @@
+ "If you select this box a new dictionary is created by parsing the KDE "
+ "documentation. The frequentness of the individual words is detect by simply "
+ "counting the occurrences of each word."
+-msgstr "選取此選項的話,會以分析 KDE 文件的方式建立新字典,並會以計算單字出現的次數來偵測單字頻率。"
++msgstr ""
++"選取此選項的話,會以分析 KDE 文件的方式建立新字典,並會以計算單字出現的次數來"
++"偵測單字頻率。"
+
+ #. i18n: file wordcompletion/creationsourceui.ui line 107
+ #: rc.cpp:268
+@@ -721,7 +734,8 @@
+ msgid ""
+ "If you select this box a new dictionary is created by loading all files in a "
+ "folder and its subdirectories."
+-msgstr "選取此選項的話,會以載入資料夾及其子資料夾中所有檔案的方式來建立新字典。"
++msgstr ""
++"選取此選項的話,會以載入資料夾及其子資料夾中所有檔案的方式來建立新字典。"
+
+ #. i18n: file wordcompletion/creationsourceui.ui line 135
+ #: rc.cpp:274
+@@ -734,23 +748,25 @@
+ #, no-c-format
+ msgid ""
+ "If you select this box a blank dictionary without any entries is created. As "
+-"KMouth automatically adds newly typed words to the dictionaries it will learn "
+-"your vocabulary with the time."
+-msgstr "選取此選項的話,會建立一個空的字典,不含任何項目。KMouth 可以將您新輸入的單字加入字典中。"
++"KMouth automatically adds newly typed words to the dictionaries it will "
++"learn your vocabulary with the time."
++msgstr ""
++"選取此選項的話,會建立一個空的字典,不含任何項目。KMouth 可以將您新輸入的單字"
++"加入字典中。"
+
+ #. i18n: file wordcompletion/kdedocsourceui.ui line 30
+ #: rc.cpp:283
+ #, no-c-format
+ msgid ""
+-"If you select this check box the words from the KDE documentation are "
+-"spell-checked before they are inserted into the new dictionary."
++"If you select this check box the words from the KDE documentation are spell-"
++"checked before they are inserted into the new dictionary."
+ msgstr "勾選此選項的話,KDE 文件中的單字在插入新字典之前會先做拼字檢查。"
+
+ #. i18n: file wordcompletion/wordcompletionui.ui line 40
+ #: rc.cpp:295
+ #, no-c-format
+ msgid "Add D&ictionary..."
+-msgstr "新增字典(&I)..."
++msgstr "新增字典(&I)…"
+
+ #. i18n: file wordcompletion/wordcompletionui.ui line 43
+ #: rc.cpp:298
+@@ -800,7 +816,7 @@
+ #: rc.cpp:319
+ #, no-c-format
+ msgid "&Export Dictionary..."
+-msgstr "輸出字典(&E)..."
++msgstr "輸出字典(&E)…"
+
+ #. i18n: file wordcompletion/wordcompletionui.ui line 131
+ #: rc.cpp:322
+@@ -824,11 +840,14 @@
+ #: rc.cpp:331
+ #, no-c-format
+ msgid ""
+-"This list contains all available dictionaries for the word completion. KMouth "
+-"will display a combo box next to the edit field in the main window if this list "
+-"contains more than one dictionary. You can use this combo box in order to "
+-"select the dictionary that actually gets used for the word completion."
+-msgstr "這個清單包含所有可用於單字補完的字典。如果有兩個以上的字典可選擇,KMouth 會在主視窗中顯示選單。您可以在此選擇要用於單字補完的字典。"
++"This list contains all available dictionaries for the word completion. "
++"KMouth will display a combo box next to the edit field in the main window if "
++"this list contains more than one dictionary. You can use this combo box in "
++"order to select the dictionary that actually gets used for the word "
++"completion."
++msgstr ""
++"這個清單包含所有可用於單字補完的字典。如果有兩個以上的字典可選擇,KMouth 會在"
++"主視窗中顯示選單。您可以在此選擇要用於單字補完的字典。"
+
+ #. i18n: file wordcompletion/wordcompletionui.ui line 210
+ #: rc.cpp:334
+@@ -862,8 +881,8 @@
+
+ #: phrasebook/phrasebookdialog.cpp:242
+ msgid ""
+-"By clicking on this button you can select the keyboard shortcut associated with "
+-"the selected phrase."
++"By clicking on this button you can select the keyboard shortcut associated "
++"with the selected phrase."
+ msgstr "按下此按鍵,您可以選擇所選的片語使用的快速鍵。"
+
+ #: phrasebook/phrasebookdialog.cpp:263
+@@ -880,9 +899,10 @@
+
+ #: phrasebook/phrasebookdialog.cpp:305
+ msgid ""
+-"This list contains the current phrase book in a tree structure. You can select "
+-"and modify individual phrases and sub phrase books"
+-msgstr "這個清單包含目前的片語書,以樹狀圖顯示。您可以選擇並變更每個片語與片語書。"
++"This list contains the current phrase book in a tree structure. You can "
++"select and modify individual phrases and sub phrase books"
++msgstr ""
++"這個清單包含目前的片語書,以樹狀圖顯示。您可以選擇並變更每個片語與片語書。"
+
+ #: phrasebook/phrasebookdialog.cpp:325
+ msgid "&New Phrase"
+@@ -906,7 +926,7 @@
+
+ #: phrasebook/phrasebookdialog.cpp:337 phrasebook/phrasebookdialog.cpp:341
+ msgid "&Import..."
+-msgstr "匯入(&I)..."
++msgstr "匯入(&I)…"
+
+ #: phrasebook/phrasebookdialog.cpp:338 phrasebook/phrasebookdialog.cpp:339
+ #: phrasebook/phrasebookdialog.cpp:342 phrasebook/phrasebookdialog.cpp:343
+@@ -923,7 +943,7 @@
+
+ #: phrasebook/phrasebookdialog.cpp:349
+ msgid "&Export..."
+-msgstr "輸出(&E)..."
++msgstr "輸出(&E)…"
+
+ #: phrasebook/phrasebookdialog.cpp:350 phrasebook/phrasebookdialog.cpp:351
+ msgid "Exports the currently selected phrase(s) or phrase book(s) into a file"
+@@ -958,10 +978,10 @@
+
+ #: phrasebook/phrasebookdialog.cpp:545
+ msgid ""
+-"There are unsaved changes."
+-"
Do you want to apply the changes before closing the \"phrase book\" window "
+-"or discard the changes?"
+-msgstr "有變更尚未儲存。
關閉片語書視窗之前,您要套用變更還是要放棄變更?"
++"There are unsaved changes.
Do you want to apply the changes before "
++"closing the \"phrase book\" window or discard the changes?"
++msgstr ""
++"有變更尚未儲存。
關閉片語書視窗之前,您要套用變更還是要放棄變更?"
+
+ #: phrasebook/phrasebookdialog.cpp:546
+ msgid "Closing \"Phrase Book\" Window"
+@@ -969,9 +989,10 @@
+
+ #: phrasebook/phrasebookdialog.cpp:598
+ msgid ""
+-"In order to use the '%1' key as a shortcut, it must be combined with the Win, "
+-"Alt, Ctrl, and/or Shift keys."
+-msgstr "要使用'%1'鍵作為快速鍵,必須和Win, Alt, Ctrl, 及/或 Shift 等鍵合併使用。"
++"In order to use the '%1' key as a shortcut, it must be combined with the "
++"Win, Alt, Ctrl, and/or Shift keys."
++msgstr ""
++"要使用'%1'鍵作為快速鍵,必須和Win, Alt, Ctrl, 及/或 Shift 等鍵合併使用。"
+
+ #: phrasebook/phrasebookdialog.cpp:601
+ msgid "Invalid Shortcut Key"
+@@ -1033,10 +1054,11 @@
+
+ #: phrasebook/phrasebook.cpp:289
+ msgid ""
+-"Your chosen filename %1 has a different extension than .phrasebook"
+-". Do you wish to add .phrasebook to the filename?"
++"Your chosen filename %1 has a different extension than ."
++"phrasebook. Do you wish to add .phrasebook to the filename?"
+ msgstr ""
+-"您選擇的檔案名稱 %1 延伸檔名與 .phrasebook不同。是否把 .phrasebook 加到檔案名稱?"
++"您選擇的檔案名稱 %1 延伸檔名與 .phrasebook不同。是否把 ."
++"phrasebook 加到檔案名稱?"
+
+ #: phrasebook/phrasebook.cpp:290 phrasebook/phrasebook.cpp:306
+ msgid "File Extension"
+@@ -1048,9 +1070,11 @@
+
+ #: phrasebook/phrasebook.cpp:305
+ msgid ""
+-"Your chosen filename %1 has the extension .phrasebook"
+-". Do you wish to save in phrasebook format?"
+-msgstr "您選擇的檔案名稱 %1 有 .phrasebook 延伸檔名。您是否要以片語書格式儲存?"
++"Your chosen filename %1 has the extension .phrasebook. Do you "
++"wish to save in phrasebook format?"
++msgstr ""
++"您選擇的檔案名稱 %1 有 .phrasebook 延伸檔名。您是否要以片語書格"
++"式儲存?"
+
+ #: phrasebook/phrasebook.cpp:306
+ msgid "As Phrasebook"
+@@ -1108,12 +1132,13 @@
+ msgid ""
+ "This list contains the history of spoken sentences. You can select sentences "
+ "and press the speak button for re-speaking."
+-msgstr "這個列表包含已朗讀句子的歷史紀錄。您可以選擇句子並按下朗讀按鈕來再次朗讀。"
++msgstr ""
++"這個列表包含已朗讀句子的歷史紀錄。您可以選擇句子並按下朗讀按鈕來再次朗讀。"
+
+ #: phraselist.cpp:74
+ msgid ""
+-"Into this edit field you can type a phrase. Click on the speak button in order "
+-"to speak the entered phrase."
++"Into this edit field you can type a phrase. Click on the speak button in "
++"order to speak the entered phrase."
+ msgstr "您可以進入編輯區打入片語。按下朗讀按鈕以朗讀輸入的片語。"
+
+ #: phraselist.cpp:454
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaccessibility/ksayit.po kde-i18n-zh_TW-3.5.10/messages/kdeaccessibility/ksayit.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaccessibility/ksayit.po 2008-08-19 20:43:18.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdeaccessibility/ksayit.po 2011-11-11 15:45:17.000000000 +0100
+@@ -6,8 +6,7 @@
+ "Project-Id-Version: ksayit\n"
+ "POT-Creation-Date: 2008-07-08 01:24+0200\n"
+ "PO-Revision-Date: 2006-06-06 10:28+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Traditional Chinese \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -32,11 +31,11 @@
+
+ #: contextmenuhandler.cpp:159
+ msgid "Rename..."
+-msgstr "重新命名..."
++msgstr "重新命名…"
+
+ #: contextmenuhandler.cpp:163
+ msgid "Delete..."
+-msgstr "刪除..."
++msgstr "刪除…"
+
+ #: contextmenuhandler.cpp:167 docbookclasses.cpp:133 docbookclasses.cpp:135
+ #: docbookparser.cpp:91 doctreeviewimpl.cpp:799
+@@ -243,7 +242,7 @@
+
+ #: ksayit.cpp:401
+ msgid "Say XML file..."
+-msgstr "朗讀 XML 檔..."
++msgstr "朗讀 XML 檔…"
+
+ #: ksayit.cpp:435 ksayit.cpp:672
+ msgid "Edit Mode ON."
+@@ -255,7 +254,7 @@
+
+ #: ksayit.cpp:470
+ msgid "Open file..."
+-msgstr "開啟檔案..."
++msgstr "開啟檔案…"
+
+ #: ksayit.cpp:476
+ msgid "File to Speak"
+@@ -263,15 +262,15 @@
+
+ #: ksayit.cpp:502
+ msgid "Save file..."
+-msgstr "儲存檔案..."
++msgstr "儲存檔案…"
+
+ #: ksayit.cpp:519
+ msgid "Save file as..."
+-msgstr "另存新檔..."
++msgstr "另存新檔…"
+
+ #: ksayit.cpp:551
+ msgid "Exiting..."
+-msgstr "離開中..."
++msgstr "離開中…"
+
+ #: ksayit.cpp:552
+ msgid "Do you really want to quit?"
+@@ -279,7 +278,7 @@
+
+ #: ksayit.cpp:570
+ msgid "Toggle the statusbar..."
+-msgstr "切換狀態列..."
++msgstr "切換狀態列…"
+
+ #: ksayit.cpp:598
+ msgid "Setup"
+@@ -287,11 +286,11 @@
+
+ #: ksayit.cpp:686
+ msgid "speaking Clipboard..."
+-msgstr "朗讀剪貼簿內容..."
++msgstr "朗讀剪貼簿內容…"
+
+ #: ksayit.cpp:704
+ msgid "synthesizing..."
+-msgstr "合成中..."
++msgstr "合成中…"
+
+ #: ksayit.cpp:744
+ msgid "Unable to speak text"
+@@ -299,13 +298,11 @@
+
+ #: ksayit.cpp:792
+ msgid "Paused..."
+-msgstr "暫停..."
++msgstr "暫停…"
+
+ #: ksayitbookmarkhandler.cpp:59
+-msgid ""
+-"This is not a KSayIt bookmark.\n"
+-msgstr ""
+-"這不是 KSayIt 書籤。\n"
++msgid "This is not a KSayIt bookmark.\n"
++msgstr "這不是 KSayIt 書籤。\n"
+
+ #: ksayitbookmarkhandler.cpp:77
+ msgid "Bookmark not found"
+@@ -372,24 +369,20 @@
+ msgstr "全部移除"
+
+ #: saxhandler.cpp:129
+-msgid ""
+-"Fatal error while parsing XML-Paragraph:\n"
+-msgstr ""
+-"分析 XML 段落時發生嚴重錯誤:\n"
++msgid "Fatal error while parsing XML-Paragraph:\n"
++msgstr "分析 XML 段落時發生嚴重錯誤:\n"
+
+ #: saxhandler.cpp:130
+ msgid "%1, Line: %2"
+-msgstr "%1,第 %2 行"
++msgstr "%1,第 %2 列"
+
+ #: saxhandler.cpp:131
+ msgid "Fatal error"
+ msgstr "嚴重錯誤"
+
+ #: saxhandler.cpp:163
+-msgid ""
+-"Unresolved entity found: %1.\n"
+-msgstr ""
+-"找到無法反解的實體:%1\n"
++msgid "Unresolved entity found: %1.\n"
++msgstr "找到無法反解的實體:%1\n"
+
+ #: saxhandler.cpp:164
+ msgid "KSayIt does not support DocBook files with external entities. "
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaccessibility/kttsd.po kde-i18n-zh_TW-3.5.10/messages/kdeaccessibility/kttsd.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaccessibility/kttsd.po 2008-08-19 20:43:18.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdeaccessibility/kttsd.po 2011-11-11 15:45:17.000000000 +0100
+@@ -6,8 +6,7 @@
+ "Project-Id-Version: kttsd\n"
+ "POT-Creation-Date: 2008-07-08 01:24+0200\n"
+ "PO-Revision-Date: 2006-11-04 13:58+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Chinese Traditional \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -30,10 +29,12 @@
+ #: rc.cpp:15 rc.cpp:33
+ #, no-c-format
+ msgid ""
+-"Select the language to be spoken. Note that after you configure a Talker, your "
+-"chosen Language may be overridden by the synthesizer, depending upon the "
+-"options you choose."
+-msgstr "選擇要發音的語言。注意,在您設定發音員之後,您所選擇的語言可能依據選項而被合成器蓋過。"
++"Select the language to be spoken. Note that after you configure a Talker, "
++"your chosen Language may be overridden by the synthesizer, depending upon "
++"the options you choose."
++msgstr ""
++"選擇要發音的語言。注意,在您設定發音員之後,您所選擇的語言可能依據選項而被合"
++"成器蓋過。"
+
+ #. i18n: file kcmkttsmgr/addtalkerwidget.ui line 95
+ #: rc.cpp:18 rc.cpp:423
+@@ -51,10 +52,13 @@
+ #: rc.cpp:27
+ #, no-c-format
+ msgid ""
+-"The radio buttons below determine which box shows all possibilities. The box "
+-"to the left of the checked button shows all possibilities. The box to the left "
+-"of the unchecked box only shows those possibilities that match the other box."
+-msgstr "底下的圓鈕決定哪個盒子裡顯示所有的可用的選項。勾選的選項左方會顯示所有的選項。而另一邊則只會顯示符合所選取設定的選項。"
++"The radio buttons below determine which box shows all possibilities. The "
++"box to the left of the checked button shows all possibilities. The box to "
++"the left of the unchecked box only shows those possibilities that match the "
++"other box."
++msgstr ""
++"底下的圓鈕決定哪個盒子裡顯示所有的可用的選項。勾選的選項左方會顯示所有的選"
++"項。而另一邊則只會顯示符合所選取設定的選項。"
+
+ #. i18n: file kcmkttsmgr/addtalkerwidget.ui line 200
+ #: rc.cpp:30 rc.cpp:435
+@@ -66,19 +70,23 @@
+ #: rc.cpp:36
+ #, no-c-format
+ msgid ""
+-"Check to list all the possible languages in the Language box at the left. When "
+-"a language has been chosen, the Synthesizer box will show only those "
++"Check to list all the possible languages in the Language box at the left. "
++"When a language has been chosen, the Synthesizer box will show only those "
+ "synthesizers that can speak in the chosen language."
+-msgstr "勾選後在左方語言盒中會列出所有可用的語言。選取語言之後,合成器盒中則會顯示該語言可使用的合成器。"
++msgstr ""
++"勾選後在左方語言盒中會列出所有可用的語言。選取語言之後,合成器盒中則會顯示該"
++"語言可使用的合成器。"
+
+ #. i18n: file kcmkttsmgr/addtalkerwidget.ui line 241
+ #: rc.cpp:39
+ #, no-c-format
+ msgid ""
+-"Check this box to display all the available synthesizers in the Synthesizer box "
+-"to the left. When a synthesizer is chosen, only the languages that can be "
+-"spoken by that synthesizer appear in the Language box."
+-msgstr "勾選後在左方合成器盒中會列出所有可用的合成器。選取合成器之後,語言盒中則會顯示該合成器可發音的語言。"
++"Check this box to display all the available synthesizers in the Synthesizer "
++"box to the left. When a synthesizer is chosen, only the languages that can "
++"be spoken by that synthesizer appear in the Language box."
++msgstr ""
++"勾選後在左方合成器盒中會列出所有可用的合成器。選取合成器之後,語言盒中則會顯"
++"示該合成器可發音的語言。"
+
+ #. i18n: file kcmkttsmgr/kcmkttsmgrwidget.ui line 45
+ #: rc.cpp:42
+@@ -108,13 +116,14 @@
+ #: rc.cpp:54
+ #, no-c-format
+ msgid ""
+-"When checked, KTTSMgr displays an icon in the system tray, and clicking OK or "
+-"Cancel buttons does not stop KTTSMgr. Use system tray context menu to quit "
+-"KTTSMgr. This setting takes effect when KTTSMgr is next started. This setting "
+-"has no effect when running in the KDE Control Center."
+-msgstr ""
+-"勾選此選項的話,KTTSMgr 會顯示在系統匣中,按下「確定」或「取消」不會停止 KTTSMgr,要點選系統匣圖示的選單才能離開 "
+-"KTTSMgr。這個設定在下次啟動時生效,在 KDE 控制中心中執行時則不會有作用。"
++"When checked, KTTSMgr displays an icon in the system tray, and clicking OK "
++"or Cancel buttons does not stop KTTSMgr. Use system tray context menu to "
++"quit KTTSMgr. This setting takes effect when KTTSMgr is next started. This "
++"setting has no effect when running in the KDE Control Center."
++msgstr ""
++"勾選此選項的話,KTTSMgr 會顯示在系統匣中,按下「確定」或「取消」不會停止 "
++"KTTSMgr,要點選系統匣圖示的選單才能離開 KTTSMgr。這個設定在下次啟動時生效,"
++"在 KDE 控制中心中執行時則不會有作用。"
+
+ #. i18n: file kcmkttsmgr/kcmkttsmgrwidget.ui line 123
+ #: rc.cpp:57
+@@ -127,8 +136,11 @@
+ #, no-c-format
+ msgid ""
+ "When checked, the KTTSMgr window is displayed when KTTSMgr starts. When "
+-"unchecked, click on the icon in the system tray to display the KTTSMgr window."
+-msgstr "勾選此選項的話,KTTSMgr 啟動時會顯示主視窗。此外,您也可以點選系統匣中的圖示來顯示主視窗。"
++"unchecked, click on the icon in the system tray to display the KTTSMgr "
++"window."
++msgstr ""
++"勾選此選項的話,KTTSMgr 啟動時會顯示主視窗。此外,您也可以點選系統匣中的圖示"
++"來顯示主視窗。"
+
+ #. i18n: file kcmkttsmgr/kcmkttsmgrwidget.ui line 164
+ #: rc.cpp:63
+@@ -141,10 +153,11 @@
+ #, no-c-format
+ msgid ""
+ "When checked, and KTTSMgr was automatically started when speech began, "
+-"automatically exits when speech has finished. Does not automatically exit if "
+-"KTTSMgr was started manually or started from the Control Center."
++"automatically exits when speech has finished. Does not automatically exit "
++"if KTTSMgr was started manually or started from the Control Center."
+ msgstr ""
+-"勾選此選項的話,KTTSMgr 在開始讀字時會自動啟動,發音結束後自動離開。但是若 KTTSMgr 是手動啟動的,或是從控制中心啟動的,就不會自動離開。"
++"勾選此選項的話,KTTSMgr 在開始讀字時會自動啟動,發音結束後自動離開。但是若 "
++"KTTSMgr 是手動啟動的,或是從控制中心啟動的,就不會自動離開。"
+
+ #. i18n: file kcmkttsmgr/kcmkttsmgrwidget.ui line 180
+ #: rc.cpp:69
+@@ -157,11 +170,11 @@
+ #, no-c-format
+ msgid ""
+ "When checked, if KTTSMgr is not already running and speech begins, starts "
+-"KTTSMgr and displays an icon in the system tray. Note"
+-": KTTSMgr only automatically starts for text jobs having 5 sentences or more."
++"KTTSMgr and displays an icon in the system tray. Note: KTTSMgr only "
++"automatically starts for text jobs having 5 sentences or more."
+ msgstr ""
+-"勾選此選項的話,如果 KTTSMgr 尚未執行,則在開始讀字時會啟動 KTTSMgr 並在系統匣中顯示圖示。注意:KTTSMgr "
+-"只會在有五句以上文字需要閱讀時才會啟動。"
++"勾選此選項的話,如果 KTTSMgr 尚未執行,則在開始讀字時會啟動 KTTSMgr 並在系統"
++"匣中顯示圖示。注意:KTTSMgr 只會在有五句以上文字需要閱讀時才會啟動。"
+
+ #. i18n: file kcmkttsmgr/kcmkttsmgrwidget.ui line 196
+ #: rc.cpp:75
+@@ -218,19 +231,21 @@
+ #: rc.cpp:99 rc.cpp:471
+ #, no-c-format
+ msgid ""
+-"This is a list of all the configured Talkers. A Talker is a speech synthesizer "
+-"that has been configured with a language, voice, gender, speaking rate, and "
+-"volume. Talkers higher in the list have higher priority. The topmost Talker "
+-"will be used when no talker attributes have been specified by an application."
+-msgstr ""
+-"這個清單包括所有已設定的發音員。發音員是已設定好語言、聲音、性別、說話頻率與音量的語音合成器。清單中較高位置的發音員有較高的優先權。沒有特別指定發音員屬性的應用"
+-"程式會使用最頂端的發音員。"
++"This is a list of all the configured Talkers. A Talker is a speech "
++"synthesizer that has been configured with a language, voice, gender, "
++"speaking rate, and volume. Talkers higher in the list have higher "
++"priority. The topmost Talker will be used when no talker attributes have "
++"been specified by an application."
++msgstr ""
++"這個清單包括所有已設定的發音員。發音員是已設定好語言、聲音、性別、說話頻率與"
++"音量的語音合成器。清單中較高位置的發音員有較高的優先權。沒有特別指定發音員屬"
++"性的應用程式會使用最頂端的發音員。"
+
+ #. i18n: file kcmkttsmgr/kcmkttsmgrwidget.ui line 308
+ #: rc.cpp:102 rc.cpp:150 rc.cpp:234
+ #, no-c-format
+ msgid "Add..."
+-msgstr "新增..."
++msgstr "新增…"
+
+ #. i18n: file kcmkttsmgr/kcmkttsmgrwidget.ui line 314
+ #: rc.cpp:105
+@@ -254,7 +269,7 @@
+ #: kcmkttsmgr/kcmkttsmgr.cpp:166 rc.cpp:114 rc.cpp:252 rc.cpp:669
+ #, no-c-format
+ msgid "&Edit..."
+-msgstr "編輯(&E)..."
++msgstr "編輯(&E)…"
+
+ #. i18n: file kcmkttsmgr/kcmkttsmgrwidget.ui line 372
+ #: rc.cpp:117
+@@ -299,7 +314,9 @@
+ "This is a list of configured application events and actions to be taken when "
+ "received. The \"default\" event governs all events not specifically "
+ "configured."
+-msgstr "這分清單是設定接收到哪些應用程式的事件與動作時要讀出來。「預設」則是所有未特別設定的事件。"
++msgstr ""
++"這分清單是設定接收到哪些應用程式的事件與動作時要讀出來。「預設」則是所有未特"
++"別設定的事件。"
+
+ #. i18n: file kcmkttsmgr/kcmkttsmgrwidget.ui line 517
+ #: rc.cpp:141
+@@ -314,7 +331,9 @@
+ "Applies only to the default event. Does not affect application-specific "
+ "events. Only events that display in the manner which you select will be "
+ "spoken."
+-msgstr "只套用到預設的事件。不影響應用程式相關的事件。只有顯示在這裡的所選取的事件才會被讀出來。"
++msgstr ""
++"只套用到預設的事件。不影響應用程式相關的事件。只有顯示在這裡的所選取的事件才"
++"會被讀出來。"
+
+ #. i18n: file kcmkttsmgr/kcmkttsmgrwidget.ui line 555
+ #: rc.cpp:153
+@@ -332,8 +351,8 @@
+ #: rc.cpp:159
+ #, no-c-format
+ msgid ""
+-"Click to remove a specific notification event from the list. You cannot remove "
+-"the default event."
++"Click to remove a specific notification event from the list. You cannot "
++"remove the default event."
+ msgstr "點選以從清單中移除指定的通知事件。您無法移除預設事件。"
+
+ #. i18n: file kcmkttsmgr/kcmkttsmgrwidget.ui line 591
+@@ -353,7 +372,7 @@
+ #: rc.cpp:168 rc.cpp:738
+ #, no-c-format
+ msgid "&Load..."
+-msgstr "載入(&L)..."
++msgstr "載入(&L)…"
+
+ #. i18n: file kcmkttsmgr/kcmkttsmgrwidget.ui line 605
+ #: rc.cpp:171
+@@ -365,7 +384,7 @@
+ #: rc.cpp:174 rc.cpp:627 rc.cpp:744
+ #, no-c-format
+ msgid "&Save..."
+-msgstr "儲存(&S)..."
++msgstr "儲存(&S)…"
+
+ #. i18n: file kcmkttsmgr/kcmkttsmgrwidget.ui line 616
+ #: rc.cpp:177
+@@ -383,9 +402,10 @@
+ #: rc.cpp:183
+ #, no-c-format
+ msgid ""
+-"Click this button to test the notification. A sample message will be spoken. "
+-"Note: The Text-to-Speech system must be enabled."
+-msgstr "點選此鍵以測試通知。會讀出一個簡單的訊息。注意:必須先開啟文字發音系統。"
++"Click this button to test the notification. A sample message will be "
++"spoken. Note: The Text-to-Speech system must be enabled."
++msgstr ""
++"點選此鍵以測試通知。會讀出一個簡單的訊息。注意:必須先開啟文字發音系統。"
+
+ #. i18n: file kcmkttsmgr/kcmkttsmgrwidget.ui line 656
+ #: rc.cpp:186
+@@ -399,13 +419,14 @@
+ msgid ""
+ "Specifies how KTTS should speak the event when received. If you select "
+ "\"Speak custom text\", enter the text in the box. You may use the following "
+-"substitution strings in the text:- %e
- Name of the event
- "
+-"%a
- Application that sent the event
- %m
- "
+-"The message sent by the application
"
+-msgstr ""
+-"指定 KTTS 在接收到事件時要怎麼讀。如果選擇「讀出自訂的文字」,則在欄位中輸入要讀出來的文字。您可以在文字中使用底下的代換符號: - "
+-"%e
- 事件名稱
- %a
- 送出此事件的應用程式
- %m
- "
+-"應用程式送出的訊息
"
++"substitution strings in the text:- %e
- Name of the event"
++"dd>
- %a
- Application that sent the event
- %m
- The "
++"message sent by the application
"
++msgstr ""
++"指定 KTTS 在接收到事件時要怎麼讀。如果選擇「讀出自訂的文字」,則在欄位中"
++"輸入要讀出來的文字。您可以在文字中使用底下的代換符號: - %e
- 事"
++"件名稱
- %a
- 送出此事件的應用程式
- %m
- 應用程式"
++"送出的訊息
"
+
+ #. i18n: file kcmkttsmgr/kcmkttsmgrwidget.ui line 712
+ #: rc.cpp:198
+@@ -426,7 +447,7 @@
+ #: rc.cpp:714 rc.cpp:732
+ #, no-c-format
+ msgid "..."
+-msgstr "..."
++msgstr "…"
+
+ #. i18n: file kcmkttsmgr/kcmkttsmgrwidget.ui line 747
+ #: rc.cpp:210
+@@ -446,7 +467,9 @@
+ msgid ""
+ "When checked and KTTS is enabled, notification events from applications sent "
+ "via KNotify will be spoken according to the options you set on this tab."
+-msgstr "點選此項目而且 KTTS 已開啟的話,應用程式透過 KNotify 送出的通知事件會根據您在此設定的選項唸出來。"
++msgstr ""
++"點選此項目而且 KTTS 已開啟的話,應用程式透過 KNotify 送出的通知事件會根據您在"
++"此設定的選項唸出來。"
+
+ #. i18n: file kcmkttsmgr/kcmkttsmgrwidget.ui line 795
+ #: rc.cpp:219
+@@ -476,13 +499,14 @@
+ #: rc.cpp:231
+ #, no-c-format
+ msgid ""
+-"This is a list of all the configured Filters. Filters higher in the list are "
+-"applied first. Filters modify text before it is spoken. They can be used to "
+-"substitute for mispronounced words, transform XML from one form to another, or "
+-"change the default Talker to be used for speech output."
+-msgstr ""
+-"所有已設定的過濾器的清單。清單中較高位置的過濾器會先被套用。過濾器會在文字被讀出來之前先做更改。用於替換發音不正確的字,將 XML "
+-"表格換成另一個,或是變更要使用的預設發音員等等。"
++"This is a list of all the configured Filters. Filters higher in the list "
++"are applied first. Filters modify text before it is spoken. They can be "
++"used to substitute for mispronounced words, transform XML from one form to "
++"another, or change the default Talker to be used for speech output."
++msgstr ""
++"所有已設定的過濾器的清單。清單中較高位置的過濾器會先被套用。過濾器會在文字被"
++"讀出來之前先做更改。用於替換發音不正確的字,將 XML 表格換成另一個,或是變更要"
++"使用的預設發音員等等。"
+
+ #. i18n: file kcmkttsmgr/kcmkttsmgrwidget.ui line 876
+ #: rc.cpp:237
+@@ -494,16 +518,16 @@
+ #: rc.cpp:243
+ #, no-c-format
+ msgid ""
+-"Click to move selected filter up in the list. Filters higher in the list are "
+-"applied first."
++"Click to move selected filter up in the list. Filters higher in the list "
++"are applied first."
+ msgstr "點選以將所選取的過濾器往上移。較高的過濾器會先被套用。"
+
+ #. i18n: file kcmkttsmgr/kcmkttsmgrwidget.ui line 915
+ #: rc.cpp:249
+ #, no-c-format
+ msgid ""
+-"Click to move a filter down in the list. Filters lower in the list are applied "
+-"last."
++"Click to move a filter down in the list. Filters lower in the list are "
++"applied last."
+ msgstr "點選以將所選取的過濾器往下移。較低的過濾器被套用的順序就較後面。"
+
+ #. i18n: file kcmkttsmgr/kcmkttsmgrwidget.ui line 940
+@@ -528,15 +552,16 @@
+ #: rc.cpp:267
+ #, no-c-format
+ msgid ""
+-"This is a list of all the configured Sentence Boundary Detector (SBD) Filters. "
+-"SBDs break long text jobs up into sentences, which reduces the time before a "
+-"job begins speaking, and permits you to advance or rewind through a job. SBDs "
+-"are applied in the order listed (top to bottom) after all the normal filters at "
+-"the top of this screen have been applied. Filtering stops when the first SBD "
+-"modifies the text."
+-msgstr ""
+-"這份清單包含所有的「句子邊界偵測」過濾器(Sentence Boundary Detector,SBD)。SBD "
+-"會將需要發音的文字切成句子,以縮短發音前的準備工作,並允許您在發音過程中跳過或倒回。SBD 會在所有正常的過濾器套用之後依上到下的順序套用,當第一個 SBD "
++"This is a list of all the configured Sentence Boundary Detector (SBD) "
++"Filters. SBDs break long text jobs up into sentences, which reduces the "
++"time before a job begins speaking, and permits you to advance or rewind "
++"through a job. SBDs are applied in the order listed (top to bottom) after "
++"all the normal filters at the top of this screen have been applied. "
++"Filtering stops when the first SBD modifies the text."
++msgstr ""
++"這份清單包含所有的「句子邊界偵測」過濾器(Sentence Boundary Detector,SBD)。"
++"SBD 會將需要發音的文字切成句子,以縮短發音前的準備工作,並允許您在發音過程中"
++"跳過或倒回。SBD 會在所有正常的過濾器套用之後依上到下的順序套用,當第一個 SBD "
+ "改變文字後就停止。"
+
+ #. i18n: file kcmkttsmgr/kcmkttsmgrwidget.ui line 1040
+@@ -549,8 +574,8 @@
+ #: rc.cpp:273
+ #, no-c-format
+ msgid ""
+-"Click this button to edit the Sentence Boundary Detector (SBD) configuration or "
+-"add additional SBD filters."
++"Click this button to edit the Sentence Boundary Detector (SBD) configuration "
++"or add additional SBD filters."
+ msgstr "點選此鍵以編輯或新增句子邊界偵測器。"
+
+ #. i18n: file kcmkttsmgr/kcmkttsmgrwidget.ui line 1074
+@@ -565,15 +590,19 @@
+ msgid ""
+ "Check the Pre-sound box and choose a Pre-sound audio file, which will sound "
+ "when a text job is interrupted by another message."
+-msgstr "勾選前置聲音選項並選取前置聲音音效檔,此聲音會在文字語音工作被另一個訊息中斷時播放。"
++msgstr ""
++"勾選前置聲音選項並選取前置聲音音效檔,此聲音會在文字語音工作被另一個訊息中斷"
++"時播放。"
+
+ #. i18n: file kcmkttsmgr/kcmkttsmgrwidget.ui line 1115
+ #: rc.cpp:282 rc.cpp:288
+ #, no-c-format
+ msgid ""
+-"Check the Post-message box and enter a Post-message, which will be spoken when "
+-"a text job resumes after being interrupted by another message."
+-msgstr "勾選後置訊息選項並輸入後置訊息,此訊息會在文字語音工作被另一個訊息中斷後,又恢復工作時讀出來。"
++"Check the Post-message box and enter a Post-message, which will be spoken "
++"when a text job resumes after being interrupted by another message."
++msgstr ""
++"勾選後置訊息選項並輸入後置訊息,此訊息會在文字語音工作被另一個訊息中斷後,又"
++"恢復工作時讀出來。"
+
+ #. i18n: file kcmkttsmgr/kcmkttsmgrwidget.ui line 1124
+ #: rc.cpp:285
+@@ -599,7 +628,9 @@
+ msgid ""
+ "Check the Pre-message box and enter a Pre-message, which will be spoken "
+ "whenever a text job is interrupted by another message."
+-msgstr "勾選前置訊息選項並輸入前置訊息,此訊息會在文字語音工作被另一個訊息中斷時讀出來。"
++msgstr ""
++"勾選前置訊息選項並輸入前置訊息,此訊息會在文字語音工作被另一個訊息中斷時讀出"
++"來。"
+
+ #. i18n: file kcmkttsmgr/kcmkttsmgrwidget.ui line 1188
+ #: rc.cpp:303 rc.cpp:309
+@@ -607,7 +638,9 @@
+ msgid ""
+ "Check the Post-sound and choose a Post-sound audio file, which will sound "
+ "before a text job resumes after being interrupted by another message."
+-msgstr "勾選後置聲音選項並選取後置聲音音效檔,此聲音會在文字語音工作被另一個訊息中斷後,又恢復工作時讀出來。"
++msgstr ""
++"勾選後置聲音選項並選取後置聲音音效檔,此聲音會在文字語音工作被另一個訊息中斷"
++"後,又恢復工作時讀出來。"
+
+ #. i18n: file kcmkttsmgr/kcmkttsmgrwidget.ui line 1196
+ #: rc.cpp:306
+@@ -631,9 +664,10 @@
+ #: rc.cpp:321
+ #, no-c-format
+ msgid ""
+-"Check this if you want to keep the generated audio (wav) files. You will find "
+-"them in the indicated directory."
+-msgstr "此選項決定您是否要保留所產生的音效檔。您可以在指定的目錄中找到保留的檔案。"
++"Check this if you want to keep the generated audio (wav) files. You will "
++"find them in the indicated directory."
++msgstr ""
++"此選項決定您是否要保留所產生的音效檔。您可以在指定的目錄中找到保留的檔案。"
+
+ #. i18n: file kcmkttsmgr/kcmkttsmgrwidget.ui line 1287
+ #: rc.cpp:324
+@@ -651,12 +685,13 @@
+ #: rc.cpp:330 rc.cpp:336 rc.cpp:339 rc.cpp:994 rc.cpp:1012 rc.cpp:1024
+ #, no-c-format
+ msgid ""
+-"Sets the speed of speech. Slide the slider to the left to slow speech down; to "
+-"the right to increase talking speed. Anything less than 75 percent is "
++"Sets the speed of speech. Slide the slider to the left to slow speech down; "
++"to the right to increase talking speed. Anything less than 75 percent is "
+ "considered \"slow\", and anything greater than 125 percent is considered "
+ "\"fast\". You cannot change the speed of MultiSyn voices."
+ msgstr ""
+-"設定發音速度。滑動器左側表示慢速,右側表示快速。通常小於 75% 算是慢的,大於 125% 則算是快的。您無法改變 MultiSyn 聲音的速度。"
++"設定發音速度。滑動器左側表示慢速,右側表示快速。通常小於 75% 算是慢的,大於 "
++"125% 則算是快的。您無法改變 MultiSyn 聲音的速度。"
+
+ #. i18n: file kcmkttsmgr/kcmkttsmgrwidget.ui line 1338
+ #: rc.cpp:333 rc.cpp:883 rc.cpp:889 rc.cpp:1003 rc.cpp:1009 rc.cpp:1015
+@@ -675,12 +710,12 @@
+ #: rc.cpp:345
+ #, no-c-format
+ msgid ""
+-"Select the audio output method desired. If you select GStreamer"
+-", you must also select a Sink.
"
+-"Note: You must have GStreamer >= 0.87 to use GStreamer.
"
++"Select the audio output method desired. If you select GStreamer, "
++"you must also select a Sink.
Note: You must have "
++"GStreamer >= 0.87 to use GStreamer.
"
+ msgstr ""
+-"選擇音效輸出方法。如果您選擇 GStreamer,您也要選擇 接收器(Sink)。
"
+-"注意:您必須安裝 GStreamer 0.87 版以上。
"
++"選擇音效輸出方法。如果您選擇 GStreamer,您也要選擇 接收器"
++"(Sink)。
注意:您必須安裝 GStreamer 0.87 版以上。
"
+
+ #. i18n: file kcmkttsmgr/kcmkttsmgrwidget.ui line 1456
+ #: rc.cpp:348 rc.cpp:357
+@@ -704,9 +739,11 @@
+ #: rc.cpp:363
+ #, no-c-format
+ msgid ""
+-"Select the sink to be used for aKode output. Select \"auto\" to let aKode pick "
+-"the best output method."
+-msgstr "選擇 aKode 輸出所使用的接收器(Sink)。選擇「自動」讓 aKode 自己選擇最好的輸出方法。"
++"Select the sink to be used for aKode output. Select \"auto\" to let aKode "
++"pick the best output method."
++msgstr ""
++"選擇 aKode 輸出所使用的接收器(Sink)。選擇「自動」讓 aKode 自己選擇最好的輸"
++"出方法。"
+
+ #. i18n: file kcmkttsmgr/kcmkttsmgrwidget.ui line 1534
+ #: rc.cpp:366
+@@ -718,9 +755,11 @@
+ #: rc.cpp:369
+ #, no-c-format
+ msgid ""
+-"Check to use the GStreamer audio output system. You must also select a "
+-"Sink plugin.
"
+-msgstr "勾選以使用 GStreamer 音效輸出系統。您必須選擇一個接收器外掛程式。
"
++"Check to use the GStreamer audio output system. You must also select a "
++"Sink plugin.
"
++msgstr ""
++"勾選以使用 GStreamer 音效輸出系統。您必須選擇一個接收器外掛程式。"
++"p>"
+
+ #. i18n: file kcmkttsmgr/kcmkttsmgrwidget.ui line 1548
+ #: rc.cpp:372
+@@ -744,8 +783,11 @@
+ #: rc.cpp:381
+ #, no-c-format
+ msgid ""
+-"
Check to use aKode for audio output. You must also select a Sink.
"
+-msgstr "勾選以使用 aKode 做為音效輸出。您必須同時指定一個接收器(Sink)。
"
++"Check to use aKode for audio output. You must also select a Sink."
++"
"
++msgstr ""
++"勾選以使用 aKode 做為音效輸出。您必須同時指定一個接收器(Sink)。"
++"p>"
+
+ #. i18n: file kcmkttsmgr/kcmkttsmgrwidget.ui line 1599
+ #: rc.cpp:384
+@@ -803,8 +845,8 @@
+ #: rc.cpp:411
+ #, no-c-format
+ msgid ""
+-"When checked, will use the default Talker, which is the topmost Talker listed "
+-"in the Talkers tab."
++"When checked, will use the default Talker, which is the topmost Talker "
++"listed in the Talkers tab."
+ msgstr "勾選此選項的話,會使用發音員清單上最頂端的預設的發音員。"
+
+ #. i18n: file libkttsd/selecttalkerwidget.ui line 72
+@@ -817,10 +859,12 @@
+ #: rc.cpp:417
+ #, no-c-format
+ msgid ""
+-"When checked, will use a configured Talker most closely matching the attributes "
+-"you choose. Attributes with checks next to them will be preferred over "
+-"unchecked attributes. Language is always preferred."
+-msgstr "勾選此選項的話,會比較發音員的設定,並選擇最接近所指定屬性的發音員。會優先比對所勾選的屬性,但是語言是一定會被比對的。"
++"When checked, will use a configured Talker most closely matching the "
++"attributes you choose. Attributes with checks next to them will be "
++"preferred over unchecked attributes. Language is always preferred."
++msgstr ""
++"勾選此選項的話,會比較發音員的設定,並選擇最接近所指定屬性的發音員。會優先比"
++"對所勾選的屬性,但是語言是一定會被比對的。"
+
+ #. i18n: file libkttsd/selecttalkerwidget.ui line 125
+ #: rc.cpp:420
+@@ -850,11 +894,13 @@
+ #: rc.cpp:438 rc.cpp:702 rc.cpp:711
+ #, no-c-format
+ msgid ""
+-"This filter is applied to text jobs of the specified language. You may select "
+-"more than one language by clicking the browse button and Ctrl-clicking on more "
+-"than one in the list. If blank, the filter applies to all text jobs of any "
+-"language."
+-msgstr "這個過濾器會套用到指定語言的文字發音工作上。您可以按下 Ctrl 鍵並點選一個以上的語言。如果留白的話,則會套用到任何語言的文字發音工作上。"
++"This filter is applied to text jobs of the specified language. You may "
++"select more than one language by clicking the browse button and Ctrl-"
++"clicking on more than one in the list. If blank, the filter applies to all "
++"text jobs of any language."
++msgstr ""
++"這個過濾器會套用到指定語言的文字發音工作上。您可以按下 Ctrl 鍵並點選一個以上"
++"的語言。如果留白的話,則會套用到任何語言的文字發音工作上。"
+
+ #. i18n: file libkttsd/selecttalkerwidget.ui line 385
+ #: rc.cpp:444 rc.cpp:534 rc.cpp:615 rc.cpp:717
+@@ -882,9 +928,11 @@
+ #: rc.cpp:474
+ #, no-c-format
+ msgid ""
+-"WARNING: This filter is a key component of the KTTS system. Please read the "
+-"KTTS Handbook before modifying these settings."
+-msgstr "警告:這個過濾器是 KTTS 系統的主要成員。要變更這些設定之前,請先參考 KTTS 手冊。"
++"WARNING: This filter is a key component of the KTTS system. Please read "
++"the KTTS Handbook before modifying these settings."
++msgstr ""
++"警告:這個過濾器是 KTTS 系統的主要成員。要變更這些設定之前,請先參考 KTTS "
++"手冊。"
+
+ #. i18n: file filters/sbd/sbdconfwidget.ui line 49
+ #: rc.cpp:477 rc.cpp:582 rc.cpp:684 rc.cpp:771
+@@ -914,7 +962,8 @@
+ #: rc.cpp:492 rc.cpp:495
+ #, no-c-format
+ msgid ""
+-"The regular expression that detects boundaries between sentences in text jobs."
++"The regular expression that detects boundaries between sentences in text "
++"jobs."
+ msgstr "用於偵測句子邊界的正規表示式。"
+
+ #. i18n: file filters/sbd/sbdconfwidget.ui line 132
+@@ -927,9 +976,10 @@
+ #: rc.cpp:504 rc.cpp:507
+ #, no-c-format
+ msgid ""
+-"This string replaces the matched regular expression. Important"
+-": must end with tab (\\t)."
+-msgstr "這個字串會取代正規表示式比對到的項目。重要:必須以 tab(\\t)結束。"
++"This string replaces the matched regular expression. Important: must "
++"end with tab (\\t)."
++msgstr ""
++"這個字串會取代正規表示式比對到的項目。重要:必須以 tab(\\t)結束。"
+
+ #. i18n: file filters/sbd/sbdconfwidget.ui line 160
+ #: rc.cpp:510 rc.cpp:591 rc.cpp:789
+@@ -953,11 +1003,13 @@
+ #: rc.cpp:519 rc.cpp:528 rc.cpp:600 rc.cpp:609
+ #, no-c-format
+ msgid ""
+-"This filter is applied to text jobs of the specified language. You may select "
+-"more than one language by clicking the browse button and Ctrl-clicking on more "
+-"than one in the list. If blank the filter applies to all text jobs of any "
+-"language."
+-msgstr "此過濾器套用在所指定的語言上。您可以按下 Ctrl 鍵並點選一個以上的語言。如果留白的話,則會套用到任何語言的文字發音工作上。"
++"This filter is applied to text jobs of the specified language. You may "
++"select more than one language by clicking the browse button and Ctrl-"
++"clicking on more than one in the list. If blank the filter applies to all "
++"text jobs of any language."
++msgstr ""
++"此過濾器套用在所指定的語言上。您可以按下 Ctrl 鍵並點選一個以上的語言。如果留"
++"白的話,則會套用到任何語言的文字發音工作上。"
+
+ #. i18n: file filters/sbd/sbdconfwidget.ui line 200
+ #: rc.cpp:522 rc.cpp:603 rc.cpp:705
+@@ -969,15 +1021,16 @@
+ #: rc.cpp:525 rc.cpp:606 rc.cpp:708
+ #, no-c-format
+ msgid ""
+-"Enter a DCOP Application ID. This filter will only apply to text jobs queued "
+-"by that application. You may enter more than one ID separated by commas. If "
+-"blank, this filter applies to text jobs queued by all applications. Tip: Use "
+-"kdcop from the command line to get the Application IDs of running applications. "
+-" Example: \"konversation, kvirc,ksirc,kopete\""
+-msgstr ""
+-"輸入一個 DCOP "
+-"應用程式代碼。這個過濾器會只套用到該程式送出的文字發音要求。您也可以輸入一個以上的代碼,用逗號隔開。如果留白的話,預設套用到所有的應用程式。提示:在命令列上用 "
+-"kdcop 可以知道應用程式的代碼。範例如下:\"konversaion,kvirc,ksirc,kopete\""
++"Enter a DCOP Application ID. This filter will only apply to text jobs "
++"queued by that application. You may enter more than one ID separated by "
++"commas. If blank, this filter applies to text jobs queued by all "
++"applications. Tip: Use kdcop from the command line to get the Application "
++"IDs of running applications. Example: \"konversation, kvirc,ksirc,kopete\""
++msgstr ""
++"輸入一個 DCOP 應用程式代碼。這個過濾器會只套用到該程式送出的文字發音要求。您"
++"也可以輸入一個以上的代碼,用逗號隔開。如果留白的話,預設套用到所有的應用程"
++"式。提示:在命令列上用 kdcop 可以知道應用程式的代碼。範例如下:\"konversaion,"
++"kvirc,ksirc,kopete\""
+
+ #. i18n: file filters/sbd/sbdconfwidget.ui line 259
+ #: rc.cpp:537 rc.cpp:618 rc.cpp:720
+@@ -985,20 +1038,23 @@
+ msgid ""
+ "Enter a DCOP Application ID. This filter will only apply to text jobs "
+ "queued by that application. You may enter more than one ID separated by "
+-"commas. Use knotify to match all messages sent as KDE notifications. "
+-"If blank, this filter applies to text jobs queued by all applications. Tip: "
+-"Use kdcop from the command line to get the Application IDs of running "
+-"applications. Example: \"konversation, kvirc,ksirc,kopete\""
+-msgstr ""
+-"輸入一個 DCOP 應用程式代碼。這個過濾器會只套用到該程式送出的文字發音要求。您也可以輸入一個以上的代碼,用逗號隔開。使用 "
+-"knotify 則會套用在所有 KDE 通知上。如果留白的話,預設套用到所有的應用程式。提示:在命令列上用 kdcop "
+-"可以知道應用程式的代碼。範例如下:\"konversaion,kvirc,ksirc,kopete\""
++"commas. Use knotify to match all messages sent as KDE "
++"notifications. If blank, this filter applies to text jobs queued by all "
++"applications. Tip: Use kdcop from the command line to get the Application "
++"IDs of running applications. Example: \"konversation, kvirc,ksirc,kopete\""
++"qt>"
++msgstr ""
++"輸入一個 DCOP 應用程式代碼。這個過濾器會只套用到該程式送出的文字發音要"
++"求。您也可以輸入一個以上的代碼,用逗號隔開。使用 knotify 則會套用在所"
++"有 KDE 通知上。如果留白的話,預設套用到所有的應用程式。提示:在命令列上用 "
++"kdcop 可以知道應用程式的代碼。範例如下:\"konversaion,kvirc,ksirc,kopete\""
++"qt>"
+
+ #. i18n: file filters/sbd/sbdconfwidget.ui line 287
+ #: rc.cpp:540 rc.cpp:621
+ #, no-c-format
+ msgid "Load..."
+-msgstr "載入..."
++msgstr "載入…"
+
+ #. i18n: file filters/sbd/sbdconfwidget.ui line 293
+ #: rc.cpp:543
+@@ -1010,7 +1066,7 @@
+ #: rc.cpp:546
+ #, no-c-format
+ msgid "Sa&ve..."
+-msgstr "儲存(&V)..."
++msgstr "儲存(&V)…"
+
+ #. i18n: file filters/sbd/sbdconfwidget.ui line 313
+ #: rc.cpp:549
+@@ -1034,7 +1090,7 @@
+ #: rc.cpp:558
+ #, no-c-format
+ msgid "&Type"
+-msgstr "類型 (&T)"
++msgstr "類型(&T)"
+
+ #. i18n: file filters/stringreplacer/editreplacementwidget.ui line 85
+ #: rc.cpp:561
+@@ -1136,7 +1192,7 @@
+ #: kcmkttsmgr/kcmkttsmgr.cpp:171 rc.cpp:651
+ #, no-c-format
+ msgid "&Add..."
+-msgstr "新增(&A)..."
++msgstr "新增(&A)…"
+
+ #. i18n: file filters/stringreplacer/stringreplacerconfwidget.ui line 328
+ #: rc.cpp:654
+@@ -1207,9 +1263,11 @@
+ #, no-c-format
+ msgid ""
+ "The new Talker that will be used when the conditions above are met. The "
+-"default Talker is the topmost in the Talkers tab. Click the button to choose a "
+-"Talker."
+-msgstr "新的發音員會在上列的狀況下使用。預設的發音員為發音員清單中最頂端的那一個。點選此鍵以選擇發音員。"
++"default Talker is the topmost in the Talkers tab. Click the button to "
++"choose a Talker."
++msgstr ""
++"新的發音員會在上列的狀況下使用。預設的發音員為發音員清單中最頂端的那一個。點"
++"選此鍵以選擇發音員。"
+
+ #. i18n: file filters/talkerchooser/talkerchooserconfwidget.ui line 224
+ #: rc.cpp:735
+@@ -1247,7 +1305,8 @@
+ msgid ""
+ "Enter the full path to an XML Style Language - Transforms (XSLT) stylesheet "
+ "file. XSLT files usually end with extension .xsl."
+-msgstr "輸入 XML 風格語言轉換器(XSLT)檔案的完整路徑。XSLT 檔通常副檔名為 .xsl。"
++msgstr ""
++"輸入 XML 風格語言轉換器(XSLT)檔案的完整路徑。XSLT 檔通常副檔名為 .xsl。"
+
+ #. i18n: file filters/xmltransformer/xmltransformerconfwidget.ui line 52
+ #: rc.cpp:765
+@@ -1261,7 +1320,9 @@
+ msgid ""
+ "Enter the path to the xsltproc executable program. If it is in the PATH "
+ "environment variable, just enter \"xsltproc\"."
+-msgstr "輸入 xsltproc 執行檔的完整路徑。如果它已經在您設定的執行路徑中,只要輸入 xsltproc 即可。"
++msgstr ""
++"輸入 xsltproc 執行檔的完整路徑。如果它已經在您設定的執行路徑中,只要輸入 "
++"xsltproc 即可。"
+
+ #. i18n: file filters/xmltransformer/xmltransformerconfwidget.ui line 91
+ #: rc.cpp:777
+@@ -1279,11 +1340,12 @@
+ #: rc.cpp:795 rc.cpp:807
+ #, no-c-format
+ msgid ""
+-"This filter will be applied only to text having the specified XML root element. "
+-" If blank, applies to all text. You may enter more than one root element "
+-"separated by commas. Example: \"html\"."
++"This filter will be applied only to text having the specified XML root "
++"element. If blank, applies to all text. You may enter more than one root "
++"element separated by commas. Example: \"html\"."
+ msgstr ""
+-"這個過濾器只會套用到含有指定的 XML 根元素的文字。如果留白的話,則會套用到所有的文字。您可以輸入一個以上的根元素,用逗號隔開。範例如下:\"html\"。"
++"這個過濾器只會套用到含有指定的 XML 根元素的文字。如果留白的話,則會套用到所有"
++"的文字。您可以輸入一個以上的根元素,用逗號隔開。範例如下:\"html\"。"
+
+ #. i18n: file filters/xmltransformer/xmltransformerconfwidget.ui line 157
+ #: rc.cpp:798 rc.cpp:813
+@@ -1293,23 +1355,25 @@
+ "specification. If blank, applies to all text. You may enter more than one "
+ "DOCTYPE separated by commas. Example: \"xhtml\"."
+ msgstr ""
+-"這個過濾器只會套用到含有指定的 DOCTYPE 的文字。如果留白的話,則會套用到所有的文字。您可以輸入一個以上的 "
+-"DOCTYPE,用逗號隔開。範例如下:\"xhtml\"。"
++"這個過濾器只會套用到含有指定的 DOCTYPE 的文字。如果留白的話,則會套用到所有的"
++"文字。您可以輸入一個以上的 DOCTYPE,用逗號隔開。範例如下:\"xhtml\"。"
+
+ #. i18n: file filters/xmltransformer/xmltransformerconfwidget.ui line 165
+ #: rc.cpp:801 rc.cpp:819
+ #, no-c-format
+ msgid ""
+-"Enter a DCOP Application ID. This filter will only apply to text queued by "
+-"that application. You may enter more than one ID separated by commas. Use "
+-"knotify to match all messages sent as KDE notifications. If blank, this "
+-"filter applies to text queued by all applications. Tip: Use kdcop from the "
+-"command line to get the Application IDs of running applications. Example: "
+-"\"konversation, kvirc,ksirc,kopete\""
+-msgstr ""
+-"輸入一個 DCOP 應用程式代碼。這個過濾器會只套用到該程式送出的文字發音要求。您也可以輸入一個以上的代碼,用逗號隔開。使用 "
+-"knotify 則會套用在所有 KDE 通知上。如果留白的話,預設套用到所有的應用程式。提示:在命令列上用 kdcop "
+-"可以知道應用程式的代碼。範例如下:\"konversaion,kvirc,ksirc,kopete\""
++"Enter a DCOP Application ID. This filter will only apply to text queued "
++"by that application. You may enter more than one ID separated by commas. "
++"Use knotify to match all messages sent as KDE notifications. If "
++"blank, this filter applies to text queued by all applications. Tip: Use "
++"kdcop from the command line to get the Application IDs of running "
++"applications. Example: \"konversation, kvirc,ksirc,kopete\""
++msgstr ""
++"輸入一個 DCOP 應用程式代碼。這個過濾器會只套用到該程式送出的文字發音要"
++"求。您也可以輸入一個以上的代碼,用逗號隔開。使用 knotify 則會套用在所"
++"有 KDE 通知上。如果留白的話,預設套用到所有的應用程式。提示:在命令列上用 "
++"kdcop 可以知道應用程式的代碼。範例如下:\"konversaion,kvirc,ksirc,kopete\""
++"qt>"
+
+ #. i18n: file filters/xmltransformer/xmltransformerconfwidget.ui line 183
+ #: rc.cpp:804
+@@ -1346,13 +1410,14 @@
+ #, no-c-format
+ msgid ""
+ "This field specifies both the command used for speaking texts and its "
+-"parameters. If you want to pass the text as a parameter, write %t at the place "
+-"where the text should be inserted. To pass a file of the text, write %f. To "
+-"synthesize only and let KTTSD play the synthesized text, write %w for the "
+-"generated audio file."
+-msgstr ""
+-"這個欄位指定文字要發音的命令及參數。如果您要將文字當成參數傳遞,用 %t 來表示您要傳遞的文字。要傳遞文字檔案當成參數,用 %f 來表示。如果只要合成並讓 "
+-"KTTSD 來播放,用 %w 來表示產生的音效檔。"
++"parameters. If you want to pass the text as a parameter, write %t at the "
++"place where the text should be inserted. To pass a file of the text, write %"
++"f. To synthesize only and let KTTSD play the synthesized text, write %w for "
++"the generated audio file."
++msgstr ""
++"這個欄位指定文字要發音的命令及參數。如果您要將文字當成參數傳遞,用 %t 來表示"
++"您要傳遞的文字。要傳遞文字檔案當成參數,用 %f 來表示。如果只要合成並讓 KTTSD "
++"來播放,用 %w 來表示產生的音效檔。"
+
+ #. i18n: file plugins/command/commandconfwidget.ui line 88
+ #: rc.cpp:831
+@@ -1364,8 +1429,8 @@
+ #: rc.cpp:834
+ #, no-c-format
+ msgid ""
+-"This check box specifies whether the text is sent as standard input (stdin) to "
+-"the speech synthesizer."
++"This check box specifies whether the text is sent as standard input (stdin) "
++"to the speech synthesizer."
+ msgstr "勾選此選項的話,表示文字經由標準輸入傳遞給語音合成器。"
+
+ #. i18n: file plugins/command/commandconfwidget.ui line 116
+@@ -1384,7 +1449,8 @@
+ #: rc.cpp:843 rc.cpp:1045
+ #, no-c-format
+ msgid ""
+-"This combo box specifies which character encoding is used for passing the text."
++"This combo box specifies which character encoding is used for passing the "
++"text."
+ msgstr "這個選單指定所傳遞的文字的編碼。"
+
+ #. i18n: file plugins/command/commandconfwidget.ui line 175
+@@ -1439,11 +1505,13 @@
+ #: rc.cpp:874 rc.cpp:886 rc.cpp:895
+ #, no-c-format
+ msgid ""
+-"Sets the speed of speech. Slide the slider to the left to slow speech down; to "
+-"the right to increase talking speed. Anything less than 75 percent is "
++"Sets the speed of speech. Slide the slider to the left to slow speech down; "
++"to the right to increase talking speed. Anything less than 75 percent is "
+ "considered \"slow\", and anything greater than 125 percent is considered "
+ "\"fast\"."
+-msgstr "設定發音速度。滑動器左側表示慢速,右側表示快速。通常小於 75% 算是慢的,大於 125% 則算是快的。"
++msgstr ""
++"設定發音速度。滑動器左側表示慢速,右側表示快速。通常小於 75% 算是慢的,大於 "
++"125% 則算是快的。"
+
+ #. i18n: file plugins/epos/eposconfwidget.ui line 164
+ #: rc.cpp:877
+@@ -1455,11 +1523,13 @@
+ #: rc.cpp:880 rc.cpp:892 rc.cpp:898
+ #, no-c-format
+ msgid ""
+-"Sets the tone (frequency) of speech. Slide the slider to the left to lower the "
+-"voice tone; to the right to increase tone. Anything less than 75 percent is "
+-"considered \"low\", and anything greater than 125 percent is considered "
+-"\"high\"."
+-msgstr "設定語音的音調。滑動器左側表示音調低,右側表示音調高。小於 75% 則算是低的,大於 125% 則算是高的。"
++"Sets the tone (frequency) of speech. Slide the slider to the left to lower "
++"the voice tone; to the right to increase tone. Anything less than 75 "
++"percent is considered \"low\", and anything greater than 125 percent is "
++"considered \"high\"."
++msgstr ""
++"設定語音的音調。滑動器左側表示音調低,右側表示音調高。小於 75% 則算是低的,大"
++"於 125% 則算是高的。"
+
+ #. i18n: file plugins/epos/eposconfwidget.ui line 346
+ #: rc.cpp:901
+@@ -1471,10 +1541,12 @@
+ #: rc.cpp:904 rc.cpp:916
+ #, no-c-format
+ msgid ""
+-"If the Epos server program will be found due to your PATH environment variable, "
+-"simply enter \"epos\", otherwise enter the full path to the Epos server "
+-"executable program."
+-msgstr "如果 Epos 已經在您設定的執行路徑中,則輸入 epos 即可,否則請輸入 Epos 伺服器的完整路徑。"
++"If the Epos server program will be found due to your PATH environment "
++"variable, simply enter \"epos\", otherwise enter the full path to the Epos "
++"server executable program."
++msgstr ""
++"如果 Epos 已經在您設定的執行路徑中,則輸入 epos 即可,否則請輸入 Epos 伺服器"
++"的完整路徑。"
+
+ #. i18n: file plugins/epos/eposconfwidget.ui line 371
+ #: rc.cpp:907
+@@ -1486,10 +1558,12 @@
+ #: rc.cpp:910 rc.cpp:922
+ #, no-c-format
+ msgid ""
+-"If the Epos client program will be found due to the PATH environment variable, "
+-"simply enter \"say\" here. Otherwise, specify the full path to the Epos client "
+-"program."
+-msgstr "如果 Epos 客戶端程式已經在您設定的執行路徑中,則輸入 say 即可,否則請輸入 Epos 客戶端的完整路徑。"
++"If the Epos client program will be found due to the PATH environment "
++"variable, simply enter \"say\" here. Otherwise, specify the full path to "
++"the Epos client program."
++msgstr ""
++"如果 Epos 客戶端程式已經在您設定的執行路徑中,則輸入 say 即可,否則請輸入 "
++"Epos 客戶端的完整路徑。"
+
+ #. i18n: file plugins/epos/eposconfwidget.ui line 406
+ #: rc.cpp:913
+@@ -1515,15 +1589,19 @@
+ msgid ""
+ "Optional. Enter any server command line options here. To see available "
+ "options, enter \"epos -h\" in a terminal. Do not use \"-o\"."
+-msgstr "在此輸入伺服器命令的選項。在命令列中使用 epos -h 可以看到可使用的選項清單。不要用 -o。"
++msgstr ""
++"在此輸入伺服器命令的選項。在命令列中使用 epos -h 可以看到可使用的選項清單。不"
++"要用 -o。"
+
+ #. i18n: file plugins/epos/eposconfwidget.ui line 475
+ #: rc.cpp:931
+ #, no-c-format
+ msgid ""
+-"Specify options to be passed to Epos client. To see available options, enter "
+-"\"say -h\" in a terminal. Do not use \"-o\"."
+-msgstr "在此指定要傳遞給 Epos 客戶端的選項。在命令列中使用 say -h 可以看到可使用的選項清單。不要使用 -o。"
++"Specify options to be passed to Epos client. To see available options, "
++"enter \"say -h\" in a terminal. Do not use \"-o\"."
++msgstr ""
++"在此指定要傳遞給 Epos 客戶端的選項。在命令列中使用 say -h 可以看到可使用的選"
++"項清單。不要使用 -o。"
+
+ #. i18n: file plugins/epos/eposconfwidget.ui line 501
+ #: rc.cpp:934
+@@ -1541,15 +1619,18 @@
+ #: rc.cpp:943
+ #, no-c-format
+ msgid ""
+-"Specify options to be passed to Epos client. Do not use -o. To see available "
+-"options, enter \"say -h\" in a terminal. Do not use \"-o\"."
+-msgstr "在此指定要傳遞給 Epos 客戶端的選項。在命令列中使用 say -h 可以看到可使用的選項清單。不要使用 -o。"
++"Specify options to be passed to Epos client. Do not use -o. To see "
++"available options, enter \"say -h\" in a terminal. Do not use \"-o\"."
++msgstr ""
++"在此指定要傳遞給 Epos 客戶端的選項。在命令列中使用 say -h 可以看到可使用的選"
++"項清單。不要使用 -o。"
+
+ #. i18n: file plugins/epos/eposconfwidget.ui line 577
+ #: rc.cpp:949
+ #, no-c-format
+ msgid ""
+-"Click to test the configuration. If correct, you will hear a sentence spoken."
++"Click to test the configuration. If correct, you will hear a sentence "
++"spoken."
+ msgstr "點選以測試設定。設定正確的話,您就可以聽到一個句子。"
+
+ #. i18n: file plugins/festivalint/festivalintconfwidget.ui line 25
+@@ -1584,7 +1665,9 @@
+ msgid ""
+ "If Festival is in your PATH environment variable, just enter \"festival\", "
+ "otherwise specify the full path to the Festival executable program."
+-msgstr "如果 Festival 已經在您設定的執行路徑中,則輸入 festival 即可,否則請輸入 Festival 執行檔的完整路徑。"
++msgstr ""
++"如果 Festival 已經在您設定的執行路徑中,則輸入 festival 即可,否則請輸入 "
++"Festival 執行檔的完整路徑。"
+
+ #. i18n: file plugins/festivalint/festivalintconfwidget.ui line 144
+ #: rc.cpp:973
+@@ -1597,13 +1680,15 @@
+ #, no-c-format
+ msgid ""
+ "Select a voice to speak text with. MultiSyn voices are high quality but are "
+-"slow to load. If no voices are shown, check the Festival executable path. You "
+-"must install at least one Festival voice. If you have installed a voice and "
+-"still none are shown, check your Festival configuration. (See the README that "
+-"comes with Festival.)"
+-msgstr ""
+-"選擇要發音的聲音。MultiSyn 品質很高,但是載入很慢。如果沒有顯示聲音,請檢查 Festival 執行路徑是否正確。您必須至少安裝一個 Festival "
+-"聲音。如果您已經安裝 Festival 聲音,但是這裡仍然沒有顯示,請檢查您的 Festival 設定(請看 Festival 的 README)。"
++"slow to load. If no voices are shown, check the Festival executable path. "
++"You must install at least one Festival voice. If you have installed a voice "
++"and still none are shown, check your Festival configuration. (See the "
++"README that comes with Festival.)"
++msgstr ""
++"選擇要發音的聲音。MultiSyn 品質很高,但是載入很慢。如果沒有顯示聲音,請檢查 "
++"Festival 執行路徑是否正確。您必須至少安裝一個 Festival 聲音。如果您已經安裝 "
++"Festival 聲音,但是這裡仍然沒有顯示,請檢查您的 Festival 設定(請看 Festival "
++"的 README)。"
+
+ #. i18n: file plugins/festivalint/festivalintconfwidget.ui line 177
+ #: rc.cpp:982
+@@ -1616,10 +1701,12 @@
+ #, no-c-format
+ msgid ""
+ "Sets the volume (loudness) of speech. Slide the slider to the left to lower "
+-"the volume; to the right to increase volume. Anything less than 75 percent is "
+-"considered \"soft\", and anything greater than 125 percent is considered "
++"the volume; to the right to increase volume. Anything less than 75 percent "
++"is considered \"soft\", and anything greater than 125 percent is considered "
+ "\"loud\"."
+-msgstr "設定發音音量。滑動器左側表示小聲,右側表示大聲。通常 小於 75% 算是小聲,大於 125% 則算是大聲。"
++msgstr ""
++"設定發音音量。滑動器左側表示小聲,右側表示大聲。通常 小於 75% 算是小聲,大於 "
++"125% 則算是大聲。"
+
+ #. i18n: file plugins/festivalint/festivalintconfwidget.ui line 234
+ #: rc.cpp:991
+@@ -1637,12 +1724,13 @@
+ #: rc.cpp:1000 rc.cpp:1018 rc.cpp:1027
+ #, no-c-format
+ msgid ""
+-"Sets the tone (frequency) of speech. Slide the slider to the left to lower the "
+-"voice tone; to the right to increase tone. Anything less than 75 percent is "
+-"considered \"low\", and anything greater than 125 percent is considered "
+-"\"high\". You cannot change the pitch of MultiSyn voices."
++"Sets the tone (frequency) of speech. Slide the slider to the left to lower "
++"the voice tone; to the right to increase tone. Anything less than 75 "
++"percent is considered \"low\", and anything greater than 125 percent is "
++"considered \"high\". You cannot change the pitch of MultiSyn voices."
+ msgstr ""
+-"設定語音的音調。滑動器左側表示音調低,右側表示音調高。小於 75% 則算是低的,大於 125% 則算是高的。您無法改變 MultiSyn 的音準。"
++"設定語音的音調。滑動器左側表示音調低,右側表示音調高。小於 75% 則算是低的,大"
++"於 125% 則算是高的。您無法改變 MultiSyn 的音準。"
+
+ #. i18n: file plugins/festivalint/festivalintconfwidget.ui line 485
+ #: rc.cpp:1030
+@@ -1655,19 +1743,19 @@
+ #, no-c-format
+ msgid ""
+ "If checked, Festival will be started and this voice will be loaded when the "
+-"Text-to-Speech Deamon (KTTSD) is started. Check when a voice requires a long "
+-"time to load in Festival (for example, multisyn voices), otherwise, leave "
+-"unchecked."
++"Text-to-Speech Deamon (KTTSD) is started. Check when a voice requires a "
++"long time to load in Festival (for example, multisyn voices), otherwise, "
++"leave unchecked."
+ msgstr ""
+-"勾選此選項的話,在 KTTSD 啟動時,會同時啟動 Festival 並載入此聲音。如果這個聲音載入到 Festival 的時間較長(如 "
+-"MultiSyn),請勾選此選項,否則請不要勾選。"
++"勾選此選項的話,在 KTTSD 啟動時,會同時啟動 Festival 並載入此聲音。如果這個聲"
++"音載入到 Festival 的時間較長(如 MultiSyn),請勾選此選項,否則請不要勾選。"
+
+ #. i18n: file plugins/festivalint/festivalintconfwidget.ui line 516
+ #: rc.cpp:1039
+ #, no-c-format
+ msgid ""
+-"Click to test the configuration. Festival will be started and a test sentence "
+-"will be spoken."
++"Click to test the configuration. Festival will be started and a test "
++"sentence will be spoken."
+ msgstr "點選以測試設定。Festival 會啟動,然後您能聽到一個測試句子。"
+
+ #. i18n: file plugins/festivalint/festivalintconfwidget.ui line 542
+@@ -1686,8 +1774,8 @@
+ #: rc.cpp:1051 rc.cpp:1057
+ #, no-c-format
+ msgid ""
+-"This is the configuration dialog for the Festival Lite (Flite) speech synthesis "
+-"engine."
++"This is the configuration dialog for the Festival Lite (Flite) speech "
++"synthesis engine."
+ msgstr "這個對話框用於設定 Festival Lite (Flite)語音合成器引擎。"
+
+ #. i18n: file plugins/flite/fliteconfwidget.ui line 70
+@@ -1708,7 +1796,9 @@
+ msgid ""
+ "If Flite is in your PATH environment variable, simply enter \"flite\", "
+ "otherwise specify the complete path to the Flite executable program."
+-msgstr "如果 Flite 已經在您設定的執行路徑中,則輸入 flite 即可,否則請輸入 Flite 執行檔的完整路徑。"
++msgstr ""
++"如果 Flite 已經在您設定的執行路徑中,則輸入 flite 即可,否則請輸入 Flite 執行"
++"檔的完整路徑。"
+
+ #. i18n: file plugins/flite/fliteconfwidget.ui line 137
+ #: rc.cpp:1066
+@@ -1776,15 +1866,17 @@
+ #: rc.cpp:1105 rc.cpp:1108
+ #, no-c-format
+ msgid ""
+-"Select a voice for speaking text. If no voices are listed, check your Mbrola "
+-"configuration. You must install at least one voice."
+-msgstr "選擇要發音的聲音。如果沒有列出任何聲音,請檢查您的 Mbrola 設定。您必須至少安裝一個聲音。"
++"Select a voice for speaking text. If no voices are listed, check your "
++"Mbrola configuration. You must install at least one voice."
++msgstr ""
++"選擇要發音的聲音。如果沒有列出任何聲音,請檢查您的 Mbrola 設定。您必須至少安"
++"裝一個聲音。"
+
+ #. i18n: file plugins/hadifix/hadifixconfigui.ui line 135
+ #: rc.cpp:1111
+ #, no-c-format
+ msgid "&Select..."
+-msgstr "選擇(&S)..."
++msgstr "選擇(&S)…"
+
+ #. i18n: file plugins/hadifix/hadifixconfigui.ui line 151
+ #: rc.cpp:1114
+@@ -1804,8 +1896,8 @@
+ #: rc.cpp:1132 rc.cpp:1138 rc.cpp:1141
+ #, no-c-format
+ msgid ""
+-"Adjusts the speed of speech. Slide to left for slower speech; to the right for "
+-"faster."
++"Adjusts the speed of speech. Slide to left for slower speech; to the right "
++"for faster."
+ msgstr "調整語音的速度。滑動器左側表示慢,右側表示快。"
+
+ #. i18n: file plugins/hadifix/hadifixconfigui.ui line 327
+@@ -1833,8 +1925,11 @@
+ #, no-c-format
+ msgid ""
+ "If the txt2pho program is in your PATH environment variable, simply enter "
+-"\"txt2pho\", otherwise specify the full path to the txt2pho executable program."
+-msgstr "如果 txt2pho 已經在您設定的執行路徑中,則輸入 txt2pho 即可,否則請輸入 txt2pho 執行檔的完整路徑。"
++"\"txt2pho\", otherwise specify the full path to the txt2pho executable "
++"program."
++msgstr ""
++"如果 txt2pho 已經在您設定的執行路徑中,則輸入 txt2pho 即可,否則請輸入 "
++"txt2pho 執行檔的完整路徑。"
+
+ #. i18n: file plugins/hadifix/hadifixconfigui.ui line 446
+ #: rc.cpp:1171
+@@ -1848,15 +1943,20 @@
+ msgid ""
+ "If the Mbrola program is in your PATH environment variable, simply enter "
+ "\"mbrola\", otherwise specify the full path to the Mbrola executable program."
+-msgstr "如果 Mbrola 已經在您設定的執行路徑中,則輸入 mbrola 即可,否則請輸入 Mbrola 執行檔的完整路徑。"
++msgstr ""
++"如果 Mbrola 已經在您設定的執行路徑中,則輸入 mbrola 即可,否則請輸入 Mbrola "
++"執行檔的完整路徑。"
+
+ #. i18n: file plugins/hadifix/hadifixconfigui.ui line 511
+ #: rc.cpp:1183
+ #, no-c-format
+ msgid ""
+-"This combo box specifies which character encoding is used for passing the text. "
+-" For most western languages, use ISO-8859-1. For Hungarian, use ISO-8859-2."
+-msgstr "這個選單指定傳遞的文字的編碼。大部份西方的語言使用 ISO-8859-1,匈牙利語請使用 ISO-8859-2。"
++"This combo box specifies which character encoding is used for passing the "
++"text. For most western languages, use ISO-8859-1. For Hungarian, use ISO-"
++"8859-2."
++msgstr ""
++"這個選單指定傳遞的文字的編碼。大部份西方的語言使用 ISO-8859-1,匈牙利語請使"
++"用 ISO-8859-2。"
+
+ #. i18n: file plugins/hadifix/hadifixconfigui.ui line 551
+ #: rc.cpp:1189
+@@ -2205,7 +2305,8 @@
+
+ #: filters/main.cpp:52
+ msgid ""
+-"_: A string that appears in a single config file, not a group of config files\n"
++"_: A string that appears in a single config file, not a group of config "
++"files\n"
+ "Config file group name passed to filter"
+ msgstr "傳遞給過濾器的設定檔群組名稱"
+
+@@ -2249,22 +2350,22 @@
+
+ #: kcmkttsmgr/kcmkttsmgr.cpp:910
+ msgid ""
+-"You have made changes to the configuration but have not saved them yet. Click "
+-"Apply to save the changes or Cancel to abandon the changes."
+-msgstr "您已經變更設定,但是還沒儲存。請點選「套用」以儲存設定,或是「取消」來取消更改。"
++"You have made changes to the configuration but have not saved them yet. "
++"Click Apply to save the changes or Cancel to abandon the changes."
++msgstr ""
++"您已經變更設定,但是還沒儲存。請點選「套用」以儲存設定,或是「取消」來取消更"
++"改。"
+
+ #: kcmkttsmgr/kcmkttsmgr.cpp:1072
+ msgid ""
+-"Text-to-Speech
"
+-"This is the configuration for the text-to-speech dcop service
"
+-"This allows other applications to access text-to-speech resources
"
+-"Be sure to configure a default language for the language you are using as "
+-"this will be the language used by most of the applications
"
+-msgstr ""
+-"文字發音
"
+-"這是文字發音 DCOP 服務的設定。
"
+-"它允許其他應用程式使用文字發音的資源。
"
+-"請確定已設定好您所使用的預設語言,這會被大部份的應用程式所套用。
"
++"Text-to-Speech
This is the configuration for the text-to-speech "
++"dcop service
This allows other applications to access text-to-speech "
++"resources
Be sure to configure a default language for the language you "
++"are using as this will be the language used by most of the applications
"
++msgstr ""
++"文字發音
這是文字發音 DCOP 服務的設定。
它允許其他應用程式使"
++"用文字發音的資源。
請確定已設定好您所使用的預設語言,這會被大部份的應"
++"用程式所套用。
"
+
+ #: kcmkttsmgr/kcmkttsmgr.cpp:1080 kttsd/main.cpp:36
+ #: players/artsplayer/artsplayer.cpp:240
+@@ -2443,35 +2544,32 @@
+ #: kttsjobmgr/kttsjobmgr.cpp:127
+ msgid ""
+ "These are all the text jobs. The State column may be:"
+-"
"
+-"- Queued - the job is waiting and will not be spoken until its state "
+-"is changed to Waiting by clicking the Resume or Restart "
+-"buttons.
"
+-"- Waiting - the job is ready to be spoken. It will be spoken when the "
+-"jobs preceding it in the list have finished.
"
+-"- Speaking - the job is speaking. The Position "
+-"column shows the current sentence of the job being spoken. You may pause a "
+-"speaking job by clicking the Hold button.
"
+-"- Paused - the job is currently paused. Paused jobs prevent jobs "
+-"below them from speaking. Use the Resume or Restart "
+-"buttons to resume speaking the job, or click Later "
+-"to move the job down in the list.
"
+-"- Finished - the job has finished speaking. When a second job "
+-"finishes, this one will be deleted. You may click Restart "
+-"to repeat the job.
Note: Messages, Warnings, and Screen "
+-"Reader Output do not appear in this list. See the Handbook for more "
+-"information.
"
+-msgstr ""
+-"這些是所有的文字發音工作。狀態欄位可能為: "
+-"
"
+-"- 已送進佇列:此工作已經在等待,但是除非點選恢復或重新開始讓狀態變成等待中"
+-",否則不會被執行。
"
+-"- 等待中:此工作已經準備好被執行了,正在等待執行中的工作結束。
"
+-"- 執行中:此工作正在執行。位置欄位顯示目前正在唸的句子。您可以按下暫停來暫停此工作。
"
+-"- 已暫停:此工作目前暫停執行。之後的工作也不會被執行。用恢復或重新開始來恢復工作,或是延後"
+-"將工作放到清單的底部。
"
+-"- 已完成:此工作已完成。當下一個工作也完成後,這個工作就會被刪除。您可以點選重新開始來重新執行工作。
"
+-"注意:訊息、警告與螢幕讀取輸出不會出現在此清單中。詳情請參考手冊。
"
++"- Queued - the job is waiting and will not be spoken until its "
++"state is changed to Waiting by clicking the Resume or "
++"Restart buttons.
- Waiting - the job is ready to be "
++"spoken. It will be spoken when the jobs preceding it in the list have "
++"finished.
- Speaking - the job is speaking. The Position"
++"b> column shows the current sentence of the job being spoken. You may pause "
++"a speaking job by clicking the Hold button.
- Paused - "
++"the job is currently paused. Paused jobs prevent jobs below them from "
++"speaking. Use the Resume or Restart buttons to resume "
++"speaking the job, or click Later to move the job down in the list."
++"li>
- Finished - the job has finished speaking. When a second job "
++"finishes, this one will be deleted. You may click Restart to repeat "
++"the job.
Note: Messages, Warnings, and Screen Reader "
++"Output do not appear in this list. See the Handbook for more information."
++"p>"
++msgstr ""
++"這些是所有的文字發音工作。狀態欄位可能為:
- 已送進佇列"
++"b>:此工作已經在等待,但是除非點選恢復或重新開始讓狀態變成等"
++"待中,否則不會被執行。
- 等待中:此工作已經準備好被執行了,"
++"正在等待執行中的工作結束。
- 執行中:此工作正在執行。位置"
++"b>欄位顯示目前正在唸的句子。您可以按下暫停來暫停此工作。
- "
++"已暫停:此工作目前暫停執行。之後的工作也不會被執行。用恢復或重"
++"新開始來恢復工作,或是延後將工作放到清單的底部。
- 已完"
++"成:此工作已完成。當下一個工作也完成後,這個工作就會被刪除。您可以點選"
++"重新開始來重新執行工作。
注意:訊息、警告與螢幕讀取輸"
++"出不會出現在此清單中。詳情請參考手冊。"
+
+ #: kttsjobmgr/kttsjobmgr.cpp:176
+ msgid "Hold"
+@@ -2480,12 +2578,13 @@
+ #: kttsjobmgr/kttsjobmgr.cpp:178
+ msgid ""
+ "Changes a job to Paused state. If currently speaking, the job stops "
+-"speaking. Paused jobs prevent jobs that follow them from speaking, so either "
+-"click Resume to make the job speakable, or click Later "
++"speaking. Paused jobs prevent jobs that follow them from speaking, so "
++"either click Resume to make the job speakable, or click Later "
+ "to move it down in the list.
"
+ msgstr ""
+-"將工作狀態變更為「已暫停」。如果正在發音,這個工作會暫停發音。之後的工作也會被卡住不會執行。點選恢復可以恢復工作,或是延後"
+-"將工作移到清單底部。
"
++"將工作狀態變更為「已暫停」。如果正在發音,這個工作會暫停發音。之後的工作也"
++"會被卡住不會執行。點選恢復可以恢復工作,或是延後將工作移到清單"
++"底部。
"
+
+ #: kttsjobmgr/kttsjobmgr.cpp:185 kttsmgr/kttsmgr.cpp:186
+ msgid "Resume"
+@@ -2493,9 +2592,11 @@
+
+ #: kttsjobmgr/kttsjobmgr.cpp:187
+ msgid ""
+-"Resumes a paused job or changes a Queued job to Waiting. If the job is the "
+-"top speakable job in the list, it begins speaking.
"
+-msgstr "恢復已暫停的工作,或將已送進佇列的工作狀態改為「等待中」。如果此工作在清單的最頂端,則會開始工作。
"
++"Resumes a paused job or changes a Queued job to Waiting. If the job is "
++"the top speakable job in the list, it begins speaking.
"
++msgstr ""
++"恢復已暫停的工作,或將已送進佇列的工作狀態改為「等待中」。如果此工作在清單"
++"的最頂端,則會開始工作。
"
+
+ #: kttsjobmgr/kttsjobmgr.cpp:192
+ msgid "R&estart"
+@@ -2503,14 +2604,16 @@
+
+ #: kttsjobmgr/kttsjobmgr.cpp:194
+ msgid ""
+-"Rewinds a job to the beginning and changes its state to Waiting. If the job "
+-"is the top speakable job in the list, it begins speaking.
"
+-msgstr "讓此工作從頭開始,並將狀態改變為「等待中」。如果此工作在清單的最頂端,則開始工作。
"
++"Rewinds a job to the beginning and changes its state to Waiting. If the "
++"job is the top speakable job in the list, it begins speaking.
"
++msgstr ""
++"讓此工作從頭開始,並將狀態改變為「等待中」。如果此工作在清單的最頂端,則開"
++"始工作。
"
+
+ #: kttsjobmgr/kttsjobmgr.cpp:201
+ msgid ""
+-"Deletes the job. If it is currently speaking, it stops speaking. The next "
+-"speakable job in the list begins speaking.
"
++"Deletes the job. If it is currently speaking, it stops speaking. The "
++"next speakable job in the list begins speaking.
"
+ msgstr "刪除此工作。如果它正在工作,則會停止。下一個工作會開始執行。
"
+
+ #: kttsjobmgr/kttsjobmgr.cpp:206
+@@ -2521,7 +2624,9 @@
+ msgid ""
+ "Moves a job downward in the list so that it will be spoken later. If the "
+ "job is currently speaking, its state changes to Paused.
"
+-msgstr "將工作移到清單的最底部,稍後會繼續工作。如果此工作正在執行,它的狀態會改變為「已暫停」。
"
++msgstr ""
++"將工作移到清單的最底部,稍後會繼續工作。如果此工作正在執行,它的狀態會改變"
++"為「已暫停」。
"
+
+ #: kttsjobmgr/kttsjobmgr.cpp:214
+ msgid "Pre&vious Part"
+@@ -2561,10 +2666,13 @@
+
+ #: kttsjobmgr/kttsjobmgr.cpp:241
+ msgid ""
+-"Queues the current contents of the clipboard for speaking and sets its state "
+-"to Waiting. If the job is the topmost in the list, it begins speaking. The "
+-"job will be spoken by the topmost Talker in the Talkers tab.
"
+-msgstr "將目前剪貼簿中的內容送進工作清單,並標技為「等待中」。如果此工作在清單的最頂端,則開始執行。它會用預設的發音員來讀。
"
++"Queues the current contents of the clipboard for speaking and sets its "
++"state to Waiting. If the job is the topmost in the list, it begins "
++"speaking. The job will be spoken by the topmost Talker in the Talkers"
++"b> tab.
"
++msgstr ""
++"將目前剪貼簿中的內容送進工作清單,並標技為「等待中」。如果此工作在清單的最"
++"頂端,則開始執行。它會用預設的發音員來讀。
"
+
+ #: kttsjobmgr/kttsjobmgr.cpp:247
+ msgid "Spea&k File"
+@@ -2574,9 +2682,11 @@
+ msgid ""
+ "Prompts you for a file name and queues the contents of the file for "
+ "speaking. You must click the Resume button before the job will be "
+-"speakable. The job will be spoken by the topmost Talker in the Talkers "
+-"tab.
"
+-msgstr "讓您選擇一個檔案,並將檔案內容送進工作清單。您必須點選恢復才能讓它開始工作。它會用預設的發音員來讀。
"
++"speakable. The job will be spoken by the topmost Talker in the Talkers"
++"b> tab."
++msgstr ""
++"讓您選擇一個檔案,並將檔案內容送進工作清單。您必須點選恢復才能讓它"
++"開始工作。它會用預設的發音員來讀。
"
+
+ #: kttsjobmgr/kttsjobmgr.cpp:255
+ msgid "Change Talker"
+@@ -2584,8 +2694,8 @@
+
+ #: kttsjobmgr/kttsjobmgr.cpp:257
+ msgid ""
+-"Prompts you with a list of your configured Talkers from the Talkers "
+-"tab. The job will be spoken using the selected Talker.
"
++"Prompts you with a list of your configured Talkers from the Talkers"
++"b> tab. The job will be spoken using the selected Talker.
"
+ msgstr "讓您選擇發音員。這個工作會使用所選取的發音員來讀。
"
+
+ #: kttsjobmgr/kttsjobmgr.cpp:262
+@@ -2880,8 +2990,8 @@
+
+ #: players/artsplayer/artsplayer.cpp:235
+ msgid ""
+-"Connecting/starting aRts soundserver failed. Make sure that artsd is configured "
+-"properly."
++"Connecting/starting aRts soundserver failed. Make sure that artsd is "
++"configured properly."
+ msgstr "連接/啟動 aRts 音效伺服器時發生錯誤,請確定你的 artsd 已正確設定。"
+
+ #: plugins/command/commandconf.cpp:164 plugins/epos/eposconf.cpp:230
+@@ -2905,14 +3015,15 @@
+
+ #: plugins/festivalint/festivalintconf.cpp:578
+ msgid ""
+-"Testing. MultiSyn voices require several seconds to load. Please be patient."
++"Testing. MultiSyn voices require several seconds to load. Please be "
++"patient."
+ msgstr "測試中。載入 MultiSync 聲音需要一些時間。請稍候。"
+
+ #: plugins/freetts/freettsconf.cpp:96
+ msgid ""
+ "Unable to locate freetts.jar in your path.\n"
+-"Please specify the path to freetts.jar in the Properties tab before using KDE "
+-"Text-to-Speech"
++"Please specify the path to freetts.jar in the Properties tab before using "
++"KDE Text-to-Speech"
+ msgstr "找不到 freetts.jar。請先在「內容」中指定 freetts.jar 的路徑。"
+
+ #: plugins/freetts/freettsconf.cpp:96
+@@ -2933,7 +3044,7 @@
+
+ #: plugins/hadifix/hadifixconf.cpp:216
+ msgid "This plugin is distributed under the terms of the GPL v2 or later."
+-msgstr "此外掛程式以 GPL 第二版或更新的版本散佈。"
++msgstr "此外掛程式以 GPL 第二版或更新的版本散布。"
+
+ #: plugins/hadifix/hadifixconf.cpp:300
+ msgid "Voice File - Hadifix Plugin"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaccessibility/libKTTSD.po kde-i18n-zh_TW-3.5.10/messages/kdeaccessibility/libKTTSD.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaccessibility/libKTTSD.po 2006-07-22 10:04:31.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdeaccessibility/libKTTSD.po 2011-11-11 15:45:17.000000000 +0100
+@@ -6,8 +6,7 @@
+ "Project-Id-Version: libKTTSD\n"
+ "POT-Creation-Date: 2005-05-08 01:29+0200\n"
+ "PO-Revision-Date: 2006-06-06 10:40+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Traditional Chinese \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -42,7 +41,9 @@
+ msgid ""
+ "If you would like to change the configuration of KTTSD "
+ "please use the KDE Control Center or click the button below.
"
+-msgstr "如果您要變更 KTTSD 的設定,請使用 KDE 控制中心,或按下方的按鍵。
"
++msgstr ""
++"如果您要變更 KTTSD 的設定,請使用 KDE 控制中心,或按下方"
++"的按鍵。
"
+
+ #. i18n: file KTTSDlibSetup.ui line 85
+ #: rc.cpp:9
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/akregator_konqplugin.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/akregator_konqplugin.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/akregator_konqplugin.po 2007-01-15 10:56:29.000000000 +0100
++++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/akregator_konqplugin.po 2011-11-11 15:45:17.000000000 +0100
+@@ -6,8 +6,7 @@
+ "Project-Id-Version: akregator_konqplugin\n"
+ "POT-Creation-Date: 2006-11-11 02:39+0100\n"
+ "PO-Revision-Date: 2006-05-29 09:04+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Traditional Chinese \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -28,7 +27,7 @@
+
+ #: konqfeedicon.cpp:165
+ msgid "Monitor this site for updates (using news feed)"
+-msgstr "監控此站台是否有更新(使用新的 Feed)"
++msgstr "監控此站臺是否有更新(使用新的 Feed)"
+
+ #: konqfeedicon.cpp:209 pluginbase.cpp:56 pluginbase.cpp:66
+ msgid "Imported Feeds"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/alsaplayerui.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/alsaplayerui.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/alsaplayerui.po 2008-08-19 20:43:08.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/alsaplayerui.po 2011-11-11 15:45:17.000000000 +0100
+@@ -7,7 +7,7 @@
+ "Project-Id-Version: alsaplayerui\n"
+ "POT-Creation-Date: 2008-07-08 01:23+0200\n"
+ "PO-Revision-Date: 2002-08-30 10:50\n"
+-"Last-Translator: Tse-Chun Ho \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Chinese(traditinal) \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -66,7 +66,7 @@
+ #: rc.cpp:24
+ #, no-c-format
+ msgid "..."
+-msgstr "..."
++msgstr "…"
+
+ #. i18n: file AlsaPlayer.ui line 2297
+ #: rc.cpp:27
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/ark_plugin.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/ark_plugin.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/ark_plugin.po 2007-01-15 10:56:29.000000000 +0100
++++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/ark_plugin.po 2011-11-11 15:45:17.000000000 +0100
+@@ -6,7 +6,7 @@
+ "Project-Id-Version: ark_plugin\n"
+ "POT-Creation-Date: 2006-10-17 02:38+0200\n"
+ "PO-Revision-Date: 2006-03-24 12:46+0800\n"
+-"Last-Translator: You-Cheng Hsieh \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Traditional Chinese \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -31,7 +31,7 @@
+
+ #: arkplugin.cpp:126
+ msgid "Add to Archive..."
+-msgstr "加入至壓縮檔..."
++msgstr "加入至壓縮檔…"
+
+ #: arkplugin.cpp:136
+ msgid "Extract"
+@@ -52,7 +52,7 @@
+
+ #: arkplugin.cpp:155 arkplugin.cpp:162
+ msgid "Extract To..."
+-msgstr "解壓縮至..."
++msgstr "解壓縮至…"
+
+ #: arkplugin.cpp:435 arkplugin.cpp:479
+ msgid "Archive"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/atlantikdesigner.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/atlantikdesigner.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/atlantikdesigner.po 2006-07-22 10:04:07.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/atlantikdesigner.po 2011-11-11 15:45:17.000000000 +0100
+@@ -9,8 +9,7 @@
+ "Project-Id-Version: atlantikdesigner\n"
+ "POT-Creation-Date: 2004-12-29 14:56+0100\n"
+ "PO-Revision-Date: 2006-05-29 09:14+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Traditional Chinese \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -35,7 +34,7 @@
+
+ #: designer/main.cpp:13
+ msgid "Atlantik gameboard designer"
+-msgstr "Atlantik 遊戲平台設計者"
++msgstr "Atlantik 遊戲平臺設計者"
+
+ #: designer/main.cpp:15
+ msgid "(c) 2002 Jason Katz-Brown"
+@@ -51,11 +50,11 @@
+
+ #: designer/designer.cpp:56
+ msgid "&Edit Gameboard Info..."
+-msgstr "編輯遊戲平台資訊...(&E)"
++msgstr "編輯遊戲平臺資訊…(&E)"
+
+ #: designer/designer.cpp:57
+ msgid "&Edit Groups..."
+-msgstr "編輯群組...(&E)"
++msgstr "編輯群組…(&E)"
+
+ #: designer/designer.cpp:59
+ msgid "&Add 4 Squares"
+@@ -91,7 +90,7 @@
+
+ #: designer/designer.cpp:213
+ msgid "There are unsaved changes to gameboard. Save them?"
+-msgstr "您尚未儲存遊戲平台的改變。要儲存嗎?"
++msgstr "您尚未儲存遊戲平臺的改變。要儲存嗎?"
+
+ #: designer/designer.cpp:213
+ msgid "Unsaved Changes"
+@@ -103,7 +102,7 @@
+
+ #: designer/designer.cpp:529
+ msgid "This board file is invalid; cannot open."
+-msgstr "這個平台檔無效;無法開啟。"
++msgstr "這個平臺檔無效;無法開啟。"
+
+ #: designer/designer.cpp:529
+ msgid "There are only %1 estates specified in this file."
+@@ -116,7 +115,7 @@
+
+ #: designer/designer.cpp:949
+ msgid "Atlantik Gameboard Editor"
+-msgstr "Atlantic 遊戲平台編輯器"
++msgstr "Atlantic 遊戲平臺編輯器"
+
+ #: designer/group.cpp:23
+ msgid "Group Editor"
+@@ -173,7 +172,7 @@
+
+ #: designer/group.cpp:93
+ msgid "&Add..."
+-msgstr "新增...(&A)"
++msgstr "新增…(&A)"
+
+ #: designer/group.cpp:107
+ msgid "Add Group"
+@@ -305,11 +304,11 @@
+
+ #: designer/editor.cpp:655
+ msgid "&Add Card..."
+-msgstr "新增卡片...(&A)"
++msgstr "新增卡片…(&A)"
+
+ #: designer/editor.cpp:659
+ msgid "&Rename..."
+-msgstr "更名...(&R)"
++msgstr "更名…(&R)"
+
+ #: designer/editor.cpp:675
+ msgid "&More Properties"
+@@ -365,7 +364,7 @@
+
+ #: designer/boardinfo.cpp:19
+ msgid "Gameboard Information"
+-msgstr "遊戲平台資訊"
++msgstr "遊戲平臺資訊"
+
+ #: designer/boardinfo.cpp:42
+ msgid "Version:"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/audiorename_plugin.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/audiorename_plugin.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/audiorename_plugin.po 2007-01-15 10:56:29.000000000 +0100
++++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/audiorename_plugin.po 2011-11-11 15:45:17.000000000 +0100
+@@ -10,7 +10,7 @@
+ "Project-Id-Version: audiorename_plugin\n"
+ "POT-Creation-Date: 2007-01-07 02:43+0100\n"
+ "PO-Revision-Date: 2003-07-14 21:02+0800\n"
+-"Last-Translator: Keng-Tso Ou \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Chinese (traditional) \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -18,22 +18,16 @@
+ "X-Generator: KBabel 1.0.1\n"
+
+ #: audio_plugin.cpp:76
+-msgid ""
+-"An older file named '%1' already exists.\n"
+-msgstr ""
+-"名稱為 '%1' 的較舊檔案已經存在。\n"
++msgid "An older file named '%1' already exists.\n"
++msgstr "名稱為 '%1' 的較舊檔案已經存在。\n"
+
+ #: audio_plugin.cpp:78
+-msgid ""
+-"A similar file named '%1' already exists.\n"
+-msgstr ""
+-"名稱為 '%1' 的類似檔案已經存在。\n"
++msgid "A similar file named '%1' already exists.\n"
++msgstr "名稱為 '%1' 的類似檔案已經存在。\n"
+
+ #: audio_plugin.cpp:80
+-msgid ""
+-"A newer file named '%1' already exists.\n"
+-msgstr ""
+-"名稱為 '%1' 的較新檔案已經存在。\n"
++msgid "A newer file named '%1' already exists.\n"
++msgstr "名稱為 '%1' 的較新檔案已經存在。\n"
+
+ #: audio_plugin.cpp:82
+ msgid "Source File"
+@@ -54,7 +48,7 @@
+ "Click on this label to load it.\n"
+ msgstr ""
+ "這個音樂檔案並未儲存\n"
+-"於這台主機\n"
++"於這臺主機\n"
+ "點選這個標籤來載入該檔案。\n"
+
+ #: audiopreview.cpp:60
+@@ -62,35 +56,26 @@
+ msgstr "無法載入音樂檔案"
+
+ #: audiopreview.cpp:92
+-msgid ""
+-"Artist: %1\n"
+-msgstr ""
+-"音樂家: %1\n"
++msgid "Artist: %1\n"
++msgstr "音樂家: %1\n"
+
+ #: audiopreview.cpp:95
+-msgid ""
+-"Title: %1\n"
+-msgstr ""
+-"標題: %1\n"
++msgid "Title: %1\n"
++msgstr "標題: %1\n"
+
+ #: audiopreview.cpp:98
+-msgid ""
+-"Comment: %1\n"
+-msgstr ""
+-"評論: %1\n"
++msgid "Comment: %1\n"
++msgstr "評論: %1\n"
+
+ #: audiopreview.cpp:100
+ msgid ""
+ "_: Biterate: 160 kbits/s\n"
+ "Bitrate: %1 %2\n"
+-msgstr ""
+-"位元率: %1 %2\n"
++msgstr "位元率: %1 %2\n"
+
+ #: audiopreview.cpp:102
+-msgid ""
+-"Sample rate: %1 %2\n"
+-msgstr ""
+-"取樣率: %1 %2\n"
++msgid "Sample rate: %1 %2\n"
++msgstr "取樣率: %1 %2\n"
+
+ #: audiopreview.cpp:103
+ msgid "Length: "
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/autorefresh.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/autorefresh.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/autorefresh.po 2005-09-10 11:24:11.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/autorefresh.po 2011-11-11 15:45:17.000000000 +0100
+@@ -8,7 +8,7 @@
+ "Project-Id-Version: autorefresh\n"
+ "POT-Creation-Date: 2004-10-12 01:18+0200\n"
+ "PO-Revision-Date: 2003-07-14 21:05+0800\n"
+-"Last-Translator: Keng-Tso Ou \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Chinese (traditional) \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/babelfish.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/babelfish.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/babelfish.po 2008-08-19 20:43:08.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/babelfish.po 2011-11-11 15:45:17.000000000 +0100
+@@ -7,8 +7,7 @@
+ "Project-Id-Version: babelfish\n"
+ "POT-Creation-Date: 2008-04-08 02:02+0200\n"
+ "PO-Revision-Date: 2006-05-29 09:18+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Traditional Chinese \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -33,113 +32,113 @@
+
+ #: plugin_babelfish.cpp:43
+ msgid "Translate Web &Page"
+-msgstr "翻譯網頁 (&P)"
++msgstr "翻譯網頁(&P)"
+
+ #: plugin_babelfish.cpp:47
+ msgid "&English To"
+-msgstr "英文翻為(&E)"
++msgstr "英語翻為(&E)"
+
+ #: plugin_babelfish.cpp:49
+ msgid "&French To"
+-msgstr "法文翻為(&E)"
++msgstr "法語翻為(&E)"
+
+ #: plugin_babelfish.cpp:51
+ msgid "&German To"
+-msgstr "德文翻為(&G)"
++msgstr "德語翻為(&G)"
+
+ #: plugin_babelfish.cpp:53
+ msgid "&Spanish To"
+-msgstr "西班牙文翻為(&S)"
++msgstr "西班牙語翻為(&S)"
+
+ #: plugin_babelfish.cpp:55
+ msgid "&Portuguese To"
+-msgstr "葡萄牙文翻為(&P)"
++msgstr "葡萄牙語翻為(&P)"
+
+ #: plugin_babelfish.cpp:57
+ msgid "&Italian To"
+-msgstr "義大利文翻為(&I)"
++msgstr "義大利語翻為(&I)"
+
+ #: plugin_babelfish.cpp:59
+ msgid "&Dutch To"
+-msgstr "荷蘭文翻為(&D)"
++msgstr "荷蘭語翻為(&D)"
+
+ #: plugin_babelfish.cpp:62
+ msgid "&Chinese (Simplified)"
+-msgstr "簡體中文(&C)"
++msgstr "簡化字漢語(&C)"
+
+ #: plugin_babelfish.cpp:65
+ msgid "Chinese (&Traditional)"
+-msgstr "繁體中文(&T)"
++msgstr "傳統字漢語(&T)"
+
+ #: plugin_babelfish.cpp:68 plugin_babelfish.cpp:102
+ msgid "&Dutch"
+-msgstr "荷蘭文(&D)"
++msgstr "荷蘭語(&D)"
+
+ #: plugin_babelfish.cpp:71 plugin_babelfish.cpp:124 plugin_babelfish.cpp:131
+ #: plugin_babelfish.cpp:138 plugin_babelfish.cpp:145 plugin_babelfish.cpp:152
+ msgid "&French"
+-msgstr "法文(&F)"
++msgstr "法語(&F)"
+
+ #: plugin_babelfish.cpp:74 plugin_babelfish.cpp:108
+ msgid "&German"
+-msgstr "德文(&G)"
++msgstr "德語(&G)"
+
+ #: plugin_babelfish.cpp:77 plugin_babelfish.cpp:111
+ msgid "&Italian"
+-msgstr "義大利文(&I)"
++msgstr "義大利語(&I)"
+
+ #: plugin_babelfish.cpp:80
+ msgid "&Japanese"
+-msgstr "日文(&J)"
++msgstr "日語(&J)"
+
+ #: plugin_babelfish.cpp:83
+ msgid "&Korean"
+-msgstr "韓文(&K)"
++msgstr "韓語(&K)"
+
+ #: plugin_babelfish.cpp:86
+ msgid "&Norwegian"
+-msgstr "挪威文(&N)"
++msgstr "挪威語(&N)"
+
+ #: plugin_babelfish.cpp:89 plugin_babelfish.cpp:114
+ msgid "&Portuguese"
+-msgstr "葡萄牙文(&P)"
++msgstr "葡萄牙語(&P)"
+
+ #: plugin_babelfish.cpp:92
+ msgid "&Russian"
+-msgstr "俄文(&R)"
++msgstr "俄語(&R)"
+
+ #: plugin_babelfish.cpp:95 plugin_babelfish.cpp:117
+ msgid "&Spanish"
+-msgstr "西班牙文(&S)"
++msgstr "西班牙語(&S)"
+
+ #: plugin_babelfish.cpp:98
+ msgid "T&hai"
+-msgstr "泰文(&H)"
++msgstr "泰語(&H)"
+
+ #: plugin_babelfish.cpp:105 plugin_babelfish.cpp:121 plugin_babelfish.cpp:128
+ #: plugin_babelfish.cpp:135 plugin_babelfish.cpp:142 plugin_babelfish.cpp:149
+ msgid "&English"
+-msgstr "英文(&E)"
++msgstr "英語(&E)"
+
+ #: plugin_babelfish.cpp:156
+ msgid "&Chinese (Simplified) to English"
+-msgstr "簡體中文翻為英文(&C)"
++msgstr "簡化字漢語翻為英語(&C)"
+
+ #: plugin_babelfish.cpp:159
+ msgid "Chinese (&Traditional) to English"
+-msgstr "繁體中文翻為英文(&T)"
++msgstr "傳統字漢語翻為英語(&T)"
+
+ #: plugin_babelfish.cpp:167
+ msgid "&Japanese to English"
+-msgstr "日文翻為英文(&J)"
++msgstr "日語翻為英語(&J)"
+
+ #: plugin_babelfish.cpp:170
+ msgid "&Korean to English"
+-msgstr "韓文翻為英文(&K)"
++msgstr "韓語翻為英語(&K)"
+
+ #: plugin_babelfish.cpp:174
+ msgid "&Russian to English"
+-msgstr "俄文翻為英文(&R)"
++msgstr "俄語翻為英語(&R)"
+
+ #: plugin_babelfish.cpp:217
+ msgid "Cannot Translate Source"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/charlatanui.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/charlatanui.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/charlatanui.po 2006-07-22 10:04:07.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/charlatanui.po 2011-11-11 15:45:17.000000000 +0100
+@@ -6,8 +6,7 @@
+ "Project-Id-Version: charlatanui\n"
+ "POT-Creation-Date: 2004-10-12 01:18+0200\n"
+ "PO-Revision-Date: 2006-05-29 09:19+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Traditional Chinese \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/crashesplugin.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/crashesplugin.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/crashesplugin.po 2006-07-22 10:04:07.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/crashesplugin.po 2011-11-11 15:45:17.000000000 +0100
+@@ -9,8 +9,7 @@
+ "Project-Id-Version: crashesplugin\n"
+ "POT-Creation-Date: 2005-08-10 10:20+0200\n"
+ "PO-Revision-Date: 2006-05-29 09:20+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Traditional Chinese \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/dirfilterplugin.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/dirfilterplugin.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/dirfilterplugin.po 2006-07-22 10:04:07.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/dirfilterplugin.po 2011-11-11 15:45:17.000000000 +0100
+@@ -7,8 +7,7 @@
+ "Project-Id-Version: dirfilterplugin\n"
+ "POT-Creation-Date: 2005-12-31 03:19+0100\n"
+ "PO-Revision-Date: 2006-05-29 09:33+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Traditional Chinese \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -33,7 +32,8 @@
+
+ #: dirfilterplugin.cpp:195
+ msgid ""
+-"Enter here a text which an item in the view must contain anywhere to be shown."
++"Enter here a text which an item in the view must contain anywhere to be "
++"shown."
+ msgstr "在此輸入要檢視的項目包含的字串。"
+
+ #: dirfilterplugin.cpp:199
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/domtreeviewer.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/domtreeviewer.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/domtreeviewer.po 2006-07-22 10:04:07.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/domtreeviewer.po 2011-11-11 15:45:17.000000000 +0100
+@@ -7,8 +7,7 @@
+ "Project-Id-Version: domtreeviewer\n"
+ "POT-Creation-Date: 2006-05-18 04:07+0200\n"
+ "PO-Revision-Date: 2006-05-29 09:43+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Traditional Chinese \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -209,11 +208,11 @@
+
+ #: domtreewindow.cpp:162
+ msgid "New &Element ..."
+-msgstr "新增元素...(&E)"
++msgstr "新增元素…(&E)"
+
+ #: domtreewindow.cpp:166
+ msgid "New &Text Node ..."
+-msgstr "新增文字節點...(&T)"
++msgstr "新增文字節點…(&T)"
+
+ #: domtreewindow.cpp:174
+ msgid "Delete attributes"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/dub.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/dub.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/dub.po 2006-07-22 10:04:07.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/dub.po 2011-11-11 15:45:17.000000000 +0100
+@@ -9,8 +9,7 @@
+ "Project-Id-Version: dub\n"
+ "POT-Creation-Date: 2004-10-12 01:18+0200\n"
+ "PO-Revision-Date: 2006-05-29 09:48+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Traditional Chinese \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/ffrs.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/ffrs.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/ffrs.po 2006-07-22 10:04:07.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/ffrs.po 2011-11-11 15:45:17.000000000 +0100
+@@ -6,8 +6,7 @@
+ "Project-Id-Version: ffrs\n"
+ "POT-Creation-Date: 2004-10-12 01:18+0200\n"
+ "PO-Revision-Date: 2006-05-29 09:50+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Traditional Chinese \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/fsview.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/fsview.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/fsview.po 2007-07-12 10:27:45.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/fsview.po 2011-11-11 15:45:17.000000000 +0100
+@@ -6,8 +6,7 @@
+ "Project-Id-Version: fsview\n"
+ "POT-Creation-Date: 2007-05-17 02:17+0200\n"
+ "PO-Revision-Date: 2006-05-29 09:59+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Traditional Chinese \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -66,14 +65,14 @@
+ #: fsview_part.cpp:105
+ msgid ""
+ "This is the FSView plugin, a graphical browsing mode showing filesystem "
+-"utilization by using a tree map visualization.
"
+-"Note that in this mode, automatic updating when filesystem changes are made "
+-"is intentionally not done.
"
+-"For details on usage and options available, see the online help under menu "
+-"'Help/FSView Manual'.
"
++"utilization by using a tree map visualization.Note that in this mode, "
++"automatic updating when filesystem changes are made is intentionally not"
++"b> done.
For details on usage and options available, see the online "
++"help under menu 'Help/FSView Manual'.
"
+ msgstr ""
+-"這是 FSView,一個使用樹狀圖來檢視目前檔案系統使用狀況的外掛程式。
"
+-"注意,在此模式下,不會自動更新檔案系統的狀況。詳細的用法與可用的選項,請參考 FSView 線上手冊。
"
++"這是 FSView,一個使用樹狀圖來檢視目前檔案系統使用狀況的外掛程式。
"
++"注意,在此模式下,不會自動更新檔案系統的狀況。詳細的用法與可用的選項,"
++"請參考 FSView 線上手冊。
"
+
+ #: fsview.cpp:294 fsview_part.cpp:121
+ msgid "Stop at Area"
+@@ -105,10 +104,13 @@
+
+ #: fsview_part.cpp:199
+ msgid ""
+-"FSView intentionally does not support automatic updates when changes are made "
+-"to files or directories, currently visible in FSView, from the outside.\n"
++"FSView intentionally does not support automatic updates when changes are "
++"made to files or directories, currently visible in FSView, from the "
++"outside.\n"
+ "For details, see the 'Help/FSView Manual'."
+-msgstr "在檢視檔案系統時,若檔案系統中的檔案、目錄等有變更時,FSView 並不會自動變更狀態。這是刻意如此的。詳情請參考 FSView 手冊。"
++msgstr ""
++"在檢視檔案系統時,若檔案系統中的檔案、目錄等有變更時,FSView 並不會自動變更狀"
++"態。這是刻意如此的。詳情請參考 FSView 手冊。"
+
+ #: treemap.cpp:1255
+ #, c-format
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/imagerename_plugin.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/imagerename_plugin.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/imagerename_plugin.po 2006-07-22 10:04:07.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/imagerename_plugin.po 2011-11-11 15:45:17.000000000 +0100
+@@ -9,8 +9,7 @@
+ "Project-Id-Version: imagerename_plugin\n"
+ "POT-Creation-Date: 2004-10-12 01:18+0200\n"
+ "PO-Revision-Date: 2006-05-29 10:03+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Traditional Chinese \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -38,8 +37,7 @@
+ msgid ""
+ "_: The color depth of an image\n"
+ "Depth: %1\n"
+-msgstr ""
+-"深度:%1\n"
++msgstr "深度:%1\n"
+
+ #: imagevisualizer.cpp:68
+ #, c-format
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/imgalleryplugin.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/imgalleryplugin.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/imgalleryplugin.po 2007-01-15 10:56:29.000000000 +0100
++++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/imgalleryplugin.po 2011-11-11 15:45:17.000000000 +0100
+@@ -7,8 +7,7 @@
+ "Project-Id-Version: imgalleryplugin\n"
+ "POT-Creation-Date: 2007-01-07 02:43+0100\n"
+ "PO-Revision-Date: 2006-05-29 10:23+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Traditional Chinese \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -90,7 +89,8 @@
+
+ #: imgallerydialog.cpp:201
+ msgid ""
+-"Whether subfolders should be included for the image gallery creation or not."
++"
Whether subfolders should be included for the image gallery creation or "
++"not."
+ msgstr "
建立相簿時是否要收入子資料夾的內容。"
+
+ #: imgallerydialog.cpp:208
+@@ -103,8 +103,8 @@
+
+ #: imgallerydialog.cpp:212
+ msgid ""
+-"
You can limit the number of folders the image gallery creator will traverse "
+-"to by setting an upper bound for the recursion depth."
++"
You can limit the number of folders the image gallery creator will "
++"traverse to by setting an upper bound for the recursion depth."
+ msgstr "
您可以限制要遞迴收錄多少層以內的子資料夾到相簿內。"
+
+ #: imgallerydialog.cpp:224
+@@ -113,8 +113,8 @@
+
+ #: imgallerydialog.cpp:227
+ msgid ""
+-"
This makes a copy of all images and the gallery will refer to these copies "
+-"instead of the original images."
++"
This makes a copy of all images and the gallery will refer to these "
++"copies instead of the original images."
+ msgstr "
這會將所有的影像複製一份在相簿中,並只存取此複本。"
+
+ #: imgallerydialog.cpp:233
+@@ -123,11 +123,12 @@
+
+ #: imgallerydialog.cpp:237
+ msgid ""
+-"
If you enable this option you can specify a comment file which will be used "
+-"for generating subtitles for the images."
+-"
For details about the file format please see the \"What's This?\" help "
+-"below."
+-msgstr "
開啟此選項的話,您可以指定使用一個備註檔,以記錄影像的子標題。
關於此檔案格式的詳情,請參考「這是什麼?」的說明。"
++"
If you enable this option you can specify a comment file which will be "
++"used for generating subtitles for the images.
For details about the file "
++"format please see the \"What's This?\" help below."
++msgstr ""
++"
開啟此選項的話,您可以指定使用一個備註檔,以記錄影像的子標題。
關於此檔"
++"案格式的詳情,請參考「這是什麼?」的說明。"
+
+ #: imgallerydialog.cpp:244
+ msgid "Comments &file:"
+@@ -135,24 +136,13 @@
+
+ #: imgallerydialog.cpp:247
+ msgid ""
+-"
You can specify the name of the comment file here. The comment file contains "
+-"the subtitles for the images. The format of this file is:"
+-"
FILENAME1:"
+-"
Description"
+-"
"
+-"
FILENAME2:"
+-"
Description"
+-"
"
+-"
and so on"
++"
You can specify the name of the comment file here. The comment file "
++"contains the subtitles for the images. The format of this file is:"
++"
FILENAME1:
Description
FILENAME2:
Description
and so "
++"on"
+ msgstr ""
+ "
您可以指定備註檔的檔名。備註檔內包含影像的子標題。檔案格式為: "
+-"
FILENAME1:"
+-"
Description"
+-"
"
+-"
FILENAME2:"
+-"
Description"
+-"
"
+-"
"
++"
FILENAME1:
Description
FILENAME2:
Description
"
+ "
依此類推。"
+
+ #: imgallerydialog.cpp:274
+@@ -173,7 +163,7 @@
+
+ #: imgalleryplugin.cpp:54
+ msgid "&Create Image Gallery..."
+-msgstr "建立相簿...(&C)"
++msgstr "建立相簿…(&C)"
+
+ #: imgalleryplugin.cpp:63
+ msgid "Could not create the plugin, please report a bug."
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/katecppsymbolviewer.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/katecppsymbolviewer.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/katecppsymbolviewer.po 2007-05-14 12:22:53.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/katecppsymbolviewer.po 2011-11-11 15:45:17.000000000 +0100
+@@ -6,8 +6,7 @@
+ "Project-Id-Version: katecppsymbolviewer\n"
+ "POT-Creation-Date: 2007-03-26 02:16+0200\n"
+ "PO-Revision-Date: 2007-03-27 14:16+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Chinese Traditional \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/katefiletemplates.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/katefiletemplates.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/katefiletemplates.po 2007-10-08 12:00:11.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/katefiletemplates.po 2011-11-11 15:45:17.000000000 +0100
+@@ -6,8 +6,7 @@
+ "Project-Id-Version: katefiletemplates\n"
+ "POT-Creation-Date: 2007-10-02 01:15+0200\n"
+ "PO-Revision-Date: 2006-05-29 10:56+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Traditional Chinese \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -16,7 +15,7 @@
+
+ #: filetemplates.cpp:135
+ msgid "Any File..."
+-msgstr "任何檔案..."
++msgstr "任何檔案…"
+
+ #: filetemplates.cpp:139
+ msgid "&Use Recent"
+@@ -24,7 +23,7 @@
+
+ #: filetemplates.cpp:251
+ msgid "&Manage Templates..."
+-msgstr "管理樣本...(&M)"
++msgstr "管理樣本…(&M)"
+
+ #: filetemplates.cpp:255
+ msgid "New From &Template"
+@@ -36,9 +35,8 @@
+
+ #: filetemplates.cpp:384
+ msgid ""
+-"Error opening the file"
+-"
%1"
+-"
for reading. The document will not be created."
++"Error opening the file
%1
for reading. The "
++"document will not be created."
+ msgstr "開啟檔案 %1 時發生錯誤。
無法建立文件。"
+
+ #: filetemplates.cpp:385 filetemplates.cpp:980
+@@ -60,10 +58,12 @@
+
+ #: filetemplates.cpp:561
+ msgid ""
+-"This string is used as the template's name and is displayed, for example, in "
+-"the Template menu. It should describe the meaning of the template, for example "
+-"'HTML Document'.
"
+-msgstr "此字串用於樣本名稱,並在樣本選單中顯示。通常應該用來描述樣本的意義,例如,HTML 文件。
"
++"This string is used as the template's name and is displayed, for example, "
++"in the Template menu. It should describe the meaning of the template, for "
++"example 'HTML Document'.
"
++msgstr ""
++"此字串用於樣本名稱,並在樣本選單中顯示。通常應該用來描述樣本的意義,例如,"
++"HTML 文件。
"
+
+ #: filetemplates.cpp:566
+ msgid "Press to select or change the icon for this template"
+@@ -76,9 +76,11 @@
+ #: filetemplates.cpp:572
+ msgid ""
+ "The group is used for chosing a submenu for the plugin. If it is empty, "
+-"'Other' is used.
"
+-"You can type any string to add a new group to your menu.
"
+-msgstr "此群組是用於選擇外掛程式的子選單。如果保持空白,則會使用「其他」。
您可以輸入任何字串以新增群組到您的選單中。
"
++"'Other' is used.
You can type any string to add a new group to your "
++"menu.
"
++msgstr ""
++"此群組是用於選擇外掛程式的子選單。如果保持空白,則會使用「其他」。
"
++"您可以輸入任何字串以新增群組到您的選單中。
"
+
+ #: filetemplates.cpp:576
+ msgid "Document &name:"
+@@ -86,17 +88,16 @@
+
+ #: filetemplates.cpp:579
+ msgid ""
+-"This string will be used to set a name for the new document, to display in "
+-"the title bar and file list.
"
+-"If the string contains '%N', that will be replaced with a number increasing "
+-"with each similarly named file.
"
+-" For example, if the Document Name is 'New shellscript (%N).sh', the first "
++"
This string will be used to set a name for the new document, to display "
++"in the title bar and file list.
If the string contains '%N', that will "
++"be replaced with a number increasing with each similarly named file.
"
++"For example, if the Document Name is 'New shellscript (%N).sh', the first "
+ "document will be named 'New shellscript (1).sh', the second 'New shellscipt "
+ "(2).sh', and so on.
"
+ msgstr ""
+-"這個字串用於設定新文件的名稱,以顯示於檔案清單及標頭列。
"
+-"如果字串包含了 '%N',則會替換為類似檔名的編號。
"
+-"例如,如果文件名稱為 \"New shellscript (%N)\",則第一個檔案名稱為 New shellscript (1),第二個則為 New "
++"
這個字串用於設定新文件的名稱,以顯示於檔案清單及標頭列。
如果字串包"
++"含了 '%N',則會替換為類似檔名的編號。
例如,如果文件名稱為 \"New "
++"shellscript (%N)\",則第一個檔案名稱為 New shellscript (1),第二個則為 New "
+ "shellscript (2) 依此類推。
"
+
+ #: filetemplates.cpp:587
+@@ -119,8 +120,8 @@
+
+ #: filetemplates.cpp:596
+ msgid ""
+-"This string is used, for example, as context help for this template (such as "
+-"the 'whatsthis' help for the menu item.)
"
++"This string is used, for example, as context help for this template (such "
++"as the 'whatsthis' help for the menu item.)
"
+ msgstr "此字串用於描述此樣本。
"
+
+ #: filetemplates.cpp:600
+@@ -129,18 +130,19 @@
+
+ #: filetemplates.cpp:603
+ msgid ""
+-"You can set this if you want to share your template with other users.
"
+-"the recommended form is like an Email address: 'Anders Lund "
+-"<anders@alweb.dk>'
"
++"You can set this if you want to share your template with other users."
++"p>
the recommended form is like an Email address: 'Anders Lund <"
++"anders@alweb.dk>'
"
+ msgstr ""
+-"如果您要將此樣本分享給其他使用者,您可以設定此值。
"
+-"建議使用的格式是類似電子郵件地址:Anders Lund <anders@alweb.dk>
"
++"如果您要將此樣本分享給其他使用者,您可以設定此值。
建議使用的格式是"
++"類似電子郵件地址:Anders Lund <anders@alweb.dk>
"
+
+ #: filetemplates.cpp:675
+ msgid ""
+ "If you want to base this template on an existing file or template, select "
+ "the appropriate option below.
"
+-msgstr "如果您要以現存檔案或樣本為基礎建立新樣本,請在下方選擇適當的選項。
"
++msgstr ""
++"如果您要以現存檔案或樣本為基礎建立新樣本,請在下方選擇適當的選項。
"
+
+ #: filetemplates.cpp:682
+ msgid "Start with an &empty document"
+@@ -186,10 +188,12 @@
+
+ #: filetemplates.cpp:793
+ msgid ""
+-"You can replace certain strings in the text with template macros."
+-"
If any of the data below is incorrect or missing, edit the data in the KDE "
++"
You can replace certain strings in the text with template macros.
If "
++"any of the data below is incorrect or missing, edit the data in the KDE "
+ "email information."
+-msgstr "
您可以將目前文字裡的字串換成樣本巨集。
如果底下的資料不正確或遺失,請編輯 KDE 電子郵件資訊裡的資料。"
++msgstr ""
++"
您可以將目前文字裡的字串換成樣本巨集。
如果底下的資料不正確或遺失,請編"
++"輯 KDE 電子郵件資訊裡的資料。"
+
+ #: filetemplates.cpp:797
+ msgid "Replace full name '%1' with the '%{fullname}' macro"
+@@ -208,7 +212,9 @@
+ "
The template will now be created and saved to the chosen location. To "
+ "position the cursor put a caret ('^') character where you want it in files "
+ "created from the template.
"
+-msgstr "現在要建立樣本並儲存到指定的位置了。若您要指定游標的位置,請放一個 ^ 符號在您想要的位置。
"
++msgstr ""
++"現在要建立樣本並儲存到指定的位置了。若您要指定游標的位置,請放一個 ^ 符號"
++"在您想要的位置。
"
+
+ #: filetemplates.cpp:822
+ msgid "Open the template for editing"
+@@ -220,11 +226,11 @@
+
+ #: filetemplates.cpp:923
+ msgid ""
+-"The file "
+-"
'%1'"
+-"
already exists; if you do not want to overwrite it, change the template "
+-"file name to something else."
+-msgstr "
檔案 %1 已存在。
如果您不想覆寫它,請修改樣本檔案名稱。"
++"
The file
'%1'
already exists; if you do not want "
++"to overwrite it, change the template file name to something else."
++msgstr ""
++"
檔案 %1 已存在。
如果您不想覆寫它,請修改樣本檔案名"
++"稱。"
+
+ #: filetemplates.cpp:926
+ msgid "File Exists"
+@@ -236,9 +242,8 @@
+
+ #: filetemplates.cpp:978
+ msgid ""
+-"Error opening the file"
+-"
%1"
+-"
for reading. The document will not be created"
++"Error opening the file
%1
for reading. The "
++"document will not be created"
+ msgstr "開啟 %1 時發生錯誤。無法建立文件。"
+
+ #: filetemplates.cpp:1057
+@@ -260,16 +265,16 @@
+
+ #: filetemplates.cpp:1113
+ msgid "New..."
+-msgstr "新增..."
++msgstr "新增…"
+
+ #: filetemplates.cpp:1117
+ msgid "Edit..."
+-msgstr "編輯..."
++msgstr "編輯…"
+
+ #: filetemplates.cpp:1125
+ msgid "Upload..."
+-msgstr "上傳..."
++msgstr "上傳…"
+
+ #: filetemplates.cpp:1129
+ msgid "Download..."
+-msgstr "下載..."
++msgstr "下載…"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/katefll_initplugin.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/katefll_initplugin.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/katefll_initplugin.po 2006-07-22 10:04:07.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/katefll_initplugin.po 2011-11-11 15:45:17.000000000 +0100
+@@ -6,8 +6,7 @@
+ "Project-Id-Version: katefll_initplugin\n"
+ "POT-Creation-Date: 2005-07-24 01:39+0200\n"
+ "PO-Revision-Date: 2006-05-29 10:57+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Traditional Chinese \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -16,15 +15,15 @@
+
+ #: katefll_plugin.cpp:77
+ msgid "Open File List..."
+-msgstr "開啟檔案清單..."
++msgstr "開啟檔案清單…"
+
+ #: katefll_plugin.cpp:86
+ msgid "Save File List"
+-msgstr "儲存檔案清單..."
++msgstr "儲存檔案清單…"
+
+ #: katefll_plugin.cpp:90
+ msgid "Save File List As..."
+-msgstr "儲存檔案清單為..."
++msgstr "儲存檔案清單為…"
+
+ #: katefll_plugin.cpp:148
+ msgid "Do you want to close all other files first?"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/katefll_plugin.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/katefll_plugin.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/katefll_plugin.po 2006-07-22 10:04:07.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/katefll_plugin.po 2011-11-11 15:45:17.000000000 +0100
+@@ -6,8 +6,7 @@
+ "Project-Id-Version: katefll_plugin\n"
+ "POT-Creation-Date: 2005-07-24 01:39+0200\n"
+ "PO-Revision-Date: 2006-05-29 10:58+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Traditional Chinese \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -16,7 +15,7 @@
+
+ #: katefll_plugin.cpp:77
+ msgid "Open File List..."
+-msgstr "開啟檔案清單..."
++msgstr "開啟檔案清單…"
+
+ #: katefll_plugin.cpp:86
+ msgid "Save File List"
+@@ -24,7 +23,7 @@
+
+ #: katefll_plugin.cpp:90
+ msgid "Save File List As..."
+-msgstr "儲存檔案清單為..."
++msgstr "儲存檔案清單為…"
+
+ #: katefll_plugin.cpp:148
+ msgid "Do you want to close all other files first?"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/katehelloworld.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/katehelloworld.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/katehelloworld.po 2005-09-10 11:24:11.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/katehelloworld.po 2011-11-11 15:45:17.000000000 +0100
+@@ -7,7 +7,7 @@
+ "Project-Id-Version: katehelloworld\n"
+ "POT-Creation-Date: 2004-10-12 01:18+0200\n"
+ "PO-Revision-Date: 2002-04-06 11:04+0800\n"
+-"Last-Translator: tonniewalker \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Chinese (traditional) \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/katehtmltools.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/katehtmltools.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/katehtmltools.po 2006-07-22 10:04:07.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/katehtmltools.po 2011-11-11 15:45:17.000000000 +0100
+@@ -7,8 +7,7 @@
+ "Project-Id-Version: katehtmltools\n"
+ "POT-Creation-Date: 2004-10-12 01:18+0200\n"
+ "PO-Revision-Date: 2006-05-29 10:58+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Traditional Chinese \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -17,7 +16,7 @@
+
+ #: plugin_katehtmltools.cpp:53
+ msgid "HT&ML Tag..."
+-msgstr "HTML 標籤... (&M)"
++msgstr "HTML 標籤…(&M)"
+
+ #: plugin_katehtmltools.cpp:85
+ msgid "HTML Tag"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/kateinsertcommand.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/kateinsertcommand.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/kateinsertcommand.po 2006-07-22 10:04:07.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/kateinsertcommand.po 2011-11-11 15:45:17.000000000 +0100
+@@ -7,8 +7,7 @@
+ "Project-Id-Version: kateinsertcommand\n"
+ "POT-Creation-Date: 2006-03-06 03:57+0100\n"
+ "PO-Revision-Date: 2006-06-19 09:07+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Chinese Traditional \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -17,12 +16,12 @@
+
+ #: plugin_kateinsertcommand.cpp:86
+ msgid "Insert Command..."
+-msgstr "插入命令..."
++msgstr "插入命令…"
+
+ #: plugin_kateinsertcommand.cpp:113
+ msgid ""
+-"You are not allowed to execute arbitrary external applications. If you want to "
+-"be able to do this, contact your system administrator."
++"You are not allowed to execute arbitrary external applications. If you want "
++"to be able to do this, contact your system administrator."
+ msgstr "您無法執行任何外部應用程式。如果您要執行,請聯絡您的系統管理員。"
+
+ #: plugin_kateinsertcommand.cpp:113
+@@ -58,7 +57,7 @@
+
+ #: plugin_kateinsertcommand.cpp:246
+ msgid "Oops!"
+-msgstr "呃..."
++msgstr "呃…"
+
+ #: plugin_kateinsertcommand.cpp:286 plugin_kateinsertcommand.h:73
+ msgid "Insert Command"
+@@ -66,15 +65,15 @@
+
+ #: plugin_kateinsertcommand.cpp:293
+ msgid "Enter &command:"
+-msgstr "輸入命令 (&C):"
++msgstr "輸入命令(&C):"
+
+ #: plugin_kateinsertcommand.cpp:305
+ msgid "Choose &working folder:"
+-msgstr "選擇工作目錄 (&W):"
++msgstr "選擇工作目錄(&W):"
+
+ #: plugin_kateinsertcommand.cpp:315
+ msgid "Insert Std&Err messages"
+-msgstr "插入標準錯誤之訊息 (&E)"
++msgstr "插入標準錯誤之訊息(&E)"
+
+ #: plugin_kateinsertcommand.cpp:318
+ msgid "&Print command name"
+@@ -88,8 +87,8 @@
+
+ #: plugin_kateinsertcommand.cpp:326
+ msgid ""
+-"Sets the working folder of the command. The command executed is 'cd "
+-"&& '"
++"Sets the working folder of the command. The command executed is 'cd && "
++"'"
+ msgstr "設定此命令的工作目錄。執行此命令時會執行 'cd && '"
+
+ #: plugin_kateinsertcommand.cpp:329
+@@ -104,7 +103,7 @@
+ msgid ""
+ "If you check this, the command string will be printed followed by a newline "
+ "before the output."
+-msgstr "勾選此選項的話,會先印出命令字串,並加入一個換行符號,然後再列印輸出。"
++msgstr "勾選此選項的話,會先印出命令字串,並加入一個換列符號,然後再列印輸出。"
+
+ #: plugin_kateinsertcommand.cpp:379
+ msgid "Remember"
+@@ -124,7 +123,7 @@
+
+ #: plugin_kateinsertcommand.cpp:391
+ msgid "&Document folder"
+-msgstr "文件目錄 (&D)"
++msgstr "文件目錄(&D)"
+
+ #: plugin_kateinsertcommand.cpp:392
+ msgid "&Latest used working folder"
+@@ -138,21 +137,17 @@
+
+ #: plugin_kateinsertcommand.cpp:403
+ msgid ""
+-""
+-"Decides what is suggested as working folder for the command.
"
+-"Application Working Folder (default): "
+-"The folder from which you launched the application hosting the plugin, usually "
+-"your home folder.
"
+-"Document Folder: The folder of the document. Used only for "
+-"local documents.
"
+-"Latest Working Folder: The folder used last time you used "
+-"this plugin.
"
++"Decides what is suggested as working folder for the command."
++"
Application Working Folder (default): The folder "
++"from which you launched the application hosting the plugin, usually your "
++"home folder.
Document Folder: The folder of the "
++"document. Used only for local documents.
Latest Working Folder:"
++" The folder used last time you used this plugin.
"
+ msgstr ""
+-""
+-"決定此命令建議的工作目錄。
"
+-"應用程式工作目錄(預設):您啟動此應用程式的資料夾,通常是您的家目錄。
"
+-"文件目錄:文件所在的目錄。只使用於本地端文件。
"
+-"最新使用的工作目錄:最後一此使用此外掛程式時使用的目錄。
"
++"決定此命令建議的工作目錄。
應用程式工作目錄(預設):"
++"strong>您啟動此應用程式的資料夾,通常是您的家目錄。
文件目錄:"
++"文件所在的目錄。只使用於本地端文件。
最新使用的工作目"
++"錄:最後一此使用此外掛程式時使用的目錄。
"
+
+ #: plugin_kateinsertcommand.h:75
+ msgid "Configure Insert Command Plugin"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/katekjswrapper.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/katekjswrapper.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/katekjswrapper.po 2006-07-22 10:04:07.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/katekjswrapper.po 2011-11-11 15:45:17.000000000 +0100
+@@ -6,8 +6,7 @@
+ "Project-Id-Version: katekjswrapper\n"
+ "POT-Creation-Date: 2004-10-30 01:25+0200\n"
+ "PO-Revision-Date: 2006-05-29 11:08+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Traditional Chinese \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/katemake.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/katemake.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/katemake.po 2006-10-01 18:34:14.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/katemake.po 2011-11-11 15:45:17.000000000 +0100
+@@ -6,8 +6,7 @@
+ "Project-Id-Version: katemake\n"
+ "POT-Creation-Date: 2006-08-18 04:13+0200\n"
+ "PO-Revision-Date: 2006-08-14 13:17+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Chinese Traditional \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -20,7 +19,7 @@
+
+ #: plugin_katemake.cpp:159
+ msgid "Running make..."
+-msgstr "執行 make..."
++msgstr "執行 make…"
+
+ #: plugin_katemake.cpp:160 plugin_katemake.cpp:509
+ msgid "No Errors."
+@@ -40,7 +39,7 @@
+
+ #: plugin_katemake.cpp:348
+ msgid "Configure..."
+-msgstr "設定..."
++msgstr "設定…"
+
+ #: plugin_katemake.cpp:360
+ msgid "Line"
+@@ -74,7 +73,7 @@
+
+ #: plugin_katemake.cpp:692
+ msgid "Source prefix:"
+-msgstr "源碼前置字元:"
++msgstr "原始碼前置字元:"
+
+ #: plugin_katemake.cpp:697
+ msgid "Build prefix:"
+@@ -84,4 +83,4 @@
+ #: rc.cpp:3
+ #, no-c-format
+ msgid "&Make"
+-msgstr "Make (&M)"
++msgstr "Make(&M)"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/katemodeline.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/katemodeline.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/katemodeline.po 2005-09-10 11:24:11.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/katemodeline.po 2011-11-11 15:45:17.000000000 +0100
+@@ -7,7 +7,7 @@
+ "Project-Id-Version: katemodeline\n"
+ "POT-Creation-Date: 2004-10-12 01:18+0200\n"
+ "PO-Revision-Date: 2002-06-27 10:40+1000\n"
+-"Last-Translator: Ben Wu \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Chinese (traditional) \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/kateopenheader.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/kateopenheader.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/kateopenheader.po 2006-07-22 10:04:07.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/kateopenheader.po 2011-11-11 15:45:17.000000000 +0100
+@@ -9,8 +9,7 @@
+ "Project-Id-Version: kateopenheader\n"
+ "POT-Creation-Date: 2004-10-12 01:18+0200\n"
+ "PO-Revision-Date: 2006-05-29 11:10+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Traditional Chinese \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/katepybrowse.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/katepybrowse.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/katepybrowse.po 2006-07-22 10:04:07.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/katepybrowse.po 2011-11-11 15:45:17.000000000 +0100
+@@ -9,8 +9,7 @@
+ "Project-Id-Version: katepybrowse\n"
+ "POT-Creation-Date: 2005-05-08 01:27+0200\n"
+ "PO-Revision-Date: 2006-05-29 11:11+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Traditional Chinese \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -50,4 +49,4 @@
+ #: rc.cpp:3
+ #, no-c-format
+ msgid "P&ython"
+-msgstr "Python (&Y)"
++msgstr "Python(&Y)"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/katesnippets.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/katesnippets.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/katesnippets.po 2006-07-22 10:04:07.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/katesnippets.po 2011-11-11 15:45:17.000000000 +0100
+@@ -6,8 +6,7 @@
+ "Project-Id-Version: katesnippets\n"
+ "POT-Creation-Date: 2005-05-08 01:27+0200\n"
+ "PO-Revision-Date: 2006-05-29 11:12+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Traditional Chinese \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/katetabbarextension.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/katetabbarextension.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/katetabbarextension.po 2008-08-19 20:43:08.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/katetabbarextension.po 2011-11-11 15:45:17.000000000 +0100
+@@ -7,7 +7,7 @@
+ "Project-Id-Version: katetabbarextension\n"
+ "POT-Creation-Date: 2008-02-22 01:36+0100\n"
+ "PO-Revision-Date: 2007-06-25 08:13+0800\n"
+-"Last-Translator: Franklin Weng \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Chinese Traditional \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/katetextfilter.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/katetextfilter.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/katetextfilter.po 2006-07-22 10:04:07.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/katetextfilter.po 2011-11-11 15:45:17.000000000 +0100
+@@ -9,8 +9,7 @@
+ "Project-Id-Version: katetextfilter\n"
+ "POT-Creation-Date: 2006-01-02 03:18+0100\n"
+ "PO-Revision-Date: 2006-05-29 11:16+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Traditional Chinese \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -19,12 +18,12 @@
+
+ #: plugin_katetextfilter.cpp:66
+ msgid "Filter Te&xt..."
+-msgstr "過濾文字...(&X)"
++msgstr "過濾文字…(&X)"
+
+ #: plugin_katetextfilter.cpp:257
+ msgid ""
+-"You are not allowed to execute arbitrary external applications. If you want to "
+-"be able to do this, contact your system administrator."
++"You are not allowed to execute arbitrary external applications. If you want "
++"to be able to do this, contact your system administrator."
+ msgstr "您無法執行任何外部應用程式。如果您要執行,請聯絡您的系統管理員。"
+
+ #: plugin_katetextfilter.cpp:259
+@@ -41,14 +40,11 @@
+
+ #: plugin_katetextfilter.cpp:311
+ msgid ""
+-""
+-"Usage: textfilter COMMAND
"
+-"Replace the selection with the output of the specified shell command.
"
+-""
++"Usage: textfilter COMMAND
Replace the selection "
++"with the output of the specified shell command.
"
+ msgstr ""
+-""
+-"用法:textfilter <命令>
"
+-"將所選擇的取代為指定的文稿命令的輸出。
"
++"用法:textfilter <命令>
將所選擇的取代為指定的文稿"
++"命令的輸出。
"
+
+ #: plugin_katetextfilter.cpp:320
+ msgid "You need to have a selection to use textfilter"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/katexmlcheck.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/katexmlcheck.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/katexmlcheck.po 2006-07-22 10:04:07.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/katexmlcheck.po 2011-11-11 15:45:17.000000000 +0100
+@@ -10,8 +10,7 @@
+ "Project-Id-Version: katexmlcheck\n"
+ "POT-Creation-Date: 2005-05-08 01:27+0200\n"
+ "PO-Revision-Date: 2006-05-29 13:00+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Traditional Chinese \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -50,7 +49,9 @@
+ msgid ""
+ "Error: Failed to execute xmllint. Please make sure that xmllint is "
+ "installed. It is part of libxml2."
+-msgstr "錯誤: 無法啟動xmllint。 請確定xmllint已經安裝。xmllint是libxml2的一部分"
++msgstr ""
++"錯誤: 無法啟動xmllint。 請確定xmllint已經安裝。xmllint是libxml2的一部"
++"分"
+
+ #. i18n: file ui.rc line 4
+ #: rc.cpp:3
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/katexmltools.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/katexmltools.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/katexmltools.po 2006-07-22 10:04:07.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/katexmltools.po 2011-11-11 15:45:17.000000000 +0100
+@@ -10,8 +10,7 @@
+ "Project-Id-Version: katexmltools\n"
+ "POT-Creation-Date: 2005-05-08 01:27+0200\n"
+ "PO-Revision-Date: 2006-05-29 13:01+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Traditional Chinese \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -20,7 +19,7 @@
+
+ #: plugin_katexmltools.cpp:152
+ msgid "&Insert Element..."
+-msgstr "插入元素(&I)..."
++msgstr "插入元素(&I)…"
+
+ #: plugin_katexmltools.cpp:154
+ msgid "&Close Element"
+@@ -36,8 +35,8 @@
+
+ #: plugin_katexmltools.cpp:467
+ msgid ""
+-"The current file has been identified as a document of type \"%1\". The meta DTD "
+-"for this document type will now be loaded."
++"The current file has been identified as a document of type \"%1\". The meta "
++"DTD for this document type will now be loaded."
+ msgstr "這個檔案已經被鑑定為\"%1\"文件類型。將載入此類型文件的meta DTD"
+
+ #: plugin_katexmltools.cpp:470
+@@ -70,13 +69,14 @@
+
+ #: pseudo_dtd.cpp:56
+ msgid ""
+-"The file '%1' is not in the expected format. Please check that the file is of "
+-"this type:\n"
++"The file '%1' is not in the expected format. Please check that the file is "
++"of this type:\n"
+ "-//Norman Walsh//DTD DTDParse V2.0//EN\n"
+-"You can produce such files with dtdparse. See the Kate Plugin documentation for "
+-"more information."
++"You can produce such files with dtdparse. See the Kate Plugin documentation "
++"for more information."
+ msgstr ""
+-"檔案'%1'並不是預期的格式。請檢查這個檔案是否符合這個類型:-//Norman Walsh//DTD DTDParse V2.0//EN\n"
++"檔案'%1'並不是預期的格式。請檢查這個檔案是否符合這個類型:-//Norman Walsh//"
++"DTD DTDParse V2.0//EN\n"
+ "您可以用dtaparse製作這類檔案。請看Kate Plugin文件來獲取更多資訊"
+
+ #: pseudo_dtd.cpp:71
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/kbinaryclock.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/kbinaryclock.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/kbinaryclock.po 2008-08-19 20:43:08.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/kbinaryclock.po 2011-11-11 15:45:17.000000000 +0100
+@@ -6,8 +6,7 @@
+ "Project-Id-Version: kbinaryclock\n"
+ "POT-Creation-Date: 2008-07-08 01:23+0200\n"
+ "PO-Revision-Date: 2006-05-29 13:04+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Traditional Chinese \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -32,11 +31,11 @@
+
+ #: kbinaryclock.cpp:310
+ msgid "&Adjust Date && Time..."
+-msgstr "調整日期及時間...(&A)"
++msgstr "調整日期及時間…(&A)"
+
+ #: kbinaryclock.cpp:312
+ msgid "Date && Time &Format..."
+-msgstr "日期及時間格式...(&F)"
++msgstr "日期及時間格式…(&F)"
+
+ #: kbinaryclock.cpp:315
+ msgid "C&opy to Clipboard"
+@@ -44,7 +43,7 @@
+
+ #: kbinaryclock.cpp:319
+ msgid "&Configure KBinaryClock..."
+-msgstr "設定 KBinaryClock...(&C)"
++msgstr "設定 KBinaryClock…(&C)"
+
+ #. i18n: file settings.ui line 38
+ #: rc.cpp:3
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/kcmkuick.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/kcmkuick.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/kcmkuick.po 2006-07-22 10:04:07.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/kcmkuick.po 2011-11-11 15:45:17.000000000 +0100
+@@ -9,8 +9,7 @@
+ "Project-Id-Version: kcmkuick\n"
+ "POT-Creation-Date: 2004-10-12 01:18+0200\n"
+ "PO-Revision-Date: 2006-05-29 13:06+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Traditional Chinese \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -39,9 +38,11 @@
+
+ #: kcmkuick.cpp:151
+ msgid ""
+-"Kuick
With this module you can configure Kuick, the KDE quickcopy and "
+-"move plugin for Konqueror."
+-msgstr "Kuick
有了這個模組,您可以設定 kuick(KDE quickcopy) 和運行 Konqueror 的外掛。"
++"Kuick
With this module you can configure Kuick, the KDE quickcopy "
++"and move plugin for Konqueror."
++msgstr ""
++"Kuick
有了這個模組,您可以設定 kuick(KDE quickcopy) 和運行 "
++"Konqueror 的外掛。"
+
+ #. i18n: file kcmkuickdialog.ui line 30
+ #: rc.cpp:3
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/kfile_cert.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/kfile_cert.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/kfile_cert.po 2006-07-22 10:04:07.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/kfile_cert.po 2011-11-11 15:45:17.000000000 +0100
+@@ -6,8 +6,7 @@
+ "Project-Id-Version: kfile_cert\n"
+ "POT-Creation-Date: 2004-11-11 01:23+0100\n"
+ "PO-Revision-Date: 2006-05-29 13:07+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Traditional Chinese \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/kfile_desktop.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/kfile_desktop.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/kfile_desktop.po 2005-09-10 11:24:11.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/kfile_desktop.po 2011-11-11 15:45:17.000000000 +0100
+@@ -7,7 +7,7 @@
+ "Project-Id-Version: kfile_desktop\n"
+ "POT-Creation-Date: 2004-10-12 01:18+0200\n"
+ "PO-Revision-Date: 2002-05-23 19:24+0800\n"
+-"Last-Translator: Keanu \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: zh-l10n <>\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/kfile_folder.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/kfile_folder.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/kfile_folder.po 2005-09-10 11:24:11.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/kfile_folder.po 2011-11-11 15:45:17.000000000 +0100
+@@ -7,7 +7,7 @@
+ "Project-Id-Version: kfile_folder\n"
+ "POT-Creation-Date: 2004-10-12 01:18+0200\n"
+ "PO-Revision-Date: 2002-10-28 22:16+0800\n"
+-"Last-Translator: Keanu \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Chinese (traditional) \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/kfile_html.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/kfile_html.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/kfile_html.po 2007-01-15 10:56:29.000000000 +0100
++++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/kfile_html.po 2011-11-11 15:45:17.000000000 +0100
+@@ -7,8 +7,7 @@
+ "Project-Id-Version: kfile_html\n"
+ "POT-Creation-Date: 2006-11-26 03:48+0100\n"
+ "PO-Revision-Date: 2006-05-29 13:07+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Traditional Chinese \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/kfile_lnk.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/kfile_lnk.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/kfile_lnk.po 2006-07-22 10:04:07.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/kfile_lnk.po 2011-11-11 15:45:17.000000000 +0100
+@@ -6,8 +6,7 @@
+ "Project-Id-Version: kfile_lnk\n"
+ "POT-Creation-Date: 2004-10-12 01:18+0200\n"
+ "PO-Revision-Date: 2006-05-29 13:10+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Traditional Chinese \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/kfile_mhtml.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/kfile_mhtml.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/kfile_mhtml.po 2006-07-22 10:04:07.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/kfile_mhtml.po 2011-11-11 15:45:17.000000000 +0100
+@@ -6,8 +6,7 @@
+ "Project-Id-Version: kfile_mhtml\n"
+ "POT-Creation-Date: 2005-01-19 01:25+0100\n"
+ "PO-Revision-Date: 2006-05-29 13:10+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Traditional Chinese \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/kfile_txt.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/kfile_txt.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/kfile_txt.po 2005-09-10 11:24:11.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/kfile_txt.po 2011-11-11 15:45:17.000000000 +0100
+@@ -7,7 +7,7 @@
+ "Project-Id-Version: kfilt_txt\n"
+ "POT-Creation-Date: 2005-01-08 01:24+0100\n"
+ "PO-Revision-Date: 2002-05-23 19:29+0800\n"
+-"Last-Translator: Keanu \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: zh-l10n <>\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/khtmlsettingsplugin.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/khtmlsettingsplugin.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/khtmlsettingsplugin.po 2006-07-22 10:04:07.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/khtmlsettingsplugin.po 2011-11-11 15:45:17.000000000 +0100
+@@ -7,8 +7,7 @@
+ "Project-Id-Version: khtmlsettingsplugin\n"
+ "POT-Creation-Date: 2005-02-10 01:34+0100\n"
+ "PO-Revision-Date: 2006-05-29 13:13+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Traditional Chinese \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -39,7 +38,7 @@
+
+ #: settingsplugin.cpp:59
+ msgid "Java&Script"
+-msgstr "JavaScript (&S)"
++msgstr "JavaScript(&S)"
+
+ #: settingsplugin.cpp:64
+ msgid "&Java"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/kmathapplet.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/kmathapplet.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/kmathapplet.po 2005-09-10 13:14:56.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/kmathapplet.po 2011-11-11 15:45:17.000000000 +0100
+@@ -7,7 +7,7 @@
+ "Project-Id-Version: kmathapplet\n"
+ "POT-Creation-Date: 2004-12-17 01:25+0100\n"
+ "PO-Revision-Date: 2005-08-17 10:28+0800\n"
+-"Last-Translator: Abel Cheung \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Chinese (traditional) \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/kolourpicker.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/kolourpicker.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/kolourpicker.po 2008-08-19 20:43:08.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/kolourpicker.po 2011-11-11 15:45:17.000000000 +0100
+@@ -8,7 +8,7 @@
+ "Project-Id-Version: kolourpicker\n"
+ "POT-Creation-Date: 2008-08-12 01:19+0200\n"
+ "PO-Revision-Date: 2003-08-03 20:42+0800\n"
+-"Last-Translator: Yuan-Chen Cheng \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: zh-l10n \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/konqsidebar_delicious.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/konqsidebar_delicious.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/konqsidebar_delicious.po 2006-07-22 10:04:07.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/konqsidebar_delicious.po 2011-11-11 15:45:17.000000000 +0100
+@@ -6,8 +6,7 @@
+ "Project-Id-Version: konqsidebar_delicious\n"
+ "POT-Creation-Date: 2005-08-18 04:32+0200\n"
+ "PO-Revision-Date: 2006-05-29 13:15+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Traditional Chinese \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -28,7 +27,7 @@
+
+ #: mainWidget.cpp:238
+ msgid "Rename Tag..."
+-msgstr "重新命名標籤..."
++msgstr "重新命名標籤…"
+
+ #: mainWidget.cpp:305
+ msgid "Rename Tag"
+@@ -98,7 +97,7 @@
+ #: rc.cpp:27
+ #, no-c-format
+ msgid "Post &New..."
+-msgstr "發表新的書籤...(&N)"
++msgstr "發表新的書籤…(&N)"
+
+ #. i18n: file widget.ui line 114
+ #: rc.cpp:30
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/konqsidebar_mediaplayer.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/konqsidebar_mediaplayer.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/konqsidebar_mediaplayer.po 2006-07-22 10:04:07.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/konqsidebar_mediaplayer.po 2011-11-11 15:45:17.000000000 +0100
+@@ -9,8 +9,7 @@
+ "Project-Id-Version: konqsidebar_mediaplayer\n"
+ "POT-Creation-Date: 2004-12-11 01:24+0100\n"
+ "PO-Revision-Date: 2006-05-29 13:16+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Traditional Chinese \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/konqsidebar_metabar.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/konqsidebar_metabar.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/konqsidebar_metabar.po 2006-07-22 10:04:07.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/konqsidebar_metabar.po 2011-11-11 15:45:17.000000000 +0100
+@@ -6,8 +6,7 @@
+ "Project-Id-Version: konqsidebar_metabar\n"
+ "POT-Creation-Date: 2006-03-13 03:59+0100\n"
+ "PO-Revision-Date: 2006-06-19 09:08+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Chinese Traditional \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -44,19 +43,19 @@
+
+ #: configdialog.cpp:112
+ msgid "Themes"
+-msgstr "佈景主題"
++msgstr "布景主題"
+
+ #: configdialog.cpp:118
+ msgid "Install New Theme..."
+-msgstr "安裝新主題..."
++msgstr "安裝新主題…"
+
+ #: configdialog.cpp:127
+ msgid "New..."
+-msgstr "新增..."
++msgstr "新增…"
+
+ #: configdialog.cpp:133
+ msgid "Edit..."
+-msgstr "編輯..."
++msgstr "編輯…"
+
+ #: configdialog.cpp:150 settingsplugin.cpp:103
+ msgid "Name"
+@@ -165,11 +164,11 @@
+
+ #: metabarwidget.cpp:121
+ msgid "Configure %1..."
+-msgstr "設定 %1..."
++msgstr "設定 %1…"
+
+ #: metabarwidget.cpp:124
+ msgid "Reload Theme"
+-msgstr "重新載入佈景主題"
++msgstr "重新載入布景主題"
+
+ #: metabarwidget.cpp:435
+ msgid "Less"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/konqsidebar_news.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/konqsidebar_news.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/konqsidebar_news.po 2006-07-22 10:04:07.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/konqsidebar_news.po 2011-11-11 15:45:17.000000000 +0100
+@@ -7,8 +7,7 @@
+ "Project-Id-Version: konqsidebar_news\n"
+ "POT-Creation-Date: 2004-12-11 01:24+0100\n"
+ "PO-Revision-Date: 2006-05-29 13:21+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Traditional Chinese \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -53,7 +52,7 @@
+
+ #: nsstacktabwidget.cpp:88
+ msgid "&Configure Newsticker..."
+-msgstr "設定 Newsticker...(&N)"
++msgstr "設定 Newsticker…(&N)"
+
+ #: nsstacktabwidget.cpp:98
+ msgid "&About Newsticker"
+@@ -61,7 +60,7 @@
+
+ #: nsstacktabwidget.cpp:100
+ msgid "&Report Bug..."
+-msgstr "回報問題...(&R)"
++msgstr "回報問題…(&R)"
+
+ #. i18n: file configfeedsbase.ui line 16
+ #: rc.cpp:3
+@@ -77,11 +76,12 @@
+
+ #: sidebar_news.cpp:76
+ msgid ""
+-"Cannot connect to RSS service. Please make sure the "
+-"rssservice program is available (usually distributed as part of "
+-"kdenetwork)."
++"Cannot connect to RSS service. Please make sure the rssservice"
++"strong> program is available (usually distributed as part of kdenetwork)."
++"qt>"
+ msgstr ""
+-"無法連接到 RSS 服務。請確定 rssservice 程式存在(通常會跟著 kdenetwork 一起)。"
++"無法連接到 RSS 服務。請確定 rssservice 程式存在(通常會"
++"跟著 kdenetwork 一起)。"
+
+ #: sidebar_news.cpp:80
+ msgid "Sidebar Newsticker"
+@@ -89,10 +89,10 @@
+
+ #: sidebar_news.cpp:171
+ msgid "Connecting..."
+-msgstr "連線中..."
++msgstr "連線中…"
+
+ #~ msgid "Initializing"
+ #~ msgstr "初始化"
+
+ #~ msgid "Please wait..."
+-#~ msgstr "請稍候..."
++#~ msgstr "請稍候…"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/ksig.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/ksig.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/ksig.po 2006-07-22 10:04:07.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/ksig.po 2011-11-11 15:45:17.000000000 +0100
+@@ -6,8 +6,7 @@
+ "Project-Id-Version: ksig\n"
+ "POT-Creation-Date: 2005-03-07 01:46+0100\n"
+ "PO-Revision-Date: 2006-05-29 13:24+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Traditional Chinese \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -54,7 +53,9 @@
+ msgid ""
+ "To get started, first create a new signature by selecting \"New\" above. You "
+ "will then be able to edit and save your collection of signatures."
+-msgstr "要開始使用,請您先用上方的「新增」來產生新的簽名。接著您就可以編輯與儲存您收集的簽名。"
++msgstr ""
++"要開始使用,請您先用上方的「新增」來產生新的簽名。接著您就可以編輯與儲存您收"
++"集的簽名。"
+
+ #: ksig.cpp:170
+ msgid "Do you want to save your changes before exiting?"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/ktimemon.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/ktimemon.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/ktimemon.po 2006-07-22 10:04:07.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/ktimemon.po 2011-11-11 15:45:17.000000000 +0100
+@@ -9,8 +9,7 @@
+ "Project-Id-Version: ktimemon\n"
+ "POT-Creation-Date: 2006-04-15 04:00+0200\n"
+ "PO-Revision-Date: 2006-06-19 09:12+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Chinese Traditional \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -161,12 +160,13 @@
+ "Unable to initialize the 'kstat' library. This library is used for accessing "
+ "kernel information. The diagnostics are:\n"
+ "%1.\n"
+-"Are you really running Solaris? Please contact the maintainer at "
+-"mueller@kde.org who will try to figure out what went wrong."
++"Are you really running Solaris? Please contact the maintainer at mueller@kde."
++"org who will try to figure out what went wrong."
+ msgstr ""
+ "無法初始化 'kstat' 函式庫。此函式庫被用來取得核心資訊。診斷結果是:\n"
+ "%1 。\n"
+-"您確定是在執行 Solaris 嗎?請聯絡維護者 mueller@kde.org 他會試著評估是那兒出錯了。"
++"您確定是在執行 Solaris 嗎?請聯絡維護者 mueller@kde.org 他會試著評估是那兒出"
++"錯了。"
+
+ #: sample.cc:212
+ msgid ""
+@@ -178,13 +178,15 @@
+
+ #: sample.cc:222
+ msgid ""
+-"The memory usage file '%1' seems to use a different file format than expected.\n"
++"The memory usage file '%1' seems to use a different file format than "
++"expected.\n"
+ "Maybe your version of the proc filesystem is incompatible with supported "
+-"versions. Please contact the developer at http://bugs.kde.org/ who will try to "
+-"sort this out."
++"versions. Please contact the developer at http://bugs.kde.org/ who will try "
++"to sort this out."
+ msgstr ""
+ "檔案 %1 的記憶體使用量似乎不是用預期中的檔案格式。\n"
+-"也許您的 proc 檔案系統版本與我們所支援的版本不同。請回報到 http://bugs.kde.org。"
++"也許您的 proc 檔案系統版本與我們所支援的版本不同。請回報到 http://bugs.kde."
++"org。"
+
+ #: sample.cc:239
+ msgid ""
+@@ -207,12 +209,13 @@
+
+ #: sample.cc:309
+ msgid ""
+-"Unable to find any entries for CPU statistics in the 'kstat' library. Are you "
+-"running a non-standard version of Solaris?\n"
++"Unable to find any entries for CPU statistics in the 'kstat' library. Are "
++"you running a non-standard version of Solaris?\n"
+ "Please contact the maintainer via http://bugs.kde.org/ who will try to sort "
+ "this out."
+ msgstr ""
+-"無法在 'kstat' 函式庫發現任何 CPU 統計進入點。您是否執行非標準版本的 Solaris ?\n"
++"無法在 'kstat' 函式庫發現任何 CPU 統計進入點。您是否執行非標準版本的 "
++"Solaris ?\n"
+ "請透過 http://bugs.kde.org/ 聯絡維護者,他們會試著解決這個問題。"
+
+ #: sample.cc:325
+@@ -227,8 +230,8 @@
+
+ #: sample.cc:338
+ msgid ""
+-"The number of CPUs appears to have changed at very short notice, or the 'kstat' "
+-"library returns inconsistent results (%1 vs. %2 CPUs).\n"
++"The number of CPUs appears to have changed at very short notice, or the "
++"'kstat' library returns inconsistent results (%1 vs. %2 CPUs).\n"
+ "Please contact the maintainer via http://bugs.kde.org/ who will try to sort "
+ "this out."
+ msgstr ""
+@@ -239,18 +242,19 @@
+ msgid ""
+ "Unable to read the memory statistics entry from the 'kstat' library. The "
+ "diagnostics are '%1'\n"
+-"You might want to contact the maintainer at http://bugs.kde.org/ who will try "
+-"to sort this out."
++"You might want to contact the maintainer at http://bugs.kde.org/ who will "
++"try to sort this out."
+ msgstr ""
+ "無法從 'kstat' 函式庫讀取記憶體統計進入點。診斷結果為 '%1'。\n"
+ "請透過 http://bugs.kde.org/ 聯絡維護者,他們會試著解決這個問題。"
+
+ #: sample.cc:367
+ msgid ""
+-"There seems to be a problem with KTimeMon's handling of the 'kstat' library: 0 "
+-"bytes of physical memory determined!\n"
++"There seems to be a problem with KTimeMon's handling of the 'kstat' library: "
++"0 bytes of physical memory determined!\n"
+ "Free memory is %1, available memory is %2.\n"
+-"Please contact the maintainer at mueller@kde.org who will try to sort this out."
++"Please contact the maintainer at mueller@kde.org who will try to sort this "
++"out."
+ msgstr ""
+ "似乎在 KTimeMon 處理 'kstat' 函式庫時有一個問題: 測定實體記憶體 0 bytes !\n"
+ "閒置記憶體為 %1 ,可用記憶體為 %2 。\n"
+@@ -259,8 +263,8 @@
+ #: sample.cc:379
+ msgid ""
+ "Unable to determine the number of swap spaces. The diagnostics are '%1'.\n"
+-"Please contact the maintainer at http://bugs.kde.org/ who will try to sort this "
+-"out."
++"Please contact the maintainer at http://bugs.kde.org/ who will try to sort "
++"this out."
+ msgstr ""
+ "無法決定置換空間的數目。診斷結果為 '%1' 。\n"
+ "請透過 http://bugs.kde.org/ 聯絡維護者,他們會試著解決這個問題。"
+@@ -269,8 +273,8 @@
+ msgid ""
+ "KTimeMon ran out of memory while trying to determine the swap usage.\n"
+ "Attempted to allocate %1 bytes of memory (2 * %2 + %3 * %4).\n"
+-"Please contact the maintainer at http://bugs.kde.org/ who will try to sort this "
+-"out."
++"Please contact the maintainer at http://bugs.kde.org/ who will try to sort "
++"this out."
+ msgstr ""
+ "當 KTimeMon 試著去測定置換使用時,缺乏執行記憶體。\n"
+ "試圖配置 %1 bytes 的記憶體(2 * %2 + %3 * %4)。\n"
+@@ -280,8 +284,8 @@
+ msgid ""
+ "Unable to determine the swap usage.\n"
+ "The diagnostics are '%1'.\n"
+-"Please contact the maintainer at http://bugs.kde.org/ who will try to sort this "
+-"out."
++"Please contact the maintainer at http://bugs.kde.org/ who will try to sort "
++"this out."
+ msgstr ""
+ "無法決定分割區的使用情形。\n"
+ "診斷結果為 '%1' 。\n"
+@@ -292,8 +296,8 @@
+ "Information was requested for %1 swap spaces, but only %2 swap entries were "
+ "returned.\n"
+ "KTimeMon will attempt to continue.\n"
+-"Please contact the maintainer at http://bugs.kde.org/ who will try to sort this "
+-"out."
++"Please contact the maintainer at http://bugs.kde.org/ who will try to sort "
++"this out."
+ msgstr ""
+ "訊息要求 %1 置換空間,但只有 %2 置換進入點傳回。\n"
+ "KTimeMon 將試圖繼續。\n"
+@@ -331,7 +335,7 @@
+
+ #: timemon.cc:248
+ msgid "Preferences..."
+-msgstr "偏好設定..."
++msgstr "偏好設定…"
+
+ #: timemon.cc:428
+ msgid ""
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/kuick_plugin.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/kuick_plugin.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/kuick_plugin.po 2007-01-15 10:56:29.000000000 +0100
++++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/kuick_plugin.po 2011-11-11 15:45:17.000000000 +0100
+@@ -9,8 +9,7 @@
+ "Project-Id-Version: kuick_plugin\n"
+ "POT-Creation-Date: 2006-11-03 02:41+0100\n"
+ "PO-Revision-Date: 2006-05-29 13:41+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Traditional Chinese \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -55,7 +54,7 @@
+
+ #: kmetamenu.cpp:114
+ msgid "&Browse..."
+-msgstr "瀏覽...(&B)"
++msgstr "瀏覽…(&B)"
+
+ #: kuick_plugin.cpp:96
+ msgid "&Copy Here"
+@@ -74,7 +73,7 @@
+ msgstr "移動到"
+
+ #~ msgid "&Home Directory"
+-#~ msgstr "家目錄 (&H)"
++#~ msgstr "家目錄(&H)"
+
+ #~ msgid "&Root Directory"
+-#~ msgstr "根目錄 (&R)"
++#~ msgstr "根目錄(&R)"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/libkaddrbk_geo_xxport.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/libkaddrbk_geo_xxport.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/libkaddrbk_geo_xxport.po 2006-07-22 10:04:07.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/libkaddrbk_geo_xxport.po 2011-11-11 15:45:17.000000000 +0100
+@@ -6,8 +6,7 @@
+ "Project-Id-Version: libkaddrbk_geo_xxport\n"
+ "POT-Creation-Date: 2004-11-25 01:30+0100\n"
+ "PO-Revision-Date: 2006-05-29 13:42+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Traditional Chinese \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -16,7 +15,7 @@
+
+ #: geo_xxport.cpp:46
+ msgid "Export Geo Data..."
+-msgstr "匯出 Geo 資料..."
++msgstr "匯出 Geo 資料…"
+
+ #. i18n: file geo_xxportui.rc line 6
+ #: rc.cpp:6
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/libkaddrbk_gmx_xxport.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/libkaddrbk_gmx_xxport.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/libkaddrbk_gmx_xxport.po 2006-10-01 18:34:14.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/libkaddrbk_gmx_xxport.po 2011-11-11 15:45:17.000000000 +0100
+@@ -6,8 +6,7 @@
+ "Project-Id-Version: libkaddrbk_gmx_xxport\n"
+ "POT-Creation-Date: 2006-08-28 02:41+0200\n"
+ "PO-Revision-Date: 2006-05-29 13:43+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Traditional Chinese \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -16,11 +15,11 @@
+
+ #: gmx_xxport.cpp:54
+ msgid "Import GMX Address Book..."
+-msgstr "匯入 GMX 通訊錄..."
++msgstr "匯入 GMX 通訊錄…"
+
+ #: gmx_xxport.cpp:55
+ msgid "Export GMX Address Book..."
+-msgstr "匯出 GMX 通訊錄..."
++msgstr "匯出 GMX 通訊錄…"
+
+ #: gmx_xxport.cpp:82
+ msgid "Unable to open %1 for reading."
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/lyrics.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/lyrics.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/lyrics.po 2006-07-22 10:04:07.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/lyrics.po 2011-11-11 15:45:17.000000000 +0100
+@@ -6,8 +6,7 @@
+ "Project-Id-Version: lyrics\n"
+ "POT-Creation-Date: 2004-11-24 01:22+0100\n"
+ "PO-Revision-Date: 2006-05-29 13:55+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Traditional Chinese \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -59,13 +58,14 @@
+ "For your query, you can use any property of your multimedia item, just "
+ "enclosing it with a $(property).\n"
+ "\n"
+-"Some common properties used are $(title), $(author) and $(album). For example, "
+-"to search in Google for the author, title and track, just use:\n"
++"Some common properties used are $(title), $(author) and $(album). For "
++"example, to search in Google for the author, title and track, just use:\n"
+ "http://www.google.com/search?q=$(author)+$(title)+$(track)"
+ msgstr ""
+ "您查詢時,可以使用任何多媒體項目的屬性,只要封裝在 $(property) 中。\n"
+ "\n"
+-"一些共同的屬性包括:$(title),$(author),與 $(album)等。例如,要在 Google 搜尋作者,標題與音軌,只要使用:\n"
++"一些共同的屬性包括:$(title),$(author),與 $(album)等。例如,要在 Google 搜"
++"尋作者,標題與音軌,只要使用:\n"
+ "http://www.google.com/search?q=$(author)+$(title)+$(track)"
+
+ #: cmodule.cpp:122
+@@ -109,18 +109,20 @@
+ #: lyrics.cpp:101
+ msgid ""
+ "Choosing this option, the current URL will be attached to the current file. "
+-"This way, if you try to view the lyrics of this file later, you won't have to "
+-"search for it again. This information can be stored between sessions, as long "
+-"as your playlist stores metadata about the multimedia items (almost all the "
+-"playlists do). If you want to be able to search for other lyrics for this "
+-"music, you must select this option again to clear the stored URL."
+-msgstr ""
+-"選取此項目的話,目前的網址會被附加到目前的檔案中。如此一來,如果您稍後要檢視此檔案的歌詞,您不需要再搜尋。這個資訊可以保存起來,只要您的播放清單中有儲存此多媒體"
+-"項目的資料。如果您要搜尋此音樂的其他歌詞,您要再選取此項以清除已儲存的網址。"
++"This way, if you try to view the lyrics of this file later, you won't have "
++"to search for it again. This information can be stored between sessions, as "
++"long as your playlist stores metadata about the multimedia items (almost all "
++"the playlists do). If you want to be able to search for other lyrics for "
++"this music, you must select this option again to clear the stored URL."
++msgstr ""
++"選取此項目的話,目前的網址會被附加到目前的檔案中。如此一來,如果您稍後要檢視"
++"此檔案的歌詞,您不需要再搜尋。這個資訊可以保存起來,只要您的播放清單中有儲存"
++"此多媒體項目的資料。如果您要搜尋此音樂的其他歌詞,您要再選取此項以清除已儲存"
++"的網址。"
+
+ #: lyrics.cpp:117
+ msgid "Loading..."
+-msgstr "載入中..."
++msgstr "載入中…"
+
+ #: lyrics.cpp:124
+ msgid "Loaded"
+@@ -133,7 +135,8 @@
+
+ #: lyrics.cpp:180
+ msgid ""
+-"You can only view the lyrics of the current song, and currently there is none."
++"You can only view the lyrics of the current song, and currently there is "
++"none."
+ msgstr "您只能檢視目前歌曲的歌詞,而目前沒有歌詞可以檢視。"
+
+ #: lyrics.cpp:199
+@@ -143,38 +146,33 @@
+
+ #: lyrics.cpp:203
+ msgid ""
+-""
+-"Please wait! Searching for...
"
+-""
+-"Title | %1 |
"
+-"Author | %2 |
"
+-"Album | %3 |
"
+-msgstr ""
+-""
+-"請稍候,搜尋下列條件中...
"
+-"標題 | %1 |
"
+-"作者 | %2 |
"
+-"專輯 | %3 |
"
++"Please wait! Searching for...
Title"
++"TD> | %1 |
Author"
++"TD> | %2 |
Album"
++"TD> | %3 |
"
++msgstr ""
++"請稍候,搜尋下列條件中...
標題"
++"TD> | %1 |
作者"
++"TD> | %2 |
專輯"
++"TD> | %3 |
"
+
+ #: lyrics.cpp:221
+ msgid ""
+-"
"
+-"Searching at %1"
+-"
(%2)
"
+-msgstr ""
+-"
"
+-"搜尋於 %1..."
+-"
(%2)
"
++"
Searching at %1
(%2"
++"small>)
"
++msgstr ""
++"
搜尋於 %1...
(%2"
++"small>)
"
+
+ #: lyrics.cpp:229
+ msgid ""
+-"
"
+-"Using the stored URL"
+-"
(%1)
"
+-msgstr ""
+-"
"
+-"使用已儲存的網址"
+-"
%1
"
++"
Using the stored URL
(%1"
++"a>)
"
++msgstr ""
++"
使用已儲存的網址
%1"
++"small>
"
+
+ #: lyrics.cpp:235
+ msgid ""
+@@ -184,11 +182,13 @@
+ "not be present or be incorrect. In that case, the Lyrics plugin will not be "
+ "able to find the lyrics until these properties are fixed (you can fix them "
+ "using the tag editor).\n"
+-"Hint: The lucky tag plugin, present in the kdeaddons module, can try to guess "
+-"properties such as title and author from the filename of a song. Enabling it "
+-"may increase the probability of finding lyrics."
+-msgstr ""
+-"要找到目前歌曲的歌詞,此外掛程式對每首歌會儲存其屬性,如標題、作者、專輯等等。這些屬性通常會由標籤閱讀器讀取,不過有時無法讀取或不正確。這種狀況下,Lyrics"
+-" 外掛程式就無法找到歌詞,直到這些屬性被修正為止。(您可以用標籤編輯器修正)。\n"
+-"提示:由 kdeaddons 模組提供的「幸運標籤外掛程式(lucky tag "
+-"plugin)」,可以試著由歌曲的檔名來猜測其標題、作者等資訊。開啟此選項可以增加找到歌詞的機率。"
++"Hint: The lucky tag plugin, present in the kdeaddons module, can try to "
++"guess properties such as title and author from the filename of a song. "
++"Enabling it may increase the probability of finding lyrics."
++msgstr ""
++"要找到目前歌曲的歌詞,此外掛程式對每首歌會儲存其屬性,如標題、作者、專輯等"
++"等。這些屬性通常會由標籤閱讀器讀取,不過有時無法讀取或不正確。這種狀況下,"
++"Lyrics 外掛程式就無法找到歌詞,直到這些屬性被修正為止。(您可以用標籤編輯器修"
++"正)。\n"
++"提示:由 kdeaddons 模組提供的「幸運標籤外掛程式(lucky tag plugin)」,可以試"
++"著由歌曲的檔名來猜測其標題、作者等資訊。開啟此選項可以增加找到歌詞的機率。"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/mediacontrol.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/mediacontrol.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/mediacontrol.po 2008-08-19 20:43:08.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/mediacontrol.po 2011-11-11 15:45:17.000000000 +0100
+@@ -7,8 +7,7 @@
+ "Project-Id-Version: mediacontrol\n"
+ "POT-Creation-Date: 2008-08-12 01:19+0200\n"
+ "PO-Revision-Date: 2006-05-29 14:00+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Traditional Chinese \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -93,7 +92,7 @@
+
+ #: mediacontrol.cpp:156
+ msgid "Configure MediaControl..."
+-msgstr "設定 MediaControl..."
++msgstr "設定 MediaControl…"
+
+ #: mediacontrol.cpp:158
+ msgid "About MediaControl"
+@@ -170,19 +169,19 @@
+ #: rc.cpp:15
+ #, no-c-format
+ msgid "Sets the number of lines a mousewheel will scroll in the current file."
+-msgstr "設定滑鼠滾輪捲軸此檔案的行數。"
++msgstr "設定滑鼠滾輪捲軸此檔案的列數。"
+
+ #. i18n: file mediacontrolconfigwidget.ui line 109
+ #: rc.cpp:18
+ #, no-c-format
+ msgid "&Themes"
+-msgstr "佈景主題(&T)"
++msgstr "布景主題(&T)"
+
+ #. i18n: file mediacontrolconfigwidget.ui line 120
+ #: rc.cpp:21
+ #, no-c-format
+ msgid "&Use themes"
+-msgstr "使用佈景主題(&U)"
++msgstr "使用布景主題(&U)"
+
+ #. i18n: file mediacontrolconfigwidget.ui line 126
+ #: rc.cpp:24
+@@ -200,7 +199,7 @@
+ #: rc.cpp:30
+ #, no-c-format
+ msgid "Shows you how the selected theme will look"
+-msgstr "顯示此佈景主題的外觀"
++msgstr "顯示此布景主題的外觀"
+
+ #. i18n: file mediacontrolconfigwidget.ui line 215
+ #: rc.cpp:33
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/mf_konqplugin.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/mf_konqplugin.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/mf_konqplugin.po 2006-07-22 10:04:07.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/mf_konqplugin.po 2011-11-11 15:45:17.000000000 +0100
+@@ -6,8 +6,7 @@
+ "Project-Id-Version: mf_konqplugin\n"
+ "POT-Creation-Date: 2005-06-13 01:32+0200\n"
+ "PO-Revision-Date: 2006-05-29 14:02+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Traditional Chinese \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -27,4 +26,4 @@
+ msgid ""
+ "_n: This site has a microformat entry\n"
+ "This site has %n microformat entries"
+-msgstr "此站台有 %n 個 microformat 項目"
++msgstr "此站臺有 %n 個 microformat 項目"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/minitoolsplugin.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/minitoolsplugin.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/minitoolsplugin.po 2006-07-22 10:04:07.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/minitoolsplugin.po 2011-11-11 15:45:17.000000000 +0100
+@@ -6,8 +6,7 @@
+ "Project-Id-Version: minitoolsplugin\n"
+ "POT-Creation-Date: 2004-10-12 01:18+0200\n"
+ "PO-Revision-Date: 2006-05-29 14:02+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Traditional Chinese \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -16,11 +15,11 @@
+
+ #: minitoolsplugin.cpp:49
+ msgid "&Minitools"
+-msgstr "Minitools (&M)"
++msgstr "Minitools(&M)"
+
+ #: minitoolsplugin.cpp:118
+ msgid "&Edit Minitools"
+-msgstr "編輯 Minitools (&E)"
++msgstr "編輯 Minitools(&E)"
+
+ #. i18n: file minitoolsplugin.rc line 8
+ #: rc.cpp:6
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/nexscope.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/nexscope.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/nexscope.po 2006-07-22 10:04:07.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/nexscope.po 2011-11-11 15:45:17.000000000 +0100
+@@ -6,8 +6,7 @@
+ "Project-Id-Version: nexscope\n"
+ "POT-Creation-Date: 2004-10-12 01:18+0200\n"
+ "PO-Revision-Date: 2006-05-29 14:06+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Traditional Chinese \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/pitchablespeed.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/pitchablespeed.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/pitchablespeed.po 2006-07-22 10:04:07.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/pitchablespeed.po 2011-11-11 15:45:17.000000000 +0100
+@@ -6,8 +6,7 @@
+ "Project-Id-Version: pitchablespeed\n"
+ "POT-Creation-Date: 2004-10-12 01:18+0200\n"
+ "PO-Revision-Date: 2006-05-29 14:07+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Traditional Chinese \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/rellinks.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/rellinks.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/rellinks.po 2006-07-22 10:04:07.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/rellinks.po 2011-11-11 15:45:17.000000000 +0100
+@@ -6,8 +6,7 @@
+ "Project-Id-Version: rellinks\n"
+ "POT-Creation-Date: 2005-09-05 02:42+0200\n"
+ "PO-Revision-Date: 2006-05-29 14:13+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Traditional Chinese \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -69,7 +68,8 @@
+
+ #: plugin_rellinks.cpp:88
+ msgid ""
+-"This link references the next document in an ordered series of documents.
"
++"This link references the next document in an ordered series of documents."
++"
"
+ msgstr "此連結為順序文件的下一份文件。
"
+
+ #: plugin_rellinks.cpp:90
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/searchbarplugin.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/searchbarplugin.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/searchbarplugin.po 2006-07-22 10:04:07.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/searchbarplugin.po 2011-11-11 15:45:17.000000000 +0100
+@@ -6,8 +6,7 @@
+ "Project-Id-Version: searchbarplugin\n"
+ "POT-Creation-Date: 2006-06-20 04:04+0200\n"
+ "PO-Revision-Date: 2006-06-21 08:42+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Chinese Traditional \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -26,8 +25,8 @@
+
+ #: searchbar.cpp:79
+ msgid ""
+-"Search Bar"
+-"Enter a search term. Click on the icon to change search mode or provider."
++"Search Bar
Enter a search term. Click on the icon to change search mode or "
++"provider."
+ msgstr "搜尋列
輸入搜尋條件。點選此圖示改變搜尋模式或提供者。"
+
+ #: searchbar.cpp:82
+@@ -44,4 +43,4 @@
+
+ #: searchbar.cpp:358
+ msgid "Select Search Engines..."
+-msgstr "選擇搜尋引擎..."
++msgstr "選擇搜尋引擎…"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/synaescope.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/synaescope.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/synaescope.po 2006-07-22 10:04:07.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/synaescope.po 2011-11-11 15:45:17.000000000 +0100
+@@ -7,8 +7,7 @@
+ "Project-Id-Version: synaescope\n"
+ "POT-Creation-Date: 2004-10-12 01:18+0200\n"
+ "PO-Revision-Date: 2006-05-29 14:16+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Traditional Chinese \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/tippecanoe.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/tippecanoe.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/tippecanoe.po 2006-07-22 10:04:07.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/tippecanoe.po 2011-11-11 15:45:17.000000000 +0100
+@@ -6,8 +6,7 @@
+ "Project-Id-Version: tippecanoe\n"
+ "POT-Creation-Date: 2004-10-12 01:18+0200\n"
+ "PO-Revision-Date: 2006-05-29 14:16+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Traditional Chinese \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/tyler.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/tyler.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/tyler.po 2005-09-10 11:24:11.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/tyler.po 2011-11-11 15:45:17.000000000 +0100
+@@ -7,7 +7,7 @@
+ "Project-Id-Version: tyler\n"
+ "POT-Creation-Date: 2004-10-12 01:18+0200\n"
+ "PO-Revision-Date: 2002-10-31 08:32+0800\n"
+-"Last-Translator: Jupiter K.T. Ou \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Chinese traditional \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/uachangerplugin.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/uachangerplugin.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/uachangerplugin.po 2006-07-22 10:04:07.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/uachangerplugin.po 2011-11-11 15:45:17.000000000 +0100
+@@ -7,8 +7,7 @@
+ "Project-Id-Version: uachangerplugin\n"
+ "POT-Creation-Date: 2005-06-28 01:37+0200\n"
+ "PO-Revision-Date: 2006-05-29 14:18+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Traditional Chinese \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -39,7 +38,7 @@
+
+ #: uachangerplugin.cpp:60
+ msgid "Change Browser &Identification"
+-msgstr "改變瀏覽器識別 (&I)"
++msgstr "改變瀏覽器識別(&I)"
+
+ #: uachangerplugin.cpp:143
+ #, c-format
+@@ -68,8 +67,8 @@
+
+ #: uachangerplugin.cpp:247
+ msgid "Apply to Entire Site"
+-msgstr "套用到整個站台"
++msgstr "套用到整個站臺"
+
+ #: uachangerplugin.cpp:252
+ msgid "Configure..."
+-msgstr "設定..."
++msgstr "設定…"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/validatorsplugin.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/validatorsplugin.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/validatorsplugin.po 2006-07-22 10:04:07.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/validatorsplugin.po 2011-11-11 15:45:17.000000000 +0100
+@@ -7,8 +7,7 @@
+ "Project-Id-Version: validatorsplugin\n"
+ "POT-Creation-Date: 2004-10-12 01:18+0200\n"
+ "PO-Revision-Date: 2006-05-29 14:21+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Traditional Chinese \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -33,11 +32,11 @@
+
+ #: plugin_validators.cpp:53
+ msgid "&Validate Web Page"
+-msgstr "驗證網頁 (&V)"
++msgstr "驗證網頁(&V)"
+
+ #: plugin_validators.cpp:57
+ msgid "Validate &HTML"
+-msgstr "驗證 HTML (&H)"
++msgstr "驗證 HTML(&H)"
+
+ #: plugin_validators.cpp:62
+ msgid "Validate &CSS"
+@@ -45,11 +44,11 @@
+
+ #: plugin_validators.cpp:67
+ msgid "Validate &Links"
+-msgstr "驗證連結 (&L)"
++msgstr "驗證連結(&L)"
+
+ #: plugin_validators.cpp:76
+ msgid "C&onfigure Validator..."
+-msgstr "設定 Validator...(&O)"
++msgstr "設定 Validator…(&O)"
+
+ #: plugin_validators.cpp:146
+ msgid "Cannot Validate Source"
+@@ -73,9 +72,12 @@
+
+ #: plugin_validators.cpp:184
+ msgid ""
+-"The selected URL cannot be verified because it contains a password. Sending "
+-"this URL to %1 would put the security of %2 at risk."
+-msgstr "所選取的網址無法檢查,因為包含密碼。將此網址所到 %1 會有 %2 安全上的風險。"
++"The selected URL cannot be verified because it contains a password. "
++"Sending this URL to %1 would put the security of %2 at risk."
++"qt>"
++msgstr ""
++"所選取的網址無法檢查,因為包含密碼。將此網址所到 %1 會有 %2 安全上"
++"的風險。"
+
+ #. i18n: file plugin_validators.rc line 8
+ #: rc.cpp:6
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/wakeup.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/wakeup.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/wakeup.po 2005-09-10 11:24:11.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/wakeup.po 2011-11-11 15:45:17.000000000 +0100
+@@ -7,7 +7,7 @@
+ "Project-Id-Version: wakeup\n"
+ "POT-Creation-Date: 2004-10-12 01:18+0200\n"
+ "PO-Revision-Date: 2002-09-08 08:25+0800\n"
+-"Last-Translator: Yuan-Chen Cheng \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Chinese (traditional) \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/wavecapture.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/wavecapture.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/wavecapture.po 2005-09-10 11:24:11.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/wavecapture.po 2011-11-11 15:45:17.000000000 +0100
+@@ -7,7 +7,7 @@
+ "Project-Id-Version: wavecapture\n"
+ "POT-Creation-Date: 2004-10-12 01:18+0200\n"
+ "PO-Revision-Date: 2002-10-31 08:36+0800\n"
+-"Last-Translator: Jupiter K.T. Ou \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Chinese traditional \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/webarchiver.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/webarchiver.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/webarchiver.po 2007-05-14 12:22:53.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/webarchiver.po 2011-11-11 15:45:17.000000000 +0100
+@@ -9,8 +9,7 @@
+ "Project-Id-Version: webarchiver\n"
+ "POT-Creation-Date: 2007-01-25 02:44+0100\n"
+ "PO-Revision-Date: 2006-05-29 14:23+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Traditional Chinese \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -56,7 +55,7 @@
+
+ #: plugin_webarchiver.cpp:57
+ msgid "Archive &Web Page..."
+-msgstr "網頁存檔...(&W)"
++msgstr "網頁存檔…(&W)"
+
+ #: plugin_webarchiver.cpp:90
+ msgid "*.war *.tgz|Web Archives"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeadmin/kcmlilo.po kde-i18n-zh_TW-3.5.10/messages/kdeadmin/kcmlilo.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeadmin/kcmlilo.po 2007-05-14 12:23:04.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdeadmin/kcmlilo.po 2011-11-11 15:45:17.000000000 +0100
+@@ -7,7 +7,7 @@
+ "Project-Id-Version: kcmlilo\n"
+ "POT-Creation-Date: 2007-03-13 02:18+0100\n"
+ "PO-Revision-Date: 2005-12-08 10:11+0800\n"
+-"Last-Translator: Chao-Hsiung Liao \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Chinese (traditional) \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -15,7 +15,7 @@
+
+ #: kde-qt-common/EditWidget.cpp:43
+ msgid "Select..."
+-msgstr "選擇..."
++msgstr "選擇…"
+
+ #: kde-qt-common/expert.cpp:41
+ msgid ""
+@@ -29,21 +29,20 @@
+
+ #: kde-qt-common/general.cpp:55
+ msgid ""
+-"Select the drive or partition you want to install the LILO boot loader to here. "
+-"Unless you intend to use other boot managers in addition to LILO, this should "
+-"be the MBR (master boot record) of your boot drive."
+-"
In this case, you should probably select /dev/hda "
+-"if your boot drive is an IDE drive or /dev/sda "
+-"if your boot drive is SCSI."
+-msgstr ""
+-"在此選擇您想要安裝 LILO 啟動載入器的磁碟或分割區。除非您預備使用 LILO 以外的啟動管理器,它應該被安裝在您的開機磁碟的 MBR (主要啟動紀錄) "
+-"中。"
+-"
在這種狀況下,如果您使用 IDE 磁碟,您應該會使用 /dev/hda;如果您使用 SCSI 磁碟,使用 /dev/sda"
+-"。"
++"Select the drive or partition you want to install the LILO boot loader to "
++"here. Unless you intend to use other boot managers in addition to LILO, this "
++"should be the MBR (master boot record) of your boot drive.
In this case, "
++"you should probably select /dev/hda if your boot drive is an IDE "
++"drive or /dev/sda if your boot drive is SCSI."
++msgstr ""
++"在此選擇您想要安裝 LILO 啟動載入器的磁碟或分割區。除非您預備使用 LILO 以外的"
++"啟動管理器,它應該被安裝在您的開機磁碟的 MBR (主要啟動紀錄) 中。
在這種狀"
++"況下,如果您使用 IDE 磁碟,您應該會使用 /dev/hda;如果您使用 SCSI 磁"
++"碟,使用 /dev/sda。"
+
+ #: kde-qt-common/general.cpp:58
+ msgid "Boot the default kernel/OS &after:"
+-msgstr "在...後啟動預設核心/作業系統(&A):"
++msgstr "在…後啟動預設核心/作業系統(&A):"
+
+ #: kde-qt-common/general.cpp:60
+ msgid "/10 seconds"
+@@ -51,9 +50,11 @@
+
+ #: kde-qt-common/general.cpp:64
+ msgid ""
+-"LILO will wait the amount of time specified here before booting the kernel (or "
+-"OS) marked as default in the Images tab."
+-msgstr "LILO 將會等待在這邊指定的時間之後,自動啟動在映像分頁中標記為預設的核心(或作業系統)。"
++"LILO will wait the amount of time specified here before booting the kernel "
++"(or OS) marked as default in the Images tab."
++msgstr ""
++"LILO 將會等待在這邊指定的時間之後,自動啟動在映像分頁中標記為預設"
++"i>的核心(或作業系統)。"
+
+ #: kde-qt-common/general.cpp:67
+ msgid "Use &linear mode"
+@@ -61,17 +62,16 @@
+
+ #: kde-qt-common/general.cpp:69
+ msgid ""
+-"Check this box if you want to use the linear mode."
+-"
Linear mode tells the boot loader the location of kernels in linear "
+-"addressing rather than sector/head/cylinder."
+-"
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."
+-"
See the lilo.conf man page for details."
+-msgstr ""
+-"如果您要使用線性模式,核取此方塊。"
+-"
線性模式會使啟動載入器以線性位置載入核心而不用 CHS 方式。"
+-"
對有些 SCSI 磁碟而言,線性模式是必須的。除非您要建立在別台電腦上使用的開機磁碟,這也不會造成傷害。"
+-"
詳細資料請參照 lilo.conf 手冊頁。"
++"Check this box if you want to use the linear mode.
Linear mode tells the "
++"boot loader the location of kernels in linear addressing rather than sector/"
++"head/cylinder.
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.
See the lilo.conf man page for details."
++msgstr ""
++"如果您要使用線性模式,核取此方塊。
線性模式會使啟動載入器以線性位置載入核"
++"心而不用 CHS 方式。
對有些 SCSI 磁碟而言,線性模式是必須的。除非您要建立在"
++"別臺電腦上使用的開機磁碟,這也不會造成傷害。
詳細資料請參照 lilo.conf 手冊"
++"頁。"
+
+ #: kde-qt-common/general.cpp:70
+ msgid "Use &compact mode"
+@@ -79,13 +79,13 @@
+
+ #: kde-qt-common/general.cpp:72
+ msgid ""
+-"Check this box if you want to use the compact mode."
+-"
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."
++"Check this box if you want to use the compact mode.
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."
+ msgstr ""
+-"如果您要使用緊密模式,核取此方塊。"
+-"
緊密模式嘗試將多個磁區的讀取合併成一次讀取。這可以減少載入的時間並保持較小的啟動對應檔,但不是所有系統都能使用。"
++"如果您要使用緊密模式,核取此方塊。
緊密模式嘗試將多個磁區的讀取合併成一次"
++"讀取。這可以減少載入的時間並保持較小的啟動對應檔,但不是所有系統都能使用。"
+
+ #: kde-qt-common/general.cpp:76 kde/Details.cpp:82 qt/Details.cpp:85
+ msgid "&Record boot command lines for defaults"
+@@ -94,11 +94,12 @@
+ #: kde-qt-common/general.cpp:78
+ msgid ""
+ "Checking this box enables automatic recording of boot command lines as the "
+-"defaults for the following boots. This way, lilo \"locks\" on a choice until it "
+-"is manually overridden.\n"
++"defaults for the following boots. This way, lilo \"locks\" on a choice until "
++"it is manually overridden.\n"
+ "This sets the lock option in lilo.conf."
+ msgstr ""
+-"核取這個方塊以自動紀錄開機命令成為往後開機的預設值。這種方式會讓 LILO “鎖定”這個選擇直到手動變更。\n"
++"核取這個方塊以自動紀錄開機命令成為往後開機的預設值。這種方式會讓 LILO “鎖"
++"定”這個選擇直到手動變更。\n"
+ "這會設定 lilo.conf 中的 lock 選項。"
+
+ #: kde-qt-common/general.cpp:79 kde/Details.cpp:84 qt/Details.cpp:87
+@@ -108,17 +109,17 @@
+ #: kde-qt-common/general.cpp:82
+ msgid ""
+ "If this box is checked, a password (entered below) is required only if any "
+-"parameters are changed (i.e. the user can boot linux, but not "
+-"linux single or linux init=/bin/sh).\n"
+-"This sets the restricted option in lilo.conf."
+-"
This sets a default for all Linux kernels you want to boot. If you need a "
+-"per-kernel setting, go to the Operating systems tab and select "
+-"Details."
+-msgstr ""
+-"如果核取這個方塊,要變更任何參數時,在下面輸入的密碼是必須的。也就是使用者可以啟動 linux 但不能使用 linux single "
+-"或 linux init=/bin/sh。\n"
+-"這會設定 lilo.conf 中的 restricted 選項。這個會影響所有的核心。如果您希望在每個核心有不同的設定,請到 "
+-"作業系統 分頁並選擇 詳細資料。"
++"parameters are changed (i.e. the user can boot linux, but not "
++"linux single or linux init=/bin/sh).\n"
++"This sets the restricted option in lilo.conf.
This sets a default "
++"for all Linux kernels you want to boot. If you need a per-kernel setting, go "
++"to the Operating systems tab and select Details."
++msgstr ""
++"如果核取這個方塊,要變更任何參數時,在下面輸入的密碼是必須的。也就是使用者可"
++"以啟動 linux 但不能使用 linux single 或 linux init=/bin/sh"
++"i>。\n"
++"這會設定 lilo.conf 中的 restricted 選項。這個會影響所有的核心。如果您"
++"希望在每個核心有不同的設定,請到 作業系統 分頁並選擇 詳細資料。"
+
+ #: kde-qt-common/general.cpp:86 kde/Details.cpp:89 qt/Details.cpp:93
+ msgid "Require &password:"
+@@ -130,15 +131,15 @@
+ "above is checked, the password is required for additional parameters only."
+ "
WARNING: 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."
+-"
This sets a default for all Linux kernels you want to boot. If you need a "
+-"per-kernel setting, go to the Operating systems tab and select "
+-"Details."
+-msgstr ""
+-"在這邊輸入開機時需要的密碼。如果使用了上面的 限制參數 功能,必須要使用這個密碼才能變更參數。"
+-"
警告: 這個密碼是以未編碼的方式存在 /etc/lilo.conf "
+-"中。您必須確定未授權的人不能讀取這個檔案。同時,建議不要使用您的一般/管理者密碼。"
+-"
這個會影響所有的核心,如果您希望在每個核心有不同的設定,請到 作業系統 分頁並使用 詳細資料。"
++"probably don't want to use your normal/root password here.
This sets a "
++"default for all Linux kernels you want to boot. If you need a per-kernel "
++"setting, go to the Operating systems tab and select Details."
++msgstr ""
++"在這邊輸入開機時需要的密碼。如果使用了上面的 限制參數 功能,必須要使用"
++"這個密碼才能變更參數。
警告: 這個密碼是以未編碼的方式存在 /etc/"
++"lilo.conf 中。您必須確定未授權的人不能讀取這個檔案。同時,建議不要使用您的一"
++"般/管理者密碼。
這個會影響所有的核心,如果您希望在每個核心有不同的設定,請"
++"到 作業系統 分頁並使用 詳細資料。"
+
+ #: kde-qt-common/general.cpp:97
+ msgid "&Default graphics mode on text console:"
+@@ -146,17 +147,17 @@
+
+ #: kde-qt-common/general.cpp:100
+ msgid ""
+-"You can select the default graphics mode here."
+-"
If you intend to use a VGA graphics mode, you must compile the kernel with "
+-"support for framebuffer devices. The ask setting brings up a prompt at "
+-"boot time."
+-"
This sets a default for all Linux kernels you want to boot. If you need a "
+-"per-kernel setting, go to the Operating systems tab and select "
+-"Details."
+-msgstr ""
+-"您可以在這邊選擇預設的圖形模式。"
+-"
如果您希望使用 VGA 圖形模式,您必須在編譯核心時加入 framebuffer 的支援。選擇 詢問 將會在開機時詢問您。"
+-"這個會影響所有的核心,如果您希望在每個核心有不同的設定,請到 作業系統 分頁並使用 詳細資料。"
++"You can select the default graphics mode here.
If you intend to use a VGA "
++"graphics mode, you must compile the kernel with support for framebuffer "
++"devices. The ask setting brings up a prompt at boot time.
This "
++"sets a default for all Linux kernels you want to boot. If you need a per-"
++"kernel setting, go to the Operating systems tab and select "
++"Details."
++msgstr ""
++"您可以在這邊選擇預設的圖形模式。
如果您希望使用 VGA 圖形模式,您必須在編譯"
++"核心時加入 framebuffer 的支援。選擇 詢問 將會在開機時詢問您。
這個會"
++"影響所有的核心,如果您希望在每個核心有不同的設定,請到 作業系統 分頁並"
++"使用 詳細資料。"
+
+ #: kde-qt-common/general.cpp:101 kde/Details.cpp:48 qt/Details.cpp:48
+ msgid "default"
+@@ -270,12 +271,12 @@
+ msgid ""
+ "If this box is checked, LILO goes to the LILO prompt whether or not a key is "
+ "pressed. If it is turned off, LILO boots the default operating system unless "
+-"shift is pressed (in that case, it goes to the LILO prompt)."
+-"
This sets the prompt option in lilo.conf."
++"shift is pressed (in that case, it goes to the LILO prompt).
This sets "
++"the prompt option in lilo.conf."
+ msgstr ""
+-"如果核取這個方塊,不論是否有按下按鍵都會出現 LILO 提示。如果關閉, LILO 將會啟動預設的作業系統,除非您按下“shift”(這樣就會進入 LILO "
+-"提示)。"
+-"
這個會設定 lilo.conf 中的 prompt 選項。"
++"如果核取這個方塊,不論是否有按下按鍵都會出現 LILO 提示。如果關閉, LILO 將會"
++"啟動預設的作業系統,除非您按下“shift”(這樣就會進入 LILO 提示)。
這個會設"
++"定 lilo.conf 中的 prompt 選項。"
+
+ #: kde-qt-common/images.cpp:53
+ msgid ""
+@@ -306,8 +307,8 @@
+
+ #: kde-qt-common/images.cpp:66 kde-qt-common/images.cpp:189
+ msgid ""
+-"Enter the root filesystem (i.e. the partition that will be mounted as / at boot "
+-"time) for the kernel you want to boot here."
++"Enter the root filesystem (i.e. the partition that will be mounted as / at "
++"boot time) for the kernel you want to boot here."
+ msgstr "請在這邊輸入您核心所需的根檔案系統(在開機時被掛載於 / 的分割區)。"
+
+ #: kde-qt-common/images.cpp:68 kde-qt-common/images.cpp:190
+@@ -319,7 +320,9 @@
+ "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."
+-msgstr "如果您希望在這個核心上使用初始化記憶體磁碟(initrd),請在這邊輸入檔案名稱。否則請留下空白。"
++msgstr ""
++"如果您希望在這個核心上使用初始化記憶體磁碟(initrd),請在這邊輸入檔案名稱。否"
++"則請留下空白。"
+
+ #: kde-qt-common/images.cpp:71
+ msgid "E&xtra parameters:"
+@@ -327,10 +330,11 @@
+
+ #: kde-qt-common/images.cpp:72
+ msgid ""
+-"Enter any extra parameters you wish to pass to the kernel here. Usually, this "
+-"can be left blank."
+-"
This sets the append option in lilo.conf."
+-msgstr "在這邊輸入任何您希望傳遞給核心的額外參數。通常您可以保留空白。
這會設定 lilo.conf 中的append選項。"
++"Enter any extra parameters you wish to pass to the kernel here. Usually, "
++"this can be left blank.
This sets the append option in lilo.conf."
++msgstr ""
++"在這邊輸入任何您希望傳遞給核心的額外參數。通常您可以保留空白。
這會設定 "
++"lilo.conf 中的append選項。"
+
+ #: kde-qt-common/images.cpp:79
+ msgid "Set &Default"
+@@ -368,7 +372,7 @@
+
+ #: kde-qt-common/images.cpp:91
+ msgid "Add &Kernel..."
+-msgstr "增加核心(&K)..."
++msgstr "增加核心(&K)…"
+
+ #: kde-qt-common/images.cpp:93
+ msgid "Add a new Linux kernel to the boot menu"
+@@ -376,7 +380,7 @@
+
+ #: kde-qt-common/images.cpp:94
+ msgid "Add Other &OS..."
+-msgstr "增加其他作業系統(&O)..."
++msgstr "增加其他作業系統(&O)…"
+
+ #: kde-qt-common/images.cpp:96
+ msgid "Add a non-Linux OS to the boot menu"
+@@ -391,20 +395,16 @@
+ msgstr "從開機選單移除項目"
+
+ #: kde-qt-common/images.cpp:177
+-msgid ""
+-"Configuration ok. LILO said:\n"
+-msgstr ""
+-"組態正確。 LILO 說:\n"
++msgid "Configuration ok. LILO said:\n"
++msgstr "組態正確。 LILO 說:\n"
+
+ #: kde-qt-common/images.cpp:178
+ msgid "Configuration OK"
+ msgstr "組態設定正確"
+
+ #: kde-qt-common/images.cpp:180
+-msgid ""
+-"Configuration NOT ok. LILO said:\n"
+-msgstr ""
+-"組態不正確。 LILO 說:\n"
++msgid "Configuration NOT ok. LILO said:\n"
++msgstr "組態不正確。 LILO 說:\n"
+
+ #: kde-qt-common/images.cpp:181
+ msgid "Configuration NOT ok"
+@@ -458,13 +458,12 @@
+
+ #: kde/Details.cpp:47 qt/Details.cpp:47
+ msgid ""
+-"You can select the graphics mode for this kernel here."
+-"
If you intend to use a VGA graphics mode, you must compile the kernel with "
+-"support for framebuffer devices. The ask setting brings up a prompt at "
+-"boot time."
++"You can select the graphics mode for this kernel here.
If you intend to "
++"use a VGA graphics mode, you must compile the kernel with support for "
++"framebuffer devices. The ask setting brings up a prompt at boot time."
+ msgstr ""
+-"您可以在這邊選擇核心所使用的圖形模式。"
+-"
如果您要使用 VGA 圖形模式,您必須在編譯核心時加入 framebuffer 的支援。選擇 詢問 將會在開機時詢問您。"
++"您可以在這邊選擇核心所使用的圖形模式。
如果您要使用 VGA 圖形模式,您必須在"
++"編譯核心時加入 framebuffer 的支援。選擇 詢問 將會在開機時詢問您。"
+
+ #: kde/Details.cpp:75 qt/Details.cpp:76
+ msgid "Mount root filesystem &read-only"
+@@ -473,12 +472,13 @@
+ #: kde/Details.cpp:76 qt/Details.cpp:77
+ msgid ""
+ "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."
+-"
Don't turn this off unless you know what you're doing."
+-msgstr ""
+-"啟動這個核心時要以唯讀方式掛載的檔案系統。一般而言, init 命令稿會在一些檢查之後,將根檔案系統重新掛載為讀寫模式,這應該要被開啟。"
+-"
不要關閉這個功能除非您非常確定。"
++"normally take care of remounting the root filesystem in read-write mode "
++"after running some checks, this should always be turned on.
Don't turn "
++"this off unless you know what you're doing."
++msgstr ""
++"啟動這個核心時要以唯讀方式掛載的檔案系統。一般而言, init 命令稿會在一些檢查"
++"之後,將根檔案系統重新掛載為讀寫模式,這應該要被開啟。
不要關閉這個功能除"
++"非您非常確定。"
+
+ #: kde/Details.cpp:78 qt/Details.cpp:80
+ msgid "Do not check &partition table"
+@@ -486,34 +486,37 @@
+
+ #: kde/Details.cpp:79
+ msgid ""
+-"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."
+-"
This sets the unsafe keyword in lilo.conf."
++"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.
This sets the "
++"unsafe keyword in lilo.conf."
+ msgstr ""
+-"這個功能關閉一些寫入設定檔時的檢查。在“一般”的情形下,這不應該被使用,但是這仍是有用的,例如提供自軟碟開機的功能而不需要在每次執行 lilo 時放入軟碟片。"
++"這個功能關閉一些寫入設定檔時的檢查。在“一般”的情形下,這不應該被使用,但是這"
++"仍是有用的,例如提供自軟碟開機的功能而不需要在每次執行 lilo 時放入軟碟片。"
+ "
這會設定 lilo.conf 中的 unsafe 關鍵字。"
+
+ #: kde/Details.cpp:83 qt/Details.cpp:86
+ msgid ""
+ "Checking this box enables automatic recording of boot command lines as the "
+-"default for the following bootups. This way, lilo \"locks\" on a choice until "
+-"it is manually overridden."
+-"
This sets the lock option in lilo.conf"
+-msgstr ""
+-"啟動這個功能以啟動自動紀錄開機指令的功能,並將之作為往後開機的預設值。這種方式會讓 LILO “鎖定”這個選擇直到手動變更。"
+-"
這會設定 lilo.conf 中的 lock 選項。"
++"default for the following bootups. This way, lilo \"locks\" on a choice "
++"until it is manually overridden.
This sets the lock option in lilo."
++"conf"
++msgstr ""
++"啟動這個功能以啟動自動紀錄開機指令的功能,並將之作為往後開機的預設值。這種方"
++"式會讓 LILO “鎖定”這個選擇直到手動變更。
這會設定 lilo.conf 中的 lock"
++"b> 選項。"
+
+ #: kde/Details.cpp:86 qt/Details.cpp:89
+ msgid ""
+ "If this box is checked, a password (entered below) is required only if any "
+-"parameters are changed (i.e. the user can boot linux, but not "
+-"linux single or linux init=/bin/sh).\n"
++"parameters are changed (i.e. the user can boot linux, but not "
++"linux single or linux init=/bin/sh).\n"
+ "This sets the restricted option in lilo.conf."
+ msgstr ""
+-"如果核取這個方塊,要變更任何參數時,在下面輸入的密碼是必須的。也就是使用者可以啟動 linux 但不能使用 linux single "
+-"或 linux init=/bin/sh。\n"
++"如果核取這個方塊,要變更任何參數時,在下面輸入的密碼是必須的。也就是使用者可"
++"以啟動 linux 但不能使用 linux single 或 linux init=/bin/sh"
++"i>。\n"
+ "這會設定 lilo.conf 中的 restricted 選項。"
+
+ #: kde/Details.cpp:94 qt/Details.cpp:98
+@@ -524,9 +527,10 @@
+ "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."
+ msgstr ""
+-"在這邊輸入開機時需要的密碼(如果有的話)。如果使用了上面的 限制參數 功能,必須要使用這個密碼才能變更參數。"
+-"
警告: 這個密碼是以未編碼的方式存在 /etc/lilo.conf "
+-"中。您必須確定未授權的人不能讀取這個檔案。同時,建議不要使用您的一般/管理者密碼。"
++"在這邊輸入開機時需要的密碼(如果有的話)。如果使用了上面的 限制參數 功"
++"能,必須要使用這個密碼才能變更參數。
警告: 這個密碼是以未編碼的方"
++"式存在 /etc/lilo.conf 中。您必須確定未授權的人不能讀取這個檔案。同時,建議不"
++"要使用您的一般/管理者密碼。"
+
+ #: kde/kcontrol.cpp:48
+ msgid "kcmlilo"
+@@ -543,12 +547,13 @@
+ #: qt/Details.cpp:81
+ msgid ""
+ "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."
+-"
This sets the unsafe keyword in lilo.conf."
++"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.
This sets the "
++"unsafe keyword in lilo.conf."
+ msgstr ""
+-"這個功能關閉一些寫入設定檔時的檢查,在“一般”的情形下,這不應該被使用。但是這仍是有用的,例如提供自軟碟開機的功能而不需要在每次執行 lilo 時放入軟碟片。"
++"這個功能關閉一些寫入設定檔時的檢查,在“一般”的情形下,這不應該被使用。但是這"
++"仍是有用的,例如提供自軟碟開機的功能而不需要在每次執行 lilo 時放入軟碟片。"
+ "
這會設定 lilo.conf 中的 unsafe 關鍵字。"
+
+ #: qt/standalone.cpp:41
+@@ -557,17 +562,21 @@
+
+ #: qt/standalone.cpp:43
+ msgid ""
+-"The What's This? button is part of this program's help system. Click on "
+-"the What's This? button then on any widget in the window to get information "
+-"(like this) on it."
+-msgstr "這是什麼? 按鈕是這個程式說明系統的一部份。按下這個按鈕以及任何程式元件以取得像這樣的說明視窗。"
++"The What's This? button is part of this program's help system. Click "
++"on the What's This? button then on any widget in the window to get "
++"information (like this) on it."
++msgstr ""
++"這是什麼? 按鈕是這個程式說明系統的一部份。按下這個按鈕以及任何程式元"
++"件以取得像這樣的說明視窗。"
+
+ #: qt/standalone.cpp:47
+ msgid ""
+-"This button calls up the program's online help system. If it does nothing, no "
+-"help file has been written (yet); in that case, use the What's This "
+-"button on the left."
+-msgstr "這個按鈕呼叫程式的線上說明系統。如果它沒有作用,是因為目前沒有說明檔案;此時,請使用右邊的 這是什麼? 按鈕。"
++"This button calls up the program's online help system. If it does nothing, "
++"no help file has been written (yet); in that case, use the What's This"
++"i> button on the left."
++msgstr ""
++"這個按鈕呼叫程式的線上說明系統。如果它沒有作用,是因為目前沒有說明檔案;此"
++"時,請使用右邊的 這是什麼? 按鈕。"
+
+ #: qt/standalone.cpp:49
+ msgid "&Default"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeadmin/kcron.po kde-i18n-zh_TW-3.5.10/messages/kdeadmin/kcron.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeadmin/kcron.po 2007-07-12 10:27:49.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdeadmin/kcron.po 2011-11-11 15:45:17.000000000 +0100
+@@ -10,8 +10,7 @@
+ "Project-Id-Version: kcron\n"
+ "POT-Creation-Date: 2007-05-25 02:16+0200\n"
+ "PO-Revision-Date: 2006-01-16 16:23+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Traditional Chinese \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -266,7 +265,8 @@
+
+ #: cttask.cpp:252
+ msgid ""
+-"_: Please translator, read the README.translators file in kcron's source code\n"
++"_: Please translator, read the README.translators file in kcron's source "
++"code\n"
+ "DAYS_OF_MONTH of MONTHS"
+ msgstr "MONTHS 月 DAYS_OF_MONTH 日"
+
+@@ -325,8 +325,8 @@
+ #: ktapp.cpp:96
+ msgid ""
+ "You can use this application to schedule programs to run in the background.\n"
+-"To schedule a new task now, click on the Tasks folder and select Edit/New from "
+-"the menu."
++"To schedule a new task now, click on the Tasks folder and select Edit/New "
++"from the menu."
+ msgstr ""
+ "你可以使用這個程式來排程程式在背景執行。\n"
+ "要立刻排程一個新工作,請按下工作資料夾並從選單中選編輯/新增。"
+@@ -337,11 +337,11 @@
+
+ #: ktapp.cpp:131
+ msgid "&New..."
+-msgstr "新增(&N)..."
++msgstr "新增(&N)…"
+
+ #: ktapp.cpp:133
+ msgid "M&odify..."
+-msgstr "修改(&O)..."
++msgstr "修改(&O)…"
+
+ #: ktapp.cpp:135 kttask.cpp:171 ktvariable.cpp:74
+ msgid "&Enabled"
+@@ -367,47 +367,47 @@
+
+ #: ktapp.cpp:255
+ msgid "Saving..."
+-msgstr "儲存中..."
++msgstr "儲存中…"
+
+ #: ktapp.cpp:266
+ msgid "Printing..."
+-msgstr "列印中..."
++msgstr "列印中…"
+
+ #: ktapp.cpp:285
+ msgid "Cutting to clipboard..."
+-msgstr "剪下至剪貼簿..."
++msgstr "剪下至剪貼簿…"
+
+ #: ktapp.cpp:293
+ msgid "Copying to clipboard..."
+-msgstr "複製至剪貼簿..."
++msgstr "複製至剪貼簿…"
+
+ #: ktapp.cpp:300
+ msgid "Pasting from clipboard..."
+-msgstr "自剪貼簿貼上..."
++msgstr "自剪貼簿貼上…"
+
+ #: ktapp.cpp:307
+ msgid "Adding new entry..."
+-msgstr "新增項目..."
++msgstr "新增項目…"
+
+ #: ktapp.cpp:314
+ msgid "Modifying entry..."
+-msgstr "修改項目..."
++msgstr "修改項目…"
+
+ #: ktapp.cpp:321
+ msgid "Deleting entry..."
+-msgstr "刪除項目..."
++msgstr "刪除項目…"
+
+ #: ktapp.cpp:331
+ msgid "Disabling entry..."
+-msgstr "停用項目..."
++msgstr "停用項目…"
+
+ #: ktapp.cpp:337
+ msgid "Enabling entry..."
+-msgstr "啟用項目..."
++msgstr "啟用項目…"
+
+ #: ktapp.cpp:346
+ msgid "Running command..."
+-msgstr "執行指令..."
++msgstr "執行指令…"
+
+ #: ktapp.cpp:395
+ msgid "Create a new task or variable."
+@@ -471,7 +471,7 @@
+
+ #: ktlisttasks.cpp:85
+ msgid "No tasks..."
+-msgstr "沒有工作..."
++msgstr "沒有工作…"
+
+ #: ktlistvar.cpp:72
+ msgid "Modify Variable"
+@@ -491,7 +491,7 @@
+
+ #: ktlistvars.cpp:81
+ msgid "No variables..."
+-msgstr "沒有變數..."
++msgstr "沒有變數…"
+
+ #: ktlistvars.cpp:98
+ msgid "Variables"
+@@ -527,7 +527,7 @@
+
+ #: kttask.cpp:165
+ msgid "&Browse..."
+-msgstr "瀏覽(&B)..."
++msgstr "瀏覽(&B)…"
+
+ #: kttask.cpp:176
+ msgid "&Silent"
+@@ -576,10 +576,8 @@
+ msgstr "分鐘"
+
+ #: kttask.cpp:528
+-msgid ""
+-"Please enter the following to schedule the task:\n"
+-msgstr ""
+-"請輸入下列資訊以方便安排工作:\n"
++msgid "Please enter the following to schedule the task:\n"
++msgstr "請輸入下列資訊以方便安排工作:\n"
+
+ #: kttask.cpp:534
+ msgid "the program to run"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeadmin/kdat.po kde-i18n-zh_TW-3.5.10/messages/kdeadmin/kdat.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeadmin/kdat.po 2008-08-19 20:43:18.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdeadmin/kdat.po 2011-11-11 15:45:17.000000000 +0100
+@@ -5,7 +5,7 @@
+ "Project-Id-Version: kdat\n"
+ "POT-Creation-Date: 2008-07-08 01:20+0200\n"
+ "PO-Revision-Date: 2005-12-08 14:19+0800\n"
+-"Last-Translator: Frank Weng \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Chinese (traditional) \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -75,7 +75,7 @@
+
+ #: BackupDlg.cpp:138 IndexDlg.cpp:115
+ msgid "Save Log..."
+-msgstr "保存紀錄..."
++msgstr "保存紀錄…"
+
+ #: BackupDlg.cpp:279
+ msgid "No files to back up. Aborting."
+@@ -288,7 +288,7 @@
+
+ #: KDatMainWindow.cpp:104 KDatMainWindow.cpp:144
+ msgid "Format Tape..."
+-msgstr "格式化磁帶..."
++msgstr "格式化磁帶…"
+
+ #: KDatMainWindow.cpp:107 KDatMainWindow.cpp:113 KDatMainWindow.cpp:141
+ #: KDatMainWindow.cpp:781 KDatMainWindow.cpp:795
+@@ -297,15 +297,15 @@
+
+ #: KDatMainWindow.cpp:110 KDatMainWindow.cpp:116 KDatMainWindow.cpp:136
+ msgid "Verify..."
+-msgstr "檢驗..."
++msgstr "檢驗…"
+
+ #: KDatMainWindow.cpp:111 KDatMainWindow.cpp:117 KDatMainWindow.cpp:135
+ msgid "Restore..."
+-msgstr "資料重建..."
++msgstr "資料重建…"
+
+ #: KDatMainWindow.cpp:120 KDatMainWindow.cpp:129 KDatMainWindow.cpp:134
+ msgid "Backup..."
+-msgstr "備份..."
++msgstr "備份…"
+
+ #: KDatMainWindow.cpp:123 KDatMainWindow.cpp:829
+ msgid "Delete Tape Index"
+@@ -325,7 +325,7 @@
+
+ #: KDatMainWindow.cpp:149
+ msgid "Configure KDat..."
+-msgstr "設定 KDat..."
++msgstr "設定 KDat…"
+
+ #: KDatMainWindow.cpp:155
+ msgid ""
+@@ -367,8 +367,8 @@
+ "to restore them. To restore your files by hand, you need to know\n"
+ "the name of the *non-rewinding* version of your tape device %1.\n"
+ msgstr ""
+-"KDat 會將您的檔案存進磁帶中。要將檔案從磁帶中取出,您必須知道您的磁帶機設備 %1 的「不迴帶設備名稱」 (non-rewinding device "
+-"name)。\n"
++"KDat 會將您的檔案存進磁帶中。要將檔案從磁帶中取出,您必須知道您的磁帶機設備 %"
++"1 的「不迴帶設備名稱」 (non-rewinding device name)。\n"
+
+ #: KDatMainWindow.cpp:423
+ msgid ""
+@@ -384,7 +384,8 @@
+ " - KDat Maintenance Team\n"
+ msgstr ""
+ "例如,如果您的磁帶機設備名稱是 /dev/st0,「不迴帶設備名稱」就是 /dev/nst0。\n"
+-"如果您的設備名稱不是像這樣,請輸入 ls -l %2 看看您的磁帶機設備名稱,並將以下說明的 /dev/nst0 換成您的設備名稱。\n"
++"如果您的設備名稱不是像這樣,請輸入 ls -l %2 看看您的磁帶機設備名稱,並將以下"
++"說明的 /dev/nst0 換成您的設備名稱。\n"
+ "開啟終端機視窗,輸入下列命令:\n"
+ "tar tfv /dev/nst0; tar tfv /dev/nst0\n"
+ "tar xfv /dev/nst0\n"
+@@ -398,7 +399,7 @@
+
+ #: KDatMainWindow.cpp:467
+ msgid "Performing backup..."
+-msgstr "正在進行備份..."
++msgstr "正在進行備份…"
+
+ #: KDatMainWindow.cpp:472 KDatMainWindow.cpp:494
+ msgid "Backup canceled."
+@@ -416,7 +417,7 @@
+
+ #: KDatMainWindow.cpp:501 TapeDrive.cpp:525 TapeDrive.cpp:546
+ msgid "Rewinding tape..."
+-msgstr "正在倒帶..."
++msgstr "正在倒帶…"
+
+ #: KDatMainWindow.cpp:504
+ msgid ""
+@@ -436,7 +437,7 @@
+
+ #: KDatMainWindow.cpp:512
+ msgid "Skipping to end of tape..."
+-msgstr "正在跳到磁帶尾端..."
++msgstr "正在跳到磁帶尾端…"
+
+ #: KDatMainWindow.cpp:515
+ msgid ""
+@@ -448,7 +449,7 @@
+
+ #: KDatMainWindow.cpp:521
+ msgid "Backup in progress..."
+-msgstr "正在備份..."
++msgstr "正在備份…"
+
+ #: KDatMainWindow.cpp:535
+ msgid "Backup complete."
+@@ -456,11 +457,11 @@
+
+ #: KDatMainWindow.cpp:667
+ msgid "Restore in progress..."
+-msgstr "正在讀出資料..."
++msgstr "正在讀出資料…"
+
+ #: KDatMainWindow.cpp:669
+ msgid "Verify in progress..."
+-msgstr "正在檢驗..."
++msgstr "正在檢驗…"
+
+ #: KDatMainWindow.cpp:676
+ msgid "Restore complete."
+@@ -486,7 +487,8 @@
+ "/dev/st0). If you hear the tape drive moving, wait\n"
+ "until it stops and then try mounting it again."
+ msgstr ""
+-"磁帶機 %1 中沒有磁帶。請檢查設定是否指向正確的磁帶機設備(如 /dev/st0)。如果您有聽到磁帶機在運轉中,請稍候直到運轉停止,並試著重新掛載。"
++"磁帶機 %1 中沒有磁帶。請檢查設定是否指向正確的磁帶機設備(如 /dev/st0)。如果"
++"您有聽到磁帶機在運轉中,請稍候直到運轉停止,並試著重新掛載。"
+
+ #: KDatMainWindow.cpp:723
+ msgid "The current tape index will be overwritten, continue?"
+@@ -552,8 +554,8 @@
+ #: KDatMainWindow.cpp:811
+ msgid ""
+ "No tape index is selected.\n"
+-"In order to delete a tape index, the tape index to be deleted must be selected "
+-"in the tree first."
++"In order to delete a tape index, the tape index to be deleted must be "
++"selected in the tree first."
+ msgstr ""
+ "沒有選擇磁帶索引。\n"
+ "請在樹狀列表中選擇要刪除的磁帶索引。"
+@@ -605,7 +607,7 @@
+
+ #: KDatMainWindow.cpp:884
+ msgid "Formatting tape..."
+-msgstr "正在格式化磁帶..."
++msgstr "正在格式化磁帶…"
+
+ #: KDatMainWindow.cpp:887
+ msgid "Format complete."
+@@ -622,8 +624,8 @@
+
+ #: KDatMainWindow.cpp:940
+ msgid ""
+-"In order to delete a backup profile, the backup profile to be deleted must be "
+-"selected in the tree first."
++"In order to delete a backup profile, the backup profile to be deleted must "
++"be selected in the tree first."
+ msgstr "請先在樹狀列表中選擇要刪除的備份設定。"
+
+ #: KDatMainWindow.cpp:949
+@@ -640,7 +642,7 @@
+
+ #: KDatMainWindow.cpp:996
+ msgid "Reading tape header..."
+-msgstr "正在讀取磁帶標頭..."
++msgstr "正在讀取磁帶標頭…"
+
+ #: KDatMainWindow.cpp:1003
+ msgid "This tape has not been formatted by KDat."
+@@ -782,9 +784,11 @@
+ #, c-format
+ msgid ""
+ "The tape index file format is version %d. The index cannot be read by this "
+-"version of KDat. Perhaps the tape index file was created by a newer version of "
+-"KDat?"
+-msgstr "磁帶索引檔案格式版本為 %d。你用的 KDat 不能讀取索引檔案。也許,磁帶索引檔案是用新版本的KDat生成的?"
++"version of KDat. Perhaps the tape index file was created by a newer version "
++"of KDat?"
++msgstr ""
++"磁帶索引檔案格式版本為 %d。你用的 KDat 不能讀取索引檔案。也許,磁帶索引檔案是"
++"用新版本的KDat生成的?"
+
+ #: Tape.cpp:380
+ msgid "Error during fseek #1 while accessing archive: \""
+@@ -884,7 +888,7 @@
+
+ #: TapeDrive.cpp:231
+ msgid "Reading magic string..."
+-msgstr "正在讀取 magic 字串..."
++msgstr "正在讀取 magic 字串…"
+
+ #: TapeDrive.cpp:234
+ msgid "Reading magic string failed."
+@@ -892,7 +896,7 @@
+
+ #: TapeDrive.cpp:243
+ msgid "Reading version number..."
+-msgstr "正在讀版本號..."
++msgstr "正在讀版本號…"
+
+ #: TapeDrive.cpp:251
+ msgid ""
+@@ -901,7 +905,7 @@
+
+ #: TapeDrive.cpp:255
+ msgid "Reading tape ID..."
+-msgstr "讀取磁帶 ID..."
++msgstr "讀取磁帶 ID…"
+
+ #: TapeDrive.cpp:258
+ msgid "Reading tape ID length failed."
+@@ -909,11 +913,11 @@
+
+ #: TapeDrive.cpp:520
+ msgid "Skipping to archive..."
+-msgstr "跳至歸檔..."
++msgstr "跳至歸檔…"
+
+ #: TapeDrive.cpp:542
+ msgid "Skipping to block..."
+-msgstr "跳至區塊..."
++msgstr "跳至區塊…"
+
+ #: TapeFileInfoWidget.cpp:39
+ msgid "Start record:"
+@@ -957,17 +961,15 @@
+
+ #: VerifyDlg.cpp:144
+ msgid "&Save Log..."
+-msgstr "保存紀錄 (&S)..."
++msgstr "保存紀錄(&S)…"
+
+ #: VerifyDlg.cpp:149
+ msgid "&Abort"
+ msgstr "中斷(&A)"
+
+ #: VerifyDlg.cpp:344
+-msgid ""
+-"failed while reading tape data.\n"
+-msgstr ""
+-"無法讀取磁帶資料。\n"
++msgid "failed while reading tape data.\n"
++msgstr "無法讀取磁帶資料。\n"
+
+ #: VerifyOptDlg.cpp:41 VerifyOptDlg.cpp:42
+ msgid "KDat: Restore Options"
+@@ -989,7 +991,7 @@
+ #: VerifyOptDlg.cpp:60 rc.cpp:30 rc.cpp:42
+ #, no-c-format
+ msgid "..."
+-msgstr "..."
++msgstr "…"
+
+ #: VerifyOptDlg.cpp:65
+ msgid "Restore files:"
+@@ -1033,8 +1035,8 @@
+ #: rc.cpp:6
+ #, no-c-format
+ msgid ""
+-"This setting determines the capacity that KDat assumes your backup tapes to be. "
+-" This is used when formatting the tapes."
++"This setting determines the capacity that KDat assumes your backup tapes to "
++"be. This is used when formatting the tapes."
+ msgstr "這個設定是讓 KDat 猜測您的備份磁帶容量。用於格式化磁帶時。"
+
+ #. i18n: file OptionsDlgWidget.ui line 67
+@@ -1042,10 +1044,11 @@
+ #, no-c-format
+ msgid ""
+ "Tape drives read and write data in individual blocks. This setting controls "
+-"the size of each block, and should be set to your tape drive's block size. For "
+-"floppy tape drives this should be set to 10240 bytes."
++"the size of each block, and should be set to your tape drive's block size. "
++"For floppy tape drives this should be set to 10240 bytes."
+ msgstr ""
+-"磁帶機於個別的區塊讀寫資料。這個設定控制區塊大小,應該與您的磁帶機的區塊大小一致。Floppy 磁帶機應該設定為 10240 bytes。"
++"磁帶機於個別的區塊讀寫資料。這個設定控制區塊大小,應該與您的磁帶機的區塊大小"
++"一致。Floppy 磁帶機應該設定為 10240 bytes。"
+
+ #. i18n: file OptionsDlgWidget.ui line 73
+ #: rc.cpp:12
+@@ -1063,8 +1066,8 @@
+ #: rc.cpp:18
+ #, no-c-format
+ msgid ""
+-"This option chooses whether the default tape size to the left is in megabytes "
+-"(MB) or gigabytes (GB)."
++"This option chooses whether the default tape size to the left is in "
++"megabytes (MB) or gigabytes (GB)."
+ msgstr "這個選項設定磁帶大小是以 MB 或 GB 為單位。"
+
+ #. i18n: file OptionsDlgWidget.ui line 96
+@@ -1095,8 +1098,8 @@
+ #: rc.cpp:36
+ #, no-c-format
+ msgid ""
+-"The location in the filesystem of the non-rewinding "
+-"tape device. The default is /dev/tape."
++"The location in the filesystem of the non-rewinding tape device. "
++"The default is /dev/tape."
+ msgstr "不迴帶設備名稱在檔案系統中的位置。預設為/dev/type。"
+
+ #. i18n: file OptionsDlgWidget.ui line 155
+@@ -1115,9 +1118,11 @@
+ #: rc.cpp:48
+ #, no-c-format
+ msgid ""
+-"This setting controls the command that KDat uses to perform the tape backup. "
+-"The full path should be given. The default is tar."
+-msgstr "這個設定控制 KDat 用於進行磁帶備份的命令。您應該用完整的路徑名稱。預設值為 tar。"
++"This setting controls the command that KDat uses to perform the tape "
++"backup. The full path should be given. The default is tar."
++msgstr ""
++"這個設定控制 KDat 用於進行磁帶備份的命令。您應該用完整的路徑名稱。預設值為 "
++"tar。"
+
+ #. i18n: file OptionsDlgWidget.ui line 185
+ #: rc.cpp:51
+@@ -1147,8 +1152,8 @@
+ #: rc.cpp:63
+ #, no-c-format
+ msgid ""
+-"This command issues an mtload command to the tape device before trying "
+-"to mount it.\n"
++"This command issues an mtload command to the tape device before "
++"trying to mount it.\n"
+ "\n"
+ "This is required by some tape drives."
+ msgstr ""
+@@ -1172,8 +1177,8 @@
+ #: rc.cpp:74
+ #, no-c-format
+ msgid ""
+-"This option makes KDat try to disable the eject button on the tape drive after "
+-"the tape has been mounted.\n"
++"This option makes KDat try to disable the eject button on the tape drive "
++"after the tape has been mounted.\n"
+ "\n"
+ "This doesn't work for all tape drives."
+ msgstr ""
+@@ -1221,8 +1226,8 @@
+ #: rc.cpp:96
+ #, no-c-format
+ msgid ""
+-"Some tape drives support different sizes of the data block. With this option, "
+-"KDat will attempt to enable that support.\n"
++"Some tape drives support different sizes of the data block. With this "
++"option, KDat will attempt to enable that support.\n"
+ "\n"
+ "You must still specify the block size."
+ msgstr ""
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeadmin/kfile_deb.po kde-i18n-zh_TW-3.5.10/messages/kdeadmin/kfile_deb.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeadmin/kfile_deb.po 2005-09-10 11:24:18.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdeadmin/kfile_deb.po 2011-11-11 15:45:17.000000000 +0100
+@@ -7,7 +7,7 @@
+ "Project-Id-Version: kfile_deb.po\n"
+ "POT-Creation-Date: 2004-10-12 01:17+0200\n"
+ "PO-Revision-Date: 2002-06-27 10:17\n"
+-"Last-Translator: Keanu \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Chinese (traditional) \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeadmin/kfile_rpm.po kde-i18n-zh_TW-3.5.10/messages/kdeadmin/kfile_rpm.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeadmin/kfile_rpm.po 2006-07-22 10:04:31.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdeadmin/kfile_rpm.po 2011-11-11 15:45:17.000000000 +0100
+@@ -8,8 +8,7 @@
+ "Project-Id-Version: kfile_rpm\n"
+ "POT-Creation-Date: 2004-10-12 01:17+0200\n"
+ "PO-Revision-Date: 2005-12-15 15:38+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Traditional Chinese \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeadmin/knetworkconf.po kde-i18n-zh_TW-3.5.10/messages/kdeadmin/knetworkconf.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeadmin/knetworkconf.po 2008-08-19 20:43:18.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdeadmin/knetworkconf.po 2011-11-11 15:45:17.000000000 +0100
+@@ -7,7 +7,8 @@
+ "Project-Id-Version: knetworkconf\n"
+ "POT-Creation-Date: 2008-07-08 01:20+0200\n"
+ "PO-Revision-Date: 2006-06-19 09:12+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
++"tw>\n"
+ "Language-Team: Chinese Traditional \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -128,8 +129,8 @@
+
+ #: knetworkconf.cpp:716
+ msgid ""
+-"Could not launch backend to change network device state. You will have to do it "
+-"manually."
++"Could not launch backend to change network device state. You will have to do "
++"it manually."
+ msgstr "無法叫出後端來更新網路設備的狀態。您必須手動執行。"
+
+ #: knetworkconf.cpp:737
+@@ -341,13 +342,13 @@
+ msgid ""
+ "Using an dynamic IP address causes this device to get a free IP address "
+ "automatically.
\n"
+-"The interface will try to contact an DHCP- or BOOTP-Server during the boot "
+-"process.
\n"
++"The interface will try to contact an DHCP- or BOOTP-Server during the "
++"boot process.
\n"
+ "Rendevouz is not supported yet.
"
+ msgstr ""
+ "使用動態 IP 位址,網路設備會自動取得 IP 位址。
\n"
+-"此介面會在開機時試著去尋找 DHCP 或 BOOTP 伺服器。
"
+-"Rendevouz 尚未支援。
"
++"此介面會在開機時試著去尋找 DHCP 或 BOOTP 伺服器。
Rendevouz 尚未支"
++"援。
"
+
+ #. i18n: file kadddevicedlg.ui line 184
+ #: rc.cpp:42
+@@ -368,7 +369,9 @@
+ "Ensures that this interface gets activated during boot time.
\n"
+ "Otherwise, you will have to active the interface manually after you have "
+ "logged in after the boot process.
"
+-msgstr "確保在開機期間此介面已經被開啟。
不然您就必須在開完機後登入系統,再手動啟動介面。
"
++msgstr ""
++"確保在開機期間此介面已經被開啟。
不然您就必須在開完機後登入系統,再"
++"手動啟動介面。
"
+
+ #. i18n: file kadddevicedlg.ui line 197
+ #: rc.cpp:52
+@@ -425,8 +428,8 @@
+ "Please enter the desired subnetmask for the interface here.
\n"
+ "For small private networks, 255.255.255.0 will most often be a reasonable "
+ "default value.
\n"
+-"This field will change from a popup box to a combo box as soon as you enable "
+-"the advanced settings below.
"
++"This field will change from a popup box to a combo box as soon as you "
++"enable the advanced settings below.
"
+ msgstr ""
+ "請輸入此介面的子網路遮罩。
\n"
+ "對某些小的私密網路而言,255.255.255.0 通常是合理的預設值。
\n"
+@@ -442,8 +445,8 @@
+ #: rc.cpp:84 rc.cpp:87
+ #, no-c-format
+ msgid ""
+-"The netmask defines a range of IP numbers which will build a subnet inside the "
+-"network."
++"The netmask defines a range of IP numbers which will build a subnet inside "
++"the network."
+ msgstr "網路遮罩定義子網路內可用的 IP 範圍。"
+
+ #. i18n: file kadddevicedlg.ui line 301
+@@ -457,26 +460,29 @@
+ #, no-c-format
+ msgid ""
+ "Here you should enter the IP address for the network interface.
\n"
+-"Please note: If your network is connected to the internet, you should only "
+-"enter IP addresses you have been given by your provider.
\n"
++"Please note: If your network is connected to the internet, you should "
++"only enter IP addresses you have been given by your provider.
\n"
+ "Otherwise, you should enter one of the IP addresses which are explicitly "
+ "reserved for private use.
\n"
+ "Most small private networks use class C networks, which allow up to 255 "
+ "computers in your network. So simply use addresses like 192.168.1.1, "
+ "192.168.1.2, 192.168.1.171 and so on for your computers.
\n"
+-"Cass C networks: 192.168.0.0 to 192.168.255.25, for example 192.168.0.13.
"
+-"\n"
+-"Class B networks: 172.16.0.0 to 172.31.255.255, for example 172.28.2.5
\n"
++"Cass C networks: 192.168.0.0 to 192.168.255.25, for example 192.168.0.13."
++"
\n"
++"Class B networks: 172.16.0.0 to 172.31.255.255, for example 172.28.2.5"
++"p>\n"
+ "
Class A networks: 10.0.0.0 to 10.255.255.255, for example 10.5.12.14
\n"
+-"Please ensure that all IP addresses you give to your computers are unique; "
+-"you will have many problems if the same address is assigned to more than one "
+-"network device.
"
++"Please ensure that all IP addresses you give to your computers are "
++"unique; you will have many problems if the same address is assigned to more "
++"than one network device.
"
+ msgstr ""
+ "請在此輸入網路介面的 IP 位址。
\n"
+-"請注意:如果您是連接到網際網路上,您應該輸入您的網路服務提供者給您的 IP 位址。
\n"
++"請注意:如果您是連接到網際網路上,您應該輸入您的網路服務提供者給您的 IP 位"
++"址。
\n"
+ "否則,您應該輸入私密網路的位址。
\n"
+-"大部份小的私密網路使用的是 C class 的網路,允許 255 台電腦在同一個網域內。
"
+-"C class 網路:192.168.0.0 到 192.168.255.255,例如 192.168.0.13。
\n"
++"大部份小的私密網路使用的是 C class 的網路,允許 255 臺電腦在同一個網域內。"
++"
C class 網路:192.168.0.0 到 192.168.255.255,例如 192.168.0.13。"
++"p>\n"
+ "
B class 網路:172.16.0.0 到 172.31.255.255,例如 172.28.2.5。
\n"
+ "A class 網路:10.0.0.0 到 10.255.255.255,例如 10.5.12.14。
\n"
+ "請確定您設定的 IP 位址不會跟別人衝突,否則您會遇到一大堆的麻煩。
"
+@@ -640,25 +646,25 @@
+ #: rc.cpp:214 rc.cpp:310 rc.cpp:328
+ #, no-c-format
+ msgid "&Add..."
+-msgstr "新增(&A)..."
++msgstr "新增(&A)…"
+
+ #. i18n: file kaddknownhostdlg.ui line 201
+ #: rc.cpp:217 rc.cpp:313 rc.cpp:331
+ #, no-c-format
+ msgid "&Edit..."
+-msgstr "編輯(&E)..."
++msgstr "編輯(&E)…"
+
+ #. i18n: file kdetectdistrodlg.ui line 16
+ #: rc.cpp:223
+ #, no-c-format
+ msgid "Detecting Your Current Platform"
+-msgstr "偵測您目前的平台"
++msgstr "偵測您目前的平臺"
+
+ #. i18n: file kdetectdistrodlg.ui line 60
+ #: rc.cpp:226
+ #, no-c-format
+ msgid "Please wait while detecting your current platform..."
+-msgstr "請稍候,正在偵測您目前的平台..."
++msgstr "請稍候,正在偵測您目前的平臺…"
+
+ #. i18n: file kinterfaceupdowndlg.ui line 16
+ #: rc.cpp:229
+@@ -670,7 +676,7 @@
+ #: rc.cpp:232
+ #, no-c-format
+ msgid "Bringing up interface eth0..."
+-msgstr "帶起介面eth0..."
++msgstr "帶起介面eth0…"
+
+ #. i18n: file knetworkconfdlg.ui line 36
+ #: rc.cpp:235
+@@ -742,7 +748,7 @@
+ #: rc.cpp:268
+ #, no-c-format
+ msgid "Configure Interface..."
+-msgstr "設定介面..."
++msgstr "設定介面…"
+
+ #. i18n: file knetworkconfdlg.ui line 197
+ #: rc.cpp:271
+@@ -868,7 +874,7 @@
+ #: rc.cpp:358
+ #, no-c-format
+ msgid "&Create New..."
+-msgstr "建立新的(&C)..."
++msgstr "建立新的(&C)…"
+
+ #. i18n: file knetworkconfdlg.ui line 845
+ #: rc.cpp:361
+@@ -894,7 +900,7 @@
+ #: rc.cpp:374
+ #, no-c-format
+ msgid "Unsupported Platform"
+-msgstr "不支援的平台"
++msgstr "不支援的平臺"
+
+ #. i18n: file kselectdistrodlg.ui line 69
+ #: rc.cpp:383
+@@ -906,18 +912,20 @@
+ #: rc.cpp:386
+ #, no-c-format
+ msgid ""
+-"Your Platform is Not Supported
"
+-""
+-msgstr "未支援您的平台
"
++"Your Platform is Not Supported"
++"p>
"
++msgstr "未支援您的平臺
"
+
+ #. i18n: file kselectdistrodlg.ui line 102
+ #: rc.cpp:389
+ #, no-c-format
+ msgid ""
+-"You may choose one of the following supported platforms if you are sure "
+-"your platform behaves the same as the chosen one. Please be sure, because your "
+-"current network configuration could be damaged."
+-msgstr "如果您十分確定您的平台的行為與以下的平台一樣,您可以選擇其中一個。但請您要十分確定,因為您的網路設定可能會損毀。"
++"You may choose one of the following supported platforms if you are sure"
++"b> your platform behaves the same as the chosen one. Please be sure, because "
++"your current network configuration could be damaged."
++msgstr ""
++"如果您十分確定您的平臺的行為與以下的平臺一樣,您可以選擇其中一個。但請"
++"您要十分確定,因為您的網路設定可能會損毀。"
+
+ #: knetworkconfmodule.cpp:94
+ msgid "KNetworkConf"
+@@ -998,7 +1006,7 @@
+
+ #: knetworkconfigparser.cpp:304
+ msgid "%1Please wait while saving the network settings...%2"
+-msgstr "%1請稍候,正在儲存網路設定...%2"
++msgstr "%1請稍候,正在儲存網路設定…%2"
+
+ #: knetworkconfigparser.cpp:762
+ msgid "Ethernet Network Device"
+@@ -1014,13 +1022,13 @@
+
+ #: knetworkconfigparser.cpp:1030
+ msgid ""
+-"Could not parse the list of supported platforms from the network configuration "
+-"backend."
+-msgstr "無法剖析網路後端送來的支援平台清單。"
++"Could not parse the list of supported platforms from the network "
++"configuration backend."
++msgstr "無法剖析網路後端送來的支援平臺清單。"
+
+ #: knetworkconfigparser.cpp:1031
+ msgid "Error Obtaining Supported Platforms List"
+-msgstr "取得支援平台清單時發生錯誤"
++msgstr "取得支援平臺清單時發生錯誤"
+
+ #: version.h:5
+ msgid ""
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeadmin/kpackage.po kde-i18n-zh_TW-3.5.10/messages/kdeadmin/kpackage.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeadmin/kpackage.po 2006-10-01 18:34:21.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdeadmin/kpackage.po 2011-11-11 15:45:17.000000000 +0100
+@@ -10,8 +10,7 @@
+ "Project-Id-Version: kpackage\n"
+ "POT-Creation-Date: 2006-08-29 02:38+0200\n"
+ "PO-Revision-Date: 2006-08-30 09:27+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Chinese Traditional \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -29,8 +28,8 @@
+ "_: EMAIL OF TRANSLATORS\n"
+ "Your emails"
+ msgstr ""
+-"lancelot@pchome.com.tw,pesder.liao@msa.hinet.net,franklin at goodhorse dot idv "
+-"dot tw"
++"lancelot@pchome.com.tw,pesder.liao@msa.hinet.net,franklin at goodhorse dot "
++"idv dot tw"
+
+ #: cache.cpp:63 cache.cpp:84
+ #, c-format
+@@ -374,22 +373,21 @@
+
+ #: kpPty.cpp:160
+ msgid ""
+-"The action you requested uses ssh. Please enter the password or pass phrase.\n"
+-msgstr ""
+-"您要求的動作需要 ssh。請輸入密碼或密碼片語。\n"
++"The action you requested uses ssh. Please enter the password or pass "
++"phrase.\n"
++msgstr "您要求的動作需要 ssh。請輸入密碼或密碼片語。\n"
+
+ #: kpPty.cpp:163
+ msgid ""
+-"The action you requested needs root privileges. Please enter root's password.\n"
+-msgstr ""
+-"您要求的動作需要 root 權限。請輸入 root 密碼。\n"
++"The action you requested needs root privileges. Please enter root's "
++"password.\n"
++msgstr "您要求的動作需要 root 權限。請輸入 root 密碼。\n"
+
+ #: kpPty.cpp:166
+ msgid ""
+ "The action you requested needs root privileges. Please enter your SUDO "
+ "password.\n"
+-msgstr ""
+-"您要求的動作需要 root 權限。請輸入您的 sudo 密碼。\n"
++msgstr "您要求的動作需要 root 權限。請輸入您的 sudo 密碼。\n"
+
+ #: kpPty.cpp:182
+ msgid "Login Problem: Please login manually"
+@@ -397,11 +395,11 @@
+
+ #: kpackage.cpp:103
+ msgid "Find &Package..."
+-msgstr "搜尋套件(&P)..."
++msgstr "搜尋套件(&P)…"
+
+ #: kpackage.cpp:107
+ msgid "Find &File..."
+-msgstr "搜尋檔案(&F)..."
++msgstr "搜尋檔案(&F)…"
+
+ #: kpackage.cpp:124
+ msgid "&Expand Tree"
+@@ -437,7 +435,7 @@
+
+ #: kpackage.cpp:173
+ msgid "Configure &KPackage..."
+-msgstr "設定 Kpackage (&K)..."
++msgstr "設定 Kpackage(&K)…"
+
+ #: kpackage.cpp:177
+ msgid "Clear Package &Folder Cache"
+@@ -563,10 +561,8 @@
+ msgstr "建立套件的樹狀結構"
+
+ #: managementWidget.cpp:444
+-msgid ""
+-"Filename not available\n"
+-msgstr ""
+-"檔案名稱不存在\n"
++msgid "Filename not available\n"
++msgstr "檔案名稱不存在\n"
+
+ #: options.cpp:73
+ msgid "&Types"
+@@ -594,7 +590,7 @@
+
+ #: options.cpp:105
+ msgid "Location of Packages"
+-msgstr "套件的位置..."
++msgstr "套件的位置…"
+
+ #: options.cpp:114
+ msgid "Cac&he"
+@@ -630,7 +626,7 @@
+
+ #: options.cpp:162
+ msgid "Execute Privileged Commands Using"
+-msgstr "執行已設限的命令用..."
++msgstr "執行已設限的命令用…"
+
+ #: options.cpp:168
+ msgid "su command"
+@@ -674,7 +670,7 @@
+
+ #: packageDisplay.cpp:375
+ msgid "&Open With..."
+-msgstr "開啟用...(&O)"
++msgstr "開啟用…(&O)"
+
+ #: packageInfo.cpp:114 slackInterface.cpp:344
+ msgid "OTHER"
+@@ -1098,4 +1094,4 @@
+
+ #: updateLoc.cpp:344
+ msgid "File truncated..."
+-msgstr "檔案被截斷..."
++msgstr "檔案被截斷…"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeadmin/ksysv.po kde-i18n-zh_TW-3.5.10/messages/kdeadmin/ksysv.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeadmin/ksysv.po 2007-10-08 12:00:19.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdeadmin/ksysv.po 2011-11-11 15:45:17.000000000 +0100
+@@ -9,8 +9,7 @@
+ "Project-Id-Version: ksysv\n"
+ "POT-Creation-Date: 2007-09-19 01:14+0200\n"
+ "PO-Revision-Date: 2005-12-15 15:45+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Traditional Chinese \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -19,47 +18,37 @@
+
+ #: IOCore.cpp:51
+ msgid ""
+-"FAILED to remove %1 from %2: \"%3\""
+-"
"
++"FAILED to remove %1 from %2: \"%3\"
"
+ msgstr "從 %2 移除 %1 失敗: \"%3\"
"
+
+ #: IOCore.cpp:55
+-msgid ""
+-"FAILED to remove %1 from %2: \"%3\"\n"
+-msgstr ""
+-"無法從 %2 移除 %1: \"%3\"\n"
++msgid "FAILED to remove %1 from %2: \"%3\"\n"
++msgstr "無法從 %2 移除 %1: \"%3\"\n"
+
+ #: IOCore.cpp:62
+ msgid "removed %1 from %2
"
+ msgstr "從 %2 移除 %1
"
+
+ #: IOCore.cpp:66
+-msgid ""
+-"removed %1 from %2\n"
+-msgstr ""
+-"從 %2 移除 %1\n"
++msgid "removed %1 from %2\n"
++msgstr "從 %2 移除 %1\n"
+
+ #: IOCore.cpp:95
+ msgid "created %1 in %2
"
+ msgstr "在 %2 建立 %1
"
+
+ #: IOCore.cpp:96
+-msgid ""
+-"created %1 in %2\n"
+-msgstr ""
+-"在 %2 建立 %1\n"
++msgid "created %1 in %2\n"
++msgstr "在 %2 建立 %1\n"
+
+ #: IOCore.cpp:100
+ msgid ""
+-"FAILED to create %1 in %2: \"%3\""
+-"
"
++"FAILED to create %1 in %2: \"%3\"
"
+ msgstr "在 %2 建立 %1 失敗: \"%3\"
"
+
+ #: IOCore.cpp:105
+-msgid ""
+-"FAILED to create %1 in %2: \"%3\"\n"
+-msgstr ""
+-"無法在 %2 建立 %1: \"%3\"\n"
++msgid "FAILED to create %1 in %2: \"%3\"\n"
++msgstr "無法在 %2 建立 %1: \"%3\"\n"
+
+ #. i18n: file ksysvui.rc line 73
+ #: OldView.cpp:89 OldView.cpp:91 rc.cpp:21 rc.cpp:27
+@@ -79,27 +68,27 @@
+ "Services"
+ msgstr ""
+ "可用\n"
+-"服務 (&A)"
++"服務(&A)"
+
+ #: OldView.cpp:198
+ msgid ""
+ "These are the services "
+-"available on your computer. To start a service, drag it onto the Start "
+-"section of a runlevel.
"
+-"To stop one, do the same for the Stop section.
"
+-msgstr ""
+-"這式您系統紹可用的 服務"
+-". 要啟動一個服務, 拖曳他到執行層級的啟動區域.
"
+-"要停止, 拖曳到停止區域.
"
++"available on your computer. To start a service, drag it onto the Start"
++"em> section of a runlevel.
To stop one, do the same for the Stop"
++"em> section.
"
++msgstr ""
++"這式您系統紹可用的 服務. 要啟動"
++"一個服務, 拖曳他到執行層級的啟動區域.
要停止, 拖曳到停止"
++"em>區域.
"
+
+ #: OldView.cpp:242
+ msgid ""
+ "You can drag services from a runlevel onto the "
+-"trashcan to delete them from that runlevel.
"
+-"The Undo command can be used to restore deleted entries.
"
++"trashcan to delete them from that runlevel.
The "
++"Undo command can be used to restore deleted entries.
"
+ msgstr ""
+-"您可以從啟動層級拖曳服務到 資源回收桶 以將之刪除.
"
+-"復原 可以用來復原刪除的項目.
"
++"您可以從啟動層級拖曳服務到 資源回收桶"
++"strong> 以將之刪除.
復原 可以用來復原刪除的項目.
"
+
+ #: OldView.cpp:254
+ #, c-format
+@@ -113,18 +102,17 @@
+
+ #: OldView.cpp:260
+ msgid ""
+-"These are the services started in runlevel %1.
"
+-"The number shown on the left of the "
+-"icon determines the order in which the services are started. You can arrange "
+-"them via drag and drop, as long as a suitable sorting number "
+-"can be generated.
"
+-"If that's not possible, you have to change the number manually via the "
+-"Properties dialog box.
"
+-msgstr ""
+-"這是在啟動層級 %1 所啟動 的服務.
"
+-"在圖示左邊的編號決定了服務啟動的順序. 您可以經由拖放來排序, 如此適當的"
+-"排列編號會被產生.
"
+-"如果沒有適當的產生, 您可以經由在內容對話方塊中手動改變編號.
"
++"These are the services started in runlevel %1.
The "
++"number shown on the left of the icon "
++"determines the order in which the services are started. You can arrange them "
++"via drag and drop, as long as a suitable sorting number can be "
++"generated.
If that's not possible, you have to change the number "
++"manually via the Properties dialog box.
"
++msgstr ""
++"這是在啟動層級 %1 所啟動 的服務.
在圖示左邊的編號決定了服務啟動的順序. 您可以經由拖放來排序, 如此"
++"適當的排列編號會被產生.
如果沒有適當的產生, 您可以經由在"
++"內容對話方塊中手動改變編號.
"
+
+ #: OldView.cpp:268
+ msgid "Start"
+@@ -132,18 +120,17 @@
+
+ #: OldView.cpp:278
+ msgid ""
+-"These are the services stopped in runlevel %1.
"
+-"The number shown on the left of the "
+-"icon determines the order in which the services are stopped. You can arrange "
+-"them via drag and drop, as long as a suitable sorting number "
+-"can be generated.
"
+-"If that's not possible, you have to change the number manually via the "
+-"Properties dialog box.
"
+-msgstr ""
+-"這是在啟動層級 %1 所停止 的服務.
"
+-"在圖示左邊的編號決定了服務停止的順序. 您可以經由拖放來排序, 如此適當的"
+-"排列編號會被產生.
"
+-"如果沒有適當的產生, 您可以經由在內容對話方塊中手動改變編號.
"
++"These are the services stopped in runlevel %1.
The "
++"number shown on the left of the icon "
++"determines the order in which the services are stopped. You can arrange them "
++"via drag and drop, as long as a suitable sorting number can be "
++"generated.
If that's not possible, you have to change the number "
++"manually via the Properties dialog box.
"
++msgstr ""
++"這是在啟動層級 %1 所停止 的服務.
在圖示左邊的編號決定了服務停止的順序. 您可以經由拖放來排序, 如此"
++"適當的排列編號會被產生.
如果沒有適當的產生, 您可以經由在"
++"內容對話方塊中手動改變編號.
"
+
+ #: OldView.cpp:353
+ #, c-format
+@@ -221,19 +208,20 @@
+
+ #: OldView.cpp:937
+ msgid ""
+-"You have specified that your system's init scripts are located in the folder "
+-"%1, but this folder does not exist. You probably selected the "
+-"wrong distribution during configuration.
"
+-"If you reconfigure %2, it may be possible to fix the problem. If you choose "
+-"to reconfigure, you should shut down the application and the configuration "
+-"wizard will appear the next time %3 is run. If you choose not to reconfigure, "
+-"you will not be able to view or edit your system's init configuration.
"
+-"Would you like to reconfigure %4?
"
+-msgstr ""
+-"你剛才將你系統的啟動 scrpit 目錄指定到 %1,但這個目錄並不存在。你可能在設定時選擇了錯誤的版本。
"
+-"如果你重新設定 %2,或許就可以修正這個錯誤。如果你選擇要重新設定,你應該將這個程式關掉, 這樣組態設定精靈就會在下一次 %3 "
+-"啟動時執行。如果你選擇不要重新設定組態,你將無法檢視或是編輯你系統啟動時的設定。
"
+-"你願意重新設定 %4 ?
"
++"You have specified that your system's init scripts are located in the "
++"folder %1, but this folder does not exist. You probably "
++"selected the wrong distribution during configuration.
If you "
++"reconfigure %2, it may be possible to fix the problem. If you choose to "
++"reconfigure, you should shut down the application and the configuration "
++"wizard will appear the next time %3 is run. If you choose not to "
++"reconfigure, you will not be able to view or edit your system's init "
++"configuration.
Would you like to reconfigure %4?
"
++msgstr ""
++"你剛才將你系統的啟動 scrpit 目錄指定到 %1,但這個目錄並不存"
++"在。你可能在設定時選擇了錯誤的版本。
如果你重新設定 %2,或許就可以修正"
++"這個錯誤。如果你選擇要重新設定,你應該將這個程式關掉, 這樣組態設定精靈就會在"
++"下一次 %3 啟動時執行。如果你選擇不要重新設定組態,你將無法檢視或是編輯你系統"
++"啟動時的設定。
你願意重新設定 %4 ?
"
+
+ #: OldView.cpp:954
+ msgid "Folder Does Not Exist"
+@@ -250,16 +238,17 @@
+ #: OldView.cpp:965
+ msgid ""
+ "You do not have the right permissions to edit your system's init "
+-"configuration. However, you are free to browse the runlevels.
"
+-"If you really want to edit the configuration, either restart "
+-"%1 as root (or another privileged user), or ask your sysadmin "
+-"to install %2 suid or sgid.
"
+-"The latter way is not recommended though, due to security issues.
"
+-msgstr ""
+-"抱歉, 您沒有足夠的權限可以編輯您系統的啟動組態.然而, 您可以瀏覽這個啟動層級.
"
+-"如果您比較希望編輯這個組態, 您可以用 root 的身分重新啟動 "
+-"%1 (或使用一個具有較多權限的使用者), 或要求您的系統管理者以 suid 或 sgid 模式安裝 %2.
"
+-"但因為安全的因素, 不建議後者.
"
++"configuration. However, you are free to browse the runlevels.
If you "
++"really want to edit the configuration, either restart %1 "
++"as root (or another privileged user), or ask your sysadmin "
++"to install %2 suid or sgid.
The latter way is not "
++"recommended though, due to security issues.
"
++msgstr ""
++"抱歉, 您沒有足夠的權限可以編輯您系統的啟動組態.然而, 您可以瀏覽這個啟動層"
++"級.
如果您比較希望編輯這個組態, 您可以用 root 的身分重新啟動"
++"strong> %1 (或使用一個具有較多權限的使用者), 或要求您的系統管理者以 "
++"suid 或 sgid 模式安裝 %2.
但因為安全的因素, 不建議後"
++"者.
"
+
+ #: OldView.cpp:977
+ msgid "Insufficient Permissions"
+@@ -267,7 +256,7 @@
+
+ #: OldView.cpp:1029
+ msgid "&Other..."
+-msgstr "其他 (&O)..."
++msgstr "其他(&O)…"
+
+ #. i18n: file lookandfeelconfig.ui line 18
+ #: PreferencesDialog.cpp:41 rc.cpp:111
+@@ -305,7 +294,7 @@
+
+ #: Properties.cpp:42
+ msgid "&Service"
+-msgstr "服務 (&S)"
++msgstr "服務(&S)"
+
+ #: Properties.cpp:50
+ msgid "Description:"
+@@ -317,27 +306,27 @@
+
+ #: Properties.cpp:67
+ msgid "S&top"
+-msgstr "停止 (&T)"
++msgstr "停止(&T)"
+
+ #: Properties.cpp:70
+ msgid "&Restart"
+-msgstr "重新啟動 (&R)"
++msgstr "重新啟動(&R)"
+
+ #: Properties.cpp:121
+ msgid "&Entry"
+-msgstr "項目 (&E)"
++msgstr "項目(&E)"
+
+ #: Properties.cpp:126
+ msgid "&Name:"
+-msgstr "名稱 (&N):"
++msgstr "名稱(&N):"
+
+ #: Properties.cpp:131
+ msgid "&Points to service:"
+-msgstr "指向服務 (&P):"
++msgstr "指向服務(&P):"
+
+ #: Properties.cpp:137
+ msgid "&Sorting number:"
+-msgstr "排序編號 (&S):"
++msgstr "排序編號(&S):"
+
+ #: RunlevelAuthIcon.cpp:27
+ msgid "Editing disabled - please check your permissions"
+@@ -353,7 +342,7 @@
+
+ #: TopWidget.cpp:119
+ msgid "&Choose which service to start:"
+-msgstr "選擇要啟動的服務 (&C):"
++msgstr "選擇要啟動的服務(&C):"
+
+ #: TopWidget.cpp:121
+ msgid "Stop Service"
+@@ -361,7 +350,7 @@
+
+ #: TopWidget.cpp:122
+ msgid "&Choose which service to stop:"
+-msgstr "選擇要停止的服務 (&C):"
++msgstr "選擇要停止的服務(&C):"
+
+ #: TopWidget.cpp:124
+ msgid "Restart Service"
+@@ -369,7 +358,7 @@
+
+ #: TopWidget.cpp:125
+ msgid "&Choose which service to restart:"
+-msgstr "選擇要重新啟動的服務 (&C):"
++msgstr "選擇要重新啟動的服務(&C):"
+
+ #: TopWidget.cpp:127
+ msgid "Edit Service"
+@@ -377,7 +366,7 @@
+
+ #: TopWidget.cpp:128
+ msgid "&Choose which service to edit:"
+-msgstr "選擇要編輯的服務 (&C):"
++msgstr "選擇要編輯的服務(&C):"
+
+ #: TopWidget.cpp:215
+ msgid "Re&vert Configuration"
+@@ -389,27 +378,27 @@
+
+ #: TopWidget.cpp:226
+ msgid "Save &Log..."
+-msgstr "儲存紀錄 (&L)..."
++msgstr "儲存紀錄(&L)…"
+
+ #: TopWidget.cpp:234
+ msgid "&Print Log..."
+-msgstr "列印紀錄 (&P)..."
++msgstr "列印紀錄(&P)…"
+
+ #: TopWidget.cpp:250
+ msgid "P&roperties"
+-msgstr "內容 (&R)"
++msgstr "內容(&R)"
+
+ #: TopWidget.cpp:254
+ msgid "&Open"
+-msgstr "開啟 (&O)"
++msgstr "開啟(&O)"
+
+ #: TopWidget.cpp:258
+ msgid "Open &With"
+-msgstr "以...開啟 (&W)"
++msgstr "以…開啟(&W)"
+
+ #: TopWidget.cpp:267
+ msgid "Show &Log"
+-msgstr "顯示紀錄 (&L)"
++msgstr "顯示紀錄(&L)"
+
+ #: TopWidget.cpp:270
+ msgid "Hide &Log"
+@@ -417,19 +406,19 @@
+
+ #: TopWidget.cpp:273
+ msgid "&Start Service..."
+-msgstr "啟動服務 (&S)..."
++msgstr "啟動服務(&S)…"
+
+ #: TopWidget.cpp:277
+ msgid "&Stop Service..."
+-msgstr "停止服務 (&S)..."
++msgstr "停止服務(&S)…"
+
+ #: TopWidget.cpp:281
+ msgid "&Restart Service..."
+-msgstr "重新啟動服務 (&R)..."
++msgstr "重新啟動服務(&R)…"
+
+ #: TopWidget.cpp:285
+ msgid "&Edit Service..."
+-msgstr "編輯服務 (&E)..."
++msgstr "編輯服務(&E)…"
+
+ #: TopWidget.cpp:299
+ msgid "There are unsaved changes. Are you sure you want to quit?"
+@@ -445,14 +434,16 @@
+
+ #: TopWidget.cpp:315
+ msgid "&Revert"
+-msgstr "復原 (&R)"
++msgstr "復原(&R)"
+
+ #: TopWidget.cpp:326
+ msgid ""
+ "You're about to save the changes made to your init configuration. Wrong "
+ "settings can make your system hang on startup.\n"
+ "Do you wish to continue?"
+-msgstr "您正要儲存您對啟動程式的變更.請認知錯誤的設定可以造成您系統啟動無法完成.您是否要繼續?"
++msgstr ""
++"您正要儲存您對啟動程式的變更.請認知錯誤的設定可以造成您系統啟動無法完成.您是"
++"否要繼續?"
+
+ #: TopWidget.cpp:330
+ msgid "Save Configuration"
+@@ -461,12 +452,11 @@
+ #: TopWidget.cpp:398
+ msgid ""
+ "Click on the checkboxes to show or hide "
+-"runlevels.
"
+-"The list of currently visible runlevels is saved when you use the "
+-"Save Options command.
"
++"runlevels. The list of currently visible runlevels is saved when you "
++"use the Save Options command.
"
+ msgstr ""
+-"在方塊中點選以顯示或隱藏啟動層級.
"
+-"目前可見的執行層級列表會在您使用儲存選項時被儲存.
"
++"在方塊中點選以顯示或隱藏啟動層級.
"
++"目前可見的執行層級列表會在您使用儲存選項時被儲存.
"
+
+ #: TopWidget.cpp:402
+ msgid "Show only the selected runlevels"
+@@ -478,19 +468,16 @@
+
+ #: TopWidget.cpp:422
+ msgid ""
+-"If the lock is closed "
+-", you don't have the right permissions "
+-"to edit the init configuration.
"
+-"Either restart %1 as root (or another more privileged user), or ask your "
+-"sysadmin to install %1 suid or sgid.
"
+-"The latter way is not recommended though, due to security "
+-"issues.
"
+-msgstr ""
+-"當鎖定被關閉, 您不能得到正確的權限"
+-"來編輯啟動組態.
"
+-"重新以 root 啟動 %1 (或是以一個擁有比較多權限的使用者) 或要求您的系統管理者以 suid 或 sgid"
+-"安裝 %1.
"
+-"但因為安全的因素, 不建議後者.
"
++"If the lock is closed , you don't have "
++"the right permissions to edit the init configuration."
++"p>
Either restart %1 as root (or another more privileged user), or ask "
++"your sysadmin to install %1 suid or sgid.
The latter "
++"way is not recommended though, due to security issues.
"
++msgstr ""
++"當鎖定被關閉, 您不能得到正確的權限"
++"來編輯啟動組態.
重新以 root 啟動 %1 (或是以一個擁有比較多權限"
++"的使用者) 或要求您的系統管理者以 suid 或 sgid安裝 %1."
++"p>
但因為安全的因素, 不建議後者.
"
+
+ #: TopWidget.cpp:566
+ msgid " Changed"
+@@ -510,14 +497,14 @@
+
+ #: TopWidget.cpp:830
+ msgid ""
+-"Unable to generate a valid sorting number for this position. This means that "
+-"there was no number available between the two adjacent services, and the "
+-"service did not fit in lexically.
"
+-"Please adjust the sorting numbers manually via the "
+-"Properties dialog box.
"
+-msgstr ""
+-"抱歉, 無法產生適當的排列號碼給這個位置. 這表示在前後相鄰的服務中沒有可用的編號, 且服務無法符合詞彙.
"
+-"請使用內容對話方塊手動調整排列編號.
"
++"Unable to generate a valid sorting number for this position. This means "
++"that there was no number available between the two adjacent services, and "
++"the service did not fit in lexically.
Please adjust the sorting "
++"numbers manually via the Properties dialog box.
"
++msgstr ""
++"抱歉, 無法產生適當的排列號碼給這個位置. 這表示在前後相鄰的服務中沒有可用的"
++"編號, 且服務無法符合詞彙.
請使用內容對話方塊手動調整排"
++"列編號.
"
+
+ #: TopWidget.cpp:837
+ msgid "Unable to Generate Sorting Number"
+@@ -584,8 +571,8 @@
+ "Similar to Red Hat's\"tksysv\", but SysV-Init Editor allows\n"
+ "drag-and-drop, as well as keyboard use."
+ msgstr ""
+-"Sys-V 風格的啟動編輯器,與RedHat公司的 tksysv 相似, 但 Sys-V 啟動編輯器"
+-"允許拖放操作,同時也可以使用鍵盤."
++"Sys-V 風格的啟動編輯器,與RedHat公司的 tksysv 相似, 但 Sys-V 啟動"
++"編輯器允許拖放操作,同時也可以使用鍵盤."
+
+ #: main.cpp:65
+ msgid "Main developer"
+@@ -625,19 +612,19 @@
+ #: rc.cpp:45 rc.cpp:72
+ #, no-c-format
+ msgid "&Other"
+-msgstr "其他 (&O)"
++msgstr "其他(&O)"
+
+ #. i18n: file configwizard.ui line 157
+ #: rc.cpp:48
+ #, no-c-format
+ msgid "Distribution"
+-msgstr "散佈版本"
++msgstr "散布版本"
+
+ #. i18n: file configwizard.ui line 176
+ #: rc.cpp:51
+ #, no-c-format
+ msgid "Choose Your Distribution"
+-msgstr "選擇您的散佈版本"
++msgstr "選擇您的散布版本"
+
+ #. i18n: file configwizard.ui line 195
+ #: rc.cpp:54
+@@ -679,7 +666,7 @@
+ #: rc.cpp:78 rc.cpp:211
+ #, no-c-format
+ msgid "&Service path:"
+-msgstr "服務路徑 (&S):"
++msgstr "服務路徑(&S):"
+
+ #. i18n: file configwizard.ui line 389
+ #: rc.cpp:81 rc.cpp:214
+@@ -691,7 +678,7 @@
+ #: rc.cpp:84 rc.cpp:217
+ #, no-c-format
+ msgid "&Browse..."
+-msgstr "瀏覽 (&B)..."
++msgstr "瀏覽(&B)…"
+
+ #. i18n: file configwizard.ui line 404
+ #: rc.cpp:87 rc.cpp:220
+@@ -703,7 +690,7 @@
+ #: rc.cpp:90 rc.cpp:223
+ #, no-c-format
+ msgid "&Runlevel path:"
+-msgstr "啟動層級路徑 (&R):"
++msgstr "啟動層級路徑(&R):"
+
+ #. i18n: file configwizard.ui line 511
+ #: rc.cpp:93 rc.cpp:226
+@@ -715,7 +702,7 @@
+ #: rc.cpp:96 rc.cpp:229
+ #, no-c-format
+ msgid "Br&owse..."
+-msgstr "瀏覽 (&O)..."
++msgstr "瀏覽(&O)…"
+
+ #. i18n: file configwizard.ui line 526
+ #: rc.cpp:99 rc.cpp:232
+@@ -735,20 +722,22 @@
+ msgid ""
+ "Congratulations!
\n"
+ "\n"
+-"You have finished the initial configuration of SysV-Init Editor. Press "
+-"the button labeled Finish to start editing your init-configuration.\n"
++"You have finished the initial configuration of SysV-Init Editor. Press"
++"b> the button labeled Finish to start editing your init-"
++"configuration.\n"
+ "
"
+ msgstr ""
+ "恭喜!
\n"
+ "\n"
+-"您完成了 Sys-V 啟動編輯器的初始化組態. 按下標有完成的按鈕以開始編輯您的啟動組態.\n"
++"您完成了 Sys-V 啟動編輯器的初始化組態. 按下標有完成的按鈕以開始"
++"編輯您的啟動組態.\n"
+ "
"
+
+ #. i18n: file lookandfeelconfig.ui line 70
+ #: rc.cpp:117
+ #, no-c-format
+ msgid "C&hoose..."
+-msgstr "選擇 (&H)..."
++msgstr "選擇(&H)…"
+
+ #. i18n: file lookandfeelconfig.ui line 98
+ #: rc.cpp:120 rc.cpp:123
+@@ -772,7 +761,7 @@
+ #: rc.cpp:132
+ #, no-c-format
+ msgid "&Choose..."
+-msgstr "選擇 (&C)..."
++msgstr "選擇(&C)…"
+
+ #. i18n: file lookandfeelconfig.ui line 203
+ #: rc.cpp:135
+@@ -801,14 +790,15 @@
+ "name).\n"
+ "Changed service entries will be distinguished by this color.
"
+ msgstr ""
+-"使用選擇顏色對話方塊來選取文字顏色給已變更的服務 (改變順序或名稱).
\n"
++"使用選擇顏色對話方塊來選取文字顏色給已變更的服務"
++"em> (改變順序或名稱).
\n"
+ "已變更的服務將會用這個顏色標示.
"
+
+ #. i18n: file lookandfeelconfig.ui line 266
+ #: rc.cpp:148
+ #, no-c-format
+ msgid "&Changed:"
+-msgstr "改變的 (&C):"
++msgstr "改變的(&C):"
+
+ #. i18n: file lookandfeelconfig.ui line 302
+ #: rc.cpp:154
+@@ -824,14 +814,15 @@
+ "services new to a runlevel.\n"
+ "New service entries will be distinguished by this color.
"
+ msgstr ""
+-"使用選擇顏色對話方塊來選取文字顏色給新增到啟動層級的服務.
\n"
++"使用選擇顏色對話方塊來選取文字顏色給新增到啟動層級的"
++"服務.
\n"
+ "新的服務將會用這個顏色標示.
"
+
+ #. i18n: file lookandfeelconfig.ui line 314
+ #: rc.cpp:161
+ #, no-c-format
+ msgid "&New:"
+-msgstr "新增 (&N):"
++msgstr "新增(&N):"
+
+ #. i18n: file lookandfeelconfig.ui line 350
+ #: rc.cpp:167
+@@ -844,12 +835,13 @@
+ #, no-c-format
+ msgid ""
+ "Use the Select Color dialog box to pick a selected text "
+-"color for services that have been changed (either order/sorting number "
+-"or name).
\n"
+-"Changed service entries will be distinguished by this color while they are "
+-"selected.
"
++"color for services that have been changed (either order/sorting "
++"number or name).\n"
++"Changed service entries will be distinguished by this color while they "
++"are selected.
"
+ msgstr ""
+-"使用選擇顏色對話方塊來選取一個選定的文字顏色給已變更的服務 (改變順序或名稱).
\n"
++"使用選擇顏色對話方塊來選取一個選定的文字顏色給已變更"
++"的服務 (改變順序或名稱).
\n"
+ "已變更的服務被選取時將會用這個顏色標示.
"
+
+ #. i18n: file lookandfeelconfig.ui line 382
+@@ -867,20 +859,21 @@
+ "New service entries will be distinguished by this color while they are "
+ "selected.
"
+ msgstr ""
+-"使用選擇顏色對話方塊來選取一個選定的文字顏色給新增到啟動層級的服務.
\n"
++"使用選擇顏色對話方塊來選取一個選定的文字顏色給新增到"
++"啟動層級的服務.
\n"
+ "新的服務被選取時將會用這個顏色標示.
"
+
+ #. i18n: file lookandfeelconfig.ui line 394
+ #: rc.cpp:184
+ #, no-c-format
+ msgid "New && &selected:"
+-msgstr "新增與選擇的 (&S):"
++msgstr "新增與選擇的(&S):"
+
+ #. i18n: file lookandfeelconfig.ui line 410
+ #: rc.cpp:187
+ #, no-c-format
+ msgid "Changed && s&elected:"
+-msgstr "變更與選擇的 (&E):"
++msgstr "變更與選擇的(&E):"
+
+ #. i18n: file miscconfig.ui line 38
+ #: rc.cpp:193
+@@ -898,13 +891,13 @@
+ #: rc.cpp:199
+ #, no-c-format
+ msgid "&Show All"
+-msgstr "顯示全部 (&S)"
++msgstr "顯示全部(&S)"
+
+ #. i18n: file miscconfig.ui line 108
+ #: rc.cpp:202
+ #, no-c-format
+ msgid "&Warn if not allowed to write configuration"
+-msgstr "如果無法寫入組態時提出警告 (&W)"
++msgstr "如果無法寫入組態時提出警告(&W)"
+
+ #. i18n: file miscconfig.ui line 116
+ #: rc.cpp:205
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeadmin/kuser.po kde-i18n-zh_TW-3.5.10/messages/kdeadmin/kuser.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeadmin/kuser.po 2008-08-19 20:43:18.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdeadmin/kuser.po 2011-11-11 15:45:17.000000000 +0100
+@@ -11,7 +11,8 @@
+ "Project-Id-Version: kuser\n"
+ "POT-Creation-Date: 2008-07-08 01:20+0200\n"
+ "PO-Revision-Date: 2006-06-19 09:12+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
++"tw>\n"
+ "Language-Team: Chinese Traditional \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -29,8 +30,8 @@
+ "_: EMAIL OF TRANSLATORS\n"
+ "Your emails"
+ msgstr ""
+-"shyue@sonoma.com.tw,pesder.liao@msa.hinet.net,franklin at goodhorse dot idv dot "
+-"tw"
++"shyue@sonoma.com.tw,pesder.liao@msa.hinet.net,franklin at goodhorse dot idv "
++"dot tw"
+
+ #: addUser.cpp:45
+ msgid "New Account Options"
+@@ -647,8 +648,8 @@
+
+ #: mainView.cpp:307
+ msgid ""
+-"You have selected %1 users. Do you really want to change the password for all "
+-"the selected users?"
++"You have selected %1 users. Do you really want to change the password for "
++"all the selected users?"
+ msgstr "您已經選擇 %1 個使用者。您確定要變更這些使用者的密碼嗎?"
+
+ #: mainView.cpp:308 propdlg.cpp:510
+@@ -683,23 +684,23 @@
+
+ #: mainWidget.cpp:78 mainWidget.cpp:90
+ msgid "&Add..."
+-msgstr "增加(&A)..."
++msgstr "增加(&A)…"
+
+ #: mainWidget.cpp:81 mainWidget.cpp:93
+ msgid "&Edit..."
+-msgstr "編輯(&E)..."
++msgstr "編輯(&E)…"
+
+ #: mainWidget.cpp:84
+ msgid "&Delete..."
+-msgstr "刪除(&D)..."
++msgstr "刪除(&D)…"
+
+ #: mainWidget.cpp:87
+ msgid "&Set Password..."
+-msgstr "設定密碼(&S)..."
++msgstr "設定密碼(&S)…"
+
+ #: mainWidget.cpp:104
+ msgid "&Select Connection..."
+-msgstr "設定連線(&S)..."
++msgstr "設定連線(&S)…"
+
+ #: mainWidget.cpp:108
+ msgid "Show System Users/Groups"
+@@ -756,7 +757,7 @@
+
+ #: propdlg.cpp:125
+ msgid "Set &Password..."
+-msgstr "設定密碼(&P)..."
++msgstr "設定密碼(&P)…"
+
+ #: propdlg.cpp:133
+ msgid "Full &name:"
+@@ -925,9 +926,10 @@
+ #: propdlg.cpp:968
+ msgid ""
+ "The shell %1 is not yet listed in the file %2. In order to use this shell "
+-"you must add it to this file first."
+-"
Do you want to add it now?"
+-msgstr "
shell %1 尚未列於檔案 %2。為了要使用這個 shell 您必須先將它加入到這個檔案。
您要現在加入它嗎?"
++"you must add it to this file first.
Do you want to add it now?"
++msgstr ""
++"
shell %1 尚未列於檔案 %2。為了要使用這個 shell 您必須先將它加入到這個檔"
++"案。
您要現在加入它嗎?"
+
+ #: propdlg.cpp:972
+ msgid "Unlisted Shell"
+@@ -1326,19 +1328,19 @@
+ #, no-c-format
+ msgid ""
+ "This option allows you to select where the user/group data stored. Currently "
+-"three storage backends are supported.
Files "
+-"stores user/group data in traditional /etc/passwd and /etc/group flat files. "
+-"
LDAP stores data in a directory server using the posixAccount and "
+-"posixGroup object classes; this backend allows the management of Samba "
+-"users/groups via the sambaSamAccount object class.
System "
+-"provides a read-only access to all users and groups which your installation "
+-"knows about."
++"three storage backends are supported.
Files stores user/group "
++"data in traditional /etc/passwd and /etc/group flat files.
LDAP "
++"stores data in a directory server using the posixAccount and posixGroup "
++"object classes; this backend allows the management of Samba users/groups via "
++"the sambaSamAccount object class.
System provides a read-only "
++"access to all users and groups which your installation knows about."
+ msgstr ""
+ "這個選項讓您選擇使用者與群組的資料要儲存在哪裡。目前有三種後端型態可以選擇。"
+-"
選擇檔案會將使用者與群組資料存放在傳統的 /etc/passwd 與 /etc/group 檔案中。"
+-"
選擇LDAP會將這些資料用 posixAccount 與 posixGroup object classes "
+-"放在目錄伺服器中。這個選項也可以用來管理 Samba 使用者與群組,此時是使用 sambaSamAccount object class。"
+-"
選擇系統則會提供一種讓所有使用者與群組只能唯讀的方式。"
++"
選擇檔案會將使用者與群組資料存放在傳統的 /etc/passwd 與 /etc/"
++"group 檔案中。
選擇LDAP會將這些資料用 posixAccount 與 posixGroup "
++"object classes 放在目錄伺服器中。這個選項也可以用來管理 Samba 使用者與群組,"
++"此時是使用 sambaSamAccount object class。
選擇系統則會提供一種讓所"
++"有使用者與群組只能唯讀的方式。"
+
+ #. i18n: file kuser.kcfg line 36
+ #: rc.cpp:240
+@@ -1364,8 +1366,8 @@
+ #: rc.cpp:249
+ #, no-c-format
+ msgid ""
+-"This option specifies the UNIX home path template for new users. The '%U' macro "
+-"will replaced with the actual user name."
++"This option specifies the UNIX home path template for new users. The '%U' "
++"macro will replaced with the actual user name."
+ msgstr "這個選項指定 UNIX 家路徑的樣板。%U 會被換成實際的使用者名稱。"
+
+ #. i18n: file kuser.kcfg line 45
+@@ -1378,9 +1380,10 @@
+ #: rc.cpp:255
+ #, no-c-format
+ msgid ""
+-"This options specifies the first user ID where searching for an available UID "
+-"starts."
+-msgstr "這個選項指定第一個使用者代碼 (UID),在尋找可用的 UID 時會從這個 UID 開始找。"
++"This options specifies the first user ID where searching for an available "
++"UID starts."
++msgstr ""
++"這個選項指定第一個使用者代碼 (UID),在尋找可用的 UID 時會從這個 UID 開始找。"
+
+ #. i18n: file kuser.kcfg line 50
+ #: rc.cpp:258
+@@ -1392,33 +1395,37 @@
+ #: rc.cpp:261
+ #, no-c-format
+ msgid ""
+-"This options specifies the first group ID where searching for an available GID "
+-"starts."
+-msgstr "這個選項指定第一個群組代碼 (GID),在尋找可用的 GID 時會從這個 GID 開始找。"
++"This options specifies the first group ID where searching for an available "
++"GID starts."
++msgstr ""
++"這個選項指定第一個群組代碼 (GID),在尋找可用的 GID 時會從這個 GID 開始找。"
+
+ #. i18n: file kuser.kcfg line 56
+ #: rc.cpp:267
+ #, no-c-format
+ msgid ""
+-"If this option is checked then a home directory will created for the new user."
++"If this option is checked then a home directory will created for the new "
++"user."
+ msgstr "勾選這個選項的話,會為新使用者建立家目錄。"
+
+ #. i18n: file kuser.kcfg line 61
+ #: rc.cpp:273
+ #, no-c-format
+ msgid ""
+-"If this option is checked then the contents of the skeleton folder will copied "
+-"to the new user's home directory"
++"If this option is checked then the contents of the skeleton folder will "
++"copied to the new user's home directory"
+ msgstr "這個選項被勾選的話,會將架構(skeleton)目錄中的內容複製到新的家目錄中。"
+
+ #. i18n: file kuser.kcfg line 66
+ #: rc.cpp:279
+ #, no-c-format
+ msgid ""
+-"If this option is enabled, new user creation will create a private group named "
+-"as the user, and the primary group of the user will assigned to this private "
+-"group."
+-msgstr "打開這個選項的話,會為新使用者建立一個私密群組,名稱跟使用者一樣,而使用者的主要群組會設定為此新的群組。"
++"If this option is enabled, new user creation will create a private group "
++"named as the user, and the primary group of the user will assigned to this "
++"private group."
++msgstr ""
++"打開這個選項的話,會為新使用者建立一個私密群組,名稱跟使用者一樣,而使用者的"
++"主要群組會設定為此新的群組。"
+
+ #. i18n: file kuser.kcfg line 70
+ #: rc.cpp:282
+@@ -1516,8 +1523,8 @@
+ #: rc.cpp:327
+ #, no-c-format
+ msgid ""
+-"Check this if you want the passwords in the shadow file MD5 hashed. Leave this "
+-"unchecked if DES encryption should be used."
++"Check this if you want the passwords in the shadow file MD5 hashed. Leave "
++"this unchecked if DES encryption should be used."
+ msgstr "如果您要用 MD5 加密密碼就勾選這個選項。否則會用 DES 加密。"
+
+ #. i18n: file kuser.kcfg line 117
+@@ -1530,9 +1537,11 @@
+ #: rc.cpp:333
+ #, no-c-format
+ msgid ""
+-"Specifies the shadow password file (usually /etc/shadow). Leave this empty if "
+-"your system does not use a shadow password file."
+-msgstr "這裡指定 shadow 密碼檔(通常都是 /etc/shadow)。如果您的系統沒有使用 shadow 密碼檔,就請留白。"
++"Specifies the shadow password file (usually /etc/shadow). Leave this empty "
++"if your system does not use a shadow password file."
++msgstr ""
++"這裡指定 shadow 密碼檔(通常都是 /etc/shadow)。如果您的系統沒有使用 shadow "
++"密碼檔,就請留白。"
+
+ #. i18n: file kuser.kcfg line 122
+ #: rc.cpp:336
+@@ -1546,7 +1555,9 @@
+ msgid ""
+ "Specifies the shadow group file (usually /etc/gshadow). Leave this empty if "
+ "your system does not use a shadow group file."
+-msgstr "這裡指定群組 shadow 檔(通常都是 /etc/gshadow)。如果您的系統沒有使用群組 shadow 密碼檔,就請留白。"
++msgstr ""
++"這裡指定群組 shadow 檔(通常都是 /etc/gshadow)。如果您的系統沒有使用群組 "
++"shadow 密碼檔,就請留白。"
+
+ #. i18n: file kuser.kcfg line 127
+ #: rc.cpp:342
+@@ -1600,7 +1611,7 @@
+ #: rc.cpp:366
+ #, no-c-format
+ msgid "LDAP Host"
+-msgstr "LDAP 站台"
++msgstr "LDAP 站臺"
+
+ #. i18n: file kuser.kcfg line 155
+ #: rc.cpp:369
+@@ -1746,8 +1757,8 @@
+ #: rc.cpp:441
+ #, no-c-format
+ msgid ""
+-"Check this if the user's full name should be stored in the cn (Canonical Name) "
+-"attribute."
++"Check this if the user's full name should be stored in the cn (Canonical "
++"Name) attribute."
+ msgstr "勾選這個選項的話,會將使用者全名存在 cn (Canonical Name) 屬性裡。"
+
+ #. i18n: file kuser.kcfg line 238
+@@ -1772,9 +1783,11 @@
+ #: rc.cpp:453
+ #, no-c-format
+ msgid ""
+-"Check this if the shadowAccount object should be used in the users' entries. It "
+-"allows to enforce password change/expiration policies."
+-msgstr "勾選這個選項的話,shadowAccount object 會用於使用者資料中。這樣可以強制使用者遵循使用密碼更換與逾期的原則。"
++"Check this if the shadowAccount object should be used in the users' entries. "
++"It allows to enforce password change/expiration policies."
++msgstr ""
++"勾選這個選項的話,shadowAccount object 會用於使用者資料中。這樣可以強制使用者"
++"遵循使用密碼更換與逾期的原則。"
+
+ #. i18n: file kuser.kcfg line 248
+ #: rc.cpp:456
+@@ -1787,11 +1800,11 @@
+ #, no-c-format
+ msgid ""
+ "This option allows to specify the structural objectclass used with users' "
+-"entries. If you want to use these entries not just for authentication, but for "
+-"an addressbook, too, then choose inetOrgPerson."
++"entries. If you want to use these entries not just for authentication, but "
++"for an addressbook, too, then choose inetOrgPerson."
+ msgstr ""
+-"這個選項用於指定使用者資料中的 structural objectclass。如果您不只是使用這些資料來認證,也要用於通訊錄時,請選擇 "
+-"inetOrgPerson。"
++"這個選項用於指定使用者資料中的 structural objectclass。如果您不只是使用這些資"
++"料來認證,也要用於通訊錄時,請選擇 inetOrgPerson。"
+
+ #. i18n: file kuser.kcfg line 257
+ #: rc.cpp:462
+@@ -1827,12 +1840,13 @@
+ #: rc.cpp:477
+ #, no-c-format
+ msgid ""
+-"Check this if you want to use the user/group entries in a Samba domain. KUser "
+-"will create sambaSamAccount objectclass for each entry which is usable with the "
+-"ldapsam passdb backend with Samba version greater than 3.0."
+-msgstr ""
+-"如果您要使用使用者/群組資料於 Samba 網域中。KUser 會幫每個資料產生 sambaSamAccount objectclass,可以用於 "
+-"ldapsam passdb 後端資料庫(Samba 版本必須大於 3.0)。"
++"Check this if you want to use the user/group entries in a Samba domain. "
++"KUser will create sambaSamAccount objectclass for each entry which is usable "
++"with the ldapsam passdb backend with Samba version greater than 3.0."
++msgstr ""
++"如果您要使用使用者/群組資料於 Samba 網域中。KUser 會幫每個資料產生 "
++"sambaSamAccount objectclass,可以用於 ldapsam passdb 後端資料庫(Samba 版本必"
++"須大於 3.0)。"
+
+ #. i18n: file kuser.kcfg line 283
+ #: rc.cpp:480
+@@ -1856,11 +1870,12 @@
+ #: rc.cpp:489
+ #, no-c-format
+ msgid ""
+-"This specifies the domain Security IDentifier. It is unique in a single domain. "
+-"You can query the value of the domain SID with 'net getlocalsid domain_name'."
++"This specifies the domain Security IDentifier. It is unique in a single "
++"domain. You can query the value of the domain SID with 'net getlocalsid "
++"domain_name'."
+ msgstr ""
+-"這裡指定 Samba 網域的安全代碼(Security ID)。每一個網域都要不同。您可以用 \"net getlocalsid domain_name\" "
+-"來查詢網域的 SID。"
++"這裡指定 Samba 網域的安全代碼(Security ID)。每一個網域都要不同。您可以用 "
++"\"net getlocalsid domain_name\" 來查詢網域的 SID。"
+
+ #. i18n: file kuser.kcfg line 291
+ #: rc.cpp:492
+@@ -1872,11 +1887,12 @@
+ #: rc.cpp:495
+ #, no-c-format
+ msgid ""
+-"This value is an offset for the algorithmic mapping from uids and gids to rids. "
+-"The default (and minimum) value is 1000, it must be even, and the LDAP database "
+-"and smb.conf must store the same values."
++"This value is an offset for the algorithmic mapping from uids and gids to "
++"rids. The default (and minimum) value is 1000, it must be even, and the LDAP "
++"database and smb.conf must store the same values."
+ msgstr ""
+-"這個值是將 uid 與 gid 映射到 rid 的偏移值。預設(也是最小)值是 1000。必須是雙數,LDAP 資料庫與 smb.conf 必須存同樣的值。"
++"這個值是將 uid 與 gid 映射到 rid 的偏移值。預設(也是最小)值是 1000。必須是"
++"雙數,LDAP 資料庫與 smb.conf 必須存同樣的值。"
+
+ #. i18n: file kuser.kcfg line 296
+ #: rc.cpp:498
+@@ -1888,9 +1904,11 @@
+ #: rc.cpp:501
+ #, no-c-format
+ msgid ""
+-"This specifies a name of a login script (in the `Netlogon` share) which will be "
+-"executed as the user logs in to a Windows machine."
+-msgstr "這裡指定登入命令稿名稱(在 Netlogon 的地方),使用者登入 Windows 機器時會執行。"
++"This specifies a name of a login script (in the `Netlogon` share) which will "
++"be executed as the user logs in to a Windows machine."
++msgstr ""
++"這裡指定登入命令稿名稱(在 Netlogon 的地方),使用者登入 Windows 機器時會執"
++"行。"
+
+ #. i18n: file kuser.kcfg line 300
+ #: rc.cpp:504
+@@ -1916,8 +1934,8 @@
+ #: rc.cpp:513
+ #, no-c-format
+ msgid ""
+-"This specifies the location of the roaming profile of the user. The '%U' macro "
+-"will be replaced with the actual user name."
++"This specifies the location of the roaming profile of the user. The '%U' "
++"macro will be replaced with the actual user name."
+ msgstr "指定使用者設定檔的位置。%U 會被取代為實際的使用者名稱。"
+
+ #. i18n: file kuser.kcfg line 308
+@@ -1931,9 +1949,11 @@
+ #, no-c-format
+ msgid ""
+ "This specifies the location of the home directory of the user. This field is "
+-"meaningful only for Windows machines. The '%U' macro will be replaced with the "
+-"actual user name."
+-msgstr "指定使用者家目錄的位置。這個欄位只對 Windows 機器有意義。%U 會被取代為實際使用者名稱。"
++"meaningful only for Windows machines. The '%U' macro will be replaced with "
++"the actual user name."
++msgstr ""
++"指定使用者家目錄的位置。這個欄位只對 Windows 機器有意義。%U 會被取代為實際使"
++"用者名稱。"
+
+ #. i18n: file kuser.kcfg line 313
+ #: rc.cpp:525
+@@ -1942,7 +1962,8 @@
+ "Store the LanManager hashed password in the sambaLMPassword attribute. Check "
+ "this if you have older clients (Win9x series and before) on your network."
+ msgstr ""
+-"在 sambaLMPassword 屬性中儲存 LanManager hash 密碼。如果您使用較舊的(Win9x 系列或更早的)客戶端軟體,請勾選此項。"
++"在 sambaLMPassword 屬性中儲存 LanManager hash 密碼。如果您使用較舊的(Win9x "
++"系列或更早的)客戶端軟體,請勾選此項。"
+
+ #: selectconn.cpp:38
+ msgid "Connection Selection"
+@@ -1950,7 +1971,7 @@
+
+ #: selectconn.cpp:42
+ msgid "&New..."
+-msgstr "新增(&N)..."
++msgstr "新增(&N)…"
+
+ #: selectconn.cpp:48
+ msgid "Defined connections:"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeadmin/secpolicy.po kde-i18n-zh_TW-3.5.10/messages/kdeadmin/secpolicy.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeadmin/secpolicy.po 2006-07-22 10:04:31.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdeadmin/secpolicy.po 2011-11-11 15:45:17.000000000 +0100
+@@ -7,7 +7,7 @@
+ "Project-Id-Version: secpolicy\n"
+ "POT-Creation-Date: 2005-02-06 01:20+0100\n"
+ "PO-Revision-Date: 2001-08-29 10:03+CST\n"
+-"Last-Translator: Shell Hung \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Traditional Chinese \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeartwork/klock.po kde-i18n-zh_TW-3.5.10/messages/kdeartwork/klock.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeartwork/klock.po 2008-08-19 20:43:19.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdeartwork/klock.po 2011-11-11 15:45:17.000000000 +0100
+@@ -8,8 +8,7 @@
+ "Project-Id-Version: klock\n"
+ "POT-Creation-Date: 2008-07-08 01:23+0200\n"
+ "PO-Revision-Date: 2006-06-05 13:17+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Traditional Chinese \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -74,15 +73,13 @@
+ #: kdesavers/Euphoria.cpp:1040
+ msgid ""
+ "Euphoria 1.0
\n"
+-"Copyright (c) 2002 Terence M. Welsh"
+-"
\n"
++"
Copyright (c) 2002 Terence M. Welsh
\n"
+ "http://www.reallyslick.com/
\n"
+ "\n"
+ "Ported to KDE by Karl Robillard
"
+ msgstr ""
+ "Euphoria 1.0
\n"
+-"Copyright (c) 2002 Terence M. Welsh"
+-"
\n"
++"
Copyright (c) 2002 Terence M. Welsh
\n"
+ "http://www.reallyslick.com/
\n"
+ "\n"
+ "由Karl Robillard移植到KDE
"
+@@ -118,15 +115,13 @@
+ #: kdesavers/Flux.cpp:921
+ msgid ""
+ "Flux 1.0
\n"
+-"Copyright (c) 2002 Terence M. Welsh"
+-"
\n"
++"
Copyright (c) 2002 Terence M. Welsh
\n"
+ "http://www.reallyslick.com/
\n"
+ "\n"
+ "Ported to KDE by Karl Robillard
"
+ msgstr ""
+ "Flux 1.0
\n"
+-"Copyright (c) 2002 Terence M. Welsh"
+-"
\n"
++"
Copyright (c) 2002 Terence M. Welsh
\n"
+ "http://www.reallyslick.com/
\n"
+ "\n"
+ "由Karl Robillard移植到KDE
"
+@@ -162,15 +157,13 @@
+ #: kdesavers/SolarWinds.cpp:733
+ msgid ""
+ "Solar Winds 1.0
\n"
+-"Copyright (c) 2002 Terence M. Welsh"
+-"
\n"
++"
Copyright (c) 2002 Terence M. Welsh
\n"
+ "http://www.reallyslick.com/
\n"
+ "\n"
+ "Ported to KDE by Karl Robillard
"
+ msgstr ""
+ "太陽風 1.0
\n"
+-"Copyright (c) 2002 Terence M. Welsh"
+-"
\n"
++"
Copyright (c) 2002 Terence M. Welsh
\n"
+ "http://www.reallyslick.com/
\n"
+ "\n"
+ "由Karl Robillard移植到KDE
"
+@@ -329,7 +322,7 @@
+
+ #: kdesavers/firesaver.cpp:526
+ msgid "Gimme your eyes..."
+-msgstr "看過來..."
++msgstr "看過來…"
+
+ #: kdesavers/firesaver.cpp:527
+ msgid "Thank you for using KDE"
+@@ -351,19 +344,17 @@
+ msgid ""
+ "Particle Fountain
\n"
+ "Particle Fountain Screen Saver for KDE
\n"
+-"Copyright (c) Ian Reinhart Geiser 2001"
+-"
\n"
++"Copyright (c) Ian Reinhart Geiser 2001
\n"
+ "\n"
+ "KConfig code and KScreenSaver \"Setup...\" improvements by Nick Betcher "
+ " 2001
"
+ msgstr ""
+ "粒子噴泉
\n"
+ "KDE的粒子噴泉螢幕保護程式
\n"
+-"Copyright (c) Ian Reinhart Geiser 2001"
+-"
\n"
++"Copyright (c) Ian Reinhart Geiser 2001
\n"
+ "\n"
+-"KConfig code 和 KScreenSaver \"Setup...\" 由 Nick Betcher "
+-"所改進 2001
"
++"KConfig code 和 KScreenSaver \"Setup...\" 由 Nick Betcher 所改進"
++" 2001
"
+
+ #: kdesavers/gravity.cpp:40
+ msgid "Particle Gravity Screen Saver"
+@@ -373,19 +364,17 @@
+ msgid ""
+ "Gravity
\n"
+ "Particle Gravity Screen Saver for KDE
\n"
+-"Copyright (c) Ian Reinhart Geiser 2001"
+-"
\n"
++"Copyright (c) Ian Reinhart Geiser 2001
\n"
+ "\n"
+ "KConfig code and KScreenSaver \"Setup...\" improvements by Nick Betcher "
+ " 2001
"
+ msgstr ""
+ "重力
\n"
+ "KDE的螢幕粒子重力保護程式
\n"
+-"Copyright (c) Ian Reinhart Geiser 2001"
+-"
\n"
++"Copyright (c) Ian Reinhart Geiser 2001
\n"
+ "\n"
+-"KConfig code 和 KScreenSaver \"Setup...\" 由Nick Betcher "
+-"所改進 2001
"
++"KConfig code 和 KScreenSaver \"Setup...\" 由Nick Betcher 所改進"
++" 2001
"
+
+ #: kdesavers/kclock.cpp:54
+ msgid "Clock"
+@@ -443,9 +432,7 @@
+
+ #: kdesavers/kclock.cpp:228
+ msgid ""
+-"Clock Screen Saver"
+-"
Version 1.0"
+-"
Melchior FRANZ (c) 2003"
++"Clock Screen Saver
Version 1.0
Melchior FRANZ (c) 2003"
+ msgstr "時鐘螢幕保護程式
版本 1.0
Melchior FRANZ (c) 2003"
+
+ #: kdesavers/kvm.cpp:65
+@@ -600,15 +587,12 @@
+
+ #: kdesavers/pendulum.cpp:788
+ msgid ""
+-"KPendulum Screen Saver for KDE
"
+-"Simulation of a two-part pendulum
"
+-"Copyright (c) Georg Drenkhahn 2004
"
+-"georg-d@users.sourceforge.net
"
+-msgstr ""
+-"KPendulum 螢幕保護程式
"
+-"模擬一個兩部份鐘擺
"
+-"Copyright (c) Georg Drenkhahn 2004
"
+-"georg-d@users.sourceforge.net
"
++"KPendulum Screen Saver for KDE
Simulation of a two-part pendulum"
++"p>
Copyright (c) Georg Drenkhahn 2004
georg-d@users."
++"sourceforge.net
"
++msgstr ""
++"KPendulum 螢幕保護程式
模擬一個兩部份鐘擺
Copyright (c) "
++"Georg Drenkhahn 2004
georg-d@users.sourceforge.net
"
+
+ #: kdesavers/polygon.cpp:35
+ msgid "KPolygon"
+@@ -656,15 +640,13 @@
+
+ #: kdesavers/rotation.cpp:782
+ msgid ""
+-"KRotation Screen Saver for KDE
"
+-"Simulation of a force free rotating asymmetric body
"
+-"Copyright (c) Georg Drenkhahn 2004
"
+-"georg-d@users.sourceforge.net
"
+-msgstr ""
+-"KRotation 螢幕保護程式
"
+-"模擬不對稱主體的自由旋轉。
"
+-"Copyright (c) Georg Drenkhahn 2004
"
+-"georg-d@users.sourceforge.net
"
++"KRotation Screen Saver for KDE
Simulation of a force free "
++"rotating asymmetric body
Copyright (c) Georg Drenkhahn 2004"
++"p>
georg-d@users.sourceforge.net
"
++msgstr ""
++"KRotation 螢幕保護程式
模擬不對稱主體的自由旋轉。
"
++"Copyright (c) Georg Drenkhahn 2004
georg-d@users."
++"sourceforge.net
"
+
+ #: kdesavers/science.cpp:58
+ msgid "Science Screen Saver"
+@@ -787,10 +769,8 @@
+ msgstr "KLock"
+
+ #: xsavers/space.cpp:426
+-msgid ""
+-"GL can not render with root visual\n"
+-msgstr ""
+-"GL不能用root visual表現\n"
++msgid "GL can not render with root visual\n"
++msgstr "GL不能用root visual表現\n"
+
+ #: xsavers/space.cpp:579
+ msgid "Setup Space Screen Saver"
+@@ -1462,18 +1442,14 @@
+ #, no-c-format
+ msgid ""
+ "\n"
+-"m2"
+-"
\n"
+-"-----------"
+-"
\n"
++"m2
\n"
++"-----------
\n"
+ "m1+m2\n"
+ "
"
+ msgstr ""
+ "\n"
+-"m2"
+-"
\n"
+-"-----------"
+-"
\n"
++"m2
\n"
++"-----------
\n"
+ "m1+m2\n"
+ "
"
+
+@@ -1482,18 +1458,14 @@
+ #, no-c-format
+ msgid ""
+ "\n"
+-"l2"
+-"
\n"
+-"------"
+-"
\n"
++"l2
\n"
++"------
\n"
+ "l1+l2\n"
+ "
"
+ msgstr ""
+ "\n"
+-"l2"
+-"
\n"
+-"------"
+-"
\n"
++"l2
\n"
++"------
\n"
+ "l1+l2\n"
+ "
"
+
+@@ -1513,12 +1485,10 @@
+ #: rc.cpp:422
+ #, no-c-format
+ msgid ""
+-"Perspective"
+-"
\n"
++"Perspective
\n"
+ "Change [s]"
+ msgstr ""
+-"部份"
+-"
\n"
++"部份
\n"
+ "改變"
+
+ #. i18n: file kdesavers/pendulumcfg.ui line 264
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeartwork/kpartsaver.po kde-i18n-zh_TW-3.5.10/messages/kdeartwork/kpartsaver.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeartwork/kpartsaver.po 2007-05-14 12:23:06.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdeartwork/kpartsaver.po 2011-11-11 15:45:17.000000000 +0100
+@@ -9,8 +9,7 @@
+ "Project-Id-Version: kpartsaver\n"
+ "POT-Creation-Date: 2007-02-26 02:46+0100\n"
+ "PO-Revision-Date: 2006-06-05 11:36+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Traditional Chinese \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeartwork/kstyle_phase_config.po kde-i18n-zh_TW-3.5.10/messages/kdeartwork/kstyle_phase_config.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeartwork/kstyle_phase_config.po 2006-07-22 10:04:34.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdeartwork/kstyle_phase_config.po 2011-11-11 15:45:17.000000000 +0100
+@@ -6,8 +6,7 @@
+ "Project-Id-Version: kstyle_phase_config\n"
+ "POT-Creation-Date: 2005-01-31 01:35+0100\n"
+ "PO-Revision-Date: 2006-06-05 13:20+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Traditional Chinese \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeartwork/kwin_art_clients.po kde-i18n-zh_TW-3.5.10/messages/kdeartwork/kwin_art_clients.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeartwork/kwin_art_clients.po 2006-07-22 10:04:34.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdeartwork/kwin_art_clients.po 2011-11-11 15:45:17.000000000 +0100
+@@ -6,8 +6,7 @@
+ "Project-Id-Version: kwin_art_clients\n"
+ "POT-Creation-Date: 2005-12-17 03:14+0100\n"
+ "PO-Revision-Date: 2006-06-05 13:29+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Traditional Chinese \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -58,7 +57,8 @@
+ msgid ""
+ "When selected, the window decoration borders are drawn using the titlebar "
+ "colors. Otherwise, they are drawn using normal border colors instead."
+-msgstr "選取此項的話,視窗裝飾邊框會以標題列的顏色來繪製。否則,會用一般的邊框顏色。"
++msgstr ""
++"選取此項的話,視窗裝飾邊框會以標題列的顏色來繪製。否則,會用一般的邊框顏色。"
+
+ #: cde/config/config.cpp:48
+ msgid ""
+@@ -88,7 +88,7 @@
+
+ #: glow/config/glowconfigdialog.cpp:69
+ msgid "Theme"
+-msgstr "佈景主題"
++msgstr "布景主題"
+
+ #: glow/config/glowconfigdialog.cpp:70
+ msgid "Button Size"
+@@ -144,9 +144,11 @@
+
+ #: icewm/config/config.cpp:75
+ msgid ""
+-"When selected, titlebar colors will follow those set in the IceWM theme. If not "
+-"selected, the current KDE titlebar colors will be used instead."
+-msgstr "選取此項的話,標題列顏色會依 IceWM 主題設定。反之會使用目前 KDE 標題列的顏色。"
++"When selected, titlebar colors will follow those set in the IceWM theme. If "
++"not selected, the current KDE titlebar colors will be used instead."
++msgstr ""
++"選取此項的話,標題列顏色會依 IceWM 主題設定。反之會使用目前 KDE 標題列的顏"
++"色。"
+
+ #: icewm/config/config.cpp:80
+ msgid "&Show title bar on top of windows"
+@@ -164,9 +166,11 @@
+
+ #: icewm/config/config.cpp:91
+ msgid ""
+-"When selected, all titlebar menu buttons will have the application icon shown. "
+-"If not selected, the current theme's defaults are used instead."
+-msgstr "選取此項的話,所有的標題列選單按鍵會顯示應用程式的小圖示。反之,則使用目前主題的預設選項。"
++"When selected, all titlebar menu buttons will have the application icon "
++"shown. If not selected, the current theme's defaults are used instead."
++msgstr ""
++"選取此項的話,所有的標題列選單按鍵會顯示應用程式的小圖示。反之,則使用目前主"
++"題的預設選項。"
+
+ #: icewm/config/config.cpp:96
+ msgid "Open KDE's IceWM theme folder"
+@@ -174,13 +178,14 @@
+
+ #: icewm/config/config.cpp:99
+ msgid ""
+-"Clicking on the link above will cause a window to appear showing the KDE IceWM "
+-"theme folder. You can add or remove native IceWM themes by uncompressing "
+-"http://icewm.themes.org/ theme files into this folder, or by creating "
+-"folder symlinks to existing IceWM themes on your system."
++"Clicking on the link above will cause a window to appear showing the KDE "
++"IceWM theme folder. You can add or remove native IceWM themes by "
++"uncompressing http://icewm.themes.org/ theme files into this folder, "
++"or by creating folder symlinks to existing IceWM themes on your system."
+ msgstr ""
+-"點選上方的連結讓視窗顯示 KDE IceWM 主題資料夾。您可以將 http://icewm.themes.org/ "
+-"的主題檔案解壓到此資料夾,或是建立連到目前 IceWM 主題的符號連結以新增或移除原始的 IceWM 主題。"
++"點選上方的連結讓視窗顯示 KDE IceWM 主題資料夾。您可以將 http://icewm."
++"themes.org/ 的主題檔案解壓到此資料夾,或是建立連到目前 IceWM 主題的符號連"
++"結以新增或移除原始的 IceWM 主題。"
+
+ #: icewm/config/config.cpp:166 icewm/config/config.cpp:208
+ #: icewm/config/config.cpp:252 icewm/config/config.cpp:267
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeartwork/kxsconfig.po kde-i18n-zh_TW-3.5.10/messages/kdeartwork/kxsconfig.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeartwork/kxsconfig.po 2007-07-12 10:27:50.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdeartwork/kxsconfig.po 2011-11-11 15:45:17.000000000 +0100
+@@ -9,8 +9,7 @@
+ "Project-Id-Version: kxsconfig\n"
+ "POT-Creation-Date: 2007-05-22 02:17+0200\n"
+ "PO-Revision-Date: 2006-06-07 12:50+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Traditional Chinese \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -57,13 +56,13 @@
+ #: hacks/config/ant.xml.h:1
+ msgid ""
+ "A cellular automaton that is really a two-dimensional Turing machine: as the "
+-"heads (``ants'') walk along the screen, they change pixel values in their path. "
+-"Then, as they pass over changed pixels, their behavior is influenced. Written "
+-"by David Bagley."
++"heads (``ants'') walk along the screen, they change pixel values in their "
++"path. Then, as they pass over changed pixels, their behavior is influenced. "
++"Written by David Bagley."
+ msgstr ""
+ "一個「細胞自動機」(cellular automaton),事實上是一個二維的杜靈機(Turing "
+-"machine):當那些「螞蟻」走過螢幕時,會改變牠們路徑的像素顏色。而當牠們爬過其他已改變顏色的路徑時,牠們的行為也會被影響到。由 David Bagley "
+-"撰寫。"
++"machine):當那些「螞蟻」走過螢幕時,會改變牠們路徑的像素顏色。而當牠們爬過其"
++"他已改變顏色的路徑時,牠們的行為也會被影響到。由 David Bagley 撰寫。"
+
+ #: hacks/config/ant.xml.h:2
+ msgid "Ant"
+@@ -456,9 +455,11 @@
+
+ #: hacks/config/apollonian.xml.h:9
+ msgid ""
+-"Packs a large circle with smaller circles, demonstrating the Descartes Circle "
+-"Theorem. Written by Allan R. Wilks and David Bagley."
+-msgstr "以小圈圈將大圈圈包起來,展示笛卡兒圓形理論。由 Allan R. Wilks 與 David Bagley 撰寫。"
++"Packs a large circle with smaller circles, demonstrating the Descartes "
++"Circle Theorem. Written by Allan R. Wilks and David Bagley."
++msgstr ""
++"以小圈圈將大圈圈包起來,展示笛卡兒圓形理論。由 Allan R. Wilks 與 David "
++"Bagley 撰寫。"
+
+ #: hacks/config/apollonian.xml.h:10
+ msgid "Shallow"
+@@ -537,9 +538,12 @@
+
+ #: hacks/config/atlantis.xml.h:15
+ msgid ""
+-"This is xfishtank writ large: a GL animation of a number of sharks, dolphins, "
+-"and whales. The swimming motions are great. Originally written by Mark Kilgard."
+-msgstr "這是 xfishtank:許多海底生物如鯊魚、海豚與鯨魚的 GL 動畫。做得很棒。原始程式由 Mark Kilgard 撰寫。"
++"This is xfishtank writ large: a GL animation of a number of sharks, "
++"dolphins, and whales. The swimming motions are great. Originally written by "
++"Mark Kilgard."
++msgstr ""
++"這是 xfishtank:許多海底生物如鯊魚、海豚與鯨魚的 GL 動畫。做得很棒。原始程式"
++"由 Mark Kilgard 撰寫。"
+
+ #: hacks/config/atlantis.xml.h:16
+ msgid "Whale Speed"
+@@ -620,19 +624,22 @@
+ #: hacks/config/attraction.xml.h:14
+ msgid ""
+ "Like qix, this uses a simple simple motion model to generate many different "
+-"display modes. The control points attract each other up to a certain distance, "
+-"and then begin to repel each other. The attraction/repulsion is proportional to "
+-"the distance between any two particles, similar to the strong and weak nuclear "
+-"forces. One of the most interesting ways to watch this hack is simply as "
+-"bouncing balls, because their motions and interactions with each other are so "
+-"odd. Sometimes two balls will get into a tight orbit around each other, to be "
+-"interrupted later by a third, or by the edge of the screen. It looks quite "
+-"chaotic. Written by Jamie Zawinski, based on Lisp code by John Pezaris."
+-msgstr ""
+-"就像 "
+-"qix,這個程式使用很簡單的移動模型來產生不同的顯示模式。控制點吸引彼此到一定距離,然後再驅離彼此。這個吸引/驅離的因子是與任兩個粒子的距離比例有關,就像是核子"
+-"力的強弱。要觀察這個最簡單的方法就像是看彈力球,因為它們的動作受彼此牽制所以顯得很怪異。有時兩顆球會變成在一個軌道上跑,直到第三者來打斷它們,或是跑到螢幕的邊緣"
+-"去。由 Jamie Zawinski 撰寫,根據 John Pezaris 的 Lisp 程式碼。"
++"display modes. The control points attract each other up to a certain "
++"distance, and then begin to repel each other. The attraction/repulsion is "
++"proportional to the distance between any two particles, similar to the "
++"strong and weak nuclear forces. One of the most interesting ways to watch "
++"this hack is simply as bouncing balls, because their motions and "
++"interactions with each other are so odd. Sometimes two balls will get into a "
++"tight orbit around each other, to be interrupted later by a third, or by the "
++"edge of the screen. It looks quite chaotic. Written by Jamie Zawinski, based "
++"on Lisp code by John Pezaris."
++msgstr ""
++"就像 qix,這個程式使用很簡單的移動模型來產生不同的顯示模式。控制點吸引彼此到"
++"一定距離,然後再驅離彼此。這個吸引/驅離的因子是與任兩個粒子的距離比例有關,就"
++"像是核子力的強弱。要觀察這個最簡單的方法就像是看彈力球,因為它們的動作受彼此"
++"牽制所以顯得很怪異。有時兩顆球會變成在一個軌道上跑,直到第三者來打斷它們,或"
++"是跑到螢幕的邊緣去。由 Jamie Zawinski 撰寫,根據 John Pezaris 的 Lisp 程式"
++"碼。"
+
+ #: hacks/config/attraction.xml.h:15 hacks/config/deluxe.xml.h:5
+ #: hacks/config/lmorph.xml.h:7 hacks/config/pedal.xml.h:5
+@@ -719,9 +726,11 @@
+
+ #: hacks/config/blaster.xml.h:2
+ msgid ""
+-"Draws a simulation of flying space-combat robots (cleverly disguised as colored "
+-"circles) doing battle in front of a moving star field. Written by Jonathan Lin."
+-msgstr "模擬飛行中的太空戰鬥機器人,在移動的星球背景前戰鬥。由 Jonathan Lin 撰寫。"
++"Draws a simulation of flying space-combat robots (cleverly disguised as "
++"colored circles) doing battle in front of a moving star field. Written by "
++"Jonathan Lin."
++msgstr ""
++"模擬飛行中的太空戰鬥機器人,在移動的星球背景前戰鬥。由 Jonathan Lin 撰寫。"
+
+ #: hacks/config/blaster.xml.h:4 hacks/config/bouboule.xml.h:4
+ #: hacks/config/coral.xml.h:8 hacks/config/cubenetic.xml.h:9
+@@ -769,17 +778,19 @@
+ #: hacks/config/blitspin.xml.h:8
+ msgid ""
+ "The ``blitspin'' hack repeatedly rotates a bitmap by 90 degrees by using "
+-"logical operations: the bitmap is divided into quadrants, and the quadrants are "
+-"shifted clockwise. Then the same thing is done again with progressively smaller "
+-"quadrants, except that all sub-quadrants of a given size are rotated in "
+-"parallel. Written by Jamie Zawinski based on some cool SmallTalk code seen in "
+-"in Byte Magazine in 1981. As you watch it, the image appears to dissolve into "
+-"static and then reconstitute itself, but rotated. You can provide the image to "
+-"use, as an XBM or XPM file, or tell it to grab a screen image and rotate that."
+-msgstr ""
+-"「旋轉拼圖」會將點陣圖做 90 度旋轉:它會將點陣圖切割成四塊,每一塊再順時針旋轉。然後再切更小的四塊,再做旋轉。由 Jamie Zawinski "
+-"撰寫,根據一些在 1981 年的 Byte 雜誌中發表的很酷的 SmallTalk 程式碼。您可以自己提供影像,以 XMB 或 XPM "
+-"格式,或是告訴它去抓取螢幕的影像並旋轉。"
++"logical operations: the bitmap is divided into quadrants, and the quadrants "
++"are shifted clockwise. Then the same thing is done again with progressively "
++"smaller quadrants, except that all sub-quadrants of a given size are rotated "
++"in parallel. Written by Jamie Zawinski based on some cool SmallTalk code "
++"seen in in Byte Magazine in 1981. As you watch it, the image appears to "
++"dissolve into static and then reconstitute itself, but rotated. You can "
++"provide the image to use, as an XBM or XPM file, or tell it to grab a screen "
++"image and rotate that."
++msgstr ""
++"「旋轉拼圖」會將點陣圖做 90 度旋轉:它會將點陣圖切割成四塊,每一塊再順時針旋"
++"轉。然後再切更小的四塊,再做旋轉。由 Jamie Zawinski 撰寫,根據一些在 1981 年"
++"的 Byte 雜誌中發表的很酷的 SmallTalk 程式碼。您可以自己提供影像,以 XMB 或 "
++"XPM 格式,或是告訴它去抓取螢幕的影像並旋轉。"
+
+ #: hacks/config/bouboule.xml.h:1
+ msgid "Bouboule"
+@@ -797,7 +808,9 @@
+ msgid ""
+ "This draws what looks like a spinning, deforming baloon with varying-sized "
+ "spots painted on its invisible surface. Written by Jeremie Petit."
+-msgstr "這會畫出像是一個旋轉的、變形的汽球,由不同大小的點畫在它看不見的表面上呈現。由 Jeremie Petit 撰寫。"
++msgstr ""
++"這會畫出像是一個旋轉的、變形的汽球,由不同大小的點畫在它看不見的表面上呈現。"
++"由 Jeremie Petit 撰寫。"
+
+ #: hacks/config/boxed.xml.h:1 hacks/config/gears.xml.h:1
+ #: hacks/config/gflux.xml.h:1 hacks/config/pyro.xml.h:1
+@@ -886,8 +899,8 @@
+ "emulation, this hack simulates popular screen savers from a number of less "
+ "robust operating systems. Written by Jamie Zawinski."
+ msgstr ""
+-"BSOD 是 Blue Screen of Death 的縮寫。模擬個人電腦上一些比較爛的作業系統中最常見的「螢幕保護程式」。由 Jamie Zawinski "
+-"撰寫。"
++"BSOD 是 Blue Screen of Death 的縮寫。模擬個人電腦上一些比較爛的作業系統中最常"
++"見的「螢幕保護程式」。由 Jamie Zawinski 撰寫。"
+
+ #: hacks/config/bsod.xml.h:9
+ msgid "Mac Bomb"
+@@ -935,9 +948,11 @@
+
+ #: hacks/config/bubble3d.xml.h:2
+ msgid ""
+-"Draws a stream of rising, undulating 3D bubbles, rising toward the top of the "
+-"screen, with nice specular reflections. Written by Richard Jones."
+-msgstr "畫出一串上升波動的立體泡泡,升到螢幕的頂端。會有一些很漂亮的反射。由 Richard Jones 撰寫。"
++"Draws a stream of rising, undulating 3D bubbles, rising toward the top of "
++"the screen, with nice specular reflections. Written by Richard Jones."
++msgstr ""
++"畫出一串上升波動的立體泡泡,升到螢幕的頂端。會有一些很漂亮的反射。由 Richard "
++"Jones 撰寫。"
+
+ #: hacks/config/bubbles.xml.h:1 hacks/config/xfishtank.xml.h:2
+ msgid "Bubbles"
+@@ -973,19 +988,22 @@
+
+ #: hacks/config/bubbles.xml.h:12
+ msgid ""
+-"This simulates the kind of bubble formation that happens when water boils:small "
+-"bubbles appear, and as they get closer to each other, they combine to form "
+-"larger bubbles, which eventually pop. Written by James Macnicol."
+-msgstr "這會模擬水在沸騰時產生泡泡的樣子:小的泡泡出現,然後彼此接近、連結成一個更大的泡泡,然後可能會破掉。由 James Macnicol 撰寫。"
++"This simulates the kind of bubble formation that happens when water boils:"
++"small bubbles appear, and as they get closer to each other, they combine to "
++"form larger bubbles, which eventually pop. Written by James Macnicol."
++msgstr ""
++"這會模擬水在沸騰時產生泡泡的樣子:小的泡泡出現,然後彼此接近、連結成一個更大"
++"的泡泡,然後可能會破掉。由 James Macnicol 撰寫。"
+
+ #: hacks/config/bumps.xml.h:1
+ msgid ""
+ "A bit like `Spotlight', except that instead of merely exposing part of your "
+-"desktop, it creates a bump map from it. Basically, it 3D-izes a roaming section "
+-"of your desktop, based on color intensity. Written by Shane Smit."
++"desktop, it creates a bump map from it. Basically, it 3D-izes a roaming "
++"section of your desktop, based on color intensity. Written by Shane Smit."
+ msgstr ""
+-"有點像「聚光燈」,除了它不只是照射您的桌面,而且會產生「凹凸貼圖」(Bump map)。基本上它會將在您桌面漫遊的區域,依據顏色的緊密度立體化。由 Shane "
+-"Smit 撰寫。"
++"有點像「聚光燈」,除了它不只是照射您的桌面,而且會產生「凹凸貼圖」(Bump "
++"map)。基本上它會將在您桌面漫遊的區域,依據顏色的緊密度立體化。由 Shane Smit "
++"撰寫。"
+
+ #: hacks/config/bumps.xml.h:2
+ msgid "Bumps"
+@@ -1000,8 +1018,8 @@
+ "This draws Escher's ``Impossible Cage,'' a 3d analog of a moebius strip, and "
+ "rotates it in three dimensions. Written by Marcelo Vianna."
+ msgstr ""
+-"這會畫出 Escher 的「不可能的籠子」(Impossible Cage),一個由莫比斯帶(Moebius "
+-"strip)組成的立體圖,並以三個維度來翻轉它。由 Marcelo Vianna 撰寫。"
++"這會畫出 Escher 的「不可能的籠子」(Impossible Cage),一個由莫比斯帶"
++"(Moebius strip)組成的立體圖,並以三個維度來翻轉它。由 Marcelo Vianna 撰寫。"
+
+ #: hacks/config/ccurve.xml.h:1
+ msgid "0 seconds"
+@@ -1084,7 +1102,9 @@
+ msgid ""
+ "This draws a compass, with all elements spinning about randomly, for that "
+ "``lost and nauseous'' feeling. Written by Jamie Zawinski."
+-msgstr "畫出一個羅盤,所有的元素隨機旋轉,製造「失落與噁心」的感覺。由 Jamie Zawinski 撰寫。"
++msgstr ""
++"畫出一個羅盤,所有的元素隨機旋轉,製造「失落與噁心」的感覺。由 Jamie "
++"Zawinski 撰寫。"
+
+ #: hacks/config/coral.xml.h:1 hacks/config/deco.xml.h:1
+ #: hacks/config/helix.xml.h:1 hacks/config/imsmap.xml.h:1
+@@ -1120,9 +1140,10 @@
+
+ #: hacks/config/coral.xml.h:11
+ msgid ""
+-"Simulates coral growth, albeit somewhat slowly. This image doesn't really do it "
+-"justice. Written by Frederick Roeber."
+-msgstr "模擬珊瑚成長,雖然有點慢。這個影像不是那麼的正確。由 Frederick Roeber 撰寫。"
++"Simulates coral growth, albeit somewhat slowly. This image doesn't really do "
++"it justice. Written by Frederick Roeber."
++msgstr ""
++"模擬珊瑚成長,雖然有點慢。這個影像不是那麼的正確。由 Frederick Roeber 撰寫。"
+
+ #: hacks/config/coral.xml.h:13 hacks/config/gflux.xml.h:13
+ #: hacks/config/imsmap.xml.h:13 hacks/config/pyro.xml.h:14
+@@ -1137,10 +1158,11 @@
+
+ #: hacks/config/cosmos.xml.h:2
+ msgid ""
+-"Draws fireworks and zooming, fading flares. By Tom Campbell. You can find it at "
+-"<http://cosmos.dnsalias.net/cosmos/>"
++"Draws fireworks and zooming, fading flares. By Tom Campbell. You can find it "
++"at <http://cosmos.dnsalias.net/cosmos/>"
+ msgstr ""
+-"畫出煙火與放大、淡出的火燄。由 Tom Campbell 撰寫。您可以在 http://cosmos.dnsalias.net/cosmos/ 中找到。"
++"畫出煙火與放大、淡出的火燄。由 Tom Campbell 撰寫。您可以在 http://cosmos."
++"dnsalias.net/cosmos/ 中找到。"
+
+ #: hacks/config/critical.xml.h:1
+ msgid "Critical"
+@@ -1148,9 +1170,11 @@
+
+ #: hacks/config/critical.xml.h:2
+ msgid ""
+-"Draws a system of self-organizing lines. It starts out as random squiggles, but "
+-"after a few iterations, order begins to appear. Written by Martin Pool."
+-msgstr "畫出一個自我組織的線條系統。由隨機的曲線開始,但是在幾次循環之後,會開始出現一個系統的秩序。由 Martin Pool 撰寫。"
++"Draws a system of self-organizing lines. It starts out as random squiggles, "
++"but after a few iterations, order begins to appear. Written by Martin Pool."
++msgstr ""
++"畫出一個自我組織的線條系統。由隨機的曲線開始,但是在幾次循環之後,會開始出現"
++"一個系統的秩序。由 Martin Pool 撰寫。"
+
+ #: hacks/config/crystal.xml.h:1
+ msgid "Center on Screen"
+@@ -1191,8 +1215,8 @@
+
+ #: hacks/config/crystal.xml.h:9
+ msgid ""
+-"Moving polygons, similar to a kaleidescope (more like a kaleidescope than the "
+-"hack called `kaleid,' actually.) This one by Jouk Jansen."
++"Moving polygons, similar to a kaleidescope (more like a kaleidescope than "
++"the hack called `kaleid,' actually.) This one by Jouk Jansen."
+ msgstr "移動多邊形,類似萬花筒。由 Jouk Jansen 撰寫。"
+
+ #: hacks/config/crystal.xml.h:14
+@@ -1230,7 +1254,9 @@
+ "Draws a pulsating set of overlapping boxes with ever-chaning blobby patterns "
+ "undulating across their surfaces. It's sort of a cubist Lavalite. Written by "
+ "Jamie Zawinski."
+-msgstr "畫出許多重疊的、跳動的盒子,許多千變萬化的小小花樣在它們的表面起伏。由 Jamie Zawinski 撰寫。"
++msgstr ""
++"畫出許多重疊的、跳動的盒子,許多千變萬化的小小花樣在它們的表面起伏。由 Jamie "
++"Zawinski 撰寫。"
+
+ #: hacks/config/cubenetic.xml.h:14 hacks/config/gltext.xml.h:5
+ #: hacks/config/menger.xml.h:7 hacks/config/molecule.xml.h:14
+@@ -1296,13 +1322,14 @@
+
+ #: hacks/config/cynosure.xml.h:1
+ msgid ""
+-"A hack similar to `greynetic', but less frenetic. The first implementation was "
+-"by Stephen Linhart; then Ozymandias G. Desiderata wrote a Java applet clone. "
+-"That clone was discovered by Jamie Zawinski, and ported to C for inclusion "
+-"here."
+-msgstr ""
+-"有點像是 Greynetic,但沒那麼瘋狂。最開始是由 Stephen Linhart 所撰寫,接著 Ozymandias G. Desiderata 用 "
+-"Java applet 也寫了一個。後來 Jamie Zawinski 發現了 Java applet 的版本,將它用 C 改寫成現在的版本。"
++"A hack similar to `greynetic', but less frenetic. The first implementation "
++"was by Stephen Linhart; then Ozymandias G. Desiderata wrote a Java applet "
++"clone. That clone was discovered by Jamie Zawinski, and ported to C for "
++"inclusion here."
++msgstr ""
++"有點像是 Greynetic,但沒那麼瘋狂。最開始是由 Stephen Linhart 所撰寫,接著 "
++"Ozymandias G. Desiderata 用 Java applet 也寫了一個。後來 Jamie Zawinski 發現"
++"了 Java applet 的版本,將它用 C 改寫成現在的版本。"
+
+ #: hacks/config/cynosure.xml.h:2
+ msgid "Cynosure"
+@@ -1392,14 +1419,15 @@
+
+ #: hacks/config/decayscreen.xml.h:20
+ msgid ""
+-"This takes an image and makes it melt. You've no doubt seen this effect before, "
+-"but no screensaver would really be complete without it. It works best if "
+-"there's something colorful visible. Warning, if the effect continues after the "
+-"screen saver is off, seek medical attention. Written by David Wald and Vivek "
+-"Khera."
+-msgstr ""
+-"將一張圖片熔化。您以前應該看過這個效果,但是沒有螢幕保護程式可以做得跟這個一樣好,尤其是在彩色效果之下。注意,如果在螢幕保護程式關閉後您還看得到這個效果,請儘速"
+-"找醫生。由 David Wald 與 Vivek Khera 撰寫。"
++"This takes an image and makes it melt. You've no doubt seen this effect "
++"before, but no screensaver would really be complete without it. It works "
++"best if there's something colorful visible. Warning, if the effect continues "
++"after the screen saver is off, seek medical attention. Written by David Wald "
++"and Vivek Khera."
++msgstr ""
++"將一張圖片熔化。您以前應該看過這個效果,但是沒有螢幕保護程式可以做得跟這個一"
++"樣好,尤其是在彩色效果之下。注意,如果在螢幕保護程式關閉後您還看得到這個效"
++"果,請儘速找醫生。由 David Wald 與 Vivek Khera 撰寫。"
+
+ #: hacks/config/deco.xml.h:3
+ msgid "Deco"
+@@ -1417,12 +1445,12 @@
+ #: hacks/config/deco.xml.h:9
+ msgid ""
+ "This one subdivides and colors rectangles randomly. It looks kind of like "
+-"Brady-Bunch-era rec-room wall paneling. (Raven says: ``this screensaver is ugly "
+-"enough to peel paint.'') Written by Jamie Zawinski, inspired by Java code by "
+-"Michael Bayne."
++"Brady-Bunch-era rec-room wall paneling. (Raven says: ``this screensaver is "
++"ugly enough to peel paint.'') Written by Jamie Zawinski, inspired by Java "
++"code by Michael Bayne."
+ msgstr ""
+-"這個程式隨機分割矩形並著色。看來有點像 Brady-Bunch-era rec-room 的牆壁鑲板畫。由 Jamie Zawinski 參考 Michael "
+-"Bayne 的 Java 程式碼所撰寫,"
++"這個程式隨機分割矩形並著色。看來有點像 Brady-Bunch-era rec-room 的牆壁鑲板"
++"畫。由 Jamie Zawinski 參考 Michael Bayne 的 Java 程式碼所撰寫,"
+
+ #: hacks/config/deco.xml.h:11 hacks/config/rd-bomb.xml.h:23
+ #: hacks/config/whirlygig.xml.h:7 hacks/config/xearth.xml.h:33
+@@ -1447,11 +1475,12 @@
+ #: hacks/config/deluxe.xml.h:12
+ msgid ""
+ "This draws a pulsing sequence of stars, circles, and lines. It would look "
+-"better if it was faster, but as far as I can tell, there is no way to make this "
+-"be both: fast, and flicker-free. Yet another reason X sucks. Written by Jamie "
+-"Zawinski."
++"better if it was faster, but as far as I can tell, there is no way to make "
++"this be both: fast, and flicker-free. Yet another reason X sucks. Written by "
++"Jamie Zawinski."
+ msgstr ""
+-"依序畫出跳動的星星、圓圈與線條。速度快的話看起來會比較好,但是放得快的話就容易顫抖。其中一個原因是 X 的問題。由 Jamie Zawinski 撰寫。"
++"依序畫出跳動的星星、圓圈與線條。速度快的話看起來會比較好,但是放得快的話就容"
++"易顫抖。其中一個原因是 X 的問題。由 Jamie Zawinski 撰寫。"
+
+ #: hacks/config/deluxe.xml.h:13
+ msgid "Transparency"
+@@ -1461,7 +1490,9 @@
+ msgid ""
+ "A cellular automaton that starts with a random field, and organizes it into "
+ "stripes and spirals. Written by David Bagley."
+-msgstr "一個「細胞自動機」,由隨機的背景開始,並逐漸組織為條紋與螺旋。由 David Bagley 撰寫。"
++msgstr ""
++"一個「細胞自動機」,由隨機的背景開始,並逐漸組織為條紋與螺旋。由 David "
++"Bagley 撰寫。"
+
+ #: hacks/config/demon.xml.h:2 hacks/config/petri.xml.h:1
+ msgid "Cell Size"
+@@ -1483,7 +1514,9 @@
+ msgid ""
+ "More ``discrete map'' systems, including new variants of Hopalong and Julia, "
+ "and a few others. Written by Tim Auckland."
+-msgstr "更多的「分離地圖」(discrete map)系統,包括 Hopalong 與 Julia 的新版本。由 Tim Auckland 撰寫。"
++msgstr ""
++"更多的「分離地圖」(discrete map)系統,包括 Hopalong 與 Julia 的新版本。由 "
++"Tim Auckland 撰寫。"
+
+ #: hacks/config/distort.xml.h:1
+ msgid "Black Hole"
+@@ -1524,9 +1557,12 @@
+
+ #: hacks/config/distort.xml.h:15
+ msgid ""
+-"This hack grabs an image of the screen, and then lets a transparent lens wander "
+-"around the screen, magnifying whatever is underneath. Written by Jonas Munsin."
+-msgstr "從螢幕中抓一張圖片,並讓一個透明鏡頭繞著螢幕漫遊,將所經過之處放大。由 Jonas Munsin 撰寫。"
++"This hack grabs an image of the screen, and then lets a transparent lens "
++"wander around the screen, magnifying whatever is underneath. Written by "
++"Jonas Munsin."
++msgstr ""
++"從螢幕中抓一張圖片,並讓一個透明鏡頭繞著螢幕漫遊,將所經過之處放大。由 Jonas "
++"Munsin 撰寫。"
+
+ #: hacks/config/distort.xml.h:16 hacks/config/moire.xml.h:12
+ #: hacks/config/rd-bomb.xml.h:21 hacks/config/ripples.xml.h:15
+@@ -1568,21 +1604,22 @@
+
+ #: hacks/config/electricsheep.xml.h:2
+ msgid ""
+-"ElectricSheep is an xscreensaver module that displays mpeg video of an animated "
+-"fractal flame. In the background, it contributes render cycles to the next "
+-"animation. Periodically it uploades completed frames to the server, where they "
+-"are compressed for distribution to all clients. This program is recommended "
+-"only if you have a high bandwidth connection to the Internet. By Scott Draves. "
+-"You can find it at <http://www.electricsheep.org/>. See that web site for "
+-"configuration information."
+-msgstr ""
+-"ElectricSheep 顯示動畫火燄的 mpeg 影像。它定期會上傳完整的影像到伺服器,並壓縮後再散佈給所有客戶端,因此建議在網路頻寬夠大的時候使用。由 "
+-"Scott Draves 撰寫,您可以在 http://www.electricsheep.org/ 上找到,並參考它的設定資訊。"
++"ElectricSheep is an xscreensaver module that displays mpeg video of an "
++"animated fractal flame. In the background, it contributes render cycles to "
++"the next animation. Periodically it uploades completed frames to the server, "
++"where they are compressed for distribution to all clients. This program is "
++"recommended only if you have a high bandwidth connection to the Internet. By "
++"Scott Draves. You can find it at <http://www.electricsheep.org/>. See "
++"that web site for configuration information."
++msgstr ""
++"ElectricSheep 顯示動畫火燄的 mpeg 影像。它定期會上傳完整的影像到伺服器,並壓"
++"縮後再散布給所有客戶端,因此建議在網路頻寬夠大的時候使用。由 Scott Draves 撰"
++"寫,您可以在 http://www.electricsheep.org/ 上找到,並參考它的設定資訊。"
+
+ #: hacks/config/engine.xml.h:1
+ msgid ""
+-"Draws a simple four-stroke engine that floats around the screen. Written by Ben "
+-"Buxton."
++"Draws a simple four-stroke engine that floats around the screen. Written by "
++"Ben Buxton."
+ msgstr "畫一個簡單的四行程引擎,在螢幕上浮動。由 Ben Buxton 撰寫。"
+
+ #: hacks/config/engine.xml.h:2
+@@ -1599,11 +1636,13 @@
+
+ #: hacks/config/epicycle.xml.h:12
+ msgid ""
+-"This program draws the path traced out by a point on the edge of a circle. That "
+-"circle rotates around a point on the rim of another circle, and so on, several "
+-"times. These were the basis for the pre-heliocentric model of planetary motion. "
+-"Written by James Youngman."
+-msgstr "畫出一個圓的週邊的軌跡輪廓。圓會隨著另一個圓的圓周旋轉。這是太陽系行星運動模式的基礎。由 James Youngman 撰寫。"
++"This program draws the path traced out by a point on the edge of a circle. "
++"That circle rotates around a point on the rim of another circle, and so on, "
++"several times. These were the basis for the pre-heliocentric model of "
++"planetary motion. Written by James Youngman."
++msgstr ""
++"畫出一個圓的週邊的軌跡輪廓。圓會隨著另一個圓的圓周旋轉。這是太陽系行星運動模"
++"式的基礎。由 James Youngman 撰寫。"
+
+ #: hacks/config/euler2d.xml.h:2
+ msgid "Euler2d"
+@@ -1626,11 +1665,11 @@
+ #: hacks/config/extrusion.xml.h:1
+ msgid ""
+ "Draws various rotating extruded shapes that twist around, lengthen, and turn "
+-"inside out. Created by David Konerding from the samples that come with the GL "
+-"Extrusion library by Linas Vepstas."
++"inside out. Created by David Konerding from the samples that come with the "
++"GL Extrusion library by Linas Vepstas."
+ msgstr ""
+-"畫出不同的型狀,彼此擠壓、伸展與旋轉。由 David Konerding 根據 Linas Vepstas 的 GL Extrusion "
+-"函式庫中的範例撰寫而成。"
++"畫出不同的型狀,彼此擠壓、伸展與旋轉。由 David Konerding 根據 Linas Vepstas "
++"的 GL Extrusion 函式庫中的範例撰寫而成。"
+
+ #: hacks/config/extrusion.xml.h:2
+ msgid "Extrusion"
+@@ -1683,9 +1722,10 @@
+
+ #: hacks/config/fadeplot.xml.h:2
+ msgid ""
+-"Draws what looks like a waving ribbon following a sinusoidal path. Written by "
+-"Bas van Gaalen and Charles Vidal."
+-msgstr "畫出一個正弦路徑,像是波動中的絲帶。由 Bas van Gaalen 與 Charles Vidal 撰寫。"
++"Draws what looks like a waving ribbon following a sinusoidal path. Written "
++"by Bas van Gaalen and Charles Vidal."
++msgstr ""
++"畫出一個正弦路徑,像是波動中的絲帶。由 Bas van Gaalen 與 Charles Vidal 撰寫。"
+
+ #: hacks/config/fadeplot.xml.h:3
+ msgid "FadePlot"
+@@ -1705,14 +1745,15 @@
+
+ #: hacks/config/flag.xml.h:11
+ msgid ""
+-"This draws a waving colored flag, that undulates its way around the screen. The "
+-"trick is the flag can contain arbitrary text and images. By default, it "
+-"displays either the current system name and OS type, or a picture of ``Bob,'' "
+-"but you can replace the text or the image with a command-line option. Written "
+-"by Charles Vidal and Jamie Zawinski."
+-msgstr ""
+-"畫出彩色的旗幟,在螢幕中飄動。有趣的地方在旗子裡可以放任何字眼或圖片。預設是顯示目前系統的名稱與作業系統的型態,或是 Bob "
+-"的圖片,不過您可以用命令列參數指定任何文字或圖片來取代。由 Charles Vidal 與 Jamie Zawinski 撰寫。"
++"This draws a waving colored flag, that undulates its way around the screen. "
++"The trick is the flag can contain arbitrary text and images. By default, it "
++"displays either the current system name and OS type, or a picture of "
++"``Bob,'' but you can replace the text or the image with a command-line "
++"option. Written by Charles Vidal and Jamie Zawinski."
++msgstr ""
++"畫出彩色的旗幟,在螢幕中飄動。有趣的地方在旗子裡可以放任何字眼或圖片。預設是"
++"顯示目前系統的名稱與作業系統的型態,或是 Bob 的圖片,不過您可以用命令列參數指"
++"定任何文字或圖片來取代。由 Charles Vidal 與 Jamie Zawinski 撰寫。"
+
+ #: hacks/config/flame.xml.h:1 hacks/config/jigsaw.xml.h:1
+ #: hacks/config/maze.xml.h:1 hacks/config/rotzoomer.xml.h:1
+@@ -1748,7 +1789,9 @@
+ msgid ""
+ "Grabs an image of the desktop, turns it into a GL texture map, and spins it "
+ "around and deforms it in various ways. Written by Ben Buxton."
+-msgstr "從桌面上抓取畫面,轉換成 GL 組織圖,並以不同的方式旋轉與變形。由 Ben Buxton 撰寫。"
++msgstr ""
++"從桌面上抓取畫面,轉換成 GL 組織圖,並以不同的方式旋轉與變形。由 Ben Buxton "
++"撰寫。"
+
+ #: hacks/config/flow.xml.h:1
+ msgid "Allow 2D Attractors"
+@@ -1827,7 +1870,9 @@
+ "depending on the settings. If \"Shake Box\" is selected, then every now and "
+ "then, the box will be rotated, changing which direction is down (in order to "
+ "keep the settled balls in motion.)"
+-msgstr "根據設定模擬彈跳球或是氣體或流體的粒子。如果選擇「搖晃盒子」,則盒子會旋轉、改變方向等等。"
++msgstr ""
++"根據設定模擬彈跳球或是氣體或流體的粒子。如果選擇「搖晃盒子」,則盒子會旋轉、"
++"改變方向等等。"
+
+ #: hacks/config/fluidballs.xml.h:15
+ msgid "Sandpaper"
+@@ -1855,8 +1900,8 @@
+
+ #: hacks/config/forest.xml.h:7
+ msgid ""
+-"This draws fractal trees. Written by Peter Baumung. Everybody loves fractals, "
+-"right?"
++"This draws fractal trees. Written by Peter Baumung. Everybody loves "
++"fractals, right?"
+ msgstr "畫出分形的樹。由 Peter Baumung 撰寫。"
+
+ #: hacks/config/galaxy.xml.h:4
+@@ -1874,8 +1919,10 @@
+ #: hacks/config/galaxy.xml.h:12
+ msgid ""
+ "This draws spinning galaxies, which then collide and scatter their stars to "
+-"the, uh, four winds or something. Originally an Amiga program by Uli Siegmund."
+-msgstr "畫出旋轉的天體,碰撞並擴散到四方。根據 Uli Siegmund 的 Amiga 程式而來。"
++"the, uh, four winds or something. Originally an Amiga program by Uli "
++"Siegmund."
++msgstr ""
++"畫出旋轉的天體,碰撞並擴散到四方。根據 Uli Siegmund 的 Amiga 程式而來。"
+
+ #: hacks/config/gears.xml.h:3
+ msgid "Gears"
+@@ -1891,10 +1938,12 @@
+
+ #: hacks/config/gears.xml.h:9
+ msgid ""
+-"This draws sets of turning, interlocking gears, rotating in three dimensions. "
+-"Another GL hack, by Danny Sung, Brian Paul, Ed Mackey, and Jamie Zawinski."
++"This draws sets of turning, interlocking gears, rotating in three "
++"dimensions. Another GL hack, by Danny Sung, Brian Paul, Ed Mackey, and Jamie "
++"Zawinski."
+ msgstr ""
+-"畫出旋轉中,互相咬合的齒輪,在三個維度上旋轉。由 Danny Sung,Brian Paul,Ed Mackey 與 Jamie Zawinski 撰寫。"
++"畫出旋轉中,互相咬合的齒輪,在三個維度上旋轉。由 Danny Sung,Brian Paul,Ed "
++"Mackey 與 Jamie Zawinski 撰寫。"
+
+ #: hacks/config/gears.xml.h:10
+ msgid "Three Gear System"
+@@ -1944,12 +1993,12 @@
+
+ #: hacks/config/glforestfire.xml.h:3
+ msgid ""
+-"Draws an animation of sprinkling fire-like 3D triangles in a landscape filled "
+-"with trees. Requires OpenGL, and a machine with fast hardware support for "
+-"texture maps. Written by Eric Lassauge <lassauge@mail.dotcom.fr>."
++"Draws an animation of sprinkling fire-like 3D triangles in a landscape "
++"filled with trees. Requires OpenGL, and a machine with fast hardware support "
++"for texture maps. Written by Eric Lassauge <lassauge@mail.dotcom.fr>."
+ msgstr ""
+-"畫出在充滿樹的風景中,立體三角形像煙火一樣撒落。需要 OpenGL,還有夠快的硬體支援。由 Eric Lassauge "
+-"<lassauge@mail.dotcom.fr> 撰寫。"
++"畫出在充滿樹的風景中,立體三角形像煙火一樣撒落。需要 OpenGL,還有夠快的硬體支"
++"援。由 Eric Lassauge <lassauge@mail.dotcom.fr> 撰寫。"
+
+ #: hacks/config/glforestfire.xml.h:5
+ msgid "Fog"
+@@ -1988,10 +2037,11 @@
+ msgid ""
+ "Draws a planet bouncing around in space. Written by David Konerding. The "
+ "built-in image is a map of the earth (extracted from `xearth'), but you can "
+-"wrap any texture around the sphere, e.g., the planetary textures that come with "
+-"`ssystem'."
++"wrap any texture around the sphere, e.g., the planetary textures that come "
++"with `ssystem'."
+ msgstr ""
+-"畫出一個星球在太空中彈跳。由 David Konerding 撰寫。內建的影像為地球的地圖(由 xearth 弄出來的),不過您可以用任何圖片包在球體上。"
++"畫出一個星球在太空中彈跳。由 David Konerding 撰寫。內建的影像為地球的地圖"
++"(由 xearth 弄出來的),不過您可以用任何圖片包在球體上。"
+
+ #: hacks/config/glplanet.xml.h:3
+ msgid "GLPlanet"
+@@ -2014,8 +2064,8 @@
+ "Draws a simulation of the Rubik's Snake puzzle. Written by Jamie Wilkinson, "
+ "Andrew Bennetts, and Peter Aylett."
+ msgstr ""
+-"模擬盧比克的蛇形魔術方塊(Rubik's Snake Puzzle)。由 Jamie Wilkinson,Andrew Bennetts 與 Peter "
+-"Aylett 撰寫。"
++"模擬盧比克的蛇形魔術方塊(Rubik's Snake Puzzle)。由 Jamie Wilkinson,Andrew "
++"Bennetts 與 Peter Aylett 撰寫。"
+
+ #: hacks/config/glsnake.xml.h:6
+ msgid "GlSnake"
+@@ -2073,9 +2123,11 @@
+
+ #: hacks/config/goban.xml.h:2
+ msgid ""
+-"Replays historical games of go (aka wei-chi and baduk) on the screen. By Scott "
+-"Draves. You can find it at <http://www.draves.org/goban/>."
+-msgstr "重現歷史上的圍棋棋局。由 Scott Draves 撰寫。您可以在 http://www.draves.org/goban/ 找到。"
++"Replays historical games of go (aka wei-chi and baduk) on the screen. By "
++"Scott Draves. You can find it at <http://www.draves.org/goban/>."
++msgstr ""
++"重現歷史上的圍棋棋局。由 Scott Draves 撰寫。您可以在 http://www.draves.org/"
++"goban/ 找到。"
+
+ #: hacks/config/goop.xml.h:1
+ msgid "Additive Colors (reflected light)"
+@@ -2107,16 +2159,17 @@
+
+ #: hacks/config/goop.xml.h:14
+ msgid ""
+-"This draws set of animating, transparent, amoeba-like blobs. The blobs change "
+-"shape as they wander around the screen, and they are translucent, so you can "
+-"see the lower blobs through the higher ones, and when one passes over another, "
+-"their colors merge. Written by Jamie Zawinski. I got the idea for this from a "
+-"cool mouse pad I have, which achieves the same kind of effect in real life by "
+-"having several layers plastic with colored oil between them. Written by Jamie "
+-"Zawinski."
+-msgstr ""
+-"畫出一些像阿米巴原蟲的,透明、蠕動的小點。小點在螢幕上漫遊時會改變形狀,因為它們是半透明的,所以您可以看到其中一隻小蟲越過另一隻身上,此時它們的顏色會合併。由 "
+-"Jamie Zawinski 撰寫。"
++"This draws set of animating, transparent, amoeba-like blobs. The blobs "
++"change shape as they wander around the screen, and they are translucent, so "
++"you can see the lower blobs through the higher ones, and when one passes "
++"over another, their colors merge. Written by Jamie Zawinski. I got the idea "
++"for this from a cool mouse pad I have, which achieves the same kind of "
++"effect in real life by having several layers plastic with colored oil "
++"between them. Written by Jamie Zawinski."
++msgstr ""
++"畫出一些像阿米巴原蟲的,透明、蠕動的小點。小點在螢幕上漫遊時會改變形狀,因為"
++"它們是半透明的,所以您可以看到其中一隻小蟲越過另一隻身上,此時它們的顏色會合"
++"併。由 Jamie Zawinski 撰寫。"
+
+ #: hacks/config/goop.xml.h:15
+ msgid "Transparent Blobs"
+@@ -2140,9 +2193,11 @@
+
+ #: hacks/config/grav.xml.h:10
+ msgid ""
+-"This program draws a simple orbital simulation. If you turn on trails, it looks "
+-"kind of like a cloud-chamber photograph. Written by Greg Bowering."
+-msgstr "畫出簡單的軌道模擬。如果將軌跡打開,會看起來像是個「雲室」的圖片。由 Greg Bowering 撰寫。"
++"This program draws a simple orbital simulation. If you turn on trails, it "
++"looks kind of like a cloud-chamber photograph. Written by Greg Bowering."
++msgstr ""
++"畫出簡單的軌道模擬。如果將軌跡打開,會看起來像是個「雲室」的圖片。由 Greg "
++"Bowering 撰寫。"
+
+ #: hacks/config/greynetic.xml.h:2
+ msgid "Greynetic"
+@@ -2178,7 +2233,9 @@
+ "This draws trippy psychedelic circular patterns that hurt to look at. It can "
+ "also animate the control-points, but that takes a lot of CPU and bandwidth. "
+ "Written by Jamie Zawinski."
+-msgstr "畫出很迷幻的圓形圖樣,盯著看會昏頭。它也可以移動控制點,不過會花很多的 CPU 時間與頻寬。由 Jamie Zawinski 撰寫。"
++msgstr ""
++"畫出很迷幻的圓形圖樣,盯著看會昏頭。它也可以移動控制點,不過會花很多的 CPU 時"
++"間與頻寬。由 Jamie Zawinski 撰寫。"
+
+ #: hacks/config/helix.xml.h:4
+ msgid "Helix"
+@@ -2243,8 +2300,8 @@
+ "This draws lacy fractal patterns, based on iteration in the imaginary plane, "
+ "from a 1986 Scientific American article. Mostly written by Patrick Naughton."
+ msgstr ""
+-"用假想的平面循環畫出有花邊的分形圖樣。這是從 1986 年的 Scientific American 中的文章而來,大部份由 Patrick Naughton "
+-"撰寫。"
++"用假想的平面循環畫出有花邊的分形圖樣。這是從 1986 年的 Scientific American 中"
++"的文章而來,大部份由 Patrick Naughton 撰寫。"
+
+ #: hacks/config/hyperball.xml.h:1 hacks/config/hypercube.xml.h:1
+ msgid "Far"
+@@ -2260,8 +2317,8 @@
+ "projection of the sequence of 3D objects which are the projections of the 4D "
+ "analog to the dodecahedron. Written by Joe Keane."
+ msgstr ""
+-"Hyperball 與超立方體的關係就如同十二面體與立方體的關係:它會模擬的四維的十二面體的三維投影物件,再顯示此物件投影到二維的圖樣。由 Joe Keane "
+-"撰寫。"
++"Hyperball 與超立方體的關係就如同十二面體與立方體的關係:它會模擬的四維的十二"
++"面體的三維投影物件,再顯示此物件投影到二維的圖樣。由 Joe Keane 撰寫。"
+
+ #: hacks/config/hyperball.xml.h:7 hacks/config/hypercube.xml.h:6
+ msgid "Near"
+@@ -2305,15 +2362,16 @@
+ "This displays 2D projections of the sequence of 3D objects which are the "
+ "projections of the 4D analog to the cube: as a square is composed of four "
+ "lines, each touching two others; and a cube is composed of six squares, each "
+-"touching four others; a hypercube is composed of eight cubes, each touching six "
+-"others. To make it easier to visualize the rotation, it uses a different color "
+-"for the edges of each face. Don't think about it too long, or your brain will "
+-"melt. Written by Joe Keane, Fritz Mueller, and Jamie Zawinski."
+-msgstr ""
+-"顯示模擬的 4D 立方體的 3D 投影物件,再投影到 2D "
+-"的圖樣:如同正方形是由四條線組成,每條線都與其他兩條線相接,立方體是由六個正方形組成,每個正方形都與其他四個相接;而超立方體是由八個立方體組成,每個立方體都與其"
+-"他六個立方體相接。為了方便看清它的旋轉,每一面的邊都用不同的顏色。不要思考太多,不然您的腦筋會打結。由 Joe Keane,Fritz Mueller 與 "
+-"Jamie Zawinski 撰寫。"
++"touching four others; a hypercube is composed of eight cubes, each touching "
++"six others. To make it easier to visualize the rotation, it uses a different "
++"color for the edges of each face. Don't think about it too long, or your "
++"brain will melt. Written by Joe Keane, Fritz Mueller, and Jamie Zawinski."
++msgstr ""
++"顯示模擬的 4D 立方體的 3D 投影物件,再投影到 2D 的圖樣:如同正方形是由四條線"
++"組成,每條線都與其他兩條線相接,立方體是由六個正方形組成,每個正方形都與其他"
++"四個相接;而超立方體是由八個立方體組成,每個立方體都與其他六個立方體相接。為"
++"了方便看清它的旋轉,每一面的邊都用不同的顏色。不要思考太多,不然您的腦筋會打"
++"結。由 Joe Keane,Fritz Mueller 與 Jamie Zawinski 撰寫。"
+
+ #: hacks/config/ifs.xml.h:2
+ msgid "IFS"
+@@ -2321,8 +2379,8 @@
+
+ #: hacks/config/ifs.xml.h:7
+ msgid ""
+-"This one draws spinning, colliding iterated-function-system images. Written by "
+-"Massimino Pascal."
++"This one draws spinning, colliding iterated-function-system images. Written "
++"by Massimino Pascal."
+ msgstr "畫出旋轉、碰撞的重覆功能系統的圖樣。由 Massimino Pascal 撰寫。"
+
+ #: hacks/config/imsmap.xml.h:3
+@@ -2344,19 +2402,21 @@
+ #: hacks/config/imsmap.xml.h:14
+ msgid ""
+ "This generates random cloud-like patterns. It looks quite different in "
+-"monochrome and color. The basic idea is to take four points on the edge of the "
+-"image, and assign each a random ``elevation''. Then find the point between "
+-"them, and give it a value which is the average of the other four, plus some "
+-"small random offset. Then coloration is done based on elevation. The color "
+-"selection is done by binding the elevation to either hue, saturation, or "
+-"brightness, and assigning random values to the others. The ``brightness'' mode "
+-"tends to yield cloudlike patterns, and the others tend to generate images that "
+-"look like heat-maps or CAT-scans. Written by Juergen Nickelsen and Jamie "
+-"Zawinski."
+-msgstr ""
+-"產生隨機的像雲的圖樣。這在單色與彩色下顯示是相當不同的。基本的想法是取一張圖邊緣的四個點,並指定每個點一個隨機的高度。接著尋找它們之間的點,給它其他四個點的平均"
+-"值,再加上一點小小的隨機的偏移值。著色則是以高度為基礎,根據高度、亮度、色調、飽和度及一些隨機的數值的組合來選取使用的顏色。由 Juergen "
+-"Nickelsen 與 Jamie Zawinski 撰寫。"
++"monochrome and color. The basic idea is to take four points on the edge of "
++"the image, and assign each a random ``elevation''. Then find the point "
++"between them, and give it a value which is the average of the other four, "
++"plus some small random offset. Then coloration is done based on elevation. "
++"The color selection is done by binding the elevation to either hue, "
++"saturation, or brightness, and assigning random values to the others. The "
++"``brightness'' mode tends to yield cloudlike patterns, and the others tend "
++"to generate images that look like heat-maps or CAT-scans. Written by Juergen "
++"Nickelsen and Jamie Zawinski."
++msgstr ""
++"產生隨機的像雲的圖樣。這在單色與彩色下顯示是相當不同的。基本的想法是取一張圖"
++"邊緣的四個點,並指定每個點一個隨機的高度。接著尋找它們之間的點,給它其他四個"
++"點的平均值,再加上一點小小的隨機的偏移值。著色則是以高度為基礎,根據高度、亮"
++"度、色調、飽和度及一些隨機的數值的組合來選取使用的顏色。由 Juergen Nickelsen "
++"與 Jamie Zawinski 撰寫。"
+
+ #: hacks/config/interference.xml.h:1
+ msgid "Anim Speed"
+@@ -2396,15 +2456,16 @@
+
+ #: hacks/config/jigsaw.xml.h:8
+ msgid ""
+-"This grabs a screen image, carves it up into a jigsaw puzzle, shuffles it, and "
+-"then solves the puzzle. This works especially well when you feed it an external "
+-"video signal instead of letting it grab the screen image (actually, I guess "
+-"this is generally true...) When it is grabbing a video image, it is sometimes "
+-"pretty hard to guess what the image is going to look like once the puzzle is "
+-"solved. Written by Jamie Zawinski."
+-msgstr ""
+-"這個程式會抓取螢幕上的影像,切割成拼圖的樣子,將它洗牌後開始拼圖。如果您給它外部影像信號而不是讓它自己抓螢幕的圖像,效果更好。當它抓取影像時,有時會很難去猜測拼"
+-"好後會是什麼樣子。由 Jamie Zawinski 撰寫。"
++"This grabs a screen image, carves it up into a jigsaw puzzle, shuffles it, "
++"and then solves the puzzle. This works especially well when you feed it an "
++"external video signal instead of letting it grab the screen image (actually, "
++"I guess this is generally true...) When it is grabbing a video image, it is "
++"sometimes pretty hard to guess what the image is going to look like once the "
++"puzzle is solved. Written by Jamie Zawinski."
++msgstr ""
++"這個程式會抓取螢幕上的影像,切割成拼圖的樣子,將它洗牌後開始拼圖。如果您給它"
++"外部影像信號而不是讓它自己抓螢幕的圖像,效果更好。當它抓取影像時,有時會很難"
++"去猜測拼好後會是什麼樣子。由 Jamie Zawinski 撰寫。"
+
+ #: hacks/config/juggle.xml.h:1
+ msgid "Checkered Balls"
+@@ -2435,20 +2496,20 @@
+ "This one draws spinning, animating (are you detecting a pattern here yet?) "
+ "explorations of the Julia set. You've probably seen static images of this "
+ "fractal form before, but it's a lot of fun to watch in motion as well. One "
+-"interesting thing is that there is a small swinging dot passing in front of the "
+-"image, which indicates the control point from which the rest of the image was "
+-"generated. Written by Sean McCullough."
+-msgstr ""
+-"畫出一個旋轉的、動畫的朱利亞集合(Julia "
+-"set)圖樣。您也許看過靜態版的圖樣,不過看動態版的也是很好玩。一個有趣的地方在於會有一個小的活躍的點,指出由圖片其他地方產生的控制點。由 Sean "
+-"McCullough 撰寫。"
++"interesting thing is that there is a small swinging dot passing in front of "
++"the image, which indicates the control point from which the rest of the "
++"image was generated. Written by Sean McCullough."
++msgstr ""
++"畫出一個旋轉的、動畫的朱利亞集合(Julia set)圖樣。您也許看過靜態版的圖樣,不"
++"過看動態版的也是很好玩。一個有趣的地方在於會有一個小的活躍的點,指出由圖片其"
++"他地方產生的控制點。由 Sean McCullough 撰寫。"
+
+ #: hacks/config/kaleidescope.xml.h:1
+ msgid ""
+ "Another clone of an ancient meme, consisting largely of frenetic rotational "
+ "motion of colored lines. This one is by Ron Tapia. The motion is nice, but I "
+-"think it needs more solids, or perhaps just brighter colors. More variations in "
+-"the rotational speed might help, too."
++"think it needs more solids, or perhaps just brighter colors. More variations "
++"in the rotational speed might help, too."
+ msgstr "畫出許多有顏色的線條不斷地轉動。由 Ron Tapia 撰寫。"
+
+ #: hacks/config/kaleidescope.xml.h:4
+@@ -2483,10 +2544,12 @@
+
+ #: hacks/config/lament.xml.h:1
+ msgid ""
+-"Animates a simulation of Lemarchand's Box, repeatedly solving itself. Requires "
+-"OpenGL, and a machine with fast hardware support for texture maps. Warning: "
+-"occasionally opens doors. Written by Jamie Zawinski."
+-msgstr "模擬 Lemarchand Box 的動畫,重複自我解謎。需要 OpenGL,及夠快的硬體。由 Jamie Zawinski 撰寫。"
++"Animates a simulation of Lemarchand's Box, repeatedly solving itself. "
++"Requires OpenGL, and a machine with fast hardware support for texture maps. "
++"Warning: occasionally opens doors. Written by Jamie Zawinski."
++msgstr ""
++"模擬 Lemarchand Box 的動畫,重複自我解謎。需要 OpenGL,及夠快的硬體。由 "
++"Jamie Zawinski 撰寫。"
+
+ #: hacks/config/lament.xml.h:3
+ msgid "Lament"
+@@ -2498,8 +2561,8 @@
+
+ #: hacks/config/laser.xml.h:7
+ msgid ""
+-"Moving radiating lines, that look vaguely like scanning laser beams. Written by "
+-"Pascal Pensa. (Frankie say: relax.)"
++"Moving radiating lines, that look vaguely like scanning laser beams. Written "
++"by Pascal Pensa. (Frankie say: relax.)"
+ msgstr "移動的放射狀線條,有點像掃描雷射光束。由 Pascal Pensa 撰寫。"
+
+ #: hacks/config/lightning.xml.h:2
+@@ -2508,9 +2571,10 @@
+
+ #: hacks/config/lightning.xml.h:7
+ msgid ""
+-"This one draws crackling fractal lightning bolts. It's simple, direct, and to "
+-"the point. If only it had sound... Written by Keith Romberg."
+-msgstr "畫出閃電爆裂的圖形。簡單,直接。有聲音的話就更......由 Keith Romberg 撰寫。"
++"This one draws crackling fractal lightning bolts. It's simple, direct, and "
++"to the point. If only it had sound... Written by Keith Romberg."
++msgstr ""
++"畫出閃電爆裂的圖形。簡單,直接。有聲音的話就更......由 Keith Romberg 撰寫。"
+
+ #: hacks/config/lisa.xml.h:4
+ msgid "Lisa"
+@@ -2522,16 +2586,17 @@
+
+ #: hacks/config/lisa.xml.h:11
+ msgid ""
+-"This draws Lisajous loops, by Caleb Cullen. Remember that device they had the "
+-"Phantom Zone prisoners in during their trial in Superman? I think that was one "
+-"of these."
++"This draws Lisajous loops, by Caleb Cullen. Remember that device they had "
++"the Phantom Zone prisoners in during their trial in Superman? I think that "
++"was one of these."
+ msgstr "畫出 Lisajous loops。由 Caleb Cullen 撰寫。"
+
+ #: hacks/config/lissie.xml.h:1
+ msgid ""
+-"Another Lissajous figure. This one draws the progress of circular shapes along "
+-"a path. Written by Alexander Jolk."
+-msgstr "另一個 Lissajous 圖形。畫出一個圓形隨著一條路徑前進。由 Alexander Jolk 撰寫。"
++"Another Lissajous figure. This one draws the progress of circular shapes "
++"along a path. Written by Alexander Jolk."
++msgstr ""
++"另一個 Lissajous 圖形。畫出一個圓形隨著一條路徑前進。由 Alexander Jolk 撰寫。"
+
+ #: hacks/config/lissie.xml.h:5
+ msgid "Lissie"
+@@ -2571,9 +2636,11 @@
+
+ #: hacks/config/lmorph.xml.h:15
+ msgid ""
+-"This generates random spline-ish line drawings and morphs between them. Written "
+-"by Sverre H. Huseby and Glenn T. Lines."
+-msgstr "產生隨機的 spline 曲線及它們之間的形態。由 Sverre H. Huseby 與 Glenn T. Lines 撰寫。"
++"This generates random spline-ish line drawings and morphs between them. "
++"Written by Sverre H. Huseby and Glenn T. Lines."
++msgstr ""
++"產生隨機的 spline 曲線及它們之間的形態。由 Sverre H. Huseby 與 Glenn T. "
++"Lines 撰寫。"
+
+ #: hacks/config/loop.xml.h:3
+ msgid "Loop"
+@@ -2632,11 +2699,11 @@
+ #: hacks/config/maze.xml.h:16
+ msgid ""
+ "This is the ancient X maze demo, modified to work with xscreensaver. It "
+-"generates a random maze, then solves it with visual feedback. Originally by Jim "
+-"Randell; modified by a cast of thousands."
++"generates a random maze, then solves it with visual feedback. Originally by "
++"Jim Randell; modified by a cast of thousands."
+ msgstr ""
+-"這是個古老的 X 迷宮展示,修改以適用於 xscreensaver。它會隨機產生一個迷宮,並找到出口路徑。原始由 Jim Randell "
+-"撰寫,後來由許多人修改。"
++"這是個古老的 X 迷宮展示,修改以適用於 xscreensaver。它會隨機產生一個迷宮,並"
++"找到出口路徑。原始由 Jim Randell 撰寫,後來由許多人修改。"
+
+ #: hacks/config/menger.xml.h:6
+ msgid "Menger"
+@@ -2645,11 +2712,11 @@
+ #: hacks/config/menger.xml.h:19
+ msgid ""
+ "This draws the three-dimensional variant of the recursive Menger Gasket, a "
+-"cube-based fractal object analagous to the Sierpinski Tetrahedron. Written by "
+-"Jamie Zawinski."
++"cube-based fractal object analagous to the Sierpinski Tetrahedron. Written "
++"by Jamie Zawinski."
+ msgstr ""
+-"畫出一個立體的、遞迴的 Menger Gasket,以立方體組成的物件,類似 Sierpinski Tetrahedron。由 Jamie Zawinski "
+-"撰寫。"
++"畫出一個立體的、遞迴的 Menger Gasket,以立方體組成的物件,類似 Sierpinski "
++"Tetrahedron。由 Jamie Zawinski 撰寫。"
+
+ #: hacks/config/moebius.xml.h:1
+ msgid ""
+@@ -2687,24 +2754,27 @@
+
+ #: hacks/config/moire.xml.h:10
+ msgid ""
+-"This one draws cool circular interference patterns. Most of the circles you see "
+-"aren't explicitly rendered, but show up as a result of interactions between the "
+-"other pixels that were drawn. Written by Jamie Zawinski, inspired by Java code "
+-"by Michael Bayne. As he pointed out, the beauty of this one is that the heart "
+-"of the display algorithm can be expressed with just a pair of loops and a "
+-"handful of arithmetic, giving it a high ``display hack metric''."
++"This one draws cool circular interference patterns. Most of the circles you "
++"see aren't explicitly rendered, but show up as a result of interactions "
++"between the other pixels that were drawn. Written by Jamie Zawinski, "
++"inspired by Java code by Michael Bayne. As he pointed out, the beauty of "
++"this one is that the heart of the display algorithm can be expressed with "
++"just a pair of loops and a handful of arithmetic, giving it a high ``display "
++"hack metric''."
+ msgstr ""
+-"畫出圓圈彼此之間影響的圖樣。大部份看到的圓都不是很明確的,而是顯示出彼此互動的結果。由 Jamie Zawinski 撰寫,參考 Michael Bayne "
+-"的 Java 程式碼。"
++"畫出圓圈彼此之間影響的圖樣。大部份看到的圓都不是很明確的,而是顯示出彼此互動"
++"的結果。由 Jamie Zawinski 撰寫,參考 Michael Bayne 的 Java 程式碼。"
+
+ #: hacks/config/moire2.xml.h:1
+ msgid ""
+-"Another example of the fun you can have with moire interference patterns; this "
+-"hack generates fields of concentric circles or ovals, and combines the planes "
+-"with various operations. The planes are moving independently of one another, "
+-"causing the interference lines to ``spray.'' Written by Jamie Zawinski."
++"Another example of the fun you can have with moire interference patterns; "
++"this hack generates fields of concentric circles or ovals, and combines the "
++"planes with various operations. The planes are moving independently of one "
++"another, causing the interference lines to ``spray.'' Written by Jamie "
++"Zawinski."
+ msgstr ""
+-"另一個波紋圖樣的範例。產生許多同心圓或橢圓,用不同的操作將這些平面組合。平面彼此獨立移動,產生與其他平面的衝突線。由 Jamie Zawinski 撰寫。"
++"另一個波紋圖樣的範例。產生許多同心圓或橢圓,用不同的操作將這些平面組合。平面"
++"彼此獨立移動,產生與其他平面的衝突線。由 Jamie Zawinski 撰寫。"
+
+ #: hacks/config/moire2.xml.h:4
+ msgid "Moire2"
+@@ -2732,11 +2802,12 @@
+
+ #: hacks/config/molecule.xml.h:8
+ msgid ""
+-"Draws several different representations of molecules. Some common molecules are "
+-"built in, and it can also read PDB (Protein Data Base) files as input. Written "
+-"by Jamie Zawinski."
++"Draws several different representations of molecules. Some common molecules "
++"are built in, and it can also read PDB (Protein Data Base) files as input. "
++"Written by Jamie Zawinski."
+ msgstr ""
+-"畫出幾個不同的分子圖。有些是內建,不過您也可以讀取 PDB 檔(Protein Data Base,蛋白資料庫)。由 Jamie Zawinski 撰寫。"
++"畫出幾個不同的分子圖。有些是內建,不過您也可以讀取 PDB 檔(Protein Data "
++"Base,蛋白資料庫)。由 Jamie Zawinski 撰寫。"
+
+ #: hacks/config/molecule.xml.h:11
+ msgid "Label Atoms"
+@@ -2752,8 +2823,8 @@
+
+ #: hacks/config/morph3d.xml.h:1
+ msgid ""
+-"Another 3d shape-changing GL hack, by Marcelo Vianna. It has the same "
+-"shiny-plastic feel as Superquadrics, as many computer-generated objects do..."
++"Another 3d shape-changing GL hack, by Marcelo Vianna. It has the same shiny-"
++"plastic feel as Superquadrics, as many computer-generated objects do..."
+ msgstr "另一個立體的形狀變化的 GL 圖形。由 Marcelo Vianna 撰寫。"
+
+ #: hacks/config/morph3d.xml.h:4
+@@ -2782,8 +2853,8 @@
+ "ROTC 2,-22\n"
+ "XOR 1,2\n"
+ "JRST .-4\n"
+-"如同 HAKMEM 在 1962 年所報告的,上面的 PDP-1 程式碼由 Jackson Wright 撰寫。這些程式碼在 44 "
+-"年後還活在這個螢幕保護程式中。由 Tim Showalter 撰寫。"
++"如同 HAKMEM 在 1962 年所報告的,上面的 PDP-1 程式碼由 Jackson Wright 撰寫。這"
++"些程式碼在 44 年後還活在這個螢幕保護程式中。由 Tim Showalter 撰寫。"
+
+ #: hacks/config/munch.xml.h:5
+ msgid "Munch"
+@@ -2817,7 +2888,9 @@
+ msgid ""
+ "Draws different shapes composed of nervously vibrating squiggles, as if seen "
+ "through a camera operated by a monkey on crack. By Dan Bornstein."
+-msgstr "由不同形狀所組成的震動的波紋,就好像一隻猴子拿著照相機。由 Dan Bornstein 撰寫。"
++msgstr ""
++"由不同形狀所組成的震動的波紋,就好像一隻猴子拿著照相機。由 Dan Bornstein 撰"
++"寫。"
+
+ #: hacks/config/nerverot.xml.h:10
+ msgid "Frequent"
+@@ -2843,11 +2916,12 @@
+ msgid ""
+ "A little man with a big nose wanders around your screen saying things. The "
+ "things which he says can come from a file, or from an external program like "
+-"`zippy' or `fortune'. This was extracted from `xnlock' by Dan Heller. Colorized "
+-"by Jamie Zawinski."
++"`zippy' or `fortune'. This was extracted from `xnlock' by Dan Heller. "
++"Colorized by Jamie Zawinski."
+ msgstr ""
+-"一個大鼻子的小人在螢幕上亂跑,然後講話。小人說的話可以從檔案讀出,或是從類似 zippy 或 fortune 的程式產生。這是由 Dan Heller 從 "
+-"xnlock 弄出來,由 Jamie Zawinski 著色。"
++"一個大鼻子的小人在螢幕上亂跑,然後講話。小人說的話可以從檔案讀出,或是從類似 "
++"zippy 或 fortune 的程式產生。這是由 Dan Heller 從 xnlock 弄出來,由 Jamie "
++"Zawinski 著色。"
+
+ #: hacks/config/noseguy.xml.h:2
+ msgid "Get Text from File"
+@@ -2881,11 +2955,12 @@
+ #: hacks/config/pedal.xml.h:8
+ msgid ""
+ "This is sort of a combination spirograph/string-art. It generates a large, "
+-"complex polygon, and lets the X server do the bulk of the work by giving it an "
+-"even/odd winding rule. Written by Dale Moore, based on some ancient PDP-11 "
+-"code."
++"complex polygon, and lets the X server do the bulk of the work by giving it "
++"an even/odd winding rule. Written by Dale Moore, based on some ancient PDP-"
++"11 code."
+ msgstr ""
+-"產生一個很大的、很複雜的多邊形,給它一個盤繞的規則,讓 X 伺服器做剩下的工作。由 Dale Moore 根據一些古老的 PDP-11 撰寫。"
++"產生一個很大的、很複雜的多邊形,給它一個盤繞的規則,讓 X 伺服器做剩下的工作。"
++"由 Dale Moore 根據一些古老的 PDP-11 撰寫。"
+
+ #: hacks/config/penetrate.xml.h:1
+ msgid "Always play well"
+@@ -2918,19 +2993,21 @@
+ "Draws quasiperiodic tilings; think of the implications on modern formica "
+ "technology. Written by Timo Korvola. In April 1997, Sir Roger Penrose, a "
+ "British math professor who has worked with Stephen Hawking on such topics as "
+-"relativity, black holes, and whether time has a beginning, filed a "
+-"copyright-infringement lawsuit against the Kimberly-Clark Corporation, which "
+-"Penrose said copied a pattern he created (a pattern demonstrating that ``a "
++"relativity, black holes, and whether time has a beginning, filed a copyright-"
++"infringement lawsuit against the Kimberly-Clark Corporation, which Penrose "
++"said copied a pattern he created (a pattern demonstrating that ``a "
+ "nonrepeating pattern could exist in nature'') for its Kleenex quilted toilet "
+ "paper. Penrose said he doesn't like litigation but, ``When it comes to the "
+ "population of Great Britain being invited by a multinational to wipe their "
+ "bottoms on what appears to be the work of a Knight of the Realm, then a last "
+ "stand must be taken.'' As reported by News of the Weird #491, 4-jul-1997."
+ msgstr ""
+-"畫出半週期的磚狀。由 Timo Korvola 撰寫。根據 News of the Wierd 第 491 期,1997 年七月四日的報導,在 1997 "
+-"年四月,Roger Penrose,一位英國的數學教授,控告 Kimberly-Clark 公司所生產的 Kleenex "
+-"牌衛生紙上的圖案抄襲自一種他所創造的圖案,這個圖案展示「自然界存在的不重覆的樣式」。Penrose "
+-"表示他並不喜歡訴訟,但是「這個產品來到大不列顛後,此地的人民可能被這間跨國公司推薦用他們國家的爵士辛勤工作出來的結果擦屁股,一想到這一點就不得不採取行動。」"
++"畫出半週期的磚狀。由 Timo Korvola 撰寫。根據 News of the Wierd 第 491 期,"
++"1997 年七月四日的報導,在 1997 年四月,Roger Penrose,一位英國的數學教授,控"
++"告 Kimberly-Clark 公司所生產的 Kleenex 牌衛生紙上的圖案抄襲自一種他所創造的圖"
++"案,這個圖案展示「自然界存在的不重覆的樣式」。Penrose 表示他並不喜歡訴訟,但"
++"是「這個產品來到大不列顛後,此地的人民可能被這間跨國公司推薦用他們國家的爵士"
++"辛勤工作出來的結果擦屁股,一想到這一點就不得不採取行動。」"
+
+ #: hacks/config/penrose.xml.h:9
+ msgid "Penrose"
+@@ -3005,14 +3082,18 @@
+ "This simulates colonies of mold growing in a petri dish. Growing colored "
+ "circles overlap and leave spiral interference in their wake. Written by Dan "
+ "Bornstein."
+-msgstr "模擬一群霉菌在培養皿中生長的樣子。彩色的圈圈成長、重疊,然後彼此碰撞產生螺旋狀的線條。由 Dan Bornstein 撰寫。"
++msgstr ""
++"模擬一群霉菌在培養皿中生長的樣子。彩色的圈圈成長、重疊,然後彼此碰撞產生螺旋"
++"狀的線條。由 Dan Bornstein 撰寫。"
+
+ #: hacks/config/phosphor.xml.h:1
+ msgid ""
+ "Draws a simulation of an old terminal, with large pixels and long-sustain "
+-"phosphor. It can run any program as a source of the text it displays. Written "
+-"by Jamie Zawinski."
+-msgstr "模擬古老的終端機輸出,有大顆的像素與磷光體。可以接受任何程式的輸出做為顯示。由 Jamie Zawinski 撰寫。"
++"phosphor. It can run any program as a source of the text it displays. "
++"Written by Jamie Zawinski."
++msgstr ""
++"模擬古老的終端機輸出,有大顆的像素與磷光體。可以接受任何程式的輸出做為顯示。"
++"由 Jamie Zawinski 撰寫。"
+
+ #: hacks/config/phosphor.xml.h:2
+ msgid "Fade"
+@@ -3048,9 +3129,11 @@
+
+ #: hacks/config/pipes.xml.h:8
+ msgid ""
+-"If you've ever been in the same room with a Windows NT machine, you've probably "
+-"seen this GL hack. This version is by Marcelo Vianna."
+-msgstr "如果您曾經與 Windows NT 共處一室,您應該看過這個螢幕保護程式。這個版本由 Marcelo Vianna 撰寫。"
++"If you've ever been in the same room with a Windows NT machine, you've "
++"probably seen this GL hack. This version is by Marcelo Vianna."
++msgstr ""
++"如果您曾經與 Windows NT 共處一室,您應該看過這個螢幕保護程式。這個版本由 "
++"Marcelo Vianna 撰寫。"
+
+ #: hacks/config/pipes.xml.h:9
+ msgid "Lots"
+@@ -3084,7 +3167,8 @@
+ msgid ""
+ "Repeatedly attempts to completely fill a rectangle with irregularly-shaped "
+ "puzzle pieces. Written by Stephen Montgomery-Smith."
+-msgstr "不斷重覆試圖用不規則形來填入一個矩形。由 Stephen Montgomery-Smith 撰寫。"
++msgstr ""
++"不斷重覆試圖用不規則形來填入一個矩形。由 Stephen Montgomery-Smith 撰寫。"
+
+ #: hacks/config/pulsar.xml.h:1
+ msgid "Anti-alias Lines"
+@@ -3093,11 +3177,12 @@
+ #: hacks/config/pulsar.xml.h:3
+ msgid ""
+ "Draws some intersecting planes, making use of alpha blending, fog, textures, "
+-"and mipmaps, plus a ``frames per second'' meter so that you can tell how fast "
+-"your graphics card is... Requires OpenGL. Written by David Konerding."
++"and mipmaps, plus a ``frames per second'' meter so that you can tell how "
++"fast your graphics card is... Requires OpenGL. Written by David Konerding."
+ msgstr ""
+-"畫出一些交錯的平面,應用透明度混合、霧狀、紋理組合與位圖,加上一個「每秒幾張」的量度讓您知道您的顯示卡速度有多快。需要 OpenGL,由 David "
+-"Konerding 撰寫。"
++"畫出一些交錯的平面,應用透明度混合、霧狀、紋理組合與位圖,加上一個「每秒幾"
++"張」的量度讓您知道您的顯示卡速度有多快。需要 OpenGL,由 David Konerding 撰"
++"寫。"
+
+ #: hacks/config/pulsar.xml.h:4
+ msgid "Enable Blending"
+@@ -3166,7 +3251,7 @@
+ #: hacks/config/pyro.xml.h:11
+ msgid ""
+ "Pyro draws exploding fireworks. Blah blah blah. Written by Jamie Zawinski."
+-msgstr "畫出爆炸的煙火...等等。由 Jamie Zawinski 撰寫。"
++msgstr "畫出爆炸的煙火…等等。由 Jamie Zawinski 撰寫。"
+
+ #: hacks/config/qix.xml.h:1
+ msgid "Additive Colors"
+@@ -3203,11 +3288,12 @@
+ #: hacks/config/qix.xml.h:24
+ msgid ""
+ "This is the swiss army chainsaw of qix programs. It bounces a series of line "
+-"segments around the screen, and uses variations on this basic motion pattern to "
+-"produce all sorts of different presentations: line segments, filled polygons, "
+-"overlapping translucent areas... Written by Jamie Zawinski."
++"segments around the screen, and uses variations on this basic motion pattern "
++"to produce all sorts of different presentations: line segments, filled "
++"polygons, overlapping translucent areas... Written by Jamie Zawinski."
+ msgstr ""
+-"讓一系列線段在螢幕裡彈跳,使用多種基本的移動樣式來產生各種不同的表現:線段、多邊形與重疊半透明區域等等。由 Jamie Zawinski 撰寫。"
++"讓一系列線段在螢幕裡彈跳,使用多種基本的移動樣式來產生各種不同的表現:線段、"
++"多邊形與重疊半透明區域等等。由 Jamie Zawinski 撰寫。"
+
+ #: hacks/config/qix.xml.h:25
+ msgid "Transparent"
+@@ -3229,12 +3315,12 @@
+
+ #: hacks/config/rd-bomb.xml.h:7
+ msgid ""
+-"Another variation of the `Bomb' program by Scott Draves. This draws a grid of "
+-"growing square-like shapes that, once they overtake each other, react in "
++"Another variation of the `Bomb' program by Scott Draves. This draws a grid "
++"of growing square-like shapes that, once they overtake each other, react in "
+ "unpredictable ways. ``RD'' stands for reaction-diffusion."
+ msgstr ""
+-"由 Scott Draves 所撰寫的 Bomb 程式的變形。畫出成長的方格狀,一但重疊則會以不可預測的方式反應。RD "
+-"指的是反應擴散(Reaction-Diffusion)。"
++"由 Scott Draves 所撰寫的 Bomb 程式的變形。畫出成長的方格狀,一但重疊則會以不"
++"可預測的方式反應。RD 指的是反應擴散(Reaction-Diffusion)。"
+
+ #: hacks/config/rd-bomb.xml.h:8
+ msgid "Epoch"
+@@ -3306,10 +3392,12 @@
+
+ #: hacks/config/ripples.xml.h:14
+ msgid ""
+-"This draws rippling interference patterns like splashing water. With the -water "
+-"option, it manipulates your desktop image to look like something is dripping "
+-"into it. Written by Tom Hammersley."
+-msgstr "畫出水花濺起,漣漪相互交錯的圖樣。使用 -water 選項的話,它會用您的桌面圖樣來「滴水」下去。由 Tom Hammersley 撰寫。"
++"This draws rippling interference patterns like splashing water. With the -"
++"water option, it manipulates your desktop image to look like something is "
++"dripping into it. Written by Tom Hammersley."
++msgstr ""
++"畫出水花濺起,漣漪相互交錯的圖樣。使用 -water 選項的話,它會用您的桌面圖樣來"
++"「滴水」下去。由 Tom Hammersley 撰寫。"
+
+ #: hacks/config/rocks.xml.h:7
+ msgid "Rocks"
+@@ -3328,7 +3416,9 @@
+ "This draws an animation of flight through an asteroid field, with changes in "
+ "rotation and direction. It can also display 3D separations for red/blue "
+ "glasses! Mostly written by Jamie Zawinski."
+-msgstr "飛越小行星群的動畫,並且會旋轉與改變方向。它也可以顯示透過紅/藍眼鏡呈現的立體圖樣。大部份由 Jamie Zawinski 撰寫。"
++msgstr ""
++"飛越小行星群的動畫,並且會旋轉與改變方向。它也可以顯示透過紅/藍眼鏡呈現的立體"
++"圖樣。大部份由 Jamie Zawinski 撰寫。"
+
+ #: hacks/config/rorschach.xml.h:7
+ msgid "Rorschach"
+@@ -3336,14 +3426,14 @@
+
+ #: hacks/config/rorschach.xml.h:9
+ msgid ""
+-"This generates random inkblot patterns. The algorithm is deceptively simple for "
+-"how well it works; it merely walks a dot around the screen randomly, and then "
+-"reflects the image horizontally, vertically, or both. Any deep-seated neurotic "
+-"tendencies which this program reveals are your own problem. Written by Jamie "
+-"Zawinski."
++"This generates random inkblot patterns. The algorithm is deceptively simple "
++"for how well it works; it merely walks a dot around the screen randomly, and "
++"then reflects the image horizontally, vertically, or both. Any deep-seated "
++"neurotic tendencies which this program reveals are your own problem. Written "
++"by Jamie Zawinski."
+ msgstr ""
+-"產生隨機的墨水斑點圖樣。這個演算法看來很小,但實際上卻運作得很好:它只是讓一個點在螢幕上隨機走動,然後水平、垂直反射圖像。由 Jamie Zawinski "
+-"撰寫。"
++"產生隨機的墨水斑點圖樣。這個演算法看來很小,但實際上卻運作得很好:它只是讓一"
++"個點在螢幕上隨機走動,然後水平、垂直反射圖像。由 Jamie Zawinski 撰寫。"
+
+ #: hacks/config/rorschach.xml.h:10
+ msgid "With X Symmetry"
+@@ -3355,10 +3445,12 @@
+
+ #: hacks/config/rotor.xml.h:1
+ msgid ""
+-"Another ancient xlock demo, this one by Tom Lawrence. It draws a line segment "
+-"moving along a complex spiraling curve. I tweaked this to generate curvier "
+-"lines, but still frames of it don't look like much."
+-msgstr "古老的 xlock 的展示範例,由 Tom Lawrence 撰寫。畫出一條線段,沿著一個複雜的螺旋曲線移動。"
++"Another ancient xlock demo, this one by Tom Lawrence. It draws a line "
++"segment moving along a complex spiraling curve. I tweaked this to generate "
++"curvier lines, but still frames of it don't look like much."
++msgstr ""
++"古老的 xlock 的展示範例,由 Tom Lawrence 撰寫。畫出一條線段,沿著一個複雜的螺"
++"旋曲線移動。"
+
+ #: hacks/config/rotor.xml.h:4 hacks/config/wander.xml.h:9
+ msgid "Length"
+@@ -3376,7 +3468,8 @@
+ msgid ""
+ "Creates a collage of rotated and scaled portions of the screen. Written by "
+ "Claudio Matsuoka."
+-msgstr "用螢幕的某部份去旋轉與調整大小來產生一幅拼貼畫。由 Claudio Matsuoka 撰寫。"
++msgstr ""
++"用螢幕的某部份去旋轉與調整大小來產生一幅拼貼畫。由 Claudio Matsuoka 撰寫。"
+
+ #: hacks/config/rotzoomer.xml.h:6
+ msgid "Rectangle Count"
+@@ -3400,8 +3493,8 @@
+
+ #: hacks/config/rubik.xml.h:2
+ msgid ""
+-"Draws a Rubik's Cube that rotates in three dimensions and repeatedly shuffles "
+-"and solves itself. Another fine GL hack by Marcelo Vianna."
++"Draws a Rubik's Cube that rotates in three dimensions and repeatedly "
++"shuffles and solves itself. Another fine GL hack by Marcelo Vianna."
+ msgstr "畫出立體的魔術方塊,重覆打亂然後解開。由 Marcelo Vianna。"
+
+ #: hacks/config/rubik.xml.h:5
+@@ -3423,11 +3516,11 @@
+ #: hacks/config/sballs.xml.h:3
+ msgid ""
+ "Draws an animation of textured balls spinning like crazy in GL. Requires "
+-"OpenGL, and a machine with fast hardware support for texture maps. Written by "
+-"Eric Lassauge <lassauge@mail.dotcom.fr>."
++"OpenGL, and a machine with fast hardware support for texture maps. Written "
++"by Eric Lassauge <lassauge@mail.dotcom.fr>."
+ msgstr ""
+-"畫出一些有花紋的球瘋狂地旋轉。需要 OpenGL,及夠快的硬體。由 Eric Lassauge <lassauge@mail.dotcom.fr> "
+-"撰寫。"
++"畫出一些有花紋的球瘋狂地旋轉。需要 OpenGL,及夠快的硬體。由 Eric Lassauge "
++"<lassauge@mail.dotcom.fr> 撰寫。"
+
+ #: hacks/config/sballs.xml.h:5
+ msgid "Icosahedron"
+@@ -3467,8 +3560,8 @@
+
+ #: hacks/config/shadebobs.xml.h:11
+ msgid ""
+-"This draws smoothly-shaded oscilating oval patterns, that look something like "
+-"vapor trails or neon tubes. Written by Shane Smit."
++"This draws smoothly-shaded oscilating oval patterns, that look something "
++"like vapor trails or neon tubes. Written by Shane Smit."
+ msgstr "畫出一些看起來像是霓虹燈管或是飛機雲那樣的圖樣。由 Shane Smit 撰寫。"
+
+ #: hacks/config/sierpinski.xml.h:6
+@@ -3487,9 +3580,11 @@
+
+ #: hacks/config/sierpinski3d.xml.h:11
+ msgid ""
+-"This draws the three-dimensional variant of the recursive Sierpinski triangle "
+-"fractal, using GL. Written by Tim Robinson and Jamie Zawinski."
+-msgstr "使用 GL 畫出三維的遞迴 Sierpinski 三角形圖樣。由 Tim Robinson 與 Jamie Zawinski 撰寫。"
++"This draws the three-dimensional variant of the recursive Sierpinski "
++"triangle fractal, using GL. Written by Tim Robinson and Jamie Zawinski."
++msgstr ""
++"使用 GL 畫出三維的遞迴 Sierpinski 三角形圖樣。由 Tim Robinson 與 Jamie "
++"Zawinski 撰寫。"
+
+ #: hacks/config/slidescreen.xml.h:1 hacks/config/twang.xml.h:1
+ #: hacks/config/zoom.xml.h:1
+@@ -3512,8 +3607,9 @@
+ "those puzzles, but watching one permute itself is more amusing. Written by "
+ "Jamie Zawinski."
+ msgstr ""
+-"取得一張圖片,切成小格,然後打亂,做成像是 Fifteen "
+-"之類的遊戲,也就是將其中一個小格拿掉,讓其它的來拼湊。解這種謎是很討厭的,不過看它自己在那裡排列組合比較好玩。由 Jamie Zawinski 撰寫。"
++"取得一張圖片,切成小格,然後打亂,做成像是 Fifteen 之類的遊戲,也就是將其中一"
++"個小格拿掉,讓其它的來拼湊。解這種謎是很討厭的,不過看它自己在那裡排列組合比"
++"較好玩。由 Jamie Zawinski 撰寫。"
+
+ #: hacks/config/slip.xml.h:6
+ msgid "Slip"
+@@ -3521,15 +3617,18 @@
+
+ #: hacks/config/slip.xml.h:10
+ msgid ""
+-"This program throws some random bits on the screen, then sucks them through a "
+-"jet engine and spews them out the other side. To avoid turning the image "
++"This program throws some random bits on the screen, then sucks them through "
++"a jet engine and spews them out the other side. To avoid turning the image "
+ "completely to mush, every now and then it will and then it interjects some "
+-"splashes of color into the scene, or go into a spin cycle, or stretch the image "
+-"like taffy, or (this is my addition) grab an image of your current desktop to "
+-"chew on. Originally written by Scott Draves; whacked on by Jamie Zawinski."
++"splashes of color into the scene, or go into a spin cycle, or stretch the "
++"image like taffy, or (this is my addition) grab an image of your current "
++"desktop to chew on. Originally written by Scott Draves; whacked on by Jamie "
++"Zawinski."
+ msgstr ""
+-"這個程式隨機丟一些小點在螢幕上,然後用一個噴射引擎開始將它們吸入,再吐到另一邊。要避免影像會完全變糊掉,它偶而會插入一些顏色斑點在裡面,或是進入一個旋轉的循環,"
+-"或是將影像延展成像個太妃糖那樣,或是重新從您的桌面抓影像來玩。原始由 Scott Draves 撰寫,並由 Jamie Zawinski 改寫。"
++"這個程式隨機丟一些小點在螢幕上,然後用一個噴射引擎開始將它們吸入,再吐到另一"
++"邊。要避免影像會完全變糊掉,它偶而會插入一些顏色斑點在裡面,或是進入一個旋轉"
++"的循環,或是將影像延展成像個太妃糖那樣,或是重新從您的桌面抓影像來玩。原始由 "
++"Scott Draves 撰寫,並由 Jamie Zawinski 改寫。"
+
+ #: hacks/config/sonar.xml.h:1
+ msgid "Ping Subnet"
+@@ -3555,13 +3654,15 @@
+ msgid ""
+ "This program draws a simulation of a sonar screen. Written by default, it "
+ "displays a random assortment of ``bogies'' on the screen, but if compiled "
+-"properly, it can ping (pun intended) your local network, and actually plot the "
+-"proximity of the other hosts on your network to you. It would be easy to make "
+-"it monitor other sources of data, too. (Processes? Active network connections? "
+-"CPU usage per user?) Written by Stephen Martin."
+-msgstr ""
+-"這個程式模擬一個聲納螢幕。預設會在螢幕上隨機顯示一些「怪物」,但是如果編譯時有加入一些選項,可以測試您的子網,將網路上其他鄰近您的主機畫在螢幕上。這也可以很容易"
+-"地用來監測其他來源的資料。(像是行程啦,網路連線啦,CPU 使用率啦之類的......吧?)由 Stephen Martin 撰寫。"
++"properly, it can ping (pun intended) your local network, and actually plot "
++"the proximity of the other hosts on your network to you. It would be easy to "
++"make it monitor other sources of data, too. (Processes? Active network "
++"connections? CPU usage per user?) Written by Stephen Martin."
++msgstr ""
++"這個程式模擬一個聲納螢幕。預設會在螢幕上隨機顯示一些「怪物」,但是如果編譯時"
++"有加入一些選項,可以測試您的子網,將網路上其他鄰近您的主機畫在螢幕上。這也可"
++"以很容易地用來監測其他來源的資料。(像是行程啦,網路連線啦,CPU 使用率啦之類"
++"的......吧?)由 Stephen Martin 撰寫。"
+
+ #: hacks/config/sonar.xml.h:7
+ msgid "vs."
+@@ -3593,8 +3694,8 @@
+
+ #: hacks/config/speedmine.xml.h:12
+ msgid ""
+-"Simulates speeding down a rocky mineshaft, or a funky dancing worm. Written by "
+-"Conrad Parker."
++"Simulates speeding down a rocky mineshaft, or a funky dancing worm. Written "
++"by Conrad Parker."
+ msgstr "模擬快速通過許多岩礦,或是一條跳舞的蟲。由 Conrad Parker 撰寫。"
+
+ #: hacks/config/speedmine.xml.h:16
+@@ -3611,10 +3712,12 @@
+
+ #: hacks/config/sphere.xml.h:1
+ msgid ""
+-"Another of the classic screenhacks of the distant past, this one draws shaded "
+-"spheres in multiple colors. This hack traces its lineage back to Tom Duff in "
+-"1982."
+-msgstr "傳統的螢幕保護程式。畫出許多不同顏色的遮蔽球體。這個螢幕保護程式可以追溯到 1982 年,由 Tom Duff 所撰寫。"
++"Another of the classic screenhacks of the distant past, this one draws "
++"shaded spheres in multiple colors. This hack traces its lineage back to Tom "
++"Duff in 1982."
++msgstr ""
++"傳統的螢幕保護程式。畫出許多不同顏色的遮蔽球體。這個螢幕保護程式可以追溯到 "
++"1982 年,由 Tom Duff 所撰寫。"
+
+ #: hacks/config/sphere.xml.h:7
+ msgid "Sphere"
+@@ -3626,16 +3729,17 @@
+
+ #: hacks/config/sphereEversion.xml.h:2
+ msgid ""
+-"SphereEversion draws an animation of a sphere being turned inside out. A sphere "
+-"can be turned inside out, without any tears, sharp creases or discontinuities, "
+-"if the surface of the sphere is allowed to intersect itself. This program "
+-"animates what is known as the Thurston Eversion. Written by Nathaniel Thurston "
+-"and Michael McGuffin. This program is not included with the XScreenSaver "
+-"package, but if you don't have it already, you can find it at "
+-"<http://www.dgp.utoronto.ca/~mjmcguff/eversion/>."
+-msgstr ""
+-"SphereEversion 畫出內外翻轉的球體。如果球體表面可以與它自己交錯,那它可以自由翻轉,不會有皺折或不連續的狀況。這個程式將所謂的 Thurston "
+-"Eversion 動畫化,由 Nathaniel Thurston 與 Michael McGuffin 撰寫。這個程式不含在 XScreenSaver "
++"SphereEversion draws an animation of a sphere being turned inside out. A "
++"sphere can be turned inside out, without any tears, sharp creases or "
++"discontinuities, if the surface of the sphere is allowed to intersect "
++"itself. This program animates what is known as the Thurston Eversion. "
++"Written by Nathaniel Thurston and Michael McGuffin. This program is not "
++"included with the XScreenSaver package, but if you don't have it already, "
++"you can find it at <http://www.dgp.utoronto.ca/~mjmcguff/eversion/>."
++msgstr ""
++"SphereEversion 畫出內外翻轉的球體。如果球體表面可以與它自己交錯,那它可以自由"
++"翻轉,不會有皺折或不連續的狀況。這個程式將所謂的 Thurston Eversion 動畫化,"
++"由 Nathaniel Thurston 與 Michael McGuffin 撰寫。這個程式不含在 XScreenSaver "
+ "中,但是您可以在 http://www.dgp.utoronto.ca/~mjmcguff/eversion/ 中找到。"
+
+ #: hacks/config/spheremonics.xml.h:9
+@@ -3652,14 +3756,14 @@
+
+ #: hacks/config/spheremonics.xml.h:24
+ msgid ""
+-"These closed objects are commonly called spherical harmonics, although they are "
+-"only remotely related to the mathematical definition found in the solution to "
+-"certain wave functions, most notable the eigenfunctions of angular momentum "
+-"operators. Written by Paul Bourke and Jamie Zawinski."
+-msgstr ""
+-"這個封閉的物體通常又叫做「球函數」(spherical "
+-"harmonics),雖然它們跟數學定義上一些特定的波形函數,如處理角動量的特征函數(eigenfunction)只有一點點關係而已。由 Paul "
+-"Bourke 與 Jamie Zawinski 撰寫。"
++"These closed objects are commonly called spherical harmonics, although they "
++"are only remotely related to the mathematical definition found in the "
++"solution to certain wave functions, most notable the eigenfunctions of "
++"angular momentum operators. Written by Paul Bourke and Jamie Zawinski."
++msgstr ""
++"這個封閉的物體通常又叫做「球函數」(spherical harmonics),雖然它們跟數學定義"
++"上一些特定的波形函數,如處理角動量的特征函數(eigenfunction)只有一點點關係而"
++"已。由 Paul Bourke 與 Jamie Zawinski 撰寫。"
+
+ #: hacks/config/spiral.xml.h:2
+ msgid "Cycles"
+@@ -3679,7 +3783,8 @@
+ msgid ""
+ "Draws a spotlight scanning across a black screen, illumnating the underlying "
+ "desktop when it passes. Written by Rick Schultz."
+-msgstr "在黑色螢幕上打出探照光,並畫出光照射到的桌面圖樣。由 Rick Schultz 撰寫。"
++msgstr ""
++"在黑色螢幕上打出探照光,並畫出光照射到的桌面圖樣。由 Rick Schultz 撰寫。"
+
+ #: hacks/config/spotlight.xml.h:6
+ msgid "Spotlight"
+@@ -3695,10 +3800,12 @@
+
+ #: hacks/config/squiral.xml.h:3
+ msgid ""
+-"Draws a set of interacting, square-spiral-producing automata. The spirals grow "
+-"outward until they hit something, then they go around it. Written by Jeff "
+-"Epler."
+-msgstr "畫出一些互動的方形螺旋自動機。螺旋會往外生長,直到碰到東西,然後繞著它移動。由 Jeff Epler 撰寫。"
++"Draws a set of interacting, square-spiral-producing automata. The spirals "
++"grow outward until they hit something, then they go around it. Written by "
++"Jeff Epler."
++msgstr ""
++"畫出一些互動的方形螺旋自動機。螺旋會往外生長,直到碰到東西,然後繞著它移動。"
++"由 Jeff Epler 撰寫。"
+
+ #: hacks/config/squiral.xml.h:5
+ msgid "Handedness"
+@@ -3730,23 +3837,24 @@
+ "planets and a few major satellites, with four camera modes. Written by Raul "
+ "Alonso. This is not included with the XScreenSaver package, but is packaged "
+ "separately. Note: SSystem does not work as a screen saver on all systems, "
+-"because it doesn't communicate with xscreensaver properly. It happens to work "
+-"with some window managers, but not with others, so your mileage may vary. "
+-"SSystem was once available at <http://www1.las.es/~amil/ssystem/>, but is "
+-"now gone. You may still be able to find copies elsewhere. SSystem has since "
+-"evolved into two different programs: OpenUniverse "
+-"(http://openuniverse.sourceforge.net/) and Celestia "
+-"(http://www.shatters.net/celestia/). Sadly, neither of these programs work with "
+-"xscreensaver at all. You are encouraged to nag their authors into adding "
+-"xscreensaver support!"
+-msgstr ""
+-"S 系統是一個 GL 太陽系模擬器。它用四支攝影機的模式模擬飛越太陽與九大行星及一些小衛星。由 Raul Alonso 撰寫。這個程式不在 "
+-"XScreenSaver 中。注意:S 系統在一些系統上可能沒辦法做螢幕保護程式,因為它無法與 xscreensaver "
+-"溝通得很好。它只能在某些視窗管理員之下運作。S 系統本來在 http://www1.las.es/~amil/ssystem/ "
+-"可以取得,不過現在找不到了。您可能可以在其他地方找到。後來 S 系統發展成兩個不同的程式:OpenUniverse "
+-"(http://openuniverse.sourceforge.net/)及 "
+-"Celestia(http://www.shatters.net/celestia/)。可惜的是,這些程式也不能跟 xscreensaver "
+-"合作得很好。您可以幫忙去「嘮叨」這些程式的作者,讓它們加入 xscreensaver 的支援!"
++"because it doesn't communicate with xscreensaver properly. It happens to "
++"work with some window managers, but not with others, so your mileage may "
++"vary. SSystem was once available at <http://www1.las.es/~amil/ssystem/"
++">, but is now gone. You may still be able to find copies elsewhere. "
++"SSystem has since evolved into two different programs: OpenUniverse (http://"
++"openuniverse.sourceforge.net/) and Celestia (http://www.shatters.net/"
++"celestia/). Sadly, neither of these programs work with xscreensaver at all. "
++"You are encouraged to nag their authors into adding xscreensaver support!"
++msgstr ""
++"S 系統是一個 GL 太陽系模擬器。它用四支攝影機的模式模擬飛越太陽與九大行星及一"
++"些小衛星。由 Raul Alonso 撰寫。這個程式不在 XScreenSaver 中。注意:S 系統在一"
++"些系統上可能沒辦法做螢幕保護程式,因為它無法與 xscreensaver 溝通得很好。它只"
++"能在某些視窗管理員之下運作。S 系統本來在 http://www1.las.es/~amil/ssystem/ 可"
++"以取得,不過現在找不到了。您可能可以在其他地方找到。後來 S 系統發展成兩個不同"
++"的程式:OpenUniverse (http://openuniverse.sourceforge.net/)及 Celestia"
++"(http://www.shatters.net/celestia/)。可惜的是,這些程式也不能跟 "
++"xscreensaver 合作得很好。您可以幫忙去「嘮叨」這些程式的作者,讓它們加入 "
++"xscreensaver 的支援!"
+
+ #: hacks/config/stairs.xml.h:6
+ msgid "Stairs"
+@@ -3773,11 +3881,12 @@
+ #: hacks/config/starfish.xml.h:13
+ msgid ""
+ "This generates a sequence of undulating, throbbing, star-like patterns which "
+-"pulsate, rotate, and turn inside out. Another display mode uses these shapes to "
+-"lay down a field of colors, which are then cycled. The motion is very organic. "
+-"Written by Jamie Zawinski."
++"pulsate, rotate, and turn inside out. Another display mode uses these shapes "
++"to lay down a field of colors, which are then cycled. The motion is very "
++"organic. Written by Jamie Zawinski."
+ msgstr ""
+-"產生一系列波浪狀、跳動的星形圖樣,並旋轉與內外翻轉。另一個顯示模式則是使用這些形狀來著色,然後循環。動作非常自然。由 Jamie Zawinski 撰寫。"
++"產生一系列波浪狀、跳動的星形圖樣,並旋轉與內外翻轉。另一個顯示模式則是使用這"
++"些形狀來著色,然後循環。動作非常自然。由 Jamie Zawinski 撰寫。"
+
+ #: hacks/config/starwars.xml.h:2
+ msgid "Anti-aliased Lines"
+@@ -3789,11 +3898,12 @@
+
+ #: hacks/config/starwars.xml.h:4
+ msgid ""
+-"Draws a stream of text slowly scrolling into the distance at an angle, over a "
+-"star field, like at the beginning of the movie of the same name. Written by "
+-"Jamie Zawinski and Claudio Matauoka."
++"Draws a stream of text slowly scrolling into the distance at an angle, over "
++"a star field, like at the beginning of the movie of the same name. Written "
++"by Jamie Zawinski and Claudio Matauoka."
+ msgstr ""
+-"畫出一串文字,慢慢地以一個角度捲到螢幕中的星空深處,像是電影星際大戰的開頭一樣。由 Jamie Zawinski 與 Claudio Matauoka 撰寫。"
++"畫出一串文字,慢慢地以一個角度捲到螢幕中的星空深處,像是電影星際大戰的開頭一"
++"樣。由 Jamie Zawinski 與 Claudio Matauoka 撰寫。"
+
+ #: hacks/config/starwars.xml.h:5
+ msgid "Fade Out"
+@@ -3837,13 +3947,16 @@
+
+ #: hacks/config/starwars.xml.h:19
+ msgid "Wrap Long Lines"
+-msgstr "換行"
++msgstr "換列"
+
+ #: hacks/config/stonerview.xml.h:1
+ msgid ""
+-"Chains of colorful squares dance around each other in complex spiral patterns. "
+-"Written by Andrew Plotkin, based on SGI's `electropaint' screensaver."
+-msgstr "許多串彩色方塊形成複雜的螺旋狀圖樣,然後一起跳舞。由 Andrew Plotkin 參考 electropaint 螢幕保護程式撰寫。"
++"Chains of colorful squares dance around each other in complex spiral "
++"patterns. Written by Andrew Plotkin, based on SGI's `electropaint' "
++"screensaver."
++msgstr ""
++"許多串彩色方塊形成複雜的螺旋狀圖樣,然後一起跳舞。由 Andrew Plotkin 參考 "
++"electropaint 螢幕保護程式撰寫。"
+
+ #: hacks/config/stonerview.xml.h:3
+ msgid "StonerView"
+@@ -3859,18 +3972,21 @@
+
+ #: hacks/config/strange.xml.h:10
+ msgid ""
+-"This draws strange attractors: it's a colorful, unpredictably-animating field "
+-"of dots that swoops and twists around. The motion is very nice. Written by "
+-"Massimino Pascal."
+-msgstr "許多彩色的,有生命的,無法預測的點飛撲、扭轉。動作做得很棒。由 Massimino Pascal 撰寫。"
++"This draws strange attractors: it's a colorful, unpredictably-animating "
++"field of dots that swoops and twists around. The motion is very nice. "
++"Written by Massimino Pascal."
++msgstr ""
++"許多彩色的,有生命的,無法預測的點飛撲、扭轉。動作做得很棒。由 Massimino "
++"Pascal 撰寫。"
+
+ #: hacks/config/superquadrics.xml.h:2
+ msgid ""
+-"Ed Mackey reports that he wrote the first version of this program in BASIC on a "
+-"Commodore 64 in 1987, as a 320x200 black and white wireframe. Now it is GL and "
+-"has specular reflections."
++"Ed Mackey reports that he wrote the first version of this program in BASIC "
++"on a Commodore 64 in 1987, as a 320x200 black and white wireframe. Now it is "
++"GL and has specular reflections."
+ msgstr ""
+-"立體形狀。Ed Mackey 在 1987 年用 Commodore 64 上的 BASIC 寫出第一版,這一版使用 GL 並且加入鏡面反射的效果。"
++"立體形狀。Ed Mackey 在 1987 年用 Commodore 64 上的 BASIC 寫出第一版,這一版使"
++"用 GL 並且加入鏡面反射的效果。"
+
+ #: hacks/config/superquadrics.xml.h:10
+ msgid "Superquadrics"
+@@ -3878,12 +3994,12 @@
+
+ #: hacks/config/swirl.xml.h:4
+ msgid ""
+-"More flowing, swirly patterns. This version is by M. Dobie and R. Taylor, but "
+-"you might have seen a Mac program similar to this called FlowFazer. There is "
+-"also a cool Java applet of a similar concept."
++"More flowing, swirly patterns. This version is by M. Dobie and R. Taylor, "
++"but you might have seen a Mac program similar to this called FlowFazer. "
++"There is also a cool Java applet of a similar concept."
+ msgstr ""
+-"流動的漩渦狀的圖樣。這個版本由 M. Dobie 與 R. Taylor 撰寫,但您可能看過 Mac 上有一個類似的程式叫 FlowFazer。此外也有 "
+-"Java applet 的版本。"
++"流動的漩渦狀的圖樣。這個版本由 M. Dobie 與 R. Taylor 撰寫,但您可能看過 Mac "
++"上有一個類似的程式叫 FlowFazer。此外也有 Java applet 的版本。"
+
+ #: hacks/config/swirl.xml.h:8
+ msgid "Swirl"
+@@ -3939,7 +4055,8 @@
+ msgid ""
+ "Displays a view of the ``Bird in a Thornbush'' fractal. Written by Tim "
+ "Auckland."
+-msgstr "顯示「高灌叢中的鳥」(Bird in a Thornbush)的圖形。由 Tim Auckland 撰寫。"
++msgstr ""
++"顯示「高灌叢中的鳥」(Bird in a Thornbush)的圖形。由 Tim Auckland 撰寫。"
+
+ #: hacks/config/thornbird.xml.h:6
+ msgid "Points"
+@@ -3961,9 +4078,10 @@
+
+ #: hacks/config/truchet.xml.h:4
+ msgid ""
+-"This draws line- and arc-based Truchet patterns that tile the screen. Written "
+-"by Adrian Likins."
+-msgstr "畫出以線與弧形為基礎的 Truchet 圖樣,排列在螢幕上。由 Adrian Likins 撰寫。"
++"This draws line- and arc-based Truchet patterns that tile the screen. "
++"Written by Adrian Likins."
++msgstr ""
++"畫出以線與弧形為基礎的 Truchet 圖樣,排列在螢幕上。由 Adrian Likins 撰寫。"
+
+ #: hacks/config/truchet.xml.h:5
+ msgid "Truchet"
+@@ -3972,7 +4090,7 @@
+ #: hacks/config/twang.xml.h:2
+ msgid ""
+ "Divides the screen into a grid, and plucks them. Written by Dan Bornstein."
+-msgstr "將螢幕切割成小格,然後......。由 Dan Bornstein 撰寫。"
++msgstr "將螢幕切割成小格,然後…...。由 Dan Bornstein 撰寫。"
+
+ #: hacks/config/twang.xml.h:6
+ msgid "Jumpy"
+@@ -4011,10 +4129,12 @@
+ "This is actually just a shell script that grabs a frame of video from the "
+ "system's video input, and then uses some PBM filters (chosen at random) to "
+ "manipulate and recombine the video frame in various ways (edge detection, "
+-"subtracting the image from a rotated version of itself, etc.) Then it displays "
+-"that image for a few seconds, and does it again. This works really well if you "
+-"just feed broadcast television into it."
+-msgstr "這實際上只是文稿,從系統的影像輸入中抓取影像,然後用隨機選取的 PBM 過濾器以各種方式產生與重組影像。顯示幾秒鐘之後,再重新來過。"
++"subtracting the image from a rotated version of itself, etc.) Then it "
++"displays that image for a few seconds, and does it again. This works really "
++"well if you just feed broadcast television into it."
++msgstr ""
++"這實際上只是文稿,從系統的影像輸入中抓取影像,然後用隨機選取的 PBM 過濾器以各"
++"種方式產生與重組影像。顯示幾秒鐘之後,再重新來過。"
+
+ #: hacks/config/vidwhacker.xml.h:6
+ msgid "VidWhacker"
+@@ -4022,11 +4142,12 @@
+
+ #: hacks/config/vines.xml.h:6
+ msgid ""
+-"This one generates a continuous sequence of small, curvy geometric patterns. It "
+-"scatters them around your screen until it fills up, then it clears the screen "
+-"and starts over. Written by Tracy Camp and David Hansen."
++"This one generates a continuous sequence of small, curvy geometric patterns. "
++"It scatters them around your screen until it fills up, then it clears the "
++"screen and starts over. Written by Tracy Camp and David Hansen."
+ msgstr ""
+-"產生一串小而彎曲的幾何圖形,將它們散佈在螢幕上直到放滿,然後將螢幕清掉再重新開始。由 Tracy Camp 與 David Hansen 撰寫。"
++"產生一串小而彎曲的幾何圖形,將它們散布在螢幕上直到放滿,然後將螢幕清掉再重新"
++"開始。由 Tracy Camp 與 David Hansen 撰寫。"
+
+ #: hacks/config/vines.xml.h:8
+ msgid "Vines"
+@@ -4059,15 +4180,18 @@
+
+ #: hacks/config/webcollage.xml.h:9
+ msgid ""
+-"This program makes collages out of random images pulled off of the World Wide "
+-"Web. It finds these images by doing random web searches, and then extracting "
+-"images from the returned pages. It can also be set up to filter the images "
+-"through the `VidWhacker' program, above, which looks really great. (Note that "
+-"most of the images it finds are text, and not pictures. This is because most of "
+-"the web is pictures of text. Which is pretty sad.) Written by Jamie Zawinski."
++"This program makes collages out of random images pulled off of the World "
++"Wide Web. It finds these images by doing random web searches, and then "
++"extracting images from the returned pages. It can also be set up to filter "
++"the images through the `VidWhacker' program, above, which looks really "
++"great. (Note that most of the images it finds are text, and not pictures. "
++"This is because most of the web is pictures of text. Which is pretty sad.) "
++"Written by Jamie Zawinski."
+ msgstr ""
+-"這個程式由將網頁上的影像做成拼貼畫。它會用隨機搜尋的方式找網頁,然後取出圖片。它也可以設定成從 VidWhacker "
+-"程式中抓取圖片。不過注意,大部份它抓到的「影像」其實只是文字,而不是圖片,因為大部份的網頁只是「文字的圖片」。由 Jamie Zawinski 撰寫。"
++"這個程式由將網頁上的影像做成拼貼畫。它會用隨機搜尋的方式找網頁,然後取出圖"
++"片。它也可以設定成從 VidWhacker 程式中抓取圖片。不過注意,大部份它抓到的「影"
++"像」其實只是文字,而不是圖片,因為大部份的網頁只是「文字的圖片」。由 Jamie "
++"Zawinski 撰寫。"
+
+ #: hacks/config/webcollage.xml.h:10
+ msgid "URL Timeout"
+@@ -4082,7 +4206,9 @@
+ "Floating stars are acted upon by a mixture of simple 2D forcefields. The "
+ "strength of each forcefield changes continuously, and it is also switched on "
+ "and off at random. By Paul 'Joey' Clark."
+-msgstr "星星在混合的二維力場中動作。彼此的引力持續改變,也可以隨機開關。由 Paul 'Joey' Clark 撰寫。"
++msgstr ""
++"星星在混合的二維力場中動作。彼此的引力持續改變,也可以隨機開關。由 Paul "
++"'Joey' Clark 撰寫。"
+
+ #: hacks/config/whirlwindwarp.xml.h:7
+ msgid "Trail Size"
+@@ -4111,10 +4237,11 @@
+ #: hacks/config/worm.xml.h:1
+ msgid ""
+ "An ancient xlock hack that draws multicolored worms that crawl around the "
+-"screen. Written by Brad Taylor, Dave Lemke, Boris Putanec, and Henrik Theiling."
++"screen. Written by Brad Taylor, Dave Lemke, Boris Putanec, and Henrik "
++"Theiling."
+ msgstr ""
+-"古老的 xlock 螢幕保護程式,畫出不同顏色的蟲,在螢幕上爬行。由 Brad Taylor,Dave Lemke,Boris Putanec 與 "
+-"Henrik Theiling 撰寫。"
++"古老的 xlock 螢幕保護程式,畫出不同顏色的蟲,在螢幕上爬行。由 Brad Taylor,"
++"Dave Lemke,Boris Putanec 與 Henrik Theiling 撰寫。"
+
+ #: hacks/config/xaos.xml.h:1
+ msgid "XaoS"
+@@ -4122,13 +4249,14 @@
+
+ #: hacks/config/xaos.xml.h:2
+ msgid ""
+-"XaoS generates fast fly-through animations of the Mandelbrot and other fractal "
+-"sets. Written by Thomas Marsh and Jan Hubicka. This is not included with the "
+-"XScreenSaver package, but if you don't have it already, you can find it at "
+-"<http://limax.paru.cas.cz/~hubicka/XaoS/>."
+-msgstr ""
+-"XaoS 畫出一個快速飛過 Mandelbrot set 的動畫。由 Thomas Marsh 與 Jan Hubicka 撰寫。這個程式不含在 "
+-"XScreenSaver 中,但是您可以在 http://limax.paru.cas.cz/~hubicka/XaoS/ 中找到。"
++"XaoS generates fast fly-through animations of the Mandelbrot and other "
++"fractal sets. Written by Thomas Marsh and Jan Hubicka. This is not included "
++"with the XScreenSaver package, but if you don't have it already, you can "
++"find it at <http://limax.paru.cas.cz/~hubicka/XaoS/>."
++msgstr ""
++"XaoS 畫出一個快速飛過 Mandelbrot set 的動畫。由 Thomas Marsh 與 Jan Hubicka "
++"撰寫。這個程式不含在 XScreenSaver 中,但是您可以在 http://limax.paru.cas.cz/"
++"~hubicka/XaoS/ 中找到。"
+
+ #: hacks/config/xdaliclock.xml.h:1
+ msgid "12-Hour Time"
+@@ -4170,11 +4298,12 @@
+ msgid ""
+ "XDaliClock draws a large digital clock, the numbers of which change by "
+ "``melting'' into their new shapes. Written by Jamie Zawinski. This is not "
+-"included with the XScreenSaver package, but if you don't have it already, you "
+-"can find it at <http://www.jwz.org/xdaliclock/>."
++"included with the XScreenSaver package, but if you don't have it already, "
++"you can find it at <http://www.jwz.org/xdaliclock/>."
+ msgstr ""
+-"XDaliClock 畫出一個巨大的數位時鐘,數字改變時會「熔化」成新的形狀。由 Jamie Zawinski 撰寫。這個程式不含在 XScreenSaver "
+-"中,但是您可以在 http://www.jwz.org/xdaliclock/ 中找到。"
++"XDaliClock 畫出一個巨大的數位時鐘,數字改變時會「熔化」成新的形狀。由 Jamie "
++"Zawinski 撰寫。這個程式不含在 XScreenSaver 中,但是您可以在 http://www.jwz."
++"org/xdaliclock/ 中找到。"
+
+ #: hacks/config/xearth.xml.h:1
+ msgid "Bright"
+@@ -4258,14 +4387,15 @@
+
+ #: hacks/config/xearth.xml.h:31
+ msgid ""
+-"XEarth draws an image of the Earth, as seen from your favorite vantage point in "
+-"space, correctly shaded for the current position of the Sun. Written by Kirk "
+-"Johnson. This is not included with the XScreenSaver package, but if you don't "
+-"have it already, you can find it at "
+-"<http://www.cs.colorado.edu/~tuna/xearth/>."
+-msgstr ""
+-"XEarth 畫出一個地球,可以從太空中任何您喜歡的角度來觀察,並會依據目前太陽的位置產生陰影。由 Kirk Johnson 撰寫。這個程式不含在 "
+-"XScreenSaver 中,但是您可以在 http://www.cs.colorado.edu/~tuna/xearth/ 中找到。"
++"XEarth draws an image of the Earth, as seen from your favorite vantage point "
++"in space, correctly shaded for the current position of the Sun. Written by "
++"Kirk Johnson. This is not included with the XScreenSaver package, but if you "
++"don't have it already, you can find it at <http://www.cs.colorado.edu/"
++"~tuna/xearth/>."
++msgstr ""
++"XEarth 畫出一個地球,可以從太空中任何您喜歡的角度來觀察,並會依據目前太陽的位"
++"置產生陰影。由 Kirk Johnson 撰寫。這個程式不含在 XScreenSaver 中,但是您可以"
++"在 http://www.cs.colorado.edu/~tuna/xearth/ 中找到。"
+
+ #: hacks/config/xearth.xml.h:32
+ msgid "Xearth"
+@@ -4281,12 +4411,12 @@
+
+ #: hacks/config/xfishtank.xml.h:7
+ msgid ""
+-"Fish! This is not included with the XScreenSaver package, but if you don't have "
+-"it already, you can find it at "
+-"<http://metalab.unc.edu/pub/Linux/X11/demos/>."
++"Fish! This is not included with the XScreenSaver package, but if you don't "
++"have it already, you can find it at <http://metalab.unc.edu/pub/Linux/X11/"
++"demos/>."
+ msgstr ""
+-"就是魚嘛!這個程式不含在 XScreenSaver 中,但是您可以在 http://metalab.unc.edu/pub/Linux/X11/demos/ "
+-"中找到。"
++"就是魚嘛!這個程式不含在 XScreenSaver 中,但是您可以在 http://metalab.unc."
++"edu/pub/Linux/X11/demos/ 中找到。"
+
+ #: hacks/config/xfishtank.xml.h:12
+ msgid "XFishTank"
+@@ -4298,9 +4428,11 @@
+
+ #: hacks/config/xflame.xml.h:2
+ msgid ""
+-"Draws a simulation of pulsing fire. It can also take an arbitrary image and set "
+-"it on fire too. Written by Carsten Haitzler, hacked on by many others."
+-msgstr "模擬律動的火。它也可以隨機取得影像然後放到火裡。由 Carsten Haitzler 撰寫,其他許多人修改。"
++"Draws a simulation of pulsing fire. It can also take an arbitrary image and "
++"set it on fire too. Written by Carsten Haitzler, hacked on by many others."
++msgstr ""
++"模擬律動的火。它也可以隨機取得影像然後放到火裡。由 Carsten Haitzler 撰寫,其"
++"他許多人修改。"
+
+ #: hacks/config/xflame.xml.h:3
+ msgid "Enable Blooming"
+@@ -4314,10 +4446,12 @@
+ msgid ""
+ "This program behaves schizophrenically and makes a lot of typos. Written by "
+ "Jamie Zawinski. If you haven't seen Stanley Kubrick's masterpiece, ``The "
+-"Shining,'' you won't get it. Those who have describe this hack as ``inspired.''"
++"Shining,'' you won't get it. Those who have describe this hack as "
++"``inspired.''"
+ msgstr ""
+-"這個程式會裝瘋賣傻,然後故意打錯很多字。由 Jamie Zawinski 撰寫。如果您沒看過 Stanley Kubrick 導演的著名作品,「鬼店」(The "
+-"Shining,或譯「閃靈」),您大概就沒辦法瞭解。瞭解的人就會覺得這個程式「超棒」。"
++"這個程式會裝瘋賣傻,然後故意打錯很多字。由 Jamie Zawinski 撰寫。如果您沒看過 "
++"Stanley Kubrick 導演的著名作品,「鬼店」(The Shining,或譯「閃靈」),您大概"
++"就沒辦法瞭解。瞭解的人就會覺得這個程式「超棒」。"
+
+ #: hacks/config/xjack.xml.h:5
+ msgid "Xjack"
+@@ -4399,14 +4533,15 @@
+ #: hacks/config/xmountains.xml.h:7
+ msgid ""
+ "XMountains generates realistic-looking fractal terrains of snow-capped "
+-"mountains near water, with either a top view or a side view. Written by Stephen "
+-"Booth. This is not included with the XScreenSaver package, but if you don't "
+-"have it already, you can find it at "
+-"<http://www.epcc.ed.ac.uk/~spb/xmountains/>. Be sure to compile it with "
+-"-DVROOT or it won't work right when launched by the xscreensaver daemon."
+-msgstr ""
+-"XMountains 產生逼真的地形圖,有白雪覆蓋的山,傍在流水邊,可以從上俯瞰或從旁邊觀看。由 Stephen Booth 撰寫。這個程式不含在 "
+-"XScreenSaver 中,但是您可以在 http://www.epcc.ed.ac.uk/~spb/xmountains/ 中找到。"
++"mountains near water, with either a top view or a side view. Written by "
++"Stephen Booth. This is not included with the XScreenSaver package, but if "
++"you don't have it already, you can find it at <http://www.epcc.ed.ac.uk/"
++"~spb/xmountains/>. Be sure to compile it with -DVROOT or it won't work "
++"right when launched by the xscreensaver daemon."
++msgstr ""
++"XMountains 產生逼真的地形圖,有白雪覆蓋的山,傍在流水邊,可以從上俯瞰或從旁邊"
++"觀看。由 Stephen Booth 撰寫。這個程式不含在 XScreenSaver 中,但是您可以在 "
++"http://www.epcc.ed.ac.uk/~spb/xmountains/ 中找到。"
+
+ #: hacks/config/xmountains.xml.h:8
+ msgid "Xmountains"
+@@ -4424,10 +4559,11 @@
+
+ #: hacks/config/xsnow.xml.h:1
+ msgid ""
+-"Draws falling snow and the occasional tiny Santa. By Rick Jansen. You can find "
+-"it at <http://www.euronet.nl/~rja/Xsnow/>."
++"Draws falling snow and the occasional tiny Santa. By Rick Jansen. You can "
++"find it at <http://www.euronet.nl/~rja/Xsnow/>."
+ msgstr ""
+-"畫出下雪,及小小的聖誕老人。由 Rick Jansen 撰寫,您可以在 http://www.euronet.nl/~rja/Xsnow/ 找到。"
++"畫出下雪,及小小的聖誕老人。由 Rick Jansen 撰寫,您可以在 http://www.euronet."
++"nl/~rja/Xsnow/ 找到。"
+
+ #: hacks/config/xsnow.xml.h:2
+ msgid "Xsnow"
+@@ -4471,7 +4607,8 @@
+ msgid ""
+ "XTeeVee simulates various television problems, including static, loss of "
+ "vertical hold, and a test pattern. By Greg Knauss."
+-msgstr "XTeeVee 模擬許多電視問題,包括靜止畫面,測試圖樣等等。由 Greg Knauss 撰寫。"
++msgstr ""
++"XTeeVee 模擬許多電視問題,包括靜止畫面,測試圖樣等等。由 Greg Knauss 撰寫。"
+
+ #: hacks/config/zoom.xml.h:3
+ msgid "Lens Offset"
+@@ -4483,7 +4620,9 @@
+
+ #: hacks/config/zoom.xml.h:9
+ msgid ""
+-"Zooms in on a part of the screen and then moves around. With the -lenses option "
+-"the result is like looking through many overlapping lenses rather than just a "
+-"simple zoom. Written by James Macnicol."
+-msgstr "放大螢幕的某部份,然後移動。加上 -lenses 選項的話,會看起來像是有很多放大鏡重疊在一起。由 James Macnicol 撰寫。"
++"Zooms in on a part of the screen and then moves around. With the -lenses "
++"option the result is like looking through many overlapping lenses rather "
++"than just a simple zoom. Written by James Macnicol."
++msgstr ""
++"放大螢幕的某部份,然後移動。加上 -lenses 選項的話,會看起來像是有很多放大鏡重"
++"疊在一起。由 James Macnicol 撰寫。"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/appletproxy.po kde-i18n-zh_TW-3.5.10/messages/kdebase/appletproxy.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/appletproxy.po 2006-05-22 20:38:36.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdebase/appletproxy.po 2011-11-11 15:45:17.000000000 +0100
+@@ -7,7 +7,7 @@
+ "Project-Id-Version: appletproxy\n"
+ "POT-Creation-Date: 2006-04-09 03:51+0200\n"
+ "PO-Revision-Date: 2005-08-11 20:31+0800\n"
+-"Last-Translator: Chao-Hsiung Liao \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: traditional Chinese \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/clockapplet.po kde-i18n-zh_TW-3.5.10/messages/kdebase/clockapplet.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/clockapplet.po 2008-08-19 20:43:10.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdebase/clockapplet.po 2011-11-11 15:45:17.000000000 +0100
+@@ -17,7 +17,7 @@
+ "Project-Id-Version: clockapplet\n"
+ "POT-Creation-Date: 2008-08-19 01:16+0200\n"
+ "PO-Revision-Date: 2005-08-08 12:20+0800\n"
+-"Last-Translator: Sheng-Hung Wang \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: traditional Chinese \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -317,27 +317,27 @@
+
+ #: clock.cpp:1537
+ msgid "&Configure Timezones..."
+-msgstr "配置時區(&C)..."
++msgstr "配置時區(&C)…"
+
+ #: clock.cpp:1541
+ msgid "&Plain"
+-msgstr "樸素 (&P)"
++msgstr "樸素(&P)"
+
+ #: clock.cpp:1542
+ msgid "&Digital"
+-msgstr "數位 (&D)"
++msgstr "數位(&D)"
+
+ #: clock.cpp:1543
+ msgid "&Analog"
+-msgstr "類比 (&A)"
++msgstr "類比(&A)"
+
+ #: clock.cpp:1544
+ msgid "&Fuzzy"
+-msgstr "模糊 (&F)"
++msgstr "模糊(&F)"
+
+ #: clock.cpp:1547
+ msgid "&Type"
+-msgstr "類型 (&T)"
++msgstr "類型(&T)"
+
+ #: clock.cpp:1548
+ msgid "Show Time&zone"
+@@ -345,11 +345,11 @@
+
+ #: clock.cpp:1551
+ msgid "&Adjust Date && Time..."
+-msgstr "調整日期及時間 (&A)..."
++msgstr "調整日期及時間(&A)…"
+
+ #: clock.cpp:1553
+ msgid "Date && Time &Format..."
+-msgstr "日期及時間格式 (&F)..."
++msgstr "日期及時間格式(&F)…"
+
+ #: clock.cpp:1556
+ msgid "C&opy to Clipboard"
+@@ -357,7 +357,7 @@
+
+ #: clock.cpp:1560
+ msgid "&Configure Clock..."
+-msgstr "配置時鐘(&C)..."
++msgstr "配置時鐘(&C)…"
+
+ #: clock.cpp:1813
+ #, c-format
+@@ -564,9 +564,11 @@
+ #: rc.cpp:180
+ #, no-c-format
+ msgid ""
+-"A list of timezones known to your system. Press the middle mouse button on the "
+-"clock in the taskbar and it shows you the time in the selected cities."
+-msgstr "您的系統所知的時區清單。在工作列的時鐘按下滑鼠中鍵,它會顯示所選取城市的時間。"
++"A list of timezones known to your system. Press the middle mouse button on "
++"the clock in the taskbar and it shows you the time in the selected cities."
++msgstr ""
++"您的系統所知的時區清單。在工作列的時鐘按下滑鼠中鍵,它會顯示所選取城市的時"
++"間。"
+
+ #. i18n: file clockapplet.kcfg line 10
+ #: rc.cpp:183
+@@ -682,7 +684,9 @@
+ #~ msgid "Configure Analog Clock"
+ #~ msgstr "配置類比時鐘"
+
+-#~ msgid "You can choose either the predefined LCD look or define a custom color set."
++#~ msgid ""
++#~ "You can choose either the predefined LCD look or define a custom color "
++#~ "set."
+ #~ msgstr "你可以選擇預設的 LCD 外觀或自定顏色。"
+
+ #~ msgid "Dra&w frame"
+@@ -701,7 +705,7 @@
+ #~ msgstr "12:34"
+
+ #~ msgid "C&hoose Font..."
+-#~ msgstr "選擇字型(&H)..."
++#~ msgstr "選擇字型(&H)…"
+
+ #~ msgid "&Use custom color"
+ #~ msgstr "自訂顏色(&U)"
+@@ -725,22 +729,26 @@
+ #~ msgstr "類比時鐘(&N)"
+
+ #~ msgid "&Apply"
+-#~ msgstr "套用 (&A)"
++#~ msgstr "套用(&A)"
+
+ #~ msgid "Type"
+ #~ msgstr "類型"
+
+-#~ msgid "Here you can select the clock type.
digital clock: a LCD-style clock
analog clock: a traditional clock with clock face and hands"
+-#~ msgstr "在這裡你可以選擇時鐘的類型。
數位時鐘: LCD 風格的時鐘
類比時鐘:傳統有指針的時鐘"
++#~ msgid ""
++#~ "Here you can select the clock type.
digital clock: a LCD-style "
++#~ "clock
analog clock: a traditional clock with clock face and hands"
++#~ msgstr ""
++#~ "在這裡你可以選擇時鐘的類型。
數位時鐘: LCD 風格的時鐘
類比時鐘:"
++#~ "傳統有指針的時鐘"
+
+ #~ msgid "&digital clock"
+-#~ msgstr "數位時鐘 (&d)"
++#~ msgstr "數位時鐘(&D)"
+
+ #~ msgid "analo&g clock"
+-#~ msgstr "類比時鐘 (&g)"
++#~ msgstr "類比時鐘(&G)"
+
+ #~ msgid "fuzz&y clock"
+-#~ msgstr "模糊時鐘 (&y)"
++#~ msgstr "模糊時鐘(&Y)"
+
+ #~ msgid "Here you can set various options for both clock styles."
+ #~ msgstr "在這裡你可以為兩個時鐘風格設定不同的選項。"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/display.po kde-i18n-zh_TW-3.5.10/messages/kdebase/display.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/display.po 2006-10-01 18:34:17.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdebase/display.po 2011-11-11 15:45:17.000000000 +0100
+@@ -7,7 +7,7 @@
+ "Project-Id-Version: display\n"
+ "POT-Creation-Date: 2005-05-18 21:24+0200\n"
+ "PO-Revision-Date: 2005-10-21 19:12+0800\n"
+-"Last-Translator: Tony Ni \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Chinese (traditional) \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/dockbarextension.po kde-i18n-zh_TW-3.5.10/messages/kdebase/dockbarextension.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/dockbarextension.po 2005-11-09 07:38:42.000000000 +0100
++++ kde-i18n-zh_TW-3.5.10/messages/kdebase/dockbarextension.po 2011-11-11 15:45:17.000000000 +0100
+@@ -2,13 +2,12 @@
+ # Copyright (C) YEAR Free Software Foundation, Inc.
+ # FIRST AUTHOR , YEAR.
+ #
+-#, fuzzy
+ msgid ""
+ msgstr ""
+-"Project-Id-Version: PACKAGE VERSION\n"
++"Project-Id-Version: dockbarextension\n"
+ "POT-Creation-Date: 2005-11-06 02:43+0100\n"
+ "PO-Revision-Date: 2003-11-07 15:53+1000\n"
+-"Last-Translator: Tony Ni \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Chinese (traditional) \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -31,7 +30,9 @@
+ msgid ""
+ "This applet does not behave correctly and the dockbar was unable to find the "
+ "command line necessary to launch it the next time KDE starts up"
+-msgstr "這個程式無法正確執行,dockbar 無法找到正確的指令。下次 KDE 開始時將無法啟動此程式。"
++msgstr ""
++"這個程式無法正確執行,dockbar 無法找到正確的指令。下次 KDE 開始時將無法啟動此"
++"程式。"
+
+ #: dockcontainer.cpp:174
+ msgid "Kill This Applet"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/drkonqi.po kde-i18n-zh_TW-3.5.10/messages/kdebase/drkonqi.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/drkonqi.po 2008-02-13 10:55:26.000000000 +0100
++++ kde-i18n-zh_TW-3.5.10/messages/kdebase/drkonqi.po 2011-11-11 15:45:17.000000000 +0100
+@@ -7,7 +7,7 @@
+ "Project-Id-Version: drkonqi 1.15\n"
+ "POT-Creation-Date: 2008-01-23 01:15+0100\n"
+ "PO-Revision-Date: 2005-10-21 19:13+0800\n"
+-"Last-Translator: Chao-Hsiung Liao \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Chinese (traditional) \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -81,12 +81,13 @@
+ "\n"
+ msgstr ""
+ "回溯追踨似乎沒有作用。\n"
+-"這可能是因為您的套件在編譯時防止建立回溯追蹤,或是堆疊框架已經非常嚴重的損壞。\n"
++"這可能是因為您的套件在編譯時防止建立回溯追蹤,或是堆疊框架已經非常嚴重的損"
++"壞。\n"
+ "\n"
+
+ #: debugger.cpp:156
+ msgid "Loading backtrace..."
+-msgstr "載入回溯追蹤中..."
++msgstr "載入回溯追蹤中…"
+
+ #: debugger.cpp:179
+ msgid ""
+@@ -101,11 +102,12 @@
+ "\n"
+ "As the usage of these options is not recommended - because they can, in rare "
+ "cases, be responsible for KDE problems - a backtrace will not be generated.\n"
+-"You need to turn these options off and reproduce the problem again in order to "
+-"get a backtrace.\n"
++"You need to turn these options off and reproduce the problem again in order "
++"to get a backtrace.\n"
+ msgstr ""
+ "\n"
+-"其實這些選項並不建議使用─因為它們在某些情況下可能造成 KDE 的問題─將無法產生反向追踨。\n"
++"其實這些選項並不建議使用─因為它們在某些情況下可能造成 KDE 的問題─將無法產生反"
++"向追踨。\n"
+ "您需要將這些選項關閉並且再度試著讓問題發生以取得回溯追踨。\n"
+
+ #: debugger.cpp:186
+@@ -114,13 +116,11 @@
+
+ #: debugger.cpp:194
+ msgid "Loading symbols..."
+-msgstr "載入符號中..."
++msgstr "載入符號中…"
+
+ #: debugger.cpp:216
+-msgid ""
+-"System configuration startup check disabled.\n"
+-msgstr ""
+-"已停用系統組態啟始檢查。\n"
++msgid "System configuration startup check disabled.\n"
++msgstr "已停用系統組態啟始檢查。\n"
+
+ #: drbugreport.cpp:54
+ msgid "You have to edit the description before the report can be sent."
+@@ -212,16 +212,17 @@
+
+ #: toplevel.cpp:135
+ msgid ""
+-"Do you want to generate a backtrace? This will help the developers to figure "
+-"out what went wrong.
\n"
+-"Unfortunately this will take some time on slow machines.
"
+-"Note: A backtrace is not a substitute for a proper description of the bug "
+-"and information on how to reproduce it. It is not possible to fix the bug "
++"
Do you want to generate a backtrace? This will help the developers to "
++"figure out what went wrong.
\n"
++"Unfortunately this will take some time on slow machines.
Note: A "
++"backtrace is not a substitute for a proper description of the bug and "
++"information on how to reproduce it. It is not possible to fix the bug "
+ "without a proper description.
"
+ msgstr ""
+ "您是否想要產生回溯追蹤?這可以幫助作者找到錯誤。
\n"
+-"不幸的是,在較慢的機器上這需要相當的時間。
"
+-"注意:回溯追蹤並不包括錯誤的描述與讓臭蟲出現的相關資訊。沒有這些描述資訊是不可能解決問題的。
"
++"不幸的是,在較慢的機器上這需要相當的時間。
注意:回溯追蹤並不包括"
++"錯誤的描述與讓臭蟲出現的相關資訊。沒有這些描述資訊是不可能解決問題的。"
++"p>"
+
+ #: toplevel.cpp:147
+ msgid "Include Backtrace"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/extensionproxy.po kde-i18n-zh_TW-3.5.10/messages/kdebase/extensionproxy.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/extensionproxy.po 2005-09-10 13:15:15.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdebase/extensionproxy.po 2011-11-11 15:45:17.000000000 +0100
+@@ -1,15 +1,15 @@
+ # traditional Chinese translation of extensionproxy
+ # Copyright (C) 2001, 2005 Free Software Foundation, Inc.
+ # Eric Cheng , 2001
+-#
+-#
++#
++#
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: extensionproxy\n"
+ "Report-Msgid-Bugs-To: \n"
+ "POT-Creation-Date: 2005-05-18 21:24+0200\n"
+ "PO-Revision-Date: 2005-08-25 11:05+0800\n"
+-"Last-Translator: Woodman Tuen \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Chinese/Traditional \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/filetypes.po kde-i18n-zh_TW-3.5.10/messages/kdebase/filetypes.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/filetypes.po 2007-05-14 12:22:55.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdebase/filetypes.po 2011-11-11 15:45:17.000000000 +0100
+@@ -9,7 +9,7 @@
+ "Project-Id-Version: filetypes\n"
+ "POT-Creation-Date: 2007-02-02 02:29+0100\n"
+ "PO-Revision-Date: 2005-10-21 19:45+0800\n"
+-"Last-Translator: Tsung-Chien Ho \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Chinese (traditional) \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -42,18 +42,20 @@
+
+ #: filegroupdetails.cpp:42
+ msgid ""
+-"Here you can configure what the Konqueror file manager will do when you click "
+-"on a file belonging to this group. Konqueror can display the file in an "
+-"embedded viewer or start up a separate application. You can change this setting "
+-"for a specific file type in the 'Embedding' tab of the file type configuration."
+-msgstr ""
+-"您可以在這邊組態 Konqueror 檔案管理者對於敲擊檔案時的動作. Konqueror 可以在內嵌檢視器中檢視檔案或開啟獨立的程式檢視檔案. "
+-"您可以在檔案組態中的 '內嵌' 標籤頁設定這個特性."
++"Here you can configure what the Konqueror file manager will do when you "
++"click on a file belonging to this group. Konqueror can display the file in "
++"an embedded viewer or start up a separate application. You can change this "
++"setting for a specific file type in the 'Embedding' tab of the file type "
++"configuration."
++msgstr ""
++"您可以在這邊組態 Konqueror 檔案管理者對於敲擊檔案時的動作. Konqueror 可以在內"
++"嵌檢視器中檢視檔案或開啟獨立的程式檢視檔案. 您可以在檔案組態中的 '內嵌' 標籤"
++"頁設定這個特性."
+
+ #: filetypedetails.cpp:38
+ msgid ""
+-"This button displays the icon associated with the selected file type. Click on "
+-"it to choose a different icon."
++"This button displays the icon associated with the selected file type. Click "
++"on it to choose a different icon."
+ msgstr "這個按鈕顯示和選中的文件類型關聯的圖示. 按下它以選擇一個新的圖示."
+
+ #: filetypedetails.cpp:41
+@@ -62,16 +64,17 @@
+
+ #: filetypedetails.cpp:55
+ msgid ""
+-"This box contains a list of patterns that can be used to identify files of the "
+-"selected type. For example, the pattern *.txt is associated with the file type "
+-"'text/plain'; all files ending in '.txt' are recognized as plain text files."
++"This box contains a list of patterns that can be used to identify files of "
++"the selected type. For example, the pattern *.txt is associated with the "
++"file type 'text/plain'; all files ending in '.txt' are recognized as plain "
++"text files."
+ msgstr ""
+-"這個方塊中包含了一系列可以用來識別這個檔案類型的樣式. 舉例而言, 樣式 *.txt 關聯於 'text/plain' 類型; 所有以 '.txt' "
+-"結束的檔名都會被當作純文字文件."
++"這個方塊中包含了一系列可以用來識別這個檔案類型的樣式. 舉例而言, 樣式 *.txt 關"
++"聯於 'text/plain' 類型; 所有以 '.txt' 結束的檔名都會被當作純文字文件."
+
+ #: filetypedetails.cpp:60 filetypesview.cpp:95 kservicelistwidget.cpp:123
+ msgid "Add..."
+-msgstr "增加..."
++msgstr "增加…"
+
+ #: filetypedetails.cpp:66
+ msgid "Add a new pattern for the selected file type."
+@@ -88,9 +91,11 @@
+ #: filetypedetails.cpp:84
+ msgid ""
+ "You can enter a short description for files of the selected file type (e.g. "
+-"'HTML Page'). This description will be used by applications like Konqueror to "
+-"display directory content."
+-msgstr "在這裡輸入選中的文件類型的簡要描述 (例如 'HTML 頁面'). 這個描述會被Konqueror 這樣的應用用來顯示目錄內容."
++"'HTML Page'). This description will be used by applications like Konqueror "
++"to display directory content."
++msgstr ""
++"在這裡輸入選中的文件類型的簡要描述 (例如 'HTML 頁面'). 這個描述會被Konqueror "
++"這樣的應用用來顯示目錄內容."
+
+ #: filetypedetails.cpp:108 filetypedetails.cpp:276
+ msgid "Use settings for '%1' group"
+@@ -102,14 +107,16 @@
+
+ #: filetypedetails.cpp:114
+ msgid ""
+-"Here you can configure what the Konqueror file manager will do when you click "
+-"on a file of this type. Konqueror can display the file in an embedded viewer or "
+-"start up a separate application. If set to 'Use settings for G group', "
+-"Konqueror will behave according to the settings of the group G this type "
+-"belongs to, for instance 'image' if the current file type is image/png."
+-msgstr ""
+-"您可以在這邊設定當 Konqueror 檔案管理者在您點選這類型檔案時的動作. Konqueror 可以在內嵌檢視器中檢視檔案或開啟獨立的程式檢視檔案. "
+-"如果您選擇了 '使用群組設定', Konqueror 會依據此類型的群組動作. 例如: 將 'image' 的檔案類型設為 'image/png'. "
++"Here you can configure what the Konqueror file manager will do when you "
++"click on a file of this type. Konqueror can display the file in an embedded "
++"viewer or start up a separate application. If set to 'Use settings for G "
++"group', Konqueror will behave according to the settings of the group G this "
++"type belongs to, for instance 'image' if the current file type is image/png."
++msgstr ""
++"您可以在這邊設定當 Konqueror 檔案管理者在您點選這類型檔案時的動作. Konqueror "
++"可以在內嵌檢視器中檢視檔案或開啟獨立的程式檢視檔案. 如果您選擇了 '使用群組設"
++"定', Konqueror 會依據此類型的群組動作. 例如: 將 'image' 的檔案類型設為 "
++"'image/png'. "
+
+ #: filetypedetails.cpp:127
+ msgid "&General"
+@@ -129,36 +136,33 @@
+
+ #: filetypesview.cpp:32
+ msgid ""
+-"File Associations
This module allows you to choose which applications "
+-"are associated with a given type of file. File types are also referred to MIME "
+-"types (MIME is an acronym which stands for \"Multipurpose Internet Mail "
+-"Extensions\".)"
+-" A file association consists of the following: "
+-"
"
+-"- Rules for determining the MIME-type of a file, for example the filename "
+-"pattern *.kwd, which means 'all files with names that end in .kwd', is "
+-"associated with the MIME type \"x-kword\";
"
+-"- A short description of the MIME-type, for example the description of the "
+-"MIME type \"x-kword\" is simply 'KWord document';
"
+-"- An icon to be used for displaying files of the given MIME-type, so that you "
+-"can easily identify the type of file in, say, a Konqueror view (at least for "
+-"the types you use often);
"
+-"- A list of the applications which can be used to open files of the given "
+-"MIME-type -- if more than one application can be used then the list is ordered "
+-"by priority.
You may be surprised to find that some MIME types have "
+-"no associated filename patterns; in these cases, Konqueror is able to determine "
+-"the MIME-type by directly examining the contents of the file."
+-msgstr ""
+-"檔案關聯
這個模組允許您選擇對於指定檔案類別要關聯的應用程式。檔案類別可以對應到 MIME 類別 (MIME "
+-"是「多用途網際網路郵件延伸標準」)。"
+-"檔案的關聯性依下列決定:"
+-"
"
+-"- 檔案的 MIME 類別規則,舉例而言,檔名樣式 *.kwd 表示所有以 '.kwd' 結尾的檔名, 都是關聯到 \"x-kword\" MIME "
+-"類別。
"
+-"- MIME 類別的簡短描述,例如 \"x-kword\" 的描述為 'KWord 文件';
"
+-"- 使用與該 MIME 類別的圖示,您可以在 Konqueror 的檢視中依據圖示來識別其類型(至少對您經常使用的類型而言);
"
+-"- 可以用於開啟指定 MIME 類別的程式列表 ── 如果有多於一個程式可以使用,這個列表會依據優先值排序。
"
+-"您可能會發現有些 MIME 類別沒有相關的檔名樣式;此時,Konqueror 會依據檔案內容決定 MIME 類別。"
++"File Associations
This module allows you to choose which "
++"applications are associated with a given type of file. File types are also "
++"referred to MIME types (MIME is an acronym which stands for \"Multipurpose "
++"Internet Mail Extensions\".) A file association consists of the "
++"following:
- Rules for determining the MIME-type of a file, for "
++"example the filename pattern *.kwd, which means 'all files with names that "
++"end in .kwd', is associated with the MIME type \"x-kword\";
- A short "
++"description of the MIME-type, for example the description of the MIME type "
++"\"x-kword\" is simply 'KWord document';
- An icon to be used for "
++"displaying files of the given MIME-type, so that you can easily identify the "
++"type of file in, say, a Konqueror view (at least for the types you use "
++"often);
- A list of the applications which can be used to open files "
++"of the given MIME-type -- if more than one application can be used then the "
++"list is ordered by priority.
You may be surprised to find that "
++"some MIME types have no associated filename patterns; in these cases, "
++"Konqueror is able to determine the MIME-type by directly examining the "
++"contents of the file."
++msgstr ""
++"檔案關聯
這個模組允許您選擇對於指定檔案類別要關聯的應用程式。檔案類"
++"別可以對應到 MIME 類別 (MIME 是「多用途網際網路郵件延伸標準」)。檔案的關聯"
++"性依下列決定:
- 檔案的 MIME 類別規則,舉例而言,檔名樣式 *.kwd 表示所有"
++"以 '.kwd' 結尾的檔名, 都是關聯到 \"x-kword\" MIME 類別。
- MIME 類別的"
++"簡短描述,例如 \"x-kword\" 的描述為 'KWord 文件';
- 使用與該 MIME 類別"
++"的圖示,您可以在 Konqueror 的檢視中依據圖示來識別其類型(至少對您經常使用的類"
++"型而言);
- 可以用於開啟指定 MIME 類別的程式列表 ── 如果有多於一個程式"
++"可以使用,這個列表會依據優先值排序。
您可能會發現有些 MIME 類別沒有"
++"相關的檔名樣式;此時,Konqueror 會依據檔案內容決定 MIME 類別。"
+
+ #: filetypesview.cpp:62
+ msgid "F&ind filename pattern:"
+@@ -176,13 +180,13 @@
+
+ #: filetypesview.cpp:89
+ msgid ""
+-"Here you can see a hierarchical list of the file types which are known on your "
+-"system. Click on the '+' sign to expand a category, or the '-' sign to collapse "
+-"it. Select a file type (e.g. text/html for HTML files) to view/edit the "
+-"information for that file type using the controls on the right."
++"Here you can see a hierarchical list of the file types which are known on "
++"your system. Click on the '+' sign to expand a category, or the '-' sign to "
++"collapse it. Select a file type (e.g. text/html for HTML files) to view/edit "
++"the information for that file type using the controls on the right."
+ msgstr ""
+-"你可以看到在你系統上安裝的文件類型的分級列表. 按下 '+' 符號來展開類別, '-' 來收攏. 您選擇一個文件類型 (例如 text/html) "
+-"用右側的按鈕來編輯."
++"你可以看到在你系統上安裝的文件類型的分級列表. 按下 '+' 符號來展開類別, '-' 來"
++"收攏. 您選擇一個文件類型 (例如 text/html) 用右側的按鈕來編輯."
+
+ #: filetypesview.cpp:99
+ msgid "Click here to add a new file type."
+@@ -245,14 +249,15 @@
+
+ #: kservicelistwidget.cpp:83
+ msgid ""
+-"This is a list of applications associated with files of the selected file type. "
+-"This list is shown in Konqueror's context menus when you select \"Open "
+-"With...\". If more than one application is associated with this file type, then "
+-"the list is ordered by priority with the uppermost item taking precedence over "
+-"the others."
++"This is a list of applications associated with files of the selected file "
++"type. This list is shown in Konqueror's context menus when you select \"Open "
++"With...\". If more than one application is associated with this file type, "
++"then the list is ordered by priority with the uppermost item taking "
++"precedence over the others."
+ msgstr ""
+-"這是關聯於檔案類別的應用程式之列表。當您選擇 \"以...開啟\" 時,這個列表會出現在 Konqueror "
+-"的快顯目錄中。如果有多於一個應用程式,這個列表會依據這邊的順序排列。"
++"這是關聯於檔案類別的應用程式之列表。當您選擇 \"以...開啟\" 時,這個列表會出現"
++"在 Konqueror 的快顯目錄中。如果有多於一個應用程式,這個列表會依據這邊的順序排"
++"列。"
+
+ #: kservicelistwidget.cpp:88
+ msgid ""
+@@ -262,8 +267,8 @@
+ "type, then the list is ordered by priority with the uppermost item taking "
+ "precedence over the others."
+ msgstr ""
+-"這是關聯於檔案類別的服務之列表. 當您選擇 \"以...開啟\" 時, 這個列表會出現在 Konqueror 的內容目錄中如果有多於一個服務, "
+-"這個列表會依據這邊的順序排列."
++"這是關聯於檔案類別的服務之列表. 當您選擇 \"以...開啟\" 時, 這個列表會出現在 "
++"Konqueror 的內容目錄中如果有多於一個服務, 這個列表會依據這邊的順序排列."
+
+ #: kservicelistwidget.cpp:97
+ msgid "Move &Up"
+@@ -319,7 +324,7 @@
+
+ #: kservicelistwidget.cpp:131
+ msgid "Edit..."
+-msgstr "編輯..."
++msgstr "編輯…"
+
+ #: kservicelistwidget.cpp:136
+ msgid "Edit command line of the selected application."
+@@ -340,21 +345,23 @@
+ #: kservicelistwidget.cpp:353
+ msgid ""
+ "The service is listed here because it has been associated with the %1 "
+-"(%2) file type and files of type %3 (%4) are per definition also of type "
+-"%5."
++"(%2) file type and files of type %3 (%4) are per definition also of "
++"type %5."
+ msgstr ""
+-"在這裡列出的服務是由於它與 %1 (%2) 檔案類型關聯,而類型 %3 (%4) 的檔案也同時是類型 %5 的定義。"
++"在這裡列出的服務是由於它與 %1 (%2) 檔案類型關聯,而類型 %3 (%"
++"4) 的檔案也同時是類型 %5 的定義。"
+
+ #: kservicelistwidget.cpp:357
+ msgid ""
+-"Either select the %1 file type to remove the service from there or move "
+-"the service down to deprecate it."
+-msgstr "您可以選擇 %1 檔案類型將它的服務移除或是把該服務下移以降低其優先權。"
++"Either select the %1 file type to remove the service from there or "
++"move the service down to deprecate it."
++msgstr ""
++"您可以選擇 %1 檔案類型將它的服務移除或是把該服務下移以降低其優先權。"
+
+ #: kservicelistwidget.cpp:360
+ msgid ""
+-"Do you want to remove the service from the %1 file type or from the "
+-"%2 file type?"
++"Do you want to remove the service from the %1 file type or from the "
++"%2 file type?"
+ msgstr "您是否想要從檔案類型%1或檔案類型%2中移除這個服務"
+
+ #: kservicelistwidget.cpp:371
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/htmlsearch.po kde-i18n-zh_TW-3.5.10/messages/kdebase/htmlsearch.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/htmlsearch.po 2005-09-10 13:15:15.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdebase/htmlsearch.po 2011-11-11 15:45:17.000000000 +0100
+@@ -9,7 +9,7 @@
+ "Project-Id-Version: htmlsearch\n"
+ "POT-Creation-Date: 2005-05-18 21:23+0200\n"
+ "PO-Revision-Date: 2005-08-11 21:13+0800\n"
+-"Last-Translator: Chao-Hsiung Liao \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Traditional Chinese \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -152,7 +152,7 @@
+
+ #: progressdialog.cpp:38
+ msgid "Generating index..."
+-msgstr "產生索引中..."
++msgstr "產生索引中…"
+
+ #: progressdialog.cpp:52
+ #, c-format
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/joystick.po kde-i18n-zh_TW-3.5.10/messages/kdebase/joystick.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/joystick.po 2006-03-17 11:47:46.000000000 +0100
++++ kde-i18n-zh_TW-3.5.10/messages/kdebase/joystick.po 2011-11-11 15:45:17.000000000 +0100
+@@ -6,7 +6,7 @@
+ "Project-Id-Version: joystick\n"
+ "POT-Creation-Date: 2006-03-02 03:42+0100\n"
+ "PO-Revision-Date: 2005-10-21 21:09+0800\n"
+-"Last-Translator: Asho Yeh \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Chinese (traditional) \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -47,49 +47,32 @@
+ #: caldialog.cpp:90
+ msgid ""
+ "Calibration is about to check the value range your device delivers."
+-"
"
+-"
Please move axis %1 %2 on your device to the minimum "
+-"position."
+-"
"
+-"
Press any button on the device or click on the 'Next' button to continue "
+-"with the next step."
++"
Please move axis %1 %2 on your device to the minimum "
++"position.
Press any button on the device or click on the 'Next' "
++"button to continue with the next step."
+ msgstr ""
+-"準備偵測裝置移動範圍。"
+-"
"
+-"
請移動裝置的%1 軸 %2到最小的位置。"
+-"
"
+-"
按下搖桿任意鍵或按「下一步」繼續。"
++"準備偵測裝置移動範圍。
請移動裝置的%1 軸 %2到最小的"
++"位置。
按下搖桿任意鍵或按「下一步」繼續。"
+
+ #: caldialog.cpp:107
+ msgid ""
+ "Calibration is about to check the value range your device delivers."
+-"
"
+-"
Please move axis %1 %2 on your device to the center position."
+-"
"
+-"
Press any button on the device or click on the 'Next' button to continue "
+-"with the next step."
++"
Please move axis %1 %2 on your device to the center "
++"position.
Press any button on the device or click on the 'Next' "
++"button to continue with the next step."
+ msgstr ""
+-"準備偵測裝置移動範圍。"
+-"
"
+-"
請移動裝置的%1 軸 %2到中央的位置。"
+-"
"
+-"
按下搖桿任意鍵或按「下一步」繼續。"
++"準備偵測裝置移動範圍。
請移動裝置的%1 軸 %2到中央的"
++"位置。
按下搖桿任意鍵或按「下一步」繼續。"
+
+ #: caldialog.cpp:124
+ msgid ""
+ "Calibration is about to check the value range your device delivers."
+-"
"
+-"
Please move axis %1 %2 on your device to the maximum "
+-"position."
+-"
"
+-"
Press any button on the device or click on the 'Next' button to continue "
+-"with the next step."
++"
Please move axis %1 %2 on your device to the maximum "
++"position.
Press any button on the device or click on the 'Next' "
++"button to continue with the next step."
+ msgstr ""
+-"準備偵測裝置移動範圍。"
+-"
"
+-"
請移動裝置的%1 軸 %2到最大的位置。"
+-"
"
+-"
按下搖桿任意鍵或按「下一步」繼續。"
++"準備偵測裝置移動範圍。
請移動裝置的%1 軸 %2到最大的"
++"位置。
按下搖桿任意鍵或按「下一步」繼續。"
+
+ #: caldialog.cpp:147 joywidget.cpp:332 joywidget.cpp:367
+ msgid "Communication Error"
+@@ -121,8 +104,8 @@
+
+ #: joydevice.cpp:80
+ msgid ""
+-"The current running kernel driver version (%1.%2.%3) is not the one this module "
+-"was compiled for (%4.%5.%6)."
++"The current running kernel driver version (%1.%2.%3) is not the one this "
++"module was compiled for (%4.%5.%6)."
+ msgstr "該模組所編譯的核心(%4.%5.%6)與正執行中的核心驅動程式版本(%1.%2.%3)不符"
+
+ #: joydevice.cpp:87
+@@ -164,34 +147,24 @@
+ #: joystick.cpp:77
+ msgid ""
+ "Joystick
This module helps to check if your joystick is working "
+-"correctly."
+-"
If it delivers wrong values for the axes, you can try to solve this with "
+-"the calibration."
+-"
This module tries to find all available joystick devices by checking "
+-"/dev/js[0-4] and /dev/input/js[0-4]"
+-"
If you have another device file, enter it in the combobox."
+-"
The Buttons list shows the state of the buttons on your joystick, the Axes "
+-"list shows the current value for all axes."
+-"
NOTE: the current Linux device driver (Kernel 2.4, 2.6) can only autodetect"
+-""
+-"- 2-axis, 4-button joystick
"
+-"- 3-axis, 4-button joystick
"
+-"- 4-axis, 4-button joystick
"
+-"- Saitek Cyborg 'digital' joysticks
(For details you can check your "
+-"Linux source/Documentation/input/joystick.txt)"
+-msgstr ""
+-"搖桿
該模組能幫您檢查搖桿是否設定正確."
+-"
如果搖桿送出錯誤的方向, 您可以重新校正搖桿."
+-"
該模組會試著搜尋 /dev/js[0-4] 和 /dev/input/js[0-4] 找出可使用的搖桿"
+-"
如果您有其他的裝置檔, 輸入到裝置清單新增."
+-"
按鍵清單列出搖桿上的所有按鍵, 座標列表列出所有的座標位置."
+-"
注意: 現在的 Linux (核心 2.4, 2.6) 驅動程式可以自動偵測"
+-""
+-"- 2-軸, 4-鍵 搖桿
"
+-"- 3-軸, 4-鍵 搖桿
"
+-"- 4-軸, 4-鍵 搖桿
"
+-"- Saitek Cyborg 'digital' 搖桿
(更多的資訊請參閱 Linux 源碼中的 "
+-"Documentation/input/joystick.txt)"
++"correctly.
If it delivers wrong values for the axes, you can try to solve "
++"this with the calibration.
This module tries to find all available "
++"joystick devices by checking /dev/js[0-4] and /dev/input/js[0-4]
If you "
++"have another device file, enter it in the combobox.
The Buttons list "
++"shows the state of the buttons on your joystick, the Axes list shows the "
++"current value for all axes.
NOTE: the current Linux device driver (Kernel "
++"2.4, 2.6) can only autodetect- 2-axis, 4-button joystick
- 3-"
++"axis, 4-button joystick
- 4-axis, 4-button joystick
- Saitek "
++"Cyborg 'digital' joysticks
(For details you can check your Linux "
++"source/Documentation/input/joystick.txt)"
++msgstr ""
++"搖桿
該模組能幫您檢查搖桿是否設定正確.
如果搖桿送出錯誤的方向, 您"
++"可以重新校正搖桿.
該模組會試著搜尋 /dev/js[0-4] 和 /dev/input/js[0-4] 找出"
++"可使用的搖桿
如果您有其他的裝置檔, 輸入到裝置清單新增.
按鍵清單列出搖桿"
++"上的所有按鍵, 座標列表列出所有的座標位置.
注意: 現在的 Linux (核心 2.4, "
++"2.6) 驅動程式可以自動偵測- 2-軸, 4-鍵 搖桿
- 3-軸, 4-鍵 搖桿"
++"li>
- 4-軸, 4-鍵 搖桿
- Saitek Cyborg 'digital' 搖桿
(更多的"
++"資訊請參閱 Linux 原始碼中的 Documentation/input/joystick.txt)"
+
+ #: joywidget.cpp:43
+ msgid "PRESSED"
+@@ -231,13 +204,11 @@
+
+ #: joywidget.cpp:190
+ msgid ""
+-"No joystick device automatically found on this computer."
+-"
Checks were done in /dev/js[0-4] and /dev/input/js[0-4]"
+-"
If you know that there is one attached, please enter the correct device "
+-"file."
++"No joystick device automatically found on this computer.
Checks were done "
++"in /dev/js[0-4] and /dev/input/js[0-4]
If you know that there is one "
++"attached, please enter the correct device file."
+ msgstr ""
+-"電腦上找不到任何搖桿。"
+-"
檢查 /dev/js[0-4] 和 /dev/input/js[0-4] 是否正常"
++"電腦上找不到任何搖桿。
檢查 /dev/js[0-4] 和 /dev/input/js[0-4] 是否正常"
+ "
如果已確認連線,請輸入正確的裝置檔案。"
+
+ #: joywidget.cpp:236
+@@ -260,13 +231,12 @@
+
+ #: joywidget.cpp:337
+ msgid ""
+-"Calibration is about to check the precision."
+-"
"
+-"
Please move all axes to their center position and then do not touch the "
+-"joystick anymore."
+-"
"
+-"
Click OK to start the calibration."
+-msgstr "準備校正準確度.
請將轉軸移到中心然後不要再接觸搖桿.
按下確定開始校正."
++"Calibration is about to check the precision.
Please move all "
++"axes to their center position and then do not touch the joystick anymore."
++"b>
Click OK to start the calibration."
++msgstr ""
++"準備校正準確度.
請將轉軸移到中心然後不要再接觸搖桿.
"
++"按下確定開始校正."
+
+ #: joywidget.cpp:372
+ #, c-format
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kaccess.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kaccess.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kaccess.po 2006-10-01 18:34:18.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kaccess.po 2011-11-11 15:45:17.000000000 +0100
+@@ -12,8 +12,7 @@
+ "Project-Id-Version: kaccess\n"
+ "POT-Creation-Date: 2006-09-16 02:33+0200\n"
+ "PO-Revision-Date: 2006-01-12 13:18+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Traditional Chinese \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -250,8 +249,8 @@
+
+ #: kaccess.cpp:704
+ msgid ""
+-"Do you really want to activate \"%1\", and \"%2\" and to deactivate \"%3\" and "
+-"\"%4\"?"
++"Do you really want to activate \"%1\", and \"%2\" and to deactivate \"%3\" "
++"and \"%4\"?"
+ msgstr "您確定要使用「%1」與「%2」而停止使用「%3」與「%4」嗎?"
+
+ #: kaccess.cpp:711
+@@ -280,8 +279,8 @@
+
+ #: kaccess.cpp:734
+ msgid ""
+-"You pressed the Shift key 5 consecutive times or an application has requested "
+-"to change this setting."
++"You pressed the Shift key 5 consecutive times or an application has "
++"requested to change this setting."
+ msgstr "您連續按下 Shift 按鍵已達 5 次或者有應用程式要求改變這個設定值。"
+
+ #: kaccess.cpp:738
+@@ -301,13 +300,14 @@
+ #: kaccess.cpp:751
+ msgid ""
+ "These AccessX settings are needed for some users with motion impairments and "
+-"can be configured in the KDE Control Center. You can also turn them on and off "
+-"with standardized keyboard gestures.\n"
++"can be configured in the KDE Control Center. You can also turn them on and "
++"off with standardized keyboard gestures.\n"
+ "\n"
+-"If you do not need them, you can select \"Deactivate all AccessX features and "
+-"gestures\"."
++"If you do not need them, you can select \"Deactivate all AccessX features "
++"and gestures\"."
+ msgstr ""
+-"這些 AccessX 設定值是某些行動不便的使用者所需要的,而可從 KDE 控制中心來設定。您也可以使用標準化的鍵盤筆勢來開啟或關閉它們。\n"
++"這些 AccessX 設定值是某些行動不便的使用者所需要的,而可從 KDE 控制中心來設"
++"定。您也可以使用標準化的鍵盤筆勢來開啟或關閉它們。\n"
+ "\n"
+ "如果您不需要它們,您可以選擇「停止使用所有的 AccessX 功能與筆勢」。"
+
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kappfinder.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kappfinder.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kappfinder.po 2006-07-22 10:04:12.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kappfinder.po 2011-11-11 15:45:17.000000000 +0100
+@@ -10,7 +10,7 @@
+ "Project-Id-Version: kappfinder\n"
+ "POT-Creation-Date: 2005-05-18 21:23+0200\n"
+ "PO-Revision-Date: 2006-05-08 09:35+0800\n"
+-"Last-Translator: Tzer-Ming Liu \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Chinese Traditional \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -31,11 +31,12 @@
+
+ #: toplevel.cpp:53
+ msgid ""
+-"The application finder looks for non-KDE applications on your system and adds "
+-"them to the KDE menu system. Click 'Scan' to begin, select the desired "
++"The application finder looks for non-KDE applications on your system and "
++"adds them to the KDE menu system. Click 'Scan' to begin, select the desired "
+ "applications and then click 'Apply'."
+ msgstr ""
+-"程式搜尋器的功能是要找出系統中非-KDE 的程式並且把它們加入目前的 KDE 選單中。請點選「掃描」開始尋找,選擇「套用」即可把選取的程式項目加入系統內。"
++"程式搜尋器的功能是要找出系統中非-KDE 的程式並且把它們加入目前的 KDE 選單中。"
++"請點選「掃描」開始尋找,選擇「套用」即可把選取的程式項目加入系統內。"
+
+ #: toplevel.cpp:63
+ msgid "Application"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kasbarextension.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kasbarextension.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kasbarextension.po 2006-10-01 18:34:17.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kasbarextension.po 2011-11-11 15:45:17.000000000 +0100
+@@ -8,8 +8,7 @@
+ "Project-Id-Version: kasbarextension\n"
+ "POT-Creation-Date: 2006-08-13 04:04+0200\n"
+ "PO-Revision-Date: 2006-06-19 09:14+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Chinese Traditional \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -26,20 +25,19 @@
+
+ #: kasaboutdlg.cpp:164
+ msgid ""
+-""
+-"Kasbar TNG began as a port of the original Kasbar applet to the (then new) "
+-"extension API, but ended up as a complete rewrite because of the range of "
+-"features needed by different groups of users. In the process of the rewrite all "
+-"the standard features provided by the default taskbar were added, along with "
+-"some more original ones such as thumbnails.
"
+-"You can find information about the latest developments in Kasbar at %4, the Kasbar homepage.
"
++"Kasbar TNG began as a port of the original Kasbar applet to "
++"the (then new) extension API, but ended up as a complete rewrite because of "
++"the range of features needed by different groups of users. In the process of "
++"the rewrite all the standard features provided by the default taskbar were "
++"added, along with some more original ones such as thumbnails.
You can "
++"find information about the latest developments in Kasbar at %"
++"4, the Kasbar homepage.
"
+ msgstr ""
+-""
+-"Kasbar TNG 在開始只是在原有的 Kasbar applet(新的) 延伸 API "
+-"的一部分,但是後來為了不同的使用者族群所需要的特色而完全重寫。首先重寫所有已在本來 taskbar 已有的基本特徵,接著加入一些在舊有 Kasbar "
+-"所具有的特色,像是視窗縮圖預覽(thumbnails)。
"
+-"您可在 Kasbar 的網頁找到關於最新的發展資訊:%4
"
++"Kasbar TNG 在開始只是在原有的 Kasbar applet(新的) 延伸 API 的"
++"一部分,但是後來為了不同的使用者族群所需要的特色而完全重寫。首先重寫所有已在"
++"本來 taskbar 已有的基本特徵,接著加入一些在舊有 Kasbar 所具有的特色,像是視窗"
++"縮圖預覽(thumbnails)。
您可在 Kasbar 的網頁找到關於最新的發展資訊:%4
"
+
+ #: kasaboutdlg.cpp:184
+ msgid "Authors"
+@@ -51,29 +49,26 @@
+
+ #: kasaboutdlg.cpp:190
+ msgid ""
+-"Richard Moore rich@kde.org"
+-"
Homepage: "
+-"http://xmelegance.org/"
+-"Developer and maintainer of the Kasbar TNG code.
"
+-"
Daniel M. Duley (Mosfet) "
+-"mosfet@kde.org"
+-"
Homepage: "
+-"http://www.mosfet.org/"
+-"Mosfet wrote the original Kasbar applet on which this extension is based. "
+-"There is little of the original code remaining, but the basic look in opaque "
+-"mode is almost identical to this first implementation.
"
++"Richard Moore rich@kde.org"
++"a>
Homepage: http://xmelegance."
++"org/Developer and maintainer of the Kasbar TNG code.
Daniel M. Duley (Mosfet) mosfet@kde.org
Homepage: http://www.mosfet.org/Mosfet wrote the original Kasbar applet on "
++"which this extension is based. There is little of the original code "
++"remaining, but the basic look in opaque mode is almost identical to this "
++"first implementation.
"
+ msgstr ""
+-"Richard Moore rich@kde.org"
+-"
首頁: http://xmelegance.org/"
+-"Kasbar TNG 程式碼的開發及維護者。
"
+-"
Daniel M. Duley (Mosfet) "
+-"mosfet@kde.org"
+-"
首頁: http://www.mosfet.org/"
+-"Mosfet 他寫了此延伸功能所的基礎架構─原始 Kasbar applet "
+-"。雖然這裡只剩下一些些原本的程式碼,但是在不透明模式的基本外觀上看來還是跟原本的大致上相同。
"
+-"
李健秋(Andrew Lee) "
+-"andrew@linux.org.tw"
+-"Andrew 他替 Kabar 翻譯了繁體中文訊息,若您發現他翻譯的不好或不正確的地方,可用中文直接寫信告訴他。"
++"Richard Moore rich@kde.org"
++"a>
首頁: http://xmelegance.org/"
++"
Kasbar TNG 程式碼的開發及維護者。
Daniel M. Duley (Mosfet)"
++" mosfet@kde.org
首頁: "
++"http://www.mosfet.org/Mosfet 他寫了"
++"此延伸功能所的基礎架構─原始 Kasbar applet 。雖然這裡只剩下一些些原本的程式"
++"碼,但是在不透明模式的基本外觀上看來還是跟原本的大致上相同。
李健"
++"秋(Andrew Lee) andrew@linux.org."
++"twAndrew 他替 Kabar 翻譯了傳統字漢語訊息,若您發現他翻譯的不好或不正確的"
++"地方,可用中文直接寫信告訴他。"
+
+ #: kasaboutdlg.cpp:214
+ msgid "BSD License"
+@@ -81,8 +76,8 @@
+
+ #: kasaboutdlg.cpp:216 kasaboutdlg.cpp:242
+ msgid ""
+-"Kasbar may be used under the terms of either the BSD license, or the GNU Public "
+-"License."
++"Kasbar may be used under the terms of either the BSD license, or the GNU "
++"Public License."
+ msgstr "Kasbar 可適用於 BSD license 或是 GNU Public License 兩者之一。"
+
+ #: kasaboutdlg.cpp:240
+@@ -150,11 +145,12 @@
+ "Specifies the maximum number of items that should be placed in a line before "
+ "starting a new row or column. If the value is 0 then all the available space "
+ "will be used."
+-msgstr "指定在同一行可顯示最大工作項目數量,若設定為 0 則會使用所有可能使用的空間。"
++msgstr ""
++"指定在同一列可顯示最大工作項目數量,若設定為 0 則會使用所有可能使用的空間。"
+
+ #: kasprefsdlg.cpp:165
+ msgid "Bo&xes per line: "
+-msgstr "每行方塊數(&X):"
++msgstr "每列方塊數(&X):"
+
+ #: kasprefsdlg.cpp:181
+ msgid "&Detach from screen edge"
+@@ -211,12 +207,13 @@
+ #: kasprefsdlg.cpp:247
+ msgid ""
+ "Enables the display of a thumbnailed image of the window when you move your "
+-"mouse pointer over an item. The thumbnails are approximate, and may not reflect "
+-"the current window contents.\n"
++"mouse pointer over an item. The thumbnails are approximate, and may not "
++"reflect the current window contents.\n"
+ "\n"
+ "Using this option on a slow machine may cause performance problems."
+ msgstr ""
+-"啟動當滑鼠停留在任一項目上便顯示該項目之視窗縮圖預覽。縮圖預覽只能大約的顯示該視窗的狀態,並不能反映出目前視窗的內容。\n"
++"啟動當滑鼠停留在任一項目上便顯示該項目之視窗縮圖預覽。縮圖預覽只能大約的顯示"
++"該視窗的狀態,並不能反映出目前視窗的內容。\n"
+ "\n"
+ "當這個選項使用在緩慢的機器上將可能會造成效能問題。"
+
+@@ -289,10 +286,12 @@
+
+ #: kasprefsdlg.cpp:314
+ msgid ""
+-"When this option is checked only minimized windows are shown in the bar. This "
+-"gives Kasbar similar behavior to the icon handling in older environments like "
+-"CDE or OpenLook."
+-msgstr "當核取此選項時只有最小化的視窗會顯示在該列中。這會讓 Kasbar 與舊式的環境如 CDE 或 Openlook 有類似的圖示處理方式。"
++"When this option is checked only minimized windows are shown in the bar. "
++"This gives Kasbar similar behavior to the icon handling in older "
++"environments like CDE or OpenLook."
++msgstr ""
++"當核取此選項時只有最小化的視窗會顯示在該列中。這會讓 Kasbar 與舊式的環境如 "
++"CDE 或 Openlook 有類似的圖示處理方式。"
+
+ #: kasprefsdlg.cpp:326
+ msgid "Colors"
+@@ -364,8 +363,8 @@
+
+ #: kasprefsdlg.cpp:421
+ msgid ""
+-"Enables the display of a progress bar in the label of windows show are progress "
+-"indicators."
++"Enables the display of a progress bar in the label of windows show are "
++"progress indicators."
+ msgstr "啟用在視窗標籤中顯示進度的指示器。"
+
+ #: kasprefsdlg.cpp:426
+@@ -383,9 +382,11 @@
+
+ #: kasprefsdlg.cpp:434
+ msgid ""
+-"Enables frames around inactive items, if you want the bar to disappear into the "
+-"background you should probably uncheck this option."
+-msgstr "啟用非作用中項目周圍的框架,如果您希望工具列能消失到背景中您可能應該核消這個選項。"
++"Enables frames around inactive items, if you want the bar to disappear into "
++"the background you should probably uncheck this option."
++msgstr ""
++"啟用非作用中項目周圍的框架,如果您希望工具列能消失到背景中您可能應該核消這個"
++"選項。"
+
+ #: kasprefsdlg.cpp:445
+ msgid ""
+@@ -423,7 +424,7 @@
+
+ #: kastasker.cpp:201
+ msgid "&Configure Kasbar..."
+-msgstr "設定 Kasbar(&C)..."
++msgstr "設定 Kasbar(&C)…"
+
+ #: kastasker.cpp:205
+ msgid "&About Kasbar"
+@@ -488,43 +489,22 @@
+
+ #: kastaskitem.cpp:468
+ msgid ""
+-"
Name: $name"
+-"
Visible name: $visibleName"
+-"
"
+-"
Iconified: $iconified"
+-"
Minimized: $minimized"
+-"
Maximized: $maximized"
+-"
Shaded: $shaded"
+-"
Always on top: $alwaysOnTop"
+-"
"
+-"
Desktop: $desktop"
+-"
All desktops: $onAllDesktops"
+-"
"
+-"
Iconic name: $iconicName"
+-"
Iconic visible name: $visibleIconicName"
+-"
"
+-"
Modified: $modified"
+-"
Demands attention: $demandsAttention"
+-"
"
++"Name: $name
Visible name: "
++"$visibleName
Iconified: $iconified
Minimized: "
++"$minimized
Maximized: $maximized
Shaded: "
++"$shaded
Always on top: $alwaysOnTop
Desktop: "
++"$desktop
All desktops: $onAllDesktops
Iconic name: "
++"$iconicName
Iconic visible name: "
++"$visibleIconicName
Modified: $modified
Demands "
++"attention: $demandsAttention
"
+ msgstr ""
+-"名稱: $name"
+-"
可視名稱: $visibleName"
+-"
"
+-"
圖示化:$iconified"
+-"
最小化: $minimized"
+-"
最大化: $maximized"
+-"
陰影: $shaded"
+-"
最上層顯示: $alwaysOnTop"
+-"
"
+-"
桌面: $desktop"
+-"
所有桌面: $onAllDesktops"
+-"
"
+-"
圖示名稱:$iconicName"
+-"
圖示可視名稱: $visibleIconicName"
+-"
"
+-"
已修改: $modified"
+-"
伺服程式提示: $demandsAttention"
+-"
"
++"名稱: $name
可視名稱: $visibleName
"
++"圖示化:$iconified
最小化: $minimized
最大化: "
++"$maximized
陰影: $shaded
最上層顯示: "
++"$alwaysOnTop
桌面: $desktop
所有桌面: "
++"$onAllDesktops
圖示名稱:$iconicName
圖示可視名稱: "
++"$visibleIconicName
已修改: $modified
伺服程式提示: "
++"$demandsAttention
"
+
+ #: kastaskitem.cpp:504
+ msgid "NET WM Specification Info"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kate.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kate.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kate.po 2008-08-19 20:43:10.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kate.po 2011-11-11 15:45:17.000000000 +0100
+@@ -10,8 +10,7 @@
+ "Project-Id-Version: kate\n"
+ "POT-Creation-Date: 2008-08-14 01:15+0200\n"
+ "PO-Revision-Date: 2006-09-04 09:09+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Chinese Traditional \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -45,28 +44,22 @@
+ #: app/kateexternaltools.cpp:461
+ msgid ""
+ "The script to execute to invoke the tool. The script is passed to /bin/sh "
+-"for execution. The following macros will be expanded:
"
+-""
+-"%URL
- the URL of the current document."
+-"%URLs
- a list of the URLs of all open documents."
+-"%directory
- the URL of the directory containing the current "
+-"document."
+-"%filename
- the filename of the current document."
+-"%line
- the current line of the text cursor in the current "
+-"view."
+-"%column
- the column of the text cursor in the current view."
+-"%selection
- the selected text in the current view."
+-"%text
- the text of the current document.
"
+-msgstr ""
+-"用來執行以呼叫工具的命令稿。此命令稿會傳送到 /bin/sh 以利執行。下列巨集會被自動展開:
"
+-""
+-"%URL
─ 目前文件的 URL。"
+-"%URLs
─ 所有開啟文件的 URL。"
+-"%directory
─ 包含目前文件的目錄 URL。"
+-"%filename
─ 目前文件的檔案名稱。"
+-"%line
─ 目前檢視中文字游標所在的行。"
+-"%column
─ 目前檢視中文字游標所在的欄。"
+-"%selection
─ 目前檢視中選取的文字。"
++"for execution. The following macros will be expanded:
%URL"
++"code> - the URL of the current document.%URLs
- a list of "
++"the URLs of all open documents.%directory
- the URL of the "
++"directory containing the current document.%filename
- the "
++"filename of the current document.%line
- the current line "
++"of the text cursor in the current view.%column
- the column "
++"of the text cursor in the current view.%selection
- the "
++"selected text in the current view.%text
- the text of the "
++"current document.
"
++msgstr ""
++"用來執行以呼叫工具的命令稿。此命令稿會傳送到 /bin/sh 以利執行。下列巨集會"
++"被自動展開:
%URL
─ 目前文件的 URL。%"
++"URLs
─ 所有開啟文件的 URL。%directory
─ 包含目前文件"
++"的目錄 URL。%filename
─ 目前文件的檔案名稱。%"
++"line
─ 目前檢視中文字游標所在的行。%column
─ 目前檢視"
++"中文字游標所在的欄。%selection
─ 目前檢視中選取的文字。"
+ "%text
─ 目前文件的文字。
"
+
+ #: app/kateexternaltools.cpp:479
+@@ -75,9 +68,11 @@
+
+ #: app/kateexternaltools.cpp:484
+ msgid ""
+-"The executable used by the command. This is used to check if a tool should be "
+-"displayed; if not set, the first word of command will be used."
+-msgstr "該指令所使用的可執行檔。這是用來查核該工具是否應該顯示;如果沒有設定,會使用指令的第一個字。"
++"The executable used by the command. This is used to check if a tool should "
++"be displayed; if not set, the first word of command will be used."
++msgstr ""
++"該指令所使用的可執行檔。這是用來查核該工具是否應該顯示;如果沒有設定,會使用"
++"指令的第一個字。"
+
+ #: app/kateexternaltools.cpp:490
+ msgid "&Mime types:"
+@@ -86,9 +81,11 @@
+ #: app/kateexternaltools.cpp:495
+ msgid ""
+ "A semicolon-separated list of mime types for which this tool should be "
+-"available; if this is left empty, the tool is always available. To choose from "
+-"known mimetypes, press the button on the right."
+-msgstr "這個工具可以使用的 mime 類型清單(以分號隔開);如果它保持空白,該工具隨時可以使用。要從已知的 mime 類型選擇,請按右方的按鈕。"
++"available; if this is left empty, the tool is always available. To choose "
++"from known mimetypes, press the button on the right."
++msgstr ""
++"這個工具可以使用的 mime 類型清單(以分號隔開);如果它保持空白,該工具隨時可以"
++"使用。要從已知的 mime 類型選擇,請按右方的按鈕。"
+
+ #: app/kateexternaltools.cpp:504
+ msgid "Click for a dialog that can help you creating a list of mimetypes."
+@@ -112,10 +109,12 @@
+
+ #: app/kateexternaltools.cpp:516
+ msgid ""
+-"You can elect to save the current or all [modified] documents prior to running "
+-"the command. This is helpful if you want to pass URLs to an application like, "
+-"for example, an FTP client."
+-msgstr "您可以選擇在執行指令前儲存目前或所有[修改的]文件。如果您想要傳送 URL 到應用程式,例如 FTP 客戶端,這會很有幫助。"
++"You can elect to save the current or all [modified] documents prior to "
++"running the command. This is helpful if you want to pass URLs to an "
++"application like, for example, an FTP client."
++msgstr ""
++"您可以選擇在執行指令前儲存目前或所有[修改的]文件。如果您想要傳送 URL 到應用程"
++"式,例如 FTP 客戶端,這會很有幫助。"
+
+ #: app/kateexternaltools.cpp:523
+ msgid "&Command line name:"
+@@ -127,8 +126,8 @@
+ "lines with exttool-the_name_you_specified_here. Please do not use spaces or "
+ "tabs in the name."
+ msgstr ""
+-"如果您在這裡指定名稱,您可以從檢視命令列中以 exttool-the_name_you_specified_here 呼叫命令。在該名稱中請不要使用空白或 "
+-"tabs。"
++"如果您在這裡指定名稱,您可以從檢視命令列中以 exttool-"
++"the_name_you_specified_here 呼叫命令。在該名稱中請不要使用空白或 tabs。"
+
+ #: app/kateexternaltools.cpp:539
+ msgid "You must specify at least a name and a command"
+@@ -144,11 +143,11 @@
+
+ #: app/kateexternaltools.cpp:568
+ msgid "&New..."
+-msgstr "新增(&N)..."
++msgstr "新增(&N)…"
+
+ #: app/kateexternaltools.cpp:576
+ msgid "&Edit..."
+-msgstr "編輯(&E)..."
++msgstr "編輯(&E)…"
+
+ #: app/kateexternaltools.cpp:580
+ msgid "Insert &Separator"
+@@ -169,7 +168,7 @@
+
+ #: app/kateviewspace.cpp:351
+ msgid " Line: %1 Col: %2 "
+-msgstr " 行: %1 欄: %2 "
++msgstr " 列: %1 欄: %2 "
+
+ #: app/kateviewspace.cpp:355
+ msgid " R/O "
+@@ -187,15 +186,17 @@
+ msgid ""
+ "Do you really want to pipe the text to the console? This will execute any "
+ "contained commands with your user rights."
+-msgstr "您是否決定要將文字導出至主控台?這樣將會以您的使用者權限來執行任何內含的指令。"
++msgstr ""
++"您是否決定要將文字導出至主控臺?這樣將會以您的使用者權限來執行任何內含的指"
++"令。"
+
+ #: app/kateconsole.cpp:130
+ msgid "Pipe to Console?"
+-msgstr "導出至主控台?"
++msgstr "導出至主控臺?"
+
+ #: app/kateconsole.cpp:131
+ msgid "Pipe to Console"
+-msgstr "導出至主控台"
++msgstr "導出至主控臺"
+
+ #: app/katemainwindow.cpp:212 app/katesavemodifieddialog.cpp:152
+ msgid "Documents"
+@@ -223,8 +224,8 @@
+
+ #: app/katemainwindow.cpp:246 app/kwritemain.cpp:151
+ msgid ""
+-"This lists files which you have opened recently, and allows you to easily open "
+-"them again."
++"This lists files which you have opened recently, and allows you to easily "
++"open them again."
+ msgstr "這是您最近開啟的檔案清單,並且讓您可以很容易的再次開啟它們。"
+
+ #: app/katemainwindow.cpp:248
+@@ -293,7 +294,7 @@
+
+ #: app/katemainwindow.cpp:288
+ msgid "&Pipe to Console"
+-msgstr "導出至主控台(&P)"
++msgstr "導出至主控臺(&P)"
+
+ #: app/katemainwindow.cpp:291
+ msgid "This shows useful tips on the use of this application."
+@@ -315,11 +316,11 @@
+
+ #: app/katemainwindow.cpp:308
+ msgid "Save &As..."
+-msgstr "另存為(&A)..."
++msgstr "另存為(&A)…"
+
+ #: app/katemainwindow.cpp:309
+ msgid "&Manage..."
+-msgstr "管理(&M)..."
++msgstr "管理(&M)…"
+
+ #: app/katemainwindow.cpp:312
+ msgid "&Quick Open"
+@@ -341,11 +342,11 @@
+
+ #: app/katemainwindow.cpp:611
+ msgid "&Other..."
+-msgstr "其他(&O)..."
++msgstr "其他(&O)…"
+
+ #: app/katemainwindow.cpp:621
+ msgid "Other..."
+-msgstr "其他..."
++msgstr "其他…"
+
+ #: app/katemainwindow.cpp:638
+ msgid "Application '%1' not found!"
+@@ -357,10 +358,10 @@
+
+ #: app/katemainwindow.cpp:666
+ msgid ""
+-"The current document has not been saved, and cannot be attached to an email "
+-"message."
+-"
Do you want to save it and proceed?"
+-msgstr "
目前的文件尚未儲存,因此不能附加到電子郵件中。
您是否要將它儲存後繼續?"
++"
The current document has not been saved, and cannot be attached to an "
++"email message.
Do you want to save it and proceed?"
++msgstr ""
++"
目前的文件尚未儲存,因此不能附加到電子郵件中。
您是否要將它儲存後繼續?"
+
+ #: app/katemainwindow.cpp:669
+ msgid "Cannot Send Unsaved File"
+@@ -372,15 +373,12 @@
+
+ #: app/katemainwindow.cpp:688
+ msgid ""
+-"
The current file:"
+-"
%1"
+-"
has been modified. Modifications will not be available in the attachment."
+-"
Do you want to save it before sending it?"
+-msgstr ""
+-"
目前的檔案:"
+-"
%1"
+-"
已經被修改過。修改的部分將不會出現在附加檔案中。"
+-"
您是否要在寄出它之前把它儲存?"
++"
The current file:
%1
has been modified. "
++"Modifications will not be available in the attachment.
Do you want to save "
++"it before sending it?"
++msgstr ""
++"
目前的檔案:
%1
已經被修改過。修改的部分將不會出現"
++"在附加檔案中。
您是否要在寄出它之前把它儲存?"
+
+ #: app/katemainwindow.cpp:691
+ msgid "Save Before Sending?"
+@@ -400,16 +398,16 @@
+
+ #: app/katemailfilesdialog.cpp:52
+ msgid "&Mail..."
+-msgstr "電子郵件(&M)..."
++msgstr "電子郵件(&M)…"
+
+ #: app/katemailfilesdialog.cpp:57
+ msgid ""
+-"
Press Mail... to email the current document."
+-"
To select more documents to send, press Show All "
+-"Documents >>."
++"
Press Mail... to email the current document.
To select "
++"more documents to send, press Show All Documents >>"
++"strong>."
+ msgstr ""
+-"按下 郵件... 將目前文件以電子郵件傳送。"
+-"
要選擇更多寄送的文件,請按 顯示所有文件 >>哈。"
++"
按下 郵件... 將目前文件以電子郵件傳送。
要選擇更多寄送"
++"的文件,請按 顯示所有文件 >>哈。"
+
+ #: app/kateconfigplugindialogpage.cpp:81 app/katemailfilesdialog.cpp:61
+ msgid "Name"
+@@ -426,7 +424,7 @@
+
+ #: app/katemailfilesdialog.cpp:105
+ msgid "Press Mail... to send selected documents"
+-msgstr "按下 郵件... 將選擇的文件以電子郵件傳送"
++msgstr "按下 郵件… 將選擇的文件以電子郵件傳送"
+
+ #: app/katemwmodonhddialog.cpp:61
+ msgid "Documents Modified on Disk"
+@@ -442,28 +440,30 @@
+
+ #: app/katemwmodonhddialog.cpp:68
+ msgid ""
+-"Removes the modified flag from the selected documents and closes the dialog if "
+-"there are no more unhandled documents."
++"Removes the modified flag from the selected documents and closes the dialog "
++"if there are no more unhandled documents."
+ msgstr "將選擇的文件中的修改旗標移除並且若沒有其他未處理的文件則關閉此對話盒。"
+
+ #: app/katemwmodonhddialog.cpp:71
+ msgid ""
+-"Overwrite selected documents, discarding the disk changes and closes the dialog "
+-"if there are no more unhandled documents."
+-msgstr "覆蓋選擇的文件,放棄磁碟的改變並且若沒有其他未處理的文件則關閉此對話盒。"
++"Overwrite selected documents, discarding the disk changes and closes the "
++"dialog if there are no more unhandled documents."
++msgstr ""
++"覆蓋選擇的文件,放棄磁碟的改變並且若沒有其他未處理的文件則關閉此對話盒。"
+
+ #: app/katemwmodonhddialog.cpp:74
+ msgid ""
+-"Reloads the selected documents from disk and closes the dialog if there are no "
+-"more unhandled documents."
++"Reloads the selected documents from disk and closes the dialog if there are "
++"no more unhandled documents."
+ msgstr "重新從磁碟載入選擇的文件並且若沒有其他未處理的文件則關閉此對話盒。"
+
+ #: app/katemwmodonhddialog.cpp:87
+ msgid ""
+-"The documents listed below has changed on disk."
+-"Select one or more at the time and press an action button until the list is "
+-"empty.
"
+-msgstr "下面列出的文件已經在磁碟上變更過了。選擇一或多個並按下一個動作按鈕直到這個清單清空為止。
"
++"The documents listed below has changed on disk.Select one or more at "
++"the time and press an action button until the list is empty.
"
++msgstr ""
++"下面列出的文件已經在磁碟上變更過了。選擇一或多個並按下一個動作按鈕直到"
++"這個清單清空為止。
"
+
+ #: app/katemwmodonhddialog.cpp:93
+ msgid "Filename"
+@@ -491,10 +491,12 @@
+
+ #: app/katemwmodonhddialog.cpp:111
+ msgid ""
+-"Calculates the difference between the the editor contents and the disk file for "
+-"the selected document, and shows the difference with the default application. "
+-"Requires diff(1)."
+-msgstr "計算編輯器內容與所選文件的磁碟檔案間的差異,並且以預設的應用程式顯示差異。需要 diff(1)。"
++"Calculates the difference between the the editor contents and the disk file "
++"for the selected document, and shows the difference with the default "
++"application. Requires diff(1)."
++msgstr ""
++"計算編輯器內容與所選文件的磁碟檔案間的差異,並且以預設的應用程式顯示差異。需"
++"要 diff(1)。"
+
+ #: app/katemwmodonhddialog.cpp:163
+ msgid ""
+@@ -506,8 +508,8 @@
+
+ #: app/katemwmodonhddialog.cpp:268
+ msgid ""
+-"The diff command failed. Please make sure that diff(1) is installed and in your "
+-"PATH."
++"The diff command failed. Please make sure that diff(1) is installed and in "
++"your PATH."
+ msgstr "diff 指令失敗。請確定已經安裝 diff(1) 並且在您的 PATH 中。"
+
+ #: app/katemwmodonhddialog.cpp:270
+@@ -539,8 +541,8 @@
+
+ #: app/kateconfigdialog.cpp:112
+ msgid ""
+-"If this option is checked, the full document path will be shown in the window "
+-"caption."
++"If this option is checked, the full document path will be shown in the "
++"window caption."
+ msgstr "如果核取此選項,完整的文件路徑會顯示在視窗說明中。"
+
+ #: app/kateconfigdialog.cpp:117
+@@ -553,11 +555,12 @@
+
+ #: app/kateconfigdialog.cpp:125
+ msgid ""
+-"If this is checked, the built in Konsole will cd
"
+-"to the directory of the active document when started and whenever the active "
++"If this is checked, the built in Konsole will cd
to the "
++"directory of the active document when started and whenever the active "
+ "document changes, if the document is a local file."
+ msgstr ""
+-"如果選取這個選項,而文件又是一個本地檔案 (在同一部電腦中) ,每當啟動及轉換當前文件時,內置的終端機將 cd
到當前文件的目錄。"
++"如果選取這個選項,而文件又是一個本地檔案 (在同一部電腦中) ,每當啟動及轉換當"
++"前文件時,內置的終端機將 cd
到當前文件的目錄。"
+
+ #: app/kateconfigdialog.cpp:132
+ msgid "Wa&rn about files modified by foreign processes"
+@@ -567,11 +570,12 @@
+ msgid ""
+ "If enabled, when Kate receives focus you will be asked what to do with files "
+ "that have been modified on the hard disk. If not enabled, you will be asked "
+-"what to do with a file that has been modified on the hard disk only when that "
+-"file gains focus inside Kate."
++"what to do with a file that has been modified on the hard disk only when "
++"that file gains focus inside Kate."
+ msgstr ""
+-"如果啟用,當收到焦點時您將被詢問要如何處理在硬碟上被修改的檔案。如果沒有啟用,您將只有在該檔案產生焦點是在 Kate "
+-"之中時才會被詢問如何處理在硬碟上被修改的檔案。"
++"如果啟用,當收到焦點時您將被詢問要如何處理在硬碟上被修改的檔案。如果沒有啟"
++"用,您將只有在該檔案產生焦點是在 Kate 之中時才會被詢問如何處理在硬碟上被修改"
++"的檔案。"
+
+ #: app/kateconfigdialog.cpp:143
+ msgid "Meta-Information"
+@@ -583,10 +587,12 @@
+
+ #: app/kateconfigdialog.cpp:151
+ msgid ""
+-"Check this if you want document configuration like for example bookmarks to be "
+-"saved past editor sessions. The configuration will be restored if the document "
+-"has not changed when reopened."
+-msgstr "如果你想要文件組態例如書籤被儲存在過去的編輯器作業階段,請核取此項。當重新開啟該文件時,如果它沒有變更,該組態也會被回存。"
++"Check this if you want document configuration like for example bookmarks to "
++"be saved past editor sessions. The configuration will be restored if the "
++"document has not changed when reopened."
++msgstr ""
++"如果你想要文件組態例如書籤被儲存在過去的編輯器作業階段,請核取此項。當重新開"
++"啟該文件時,如果它沒有變更,該組態也會被回存。"
+
+ #: app/kateconfigdialog.cpp:159
+ msgid "&Delete unused meta-information after:"
+@@ -716,46 +722,34 @@
+
+ #: app/kategrepdialog.cpp:201
+ msgid ""
+-"
Enter the expression you want to search for here."
+-"
If 'regular expression' is unchecked, any non-space letters in your "
+-"expression will be escaped with a backslash character."
+-"
Possible meta characters are:"
+-"
. - Matches any character"
+-"
^ - Matches the beginning of a line"
+-"
$ - Matches the end of a line"
+-"
\\< - Matches the beginning of a word"
+-"
\\> - Matches the end of a word"
+-"
The following repetition operators exist:"
+-"
? - The preceding item is matched at most once"
+-"
* - The preceding item is matched zero or more times"
+-"
+ - The preceding item is matched one or more times"
+-"
{n} - The preceding item is matched exactly n times"
+-"
{n,} - The preceding item is matched n or more times"
+-"
{,n} - The preceding item is matched at most n times"
+-"
{n,m} - The preceding item is matched at least n"
+-", but at most m times."
+-"
Furthermore, backreferences to bracketed subexpressions are available via "
+-"the notation \\#
."
++"
Enter the expression you want to search for here.
If 'regular "
++"expression' is unchecked, any non-space letters in your expression will be "
++"escaped with a backslash character.
Possible meta characters are:
."
++"b> - Matches any character
^ - Matches the beginning of a "
++"line
$ - Matches the end of a line
\\< - Matches the "
++"beginning of a word
\\> - Matches the end of a word
The "
++"following repetition operators exist:
? - The preceding item is "
++"matched at most once
* - The preceding item is matched zero or "
++"more times
+ - The preceding item is matched one or more "
++"times
{n} - The preceding item is matched exactly n "
++"times
{n,} - The preceding item is matched n or more "
++"times
{,n} - The preceding item is matched at most n "
++"times
{n,m} - The preceding item is matched at least "
++"n, but at most m times.
Furthermore, backreferences to "
++"bracketed subexpressions are available via the notation \\#
."
+ "
See the grep(1) documentation for the full documentation."
+ msgstr ""
+-"
在此鍵入你想搜尋的正規表示式。"
+-"
如果核消「正規表示式」,在您的表示式中的任何非空白字元都會加上反斜線字元。"
+-"
可用的特殊字元有:"
+-"
. - 符合任何字元"
+-"
^ - 符合行首"
+-"
$ - 符合行尾"
+-"
\\< - 符合字首"
+-"
\\> - 符合字尾"
+-"
以下是可用的 repetition operators :"
+-"
? - 前面的項目最多只可以符合一次"
+-"
* - 前面的項目可以符合零至無限次"
+-"
+ - 前面的項目要符合一或更多次times"
+-"
{n} - 前面的項目要符合剛好 n 次times"
+-"
{n,} - 前面的項目要符合 n 或更多次 times"
+-"
{,n} - 前面的項目最多 n 次times"
+-"
{n,m} - 前面的項目最少符合 n 次,但最多 m 次。"
+-"
此外,可以用 \\#
來用回括著了的表示式。"
+-"
請查閱 grep(1) 文件以獲取完整的資訊。"
++"
在此鍵入你想搜尋的正規表示式。
如果核消「正規表示式」,在您的表示式中的"
++"任何非空白字元都會加上反斜線字元。
可用的特殊字元有:
. - 符合任"
++"何字元
^ - 符合行首
$ - 符合行尾
\\< - 符合"
++"字首
\\> - 符合字尾
以下是可用的 repetition operators :"
++"
? - 前面的項目最多只可以符合一次
* - 前面的項目可以符合"
++"零至無限次
+ - 前面的項目要符合一或更多次times
{n}"
++"b> - 前面的項目要符合剛好 n 次times
{n,} - 前面的項目"
++"要符合 n 或更多次 times
{,n} - 前面的項目最多 n"
++"i> 次times
{n,m} - 前面的項目最少符合 n 次,但"
++"最多 m 次。
此外,可以用 \\#
來用回括著了的表示式。
"
++"請查閱 grep(1) 文件以獲取完整的資訊。"
+
+ #: app/kategrepdialog.cpp:224
+ msgid ""
+@@ -792,13 +786,13 @@
+
+ #: app/kategrepdialog.cpp:238
+ msgid ""
+-"
If this is enabled, your pattern will be passed unmodified to "
+-"grep(1). Otherwise, all characters that are not letters will be escaped "
+-"using a backslash character to prevent grep from interpreting them as part of "
+-"the expression."
++"
If this is enabled, your pattern will be passed unmodified to grep(1)"
++". Otherwise, all characters that are not letters will be escaped using "
++"a backslash character to prevent grep from interpreting them as part of the "
++"expression."
+ msgstr ""
+-"
如果啟用此項,您的樣式將會不經修改傳送給 grep(1)。否則,所有非字母的字元將會被加上反斜線字元以避免 grep "
+-"將它們視為表示式的一部分。"
++"
如果啟用此項,您的樣式將會不經修改傳送給 grep(1)。否則,所有非字"
++"母的字元將會被加上反斜線字元以避免 grep 將它們視為表示式的一部分。"
+
+ #: app/kategrepdialog.cpp:243
+ msgid ""
+@@ -807,7 +801,7 @@
+ "on the item to show the respective line in the editor."
+ msgstr ""
+ "grep 執行後的結果將在這裡列出。選擇\n"
+-"一檔名/行號組合並按 Enter 或 doubleclick\n"
++"一檔名/列號組合並按 Enter 或 doubleclick\n"
+ "該項目會在編輯器顯示有相對的行。"
+
+ #: app/kategrepdialog.cpp:327
+@@ -844,7 +838,7 @@
+
+ #: app/katemain.cpp:49 app/kwritemain.cpp:533
+ msgid "Navigate to this line"
+-msgstr "導覽至這一行"
++msgstr "導覽至這一列"
+
+ #: app/katemain.cpp:51 app/kwritemain.cpp:534
+ msgid "Navigate to this column"
+@@ -890,7 +884,7 @@
+
+ #: app/katemain.cpp:73 app/kwritemain.cpp:560
+ msgid "Testing, ..."
+-msgstr "測試中,..."
++msgstr "測試中,…"
+
+ #: app/katemain.cpp:74 app/kwritemain.cpp:561
+ msgid "Former Core Developer"
+@@ -982,9 +976,10 @@
+
+ #: app/katedocmanager.cpp:395
+ msgid ""
+-"
The document '%1' has been modified, but not saved."
+-"
Do you want to save your changes or discard them?"
+-msgstr "
此文件「%1」已被修改,但尚未被儲存。
您想要儲存您的變更或是放棄它們?"
++"
The document '%1' has been modified, but not saved.
Do you want to save "
++"your changes or discard them?"
++msgstr ""
++"
此文件「%1」已被修改,但尚未被儲存。
您想要儲存您的變更或是放棄它們?"
+
+ #: app/katedocmanager.cpp:397
+ msgid "Close Document"
+@@ -992,7 +987,7 @@
+
+ #: app/katedocmanager.cpp:483
+ msgid "Reopening files from the last session..."
+-msgstr "從上一次作業階段重新開啟檔案..."
++msgstr "從上一次作業階段重新開啟檔案…"
+
+ #: app/katedocmanager.cpp:490
+ msgid "Starting Up"
+@@ -1088,7 +1083,7 @@
+
+ #: app/katesession.cpp:810
+ msgid "&Rename..."
+-msgstr "重新命名(&R)..."
++msgstr "重新命名(&R)…"
+
+ #: app/katesession.cpp:850
+ msgid "Specify New Name for Session"
+@@ -1143,10 +1138,12 @@
+
+ #: app/katefilelist.cpp:585
+ msgid ""
+-"When background shading is enabled, documents that have been viewed or edited "
+-"within the current session will have a shaded background. The most recent "
+-"documents have the strongest shade."
+-msgstr "當背景陰影啟用時,在目前作業階段中被檢視和編輯過的文件會顯示具有陰影的背景。而最近一次使用的文件會有最強的陰影。"
++"When background shading is enabled, documents that have been viewed or "
++"edited within the current session will have a shaded background. The most "
++"recent documents have the strongest shade."
++msgstr ""
++"當背景陰影啟用時,在目前作業階段中被檢視和編輯過的文件會顯示具有陰影的背景。"
++"而最近一次使用的文件會有最強的陰影。"
+
+ #: app/katefilelist.cpp:589
+ msgid "Set the color for shading viewed documents."
+@@ -1154,9 +1151,11 @@
+
+ #: app/katefilelist.cpp:591
+ msgid ""
+-"Set the color for modified documents. This color is blended into the color for "
+-"viewed files. The most recently edited documents get most of this color."
+-msgstr "設定修改過文件的色彩。這個色彩會和檢視過的檔案色彩混合。最近一次編輯的文件最可能取得這個色彩。"
++"Set the color for modified documents. This color is blended into the color "
++"for viewed files. The most recently edited documents get most of this color."
++msgstr ""
++"設定修改過文件的色彩。這個色彩會和檢視過的檔案色彩混合。最近一次編輯的文件最"
++"可能取得這個色彩。"
+
+ #: app/katefilelist.cpp:596
+ msgid "Set the sorting method for the documents."
+@@ -1192,7 +1191,7 @@
+
+ #: app/kwritemain.cpp:157
+ msgid "Choose Editor..."
+-msgstr "選擇編輯器..."
++msgstr "選擇編輯器…"
+
+ #: app/kwritemain.cpp:159
+ msgid "Override the system wide setting for the default editing component"
+@@ -1224,8 +1223,8 @@
+
+ #: app/kwritemain.cpp:253
+ msgid ""
+-"The given file could not be read, check if it exists or if it is readable for "
+-"the current user."
++"The given file could not be read, check if it exists or if it is readable "
++"for the current user."
+ msgstr "無法讀取指定的檔案,請檢查它是否存在或者目前使用者是否可以讀取。"
+
+ #: app/kwritemain.cpp:549
+@@ -1365,14 +1364,15 @@
+
+ #: app/katemdi.cpp:778
+ msgid ""
+-"You are about to hide the sidebars. With hidden sidebars it is not possible "
+-"to directly access the tool views with the mouse anymore, so if you need to "
+-"access the sidebars again invoke Window > Tool Views > Show "
+-"Sidebars in the menu. It is still possible to show/hide the tool views with "
+-"the assigned shortcuts."
+-msgstr ""
+-"您即將隱藏邊列。將邊列隱藏後將無法再度使用滑鼠直接存取工具檢視,因此如果您需要再次存取邊列請呼叫選單中的 "
+-"視窗 > 工具檢視 > 顯示邊列。您也可以使用指定的快速鍵來顯示/隱藏工具檢視。"
++"You are about to hide the sidebars. With hidden sidebars it is not "
++"possible to directly access the tool views with the mouse anymore, so if you "
++"need to access the sidebars again invoke Window > Tool Views > Show "
++"Sidebars in the menu. It is still possible to show/hide the tool views "
++"with the assigned shortcuts."
++msgstr ""
++"您即將隱藏邊列。將邊列隱藏後將無法再度使用滑鼠直接存取工具檢視,因此如果"
++"您需要再次存取邊列請呼叫選單中的 視窗 > 工具檢視 > 顯示邊列。您"
++"也可以使用指定的快速鍵來顯示/隱藏工具檢視。"
+
+ #: app/kateconfigplugindialogpage.cpp:82
+ msgid "Comment"
+@@ -1382,7 +1382,9 @@
+ msgid ""
+ "Here you can see all available Kate plugins. Those with a check mark are "
+ "loaded, and will be loaded again the next time Kate is started."
+-msgstr "在這裡您可以看到所有可用的 Kate 外掛程式。具有核取標記的代表已載入,並且在下次啟動 Kate 時也會再次載入。"
++msgstr ""
++"在這裡您可以看到所有可用的 Kate 外掛程式。具有核取標記的代表已載入,並且在下"
++"次啟動 Kate 時也會再次載入。"
+
+ #: app/katesavemodifieddialog.cpp:78
+ msgid "Save As (%1)"
+@@ -1402,8 +1404,8 @@
+
+ #: app/katesavemodifieddialog.cpp:142
+ msgid ""
+-"The following documents have been modified. Do you want to save them before "
+-"closing?"
++"The following documents have been modified. Do you want to save them "
++"before closing?"
+ msgstr "下列文件已被修改過。您想要在關閉前儲存它們嗎?"
+
+ #: app/katesavemodifieddialog.cpp:144
+@@ -1424,8 +1426,8 @@
+
+ #: app/katesavemodifieddialog.cpp:211
+ msgid ""
+-"Data you requested to be saved could not be written. Please choose how you want "
+-"to proceed."
++"Data you requested to be saved could not be written. Please choose how you "
++"want to proceed."
+ msgstr "您要求儲存的資料無法寫入。請選擇您要如何繼續。"
+
+ #: app/katefileselector.cpp:170
+@@ -1434,31 +1436,31 @@
+
+ #: app/katefileselector.cpp:198
+ msgid ""
+-"
Here you can enter a path for a folder to display."
+-"
To go to a folder previously entered, press the arrow on the right and "
+-"choose one. "
+-"
The entry has folder completion. Right-click to choose how completion should "
++"
Here you can enter a path for a folder to display.
To go to a folder "
++"previously entered, press the arrow on the right and choose one.
The "
++"entry has folder completion. Right-click to choose how completion should "
+ "behave."
+ msgstr ""
+-"
您可以在這裡輸入要顯示的資料夾路徑。"
+-"
要移至前一次輸入的資料夾,請按下右邊的箭頭並且選擇一個。"
+-"
該項目具有資料夾補齊功能。右擊滑鼠鍵可以選擇補齊功能要如何運作。"
++"
您可以在這裡輸入要顯示的資料夾路徑。
要移至前一次輸入的資料夾,請按下右"
++"邊的箭頭並且選擇一個。
該項目具有資料夾補齊功能。右擊滑鼠鍵可以選擇補齊功能"
++"要如何運作。"
+
+ #: app/katefileselector.cpp:203
+ msgid ""
+-"
Here you can enter a name filter to limit which files are displayed."
+-"
To clear the filter, toggle off the filter button to the left."
+-"
To reapply the last filter used, toggle on the filter button."
+-msgstr ""
+-"
您可以在這裡輸入名稱過濾器來限制要顯示的檔案。"
+-"
要清除過濾器,請將過濾器按鈕切換至左方。"
+-"
要重新套用上次使用的過濾器,請使用過濾器按鈕切換。"
++"
Here you can enter a name filter to limit which files are displayed.
To "
++"clear the filter, toggle off the filter button to the left.
To reapply the "
++"last filter used, toggle on the filter button."
++msgstr ""
++"
您可以在這裡輸入名稱過濾器來限制要顯示的檔案。
要清除過濾器,請將過濾器"
++"按鈕切換至左方。
要重新套用上次使用的過濾器,請使用過濾器按鈕切換。"
+
+ #: app/katefileselector.cpp:207
+ msgid ""
+-"
This button clears the name filter when toggled off, or reapplies the last "
+-"filter used when toggled on."
+-msgstr "
當這個按鈕切換到關閉時會清除名稱過濾器,切換到開啟時則會重新套用上次的過濾器。"
++"
This button clears the name filter when toggled off, or reapplies the "
++"last filter used when toggled on."
++msgstr ""
++"
當這個按鈕切換到關閉時會清除名稱過濾器,切換到開啟時則會重新套用上次的過濾"
++"器。"
+
+ #: app/katefileselector.cpp:321
+ msgid "Apply last filter (\"%1\")"
+@@ -1514,7 +1516,8 @@
+
+ #: app/katefileselector.cpp:592
+ msgid ""
+-"
Decides how many locations to keep in the history of the location combo box."
++"
Decides how many locations to keep in the history of the location combo "
++"box."
+ msgstr "
決定在位置組合方塊的歷史記錄中要保留多少位置。"
+
+ #: app/katefileselector.cpp:597
+@@ -1525,38 +1528,35 @@
+ #: app/katefileselector.cpp:602
+ msgid ""
+ "
These options allow you to have the File Selector automatically change "
+-"location to the folder of the active document on certain events."
+-"
Auto synchronization is lazy, meaning it will not take effect until "
+-"the file selector is visible."
+-"
None of these are enabled by default, but you can always sync the location "
+-"by pressing the sync button in the toolbar."
++"location to the folder of the active document on certain events.
Auto "
++"synchronization is lazy, meaning it will not take effect until the "
++"file selector is visible.
None of these are enabled by default, but you "
++"can always sync the location by pressing the sync button in the toolbar."
+ msgstr ""
+-"
這些選項讓您的檔案選擇器會自動依照某些事件自動變更位置到作用中文件的資料夾。"
+-"
自動同步是很 被動的,代表它只有在檔案選擇器為可視時才會生效。"
++"
這些選項讓您的檔案選擇器會自動依照某些事件自動變更位置到作用中文件的資料"
++"夾。
自動同步是很 被動的,代表它只有在檔案選擇器為可視時才會生效。"
+ "
這些功能都不是預設啟用的,但是您隨時可以按下工具列中的同步按鈕來同步位置。"
+
+ #: app/katefileselector.cpp:611
+ msgid ""
+-"
If this option is enabled (default), the location will be restored when you "
+-"start Kate."
+-"
Note that if the session is handled by the KDE session "
+-"manager, the location is always restored."
++"
If this option is enabled (default), the location will be restored when "
++"you start Kate.
Note that if the session is handled by "
++"the KDE session manager, the location is always restored."
+ msgstr ""
+-"
如果啟用此選項(預設),當您啟動 Kate 時會回存上次的位置。"
+-"
注意如果作業階段是由 KDE 作業階段管理程式掌控,將永遠會回存上次的位置。"
++"
如果啟用此選項(預設),當您啟動 Kate 時會回存上次的位置。
注意"
++"strong>如果作業階段是由 KDE 作業階段管理程式掌控,將永遠會回存上次的位置。"
+
+ #: app/katefileselector.cpp:615
+ msgid ""
+ "If this option is enabled (default), the current filter will be restored "
+-"when you start Kate."
+-"
Note that if the session is handled by the KDE session "
+-"manager, the filter is always restored."
+-"
Note that some of the autosync settings may override the "
+-"restored location if on."
+-msgstr ""
+-"
如果啟用此選項(預設),當您啟動 Kate 時會回存目前的過濾器。"
+-"
注意如果作業階段是由 KDE 作業階段管理程式掌控,將永遠會回存目前的過濾器。"
+-"
注意部分自動同步設定開啟時可能會覆蓋回存的位置。"
++"when you start Kate.
Note that if the session is handled "
++"by the KDE session manager, the filter is always restored.
Note"
++"strong> that some of the autosync settings may override the restored "
++"location if on."
++msgstr ""
++"如果啟用此選項(預設),當您啟動 Kate 時會回存目前的過濾器。
注意"
++"如果作業階段是由 KDE 作業階段管理程式掌控,將永遠會回存目前的過濾"
++"器。
注意部分自動同步設定開啟時可能會覆蓋回存的位置。"
+
+ #. i18n: file ./data/kateui.rc line 43
+ #: rc.cpp:9
+@@ -1612,18 +1612,18 @@
+ "
You can split the Kate editor as many times as you like and\n"
+ "in either direction. Each frame has its own status bar and\n"
+ "can display any open document.
\n"
+-"Just choose "
+-"
View -> Split [ Horizontal | Vertical ]
\n"
++"Just choose
View -> Split [ Horizontal | Vertical ]"
++"strong>
\n"
+ msgstr ""
+ "您可以依喜好將 Kate 編輯器分割任意次或任何\n"
+ "方向。每個框架都會有自己的狀態列並且都可以\n"
+ "顯示任何開啟的文件。
\n"
+-"只要選擇 "
+-"
檢視 -> 分割 [ 水平 | 垂直 ]
\n"
++"只要選擇
檢視 -> 分割 [ 水平 | 垂直 ]
\n"
+
+ #: tips.cpp:32
+ msgid ""
+-"You can drag the Tool views (File List and File Selector)\n"
++"
You can drag the Tool views (File List and File Selector"
++"em>)\n"
+ "to any side that you want them in Kate, or stack them, or even tear them off "
+ "the\n"
+ "main window.
\n"
+@@ -1634,8 +1634,8 @@
+
+ #: tips.cpp:39
+ msgid ""
+-"Kate has a built-in terminal emulator, just click on "
+-"\"Terminal\" at\n"
++"
Kate has a built-in terminal emulator, just click on \"Terminal"
++"\" at\n"
+ "the bottom to show or hide it as you desire.
\n"
+ msgstr ""
+ "Kate 有內建的終端機模擬器,只要按 「終端機」 \n"
+@@ -1645,25 +1645,22 @@
+ msgid ""
+ "
Kate can highlight the current line with a\n"
+ "
"
+-""
+-"different\n"
++"width=\"100%\"> |
different\n"
+ "background color.| |
\n"
+ "You can set the color in the Colors page of the configuration\n"
+ "dialog.
\n"
+ msgstr ""
+ "Kate 可以將目前所在的行突顯為\n"
+ "
"
+-""
+-"不同的\n"
++"width=\"100%\"> |
不同的\n"
+ "背景色彩。| |
\n"
+ "您可以在組態對話盒中的 色彩 頁面\n"
+ "設定色彩。
\n"
+
+ #: tips.cpp:54
+ msgid ""
+-"You can open the currently edited file in any other application from within\n"
++"
You can open the currently edited file in any other application from "
++"within\n"
+ "Kate.
\n"
+ "Choose File -> Open With for the list of programs\n"
+ "configured\n"
+@@ -1680,19 +1677,21 @@
+ #: tips.cpp:64
+ msgid ""
+ "
You can configure the editor to always display the line numbers and/or\n"
+-"bookmark panes when started from the View Defaults "
+-"page of the\n"
++"bookmark panes when started from the View Defaults page of "
++"the\n"
+ "configuration dialog.
\n"
+ msgstr ""
+-"您可以設定編輯器在啟動時永遠顯示行數和/或\n"
++"
您可以設定編輯器在啟動時永遠顯示列數和/或\n"
+ "書籤面板,就在組態對話盒的 檢視的預設值\n"
+ "中。
\n"
+
+ #: tips.cpp:71
+ msgid ""
+-"You can download new or updated Syntax highlight definitions from\n"
++"
You can download new or updated Syntax highlight definitions "
++"from\n"
+ "the Highlighting page in the configuration dialog.
\n"
+-"Just click the Download... button on the Highlight Modes\n"
++"
Just click the Download... button on the Highlight Modes"
++"em>\n"
+ "tab (You have to be online, of course...).
\n"
+ msgstr ""
+ "您可以從組態對話盒中的 突顯功能 頁面\n"
+@@ -1702,23 +1701,25 @@
+
+ #: tips.cpp:79
+ msgid ""
+-"
You can cycle through all open documents by pressing "
+-"Alt+Left\n"
+-"or Alt+Right. The next/previous document will immediately be "
+-"displayed\n"
++"
You can cycle through all open documents by pressing Alt+Left"
++"strong>\n"
++"or Alt+Right. The next/previous document will immediately "
++"be displayed\n"
+ "in the active frame.
\n"
+ msgstr ""
+-"您可以按 Alt+Left 或 Alt+Right 來在所有開啟的文件\n"
++"
您可以按 Alt+Left 或 Alt+Right 來在所有"
++"開啟的文件\n"
+ "之間循環瀏覽。上一個/下一個文件會立即顯示在作用中\n"
+ "的框架。
\n"
+
+ #: tips.cpp:86
+ msgid ""
+-"You can do cool sed-like regular expression replacements using "
+-"Command Line.
\n"
+-"For example, press F7 and enter "
+-"s /oldtext/newtext/g
\n"
+-"to replace "oldtext" with "newtext" throughout the current\n"
++"
You can do cool sed-like regular expression replacements using "
++"Command Line.
\n"
++"For example, press F7 and enter s /oldtext/newtext/"
++"g
\n"
++"to replace "oldtext" with "newtext" throughout the "
++"current\n"
+ "line.
\n"
+ msgstr ""
+ "您可以使用 命令列 來進行很酷的 類-sed 正規表示式取代功能。
\n"
+@@ -1736,7 +1737,8 @@
+
+ #: tips.cpp:100
+ msgid ""
+-"You can filter the files displayed in the File Selector tool view.\n"
++"
You can filter the files displayed in the File Selector tool "
++"view.\n"
+ "
\n"
+ "Simply enter your filter in the filter entry at the bottom, for example:\n"
+ "*.html *.php
if you only want to see HTML and PHP files in the\n"
+@@ -1755,7 +1757,8 @@
+ "
You can have two views - or even more - of the same document in Kate. "
+ "Editing\n"
+ "in either will be reflected in both.
\n"
+-"So if you find yourself scrolling up and down to look at text at the other\n"
++"
So if you find yourself scrolling up and down to look at text at the "
++"other\n"
+ "end of a document, just press Ctrl+Shift+T to split\n"
+ "horizontally.
\n"
+ msgstr ""
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kay.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kay.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kay.po 2007-05-14 12:22:55.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kay.po 2011-11-11 15:45:17.000000000 +0100
+@@ -11,8 +11,7 @@
+ "Report-Msgid-Bugs-To: \n"
+ "POT-Creation-Date: 2007-03-30 02:14+0200\n"
+ "PO-Revision-Date: 2006-01-12 13:19+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Traditional Chinese \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -55,7 +54,7 @@
+
+ #: notificationdialog.cpp:64
+ msgid "Configure..."
+-msgstr "設定..."
++msgstr "設定…"
+
+ #. i18n: file notificationdialogview.ui line 69
+ #: rc.cpp:3
+@@ -67,7 +66,7 @@
+ #: rc.cpp:6
+ #, no-c-format
+ msgid "..."
+-msgstr "..."
++msgstr "…"
+
+ #. i18n: file notificationdialogview.ui line 103
+ #: rc.cpp:9
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmaccessibility.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmaccessibility.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmaccessibility.po 2008-08-19 20:43:10.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmaccessibility.po 2011-11-11 15:45:17.000000000 +0100
+@@ -7,7 +7,7 @@
+ "Project-Id-Version: kcmaccessibility\n"
+ "POT-Creation-Date: 2008-07-08 01:18+0200\n"
+ "PO-Revision-Date: 2005-10-25 17:48+0800\n"
+-"Last-Translator: Chao-Hsiung Liao \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Chinese(traditional) \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -63,12 +63,10 @@
+ #: rc.cpp:12
+ #, no-c-format
+ msgid ""
+-"This is the configuration of the Audible Bell."
+-"
\n"
++"This is the configuration of the Audible Bell.
\n"
+ "It could be the system bell and/or a custom bell."
+ msgstr ""
+-"這是有聲響鈴的組態。"
+-"
\n"
++"這是有聲響鈴的組態。
\n"
+ "它可以是系統響鈴和/或自訂響鈴。"
+
+ #. i18n: file accessibilityconfigwidget.ui line 61
+@@ -82,12 +80,11 @@
+ #, no-c-format
+ msgid ""
+ "If this option is checked, the default system bell will be used. See the "
+-"\"System Bell\" control module for how to customize the system bell."
+-"
\n"
++"\"System Bell\" control module for how to customize the system bell.
\n"
+ "Normally, this is just a \"beep\"."
+ msgstr ""
+-"如果這個選項被確認,將會使用預設的系統響鈴。如何自訂系統響鈴則請見\"系統響鈴\"控制模組。"
+-"
\n"
++"如果這個選項被確認,將會使用預設的系統響鈴。如何自訂系統響鈴則請見\"系統響鈴"
++"\"控制模組。
\n"
+ "正常情形它就是一聲\"beep\"。"
+
+ #. i18n: file accessibilityconfigwidget.ui line 73
+@@ -100,14 +97,14 @@
+ #: rc.cpp:26
+ #, no-c-format
+ msgid ""
+-"Check this option if you want to use a customized bell, playing a sound file. "
+-"If you do this, you will probably want to turn off the system bell."
++"Check this option if you want to use a customized bell, playing a sound "
++"file. If you do this, you will probably want to turn off the system bell."
+ "
\n"
+ "Please note that on slow machines this may cause a \"lag\" between the event "
+ "causing the bell and the sound being played."
+ msgstr ""
+-"如果您要播放聲音檔作為自訂的響鈴,請確認這個選項。如此的話,您大概就要關閉系統響鈴。"
+-"
\n"
++"如果您要播放聲音檔作為自訂的響鈴,請確認這個選項。如此的話,您大概就要關閉系"
++"統響鈴。
\n"
+ "請注意在速度較慢的機器上,響鈴及播放聲音事件間可能造成延滯。"
+
+ #. i18n: file accessibilityconfigwidget.ui line 113
+@@ -120,8 +117,8 @@
+ #: rc.cpp:33
+ #, no-c-format
+ msgid ""
+-"If the option \"Use customized bell\" is enabled, you can choose a sound file "
+-"here."
++"If the option \"Use customized bell\" is enabled, you can choose a sound "
++"file here."
+ msgstr "如果選項\"使用自訂響鈴\"有啟動,您可以在這裡選擇一個聲音檔。"
+
+ #. i18n: file accessibilityconfigwidget.ui line 139
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmaccess.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmaccess.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmaccess.po 2006-10-01 18:34:17.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmaccess.po 2011-11-11 15:45:17.000000000 +0100
+@@ -14,8 +14,7 @@
+ "Project-Id-Version: kcmaccess\n"
+ "POT-Creation-Date: 2006-03-27 03:52+0200\n"
+ "PO-Revision-Date: 2006-06-19 09:14+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Chinese Traditional \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -98,19 +97,21 @@
+ #: kcmaccess.cpp:258
+ msgid ""
+ "If this option is checked, the default system bell will be used. See the "
+-"\"System Bell\" control module for how to customize the system bell. Normally, "
+-"this is just a \"beep\"."
+-msgstr "如果這個選項被確認,將會使用預設的系統響鈴。如何自訂系統響鈴則請見\"系統響鈴\"控制模組。正常情形它就是一聲\"beep\"。"
++"\"System Bell\" control module for how to customize the system bell. "
++"Normally, this is just a \"beep\"."
++msgstr ""
++"如果這個選項被確認,將會使用預設的系統響鈴。如何自訂系統響鈴則請見\"系統響鈴"
++"\"控制模組。正常情形它就是一聲\"beep\"。"
+
+ #: kcmaccess.cpp:261
+ msgid ""
+-"Check this option if you want to use a customized bell, playing a sound file. "
+-"If you do this, you will probably want to turn off the system bell."
+-" Please note that on slow machines this may cause a \"lag\" between the "
+-"event causing the bell and the sound being played."
++"Check this option if you want to use a customized bell, playing a sound "
++"file. If you do this, you will probably want to turn off the system bell.
"
++"Please note that on slow machines this may cause a \"lag\" between the event "
++"causing the bell and the sound being played."
+ msgstr ""
+-"如果您要播放聲音檔作為自訂的響鈴,請確認這個選項。如此的話,您大概就要關閉系統響鈴。"
+-"
請注意在速度較慢的機器上,響鈴及播放聲音事件間可能造成\"延滯\"。"
++"如果您要播放聲音檔作為自訂的響鈴,請確認這個選項。如此的話,您大概就要關閉系"
++"統響鈴。
請注意在速度較慢的機器上,響鈴及播放聲音事件間可能造成\"延滯\"。"
+
+ #: kcmaccess.cpp:268
+ msgid "Sound &to play:"
+@@ -118,9 +119,11 @@
+
+ #: kcmaccess.cpp:273
+ msgid ""
+-"If the option \"Use customized bell\" is enabled, you can choose a sound file "
+-"here. Click \"Browse...\" to choose a sound file using the file dialog."
+-msgstr "如果選項\"使用自訂響鈴\"有啟動,您可以在這裡選擇一個聲音檔。點擊\"瀏覽...\"可用對話框選擇選擇一個聲音檔。"
++"If the option \"Use customized bell\" is enabled, you can choose a sound "
++"file here. Click \"Browse...\" to choose a sound file using the file dialog."
++msgstr ""
++"如果選項\"使用自訂響鈴\"有啟動,您可以在這裡選擇一個聲音檔。點擊\"瀏覽...\"可"
++"用對話框選擇選擇一個聲音檔。"
+
+ #: kcmaccess.cpp:290
+ msgid "Visible Bell"
+@@ -135,7 +138,9 @@
+ "This option will turn on the \"visible bell\", i.e. a visible notification "
+ "shown every time that normally just a bell would occur. This is especially "
+ "useful for deaf people."
+-msgstr "這個選項會開啟 \"視覺響鈴\",也就是當鈴聲啟動時以視覺畫面的通知。 對於聽障而言這將很有用。"
++msgstr ""
++"這個選項會開啟 \"視覺響鈴\",也就是當鈴聲啟動時以視覺畫面的通知。 對於聽障而"
++"言這將很有用。"
+
+ #: kcmaccess.cpp:304
+ msgid "I&nvert screen"
+@@ -152,7 +157,8 @@
+
+ #: kcmaccess.cpp:311
+ msgid ""
+-"The screen will turn to a custom color for the amount of time specified below."
++"The screen will turn to a custom color for the amount of time specified "
++"below."
+ msgstr "畫面將會在下面指定的時間內轉變成自定的顏色。"
+
+ #: kcmaccess.cpp:317
+@@ -170,7 +176,8 @@
+
+ #: kcmaccess.cpp:327
+ msgid ""
+-"Here you can customize the duration of the \"visible bell\" effect being shown."
++"Here you can customize the duration of the \"visible bell\" effect being "
++"shown."
+ msgstr "您可以在這邊自訂 \"視覺響鈴\" 的持續時間。"
+
+ #: kcmaccess.cpp:344
+@@ -213,7 +220,7 @@
+
+ #: kcmaccess.cpp:390 kcmaccess.cpp:538
+ msgid "Configure System Notification..."
+-msgstr "設定系統通知..."
++msgstr "設定系統通知…"
+
+ #: kcmaccess.cpp:407
+ msgid "&Modifier Keys"
+@@ -273,7 +280,8 @@
+
+ #: kcmaccess.cpp:500
+ msgid ""
+-"Here you can activate keyboard gestures that turn on the following features: \n"
++"Here you can activate keyboard gestures that turn on the following "
++"features: \n"
+ "Sticky keys: Press Shift key 5 consecutive times\n"
+ "Slow keys: Hold down Shift for 8 seconds"
+ msgstr ""
+@@ -283,7 +291,8 @@
+
+ #: kcmaccess.cpp:504
+ msgid ""
+-"Here you can activate keyboard gestures that turn on the following features: \n"
++"Here you can activate keyboard gestures that turn on the following "
++"features: \n"
+ "Mouse Keys: %1\n"
+ "Sticky keys: Press Shift key 5 consecutive times\n"
+ "Slow keys: Hold down Shift for 8 seconds"
+@@ -311,14 +320,14 @@
+
+ #: kcmaccess.cpp:526
+ msgid ""
+-"Use the system bell whenever a gesture is used to turn an accessibility feature "
+-"on or off"
++"Use the system bell whenever a gesture is used to turn an accessibility "
++"feature on or off"
+ msgstr "當使用手勢開啟或關閉無障礙功能時使用系統鈴聲"
+
+ #: kcmaccess.cpp:529
+ msgid ""
+-"Show a confirmation dialog whenever a keyboard accessibility feature is turned "
+-"on or off"
++"Show a confirmation dialog whenever a keyboard accessibility feature is "
++"turned on or off"
+ msgstr "當開啟或關閉鍵盤無障礙功能時顯示確認對話盒"
+
+ #: kcmaccess.cpp:531
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmarts.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmarts.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmarts.po 2007-10-08 12:00:12.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmarts.po 2011-11-11 15:45:17.000000000 +0100
+@@ -2,13 +2,13 @@
+ # Copyright (C) 2001 Free Software Foundation, Inc.
+ # Ger, Huang-Bin , 2001
+ # Kenduest Lee , 2002
+-#
++#
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: kcmarts\n"
+ "POT-Creation-Date: 2007-07-28 01:12+0200\n"
+ "PO-Revision-Date: 2005-08-12 09:19+0800\n"
+-"Last-Translator: Chao-Hsiung Liao \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Traditional Chinese \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -25,7 +25,8 @@
+ "_: EMAIL OF TRANSLATORS\n"
+ "Your emails"
+ msgstr ""
+-"hbger@rpgs1.isa.nthu.edu.tw,kenduest@i18n.linux.org.tw,gentamicin5@yahoo.com.tw"
++"hbger@rpgs1.isa.nthu.edu.tw,kenduest@i18n.linux.org.tw,gentamicin5@yahoo.com."
++"tw"
+
+ #: arts.cpp:109
+ msgid ""
+@@ -43,9 +44,9 @@
+ "allows you to apply different effects to your system sounds and provides "
+ "programmers with an easy way to achieve sound support."
+ msgstr ""
+-"您現在正在設定的是"
+-"aRts 聲音伺服器
,KDE 的聲音伺服器。這個程式將不僅讓您在播放一些 MP3 "
+-"檔案或玩遊戲時仍然可以聽到系統聲音,它同時允許您套用不同的效果在系統音源上,並提供程式設計師一個較簡單的方式來達到聲音支援。"
++"您現在正在設定的是aRts 聲音伺服器
,KDE 的聲音伺服器。這個程式將不僅"
++"讓您在播放一些 MP3 檔案或玩遊戲時仍然可以聽到系統聲音,它同時允許您套用不同的"
++"效果在系統音源上,並提供程式設計師一個較簡單的方式來達到聲音支援。"
+
+ #: arts.cpp:167
+ msgid "&General"
+@@ -57,42 +58,47 @@
+
+ #: arts.cpp:182
+ msgid ""
+-"Normally, the sound server defaults to using the device called /dev/dsp "
+-"for sound output. That should work in most cases. On some systems where devfs "
+-"is used, however, you may need to use /dev/sound/dsp "
+-"instead. Other alternatives are things like /dev/dsp0 or /dev/dsp1"
+-", if you have a soundcard that supports multiple outputs, or you have multiple "
++"Normally, the sound server defaults to using the device called /dev/dsp"
++"b> for sound output. That should work in most cases. On some systems where "
++"devfs is used, however, you may need to use /dev/sound/dsp instead. "
++"Other alternatives are things like /dev/dsp0 or /dev/dsp1, if "
++"you have a soundcard that supports multiple outputs, or you have multiple "
+ "soundcards."
+ msgstr ""
+-"一般而言,聲音伺服器預設使用 /dev/dsp 作為聲音輸出,這在絕大多數的情況下應該都能運作。一個例外的情況是如果您使用 devfs "
+-"時,則您應該要使用 /dev/sound/dsp作為取代。其他像 /dev/dsp0 或 /dev/dsp1 "
+-"則是當您的音效卡支援多重輸出或您有多張音效卡時使用。"
++"一般而言,聲音伺服器預設使用 /dev/dsp 作為聲音輸出,這在絕大多數的情況"
++"下應該都能運作。一個例外的情況是如果您使用 devfs 時,則您應該要使用 /dev/"
++"sound/dsp作為取代。其他像 /dev/dsp0 或 /dev/dsp1 則是當您的"
++"音效卡支援多重輸出或您有多張音效卡時使用。"
+
+ #: arts.cpp:184
+ msgid ""
+ "Normally, the sound server defaults to using a sampling rate of 44100 Hz (CD "
+-"quality), which is supported on almost any hardware. If you are using certain "
+-"Yamaha soundcards, you might need to configure this to 48000 Hz here, if "
+-"you are using old SoundBlaster cards, like SoundBlaster Pro, you might "
+-"need to change this to 22050 Hz. All other values are possible, too, and may "
+-"make sense in certain contexts (i.e. professional studio equipment)."
+-msgstr ""
+-"一般而言,聲音伺服器的預設取樣是採大多數硬體所支援的頻率 44100 Hz (CD 音質)。如果您使用某些 Yamaha 音效卡"
+-", 您可能必須將頻率設定改為 48000 Hz,如果您使用的是 舊的聲霸卡,例如 SoundBlaster Pro ,則您可能必須將設定改為 "
+-"22050 Hz。當然其他數值的採用也都是有其可能性,端視環境需求而定(例如專業的錄音設備)。"
++"quality), which is supported on almost any hardware. If you are using "
++"certain Yamaha soundcards, you might need to configure this to 48000 "
++"Hz here, if you are using old SoundBlaster cards, like SoundBlaster "
++"Pro, you might need to change this to 22050 Hz. All other values are "
++"possible, too, and may make sense in certain contexts (i.e. professional "
++"studio equipment)."
++msgstr ""
++"一般而言,聲音伺服器的預設取樣是採大多數硬體所支援的頻率 44100 Hz (CD 音質)。"
++"如果您使用某些 Yamaha 音效卡, 您可能必須將頻率設定改為 48000 Hz,如果"
++"您使用的是 舊的聲霸卡,例如 SoundBlaster Pro ,則您可能必須將設定改為 "
++"22050 Hz。當然其他數值的採用也都是有其可能性,端視環境需求而定(例如專業的錄音"
++"設備)。"
+
+ #: arts.cpp:186
+ msgid ""
+-"This configuration module is intended to cover almost every aspect of the aRts "
+-"sound server that you can configure. However, there are some things which may "
+-"not be available here, so you can add command line options "
++"This configuration module is intended to cover almost every aspect of the "
++"aRts sound server that you can configure. However, there are some things "
++"which may not be available here, so you can add command line options "
+ "here which will be passed directly to artsd. The command line options "
+-"will override the choices made in the GUI. To see the possible choices, open a "
+-"Konsole window, and type artsd -h."
++"will override the choices made in the GUI. To see the possible choices, open "
++"a Konsole window, and type artsd -h."
+ msgstr ""
+-"這個設定模組(configuration module)適用於 aRts 聲音伺服器絕大部分的設定。然而有些設定並不在這裡,所以您可以在這邊增加 "
+-"命令行選項 以直接送給 artsd。這些命令行選項將會蓋掉您原來在圖形介面下的選項。要檢視可能的選項,請開啟一個 konsole "
+-"視窗,並輸入 artsd -h。"
++"這個設定模組(configuration module)適用於 aRts 聲音伺服器絕大部分的設定。然而"
++"有些設定並不在這裡,所以您可以在這邊增加 命令行選項 以直接送給 "
++"artsd。這些命令行選項將會蓋掉您原來在圖形介面下的選項。要檢視可能的選"
++"項,請開啟一個 konsole 視窗,並輸入 artsd -h。"
+
+ #: arts.cpp:195
+ msgid "Autodetect"
+@@ -116,7 +122,8 @@
+
+ #: arts.cpp:422
+ msgid ""
+-"The settings have changed since the last time you restarted the sound server.\n"
++"The settings have changed since the last time you restarted the sound "
++"server.\n"
+ "Do you want to save them?"
+ msgstr ""
+ "您已經異動了聲音伺服器的設定值。\n"
+@@ -136,9 +143,11 @@
+
+ #: arts.cpp:492
+ msgid ""
+-"Impossible to start aRts with realtime priority because artswrapper is missing "
+-"or disabled"
+-msgstr "由於 artswrapper 程式遺失或關閉,所以 aRts 無法開啟使用即時的優先等級模式進行工作"
++"Impossible to start aRts with realtime priority because artswrapper is "
++"missing or disabled"
++msgstr ""
++"由於 artswrapper 程式遺失或關閉,所以 aRts 無法開啟使用即時的優先等級模式進行"
++"工作"
+
+ #: arts.cpp:586
+ msgid "Restarting Sound System"
+@@ -216,7 +225,9 @@
+ msgid ""
+ "If this option is enabled, the sound system will be loaded on KDE startup.\n"
+ "Recommended if you want sound."
+-msgstr "如果啟動這個選項,arts 聲音伺服器將會在 KDE 啟動時自動啟動。如果您希望有聲音播放的功能,建議您啟動。"
++msgstr ""
++"如果啟動這個選項,arts 聲音伺服器將會在 KDE 啟動時自動啟動。如果您希望有聲音"
++"播放的功能,建議您啟動。"
+
+ #. i18n: file generaltab.ui line 64
+ #: rc.cpp:10
+@@ -230,7 +241,9 @@
+ msgid ""
+ "Enable this option if you want to play sound on a remote computer or you "
+ "want to be able to control sound on this system from another computer."
+-msgstr "如果您要在遠端的電腦播放聲音,或者 您希望可以從其他電腦控制這個系統的聲音,就啟動這個選項。"
++msgstr ""
++"如果您要在遠端的電腦播放聲音,或者 您希望可以從其他電腦控制這個系統的聲"
++"音,就啟動這個選項。"
+
+ #. i18n: file generaltab.ui line 83
+ #: rc.cpp:16
+@@ -244,7 +257,8 @@
+ msgid ""
+ "This option allows sound requests coming in from over the network to be "
+ "accepted, instead of just limiting the server to the local computer."
+-msgstr "這個選項允許您接受來自網路的聲音播放要求(request),而不限於只服務本地端電腦。"
++msgstr ""
++"這個選項允許您接受來自網路的聲音播放要求(request),而不限於只服務本地端電腦。"
+
+ #. i18n: file generaltab.ui line 96
+ #: rc.cpp:22
+@@ -258,7 +272,9 @@
+ msgid ""
+ "If your sound is skipping during playback, enable running with highest "
+ "possible priority. Increasing your sound buffer might also help."
+-msgstr "如果您的聲音播放時有遺漏,可以使用盡可能高的優先權執行。增加您的聲音緩衝區也許也有幫助。"
++msgstr ""
++"如果您的聲音播放時有遺漏,可以使用盡可能高的優先權執行。增加您的聲音緩衝區"
++"也許也有幫助。"
+
+ #. i18n: file generaltab.ui line 115
+ #: rc.cpp:28
+@@ -271,9 +287,11 @@
+ #, no-c-format
+ msgid ""
+ "On systems which support realtime scheduling, if you have sufficient "
+-"permissions, this option will enable a very high priority for processing sound "
+-"requests."
+-msgstr "對於支援聲音即時播放的系統,如果您有足夠的權限,這個選項可以使聲音播放的要求以最高優先權情況下被處理。"
++"permissions, this option will enable a very high priority for processing "
++"sound requests."
++msgstr ""
++"對於支援聲音即時播放的系統,如果您有足夠的權限,這個選項可以使聲音播放的要求"
++"以最高優先權情況下被處理。"
+
+ #. i18n: file generaltab.ui line 152
+ #: rc.cpp:34
+@@ -285,9 +303,11 @@
+ #: rc.cpp:37
+ #, no-c-format
+ msgid ""
+-"Huge buffer, for low-end machines, "
+-"less skipping
"
+-msgstr "大的緩衝區,給低等級的機器,較少遺漏。
"
++"Huge buffer, for low-end machines, less "
++"skipping
"
++msgstr ""
++"大的緩衝區,給低等級的機器,較少遺漏。"
++"b>
"
+
+ #. i18n: file generaltab.ui line 173
+ #: rc.cpp:40
+@@ -303,8 +323,8 @@
+ "blocking programs that may wish to use it directly. If the KDE sound system "
+ "sits idle it can give up this exclusive control."
+ msgstr ""
+-"KDE 聲音系統獨家控制了您的音效硬體,blocking programs 也許希望直接使用它。如果 KDE "
+-"聲音系統處於閑置,它可以放棄獨家控制。"
++"KDE 聲音系統獨家控制了您的音效硬體,blocking programs 也許希望直接使用它。"
++"如果 KDE 聲音系統處於閑置,它可以放棄獨家控制。"
+
+ #. i18n: file generaltab.ui line 203
+ #: rc.cpp:46
+@@ -352,10 +372,12 @@
+ #: rc.cpp:67
+ #, no-c-format
+ msgid ""
+-"This enables the soundserver to record and play sound at the same time. If you "
+-"use applications like Internet telephony, voice recognition or similar, you "
+-"probably want this."
+-msgstr "這將允許聲音伺服器同時錄音與放音。如果您使用網路電話、語音辨識等類似的程式,您可能需要啟動這個選項。"
++"This enables the soundserver to record and play sound at the same time. If "
++"you use applications like Internet telephony, voice recognition or similar, "
++"you probably want this."
++msgstr ""
++"這將允許聲音伺服器同時錄音與放音。如果您使用網路電話、語音辨識等類似的程式,"
++"您可能需要啟動這個選項。"
+
+ #. i18n: file hardwaretab.ui line 107
+ #: rc.cpp:70
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmbackground.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmbackground.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmbackground.po 2008-08-19 20:43:10.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmbackground.po 2011-11-11 15:45:17.000000000 +0100
+@@ -17,7 +17,7 @@
+ "Project-Id-Version: kcmbackground\n"
+ "POT-Creation-Date: 2008-07-08 01:18+0200\n"
+ "PO-Revision-Date: 2005-10-25 19:05+0800\n"
+-"Last-Translator: Chao-Hsiung Liao \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: traditional Chinese \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -54,8 +54,8 @@
+
+ #: bgadvanced.cpp:298
+ msgid ""
+-"Unable to remove the program: the program is global and can only be removed by "
+-"the system administrator."
++"Unable to remove the program: the program is global and can only be removed "
++"by the system administrator."
+ msgstr "無法移除程式:程式是全域性的,因而只有系統管理者可以移除。"
+
+ #: bgadvanced.cpp:300
+@@ -153,25 +153,27 @@
+ #: bgdialog.cpp:368
+ msgid ""
+ "Background
This module allows you to control the appearance of the "
+-"virtual desktops. KDE offers a variety of options for customization, including "
+-"the ability to specify different settings for each virtual desktop, or a common "
+-"background for all of them."
+-" The appearance of the desktop results from the combination of its "
+-"background colors and patterns, and optionally, wallpaper, which is based on "
+-"the image from a graphic file."
+-"
The background can be made up of a single color, or a pair of colors which "
+-"can be blended in a variety of patterns. Wallpaper is also customizable, with "
+-"options for tiling and stretching images. The wallpaper can be overlaid "
+-"opaquely, or blended in different ways with the background colors and patterns."
+-"
KDE allows you to have the wallpaper change automatically at specified "
+-"intervals of time. You can also replace the background with a program that "
+-"updates the desktop dynamically. For example, the \"kdeworld\" program shows a "
+-"day/night map of the world which is updated periodically."
+-msgstr ""
+-"
背景
這個模組可以讓您控制虛擬桌面的外觀。KDE 提供您許多的選項來自訂,包含對每個虛擬桌面不同的設定或全部使用相同的桌面。"
+-"桌面的外觀是由背景顏色與樣式,選擇性的圖片桌布等所共同形成的。"
+-"
背景可以使用單一的顏色或一對顏色來混合成不同的樣式。桌面也是可以依據鋪排或放大來自訂的。桌布可以與背景或樣式共同混合或覆蓋。"
+-"
KDE 允許您自動的在指定的時間間隔改變桌布或使用程式動態的改變桌面。例如使用 \"kdeworld\" 程式來週期性的更新世界的日/夜地圖。"
++"virtual desktops. KDE offers a variety of options for customization, "
++"including the ability to specify different settings for each virtual "
++"desktop, or a common background for all of them.
The appearance of the "
++"desktop results from the combination of its background colors and patterns, "
++"and optionally, wallpaper, which is based on the image from a graphic file."
++"
The background can be made up of a single color, or a pair of colors "
++"which can be blended in a variety of patterns. Wallpaper is also "
++"customizable, with options for tiling and stretching images. The wallpaper "
++"can be overlaid opaquely, or blended in different ways with the background "
++"colors and patterns.
KDE allows you to have the wallpaper change "
++"automatically at specified intervals of time. You can also replace the "
++"background with a program that updates the desktop dynamically. For example, "
++"the \"kdeworld\" program shows a day/night map of the world which is updated "
++"periodically."
++msgstr ""
++"
背景
這個模組可以讓您控制虛擬桌面的外觀。KDE 提供您許多的選項來自訂,"
++"包含對每個虛擬桌面不同的設定或全部使用相同的桌面。桌面的外觀是由背景顏色與"
++"樣式,選擇性的圖片桌布等所共同形成的。
背景可以使用單一的顏色或一對顏色來混"
++"合成不同的樣式。桌面也是可以依據鋪排或放大來自訂的。桌布可以與背景或樣式共同"
++"混合或覆蓋。
KDE 允許您自動的在指定的時間間隔改變桌布或使用程式動態的改變桌"
++"面。例如使用 \"kdeworld\" 程式來週期性的更新世界的日/夜地圖。"
+
+ #: bgdialog.cpp:424
+ #, c-format
+@@ -282,8 +284,8 @@
+
+ #: bgmonitor.cpp:165
+ msgid ""
+-"This picture of a monitor contains a preview of what the current settings will "
+-"look like on your desktop."
++"This picture of a monitor contains a preview of what the current settings "
++"will look like on your desktop."
+ msgstr "在這個小螢幕裡的圖片可預覽依現在設定的桌面的樣子。"
+
+ #: bgwallpaper.cpp:99
+@@ -316,26 +318,28 @@
+ #: rc.cpp:6 rc.cpp:245
+ #, no-c-format
+ msgid "&Add..."
+-msgstr "增加(&A)..."
++msgstr "增加(&A)…"
+
+ #. i18n: file bgadvanced_ui.ui line 50
+ #: rc.cpp:9
+ #, no-c-format
+ msgid ""
+ "\n"
+-"Click here if you want to add a program to the listbox. This button opens a "
+-"dialog where you are asked to give details about the program you want to run. "
+-"To successfully add a program, you must know if it is compatible, the name of "
+-"the executable file and, if necessary, its options.
\n"
+-"You usually can get the available options to a suitable program by typing in "
+-"a terminal emulator the name of the executable file plus --help (foobar "
+-"--help).
\n"
++"Click here if you want to add a program to the listbox. This button opens "
++"a dialog where you are asked to give details about the program you want to "
++"run. To successfully add a program, you must know if it is compatible, the "
++"name of the executable file and, if necessary, its options.
\n"
++"You usually can get the available options to a suitable program by typing "
++"in a terminal emulator the name of the executable file plus --help (foobar --"
++"help).
\n"
+ ""
+ msgstr ""
+ "\n"
+-"如果您要增加程式到這個列框則敲擊這裡。這個按鈕會打開一個對話框,並將要求您提供您所要執行程式的細節。要成功地加入程式, "
+-"您必須知道它是否相容,可執行檔的名稱以及它的選項(如果必要的話)。
\n"
+-"您通常可以在終端機模擬視窗鍵入可執行檔名稱並加上 --help(foobar --help),就可獲得合適程式的可用選項。
\n"
++"如果您要增加程式到這個列框則敲擊這裡。這個按鈕會打開一個對話框,並將要求您"
++"提供您所要執行程式的細節。要成功地加入程式, 您必須知道它是否相容,可執行檔的"
++"名稱以及它的選項(如果必要的話)。
\n"
++"您通常可以在終端機模擬視窗鍵入可執行檔名稱並加上 --help(foobar --help),就"
++"可獲得合適程式的可用選項。
\n"
+ ""
+
+ #. i18n: file bgadvanced_ui.ui line 64
+@@ -345,36 +349,39 @@
+ "Click here to remove programs from this list. Please note that it does not "
+ "remove the program from your system, it only removes it from the available "
+ "options in the background drawing programs list."
+-msgstr "按這裡以從清單移除程式。請注意它並沒有把程式從您的系統移除,它只是從背景繪製程式清單裡的可用選項移除。"
++msgstr ""
++"按這裡以從清單移除程式。請注意它並沒有把程式從您的系統移除,它只是從背景繪製"
++"程式清單裡的可用選項移除。"
+
+ #. i18n: file bgadvanced_ui.ui line 75
+ #: rc.cpp:21
+ #, no-c-format
+ msgid "&Modify..."
+-msgstr "變更(&M)..."
++msgstr "變更(&M)…"
+
+ #. i18n: file bgadvanced_ui.ui line 81
+ #: rc.cpp:24
+ #, no-c-format
+ msgid ""
+ "\n"
+-"Click here to modify the programs options. You usually can get the available "
+-"options to a suitable program by typing in a terminal emulator the name of the "
+-"executable file plus --help. (example: kwebdesktop --help).
\n"
++"Click here to modify the programs options. You usually can get the "
++"available options to a suitable program by typing in a terminal emulator the "
++"name of the executable file plus --help. (example: kwebdesktop --help).
\n"
+ "One useful example is the program kwebdesktop. It draws a web page on the "
+ "background of your desktop. You can use this program by selecting it on the "
+-"listbox on the right, but it will draw a predefined web page. To change the web "
+-"page it renders, select the kwebdesktop program on the listbox, then click "
+-"here. A dialog will appear, allowing you to change the web page by replacing "
+-"the old address (URL) with a new one.
\n"
++"listbox on the right, but it will draw a predefined web page. To change the "
++"web page it renders, select the kwebdesktop program on the listbox, then "
++"click here. A dialog will appear, allowing you to change the web page by "
++"replacing the old address (URL) with a new one.
\n"
+ ""
+ msgstr ""
+ "\n"
+-"按這裡改變程式選項。您通常可以在終端機模擬視窗鍵入可執行檔名稱並加上 --help。(例如: Kwebdesktop "
+-"--help),就可獲得合適程式的可用選項。
\n"
+-"一個有用的例子就是 "
+-"kwebdesktop這個程式。它在您的桌面背景繪製成一個網頁。您可以在列框右邊選取使用這個程式,但它將繪製為預設的網頁。要改變它顯示的網頁,選取列框內的 "
+-"kwebdesktop 程式,然後敲擊這裡。將會出現一個對話框,並允許您用新的網址取代舊有的網址(URL)以改變網頁。
\n"
++"按這裡改變程式選項。您通常可以在終端機模擬視窗鍵入可執行檔名稱並加上 --"
++"help。(例如: Kwebdesktop --help),就可獲得合適程式的可用選項。
\n"
++"一個有用的例子就是 kwebdesktop這個程式。它在您的桌面背景繪製成一個網頁。您"
++"可以在列框右邊選取使用這個程式,但它將繪製為預設的網頁。要改變它顯示的網頁,"
++"選取列框內的 kwebdesktop 程式,然後敲擊這裡。將會出現一個對話框,並允許您用新"
++"的網址取代舊有的網址(URL)以改變網頁。
\n"
+ ""
+
+ #. i18n: file bgadvanced_ui.ui line 104
+@@ -402,19 +409,16 @@
+ "\n"
+ "Select from this listbox the program you want to use to draw your desktop "
+ "background.
\n"
+-"The Program column shows the name of the program."
+-"
\n"
+-"The Comment column brings a short description."
+-"
\n"
++"
The Program column shows the name of the program.
\n"
++"The Comment column brings a short description.
\n"
+ "The Refresh column indicates the time interval between redraws of the "
+ "desktop.
\n"
+-"The K Web Desktop program (kwebdesktop) is worth noting: it draws a "
+-"specified page of the web in your desktop. You can modify it, and the webpage "
+-"it draws by selecting it here, then clicking on the Modify button."
+-"
\n"
++"
The K Web Desktop program (kwebdesktop) is worth noting: it draws "
++"a specified page of the web in your desktop. You can modify it, and the "
++"webpage it draws by selecting it here, then clicking on the Modify "
++"button.
\n"
+ "You can also add new compliant programs. To do that, click on the Add "
+-"button."
+-"
\n"
++"button.
\n"
+ "You can also remove programs from this list clicking on the Remove "
+ "button. Please note that it does not remove the program from your system, it "
+ "only removes it from the available options in this listbox.
\n"
+@@ -422,18 +426,15 @@
+ msgstr ""
+ "\n"
+ "從這個列框選擇您要用來繪製桌面背景的程式。
\n"
+-"程式這一行顯示程式的名稱。"
+-"
\n"
+-"
註解這一行提供簡短的描述。"
+-"
\n"
+-"
重整這一行指示重繪桌面的時間間隔。"
+-"
\n"
+-"
K Web Desktop 程式 (kwebdesktop) 是值得注意的: 。它在您的桌面繪製指定的網頁。在這裡選取它,然後按"
+-"變更按鈕您就可以修飾它以及它所繪的網頁。"
+-"
\n"
+-"您也可以增加新的相容的程式。要這麼做的話,就按增加按鈕。"
++"
程式這一列顯示程式的名稱。
\n"
++"
註解這一列提供簡短的描述。
\n"
++"
重整這一列指示重繪桌面的時間間隔。
\n"
++"
K Web Desktop 程式 (kwebdesktop) 是值得注意的: 。它在您的桌面繪製指"
++"定的網頁。在這裡選取它,然後按變更按鈕您就可以修飾它以及它所繪的網頁。"
+ "
\n"
+-"您也可以按移除從清單中移除程式。請注意它並沒有把程式從您的系統移除,它只是從列框內的可用選項移除。
\n"
++"您也可以增加新的相容的程式。要這麼做的話,就按增加按鈕。
\n"
++"您也可以按移除從清單中移除程式。請注意它並沒有把程式從您的系統移除,它"
++"只是從列框內的可用選項移除。
\n"
+ ""
+
+ #. i18n: file bgadvanced_ui.ui line 164
+@@ -448,11 +449,12 @@
+ msgid ""
+ "Check here if you want to allow a program to draw your desktop background. "
+ "Below you can find the list of programs currently available for drawing the "
+-"background. You may use one of the available programs, add new ones or modify "
+-"the existing ones to fit your needs."
++"background. You may use one of the available programs, add new ones or "
++"modify the existing ones to fit your needs."
+ msgstr ""
+-"點擊這裡,如果您要允許程式繪製您的桌面背景。下面您可以找到目前可以用來繪製桌面的程式清單。您可以使用其中一個可用的程式,增加一個新的程式或者修改已存在的以適合您"
+-"所需。"
++"點擊這裡,如果您要允許程式繪製您的桌面背景。下面您可以找到目前可以用來繪製桌"
++"面的程式清單。您可以使用其中一個可用的程式,增加一個新的程式或者修改已存在的"
++"以適合您所需。"
+
+ #. i18n: file bgadvanced_ui.ui line 177
+ #: rc.cpp:56
+@@ -476,9 +478,10 @@
+ #: rc.cpp:68
+ #, no-c-format
+ msgid ""
+-"Click here to select the solid background color. Choose a different color from "
+-"the background text color to assure readability."
+-msgstr "點擊這裡以選擇純粹的背景顏色。從背景的文字顏色,選擇不同的顏色以確定可讀性。"
++"Click here to select the solid background color. Choose a different color "
++"from the background text color to assure readability."
++msgstr ""
++"點擊這裡以選擇純粹的背景顏色。從背景的文字顏色,選擇不同的顏色以確定可讀性。"
+
+ #. i18n: file bgadvanced_ui.ui line 252
+ #: rc.cpp:71
+@@ -491,11 +494,12 @@
+ #, no-c-format
+ msgid ""
+ "Check here if you want to use a solid background color. This is useful to "
+-"ensure that the desktop text will be identifiable against all background colors "
+-"and wallpapers, or in other words, that a background or wallpaper will not make "
+-"a desktop text of a similar color difficult to read."
++"ensure that the desktop text will be identifiable against all background "
++"colors and wallpapers, or in other words, that a background or wallpaper "
++"will not make a desktop text of a similar color difficult to read."
+ msgstr ""
+-"點擊這裡如果您要使用純粹的背景顏色。這個能有效地確保桌面文字在所有背景顏色及桌布下能被辨認,換句話說,背景或桌布不會使顏色相近的桌面文字變得難以閱讀。"
++"點擊這裡如果您要使用純粹的背景顏色。這個能有效地確保桌面文字在所有背景顏色及"
++"桌布下能被辨認,換句話說,背景或桌布不會使顏色相近的桌面文字變得難以閱讀。"
+
+ #. i18n: file bgadvanced_ui.ui line 263
+ #: rc.cpp:77
+@@ -508,15 +512,17 @@
+ #, no-c-format
+ msgid ""
+ "Check here to enable a shadow outline around the desktop font. This also "
+-"improves the readability of the desktop text against backgrounds of a similar "
+-"color."
+-msgstr "點擊這裡可以啟用桌面文字外框陰影。這也可以增加桌面文字在相似顏色的背景下的可讀性。"
++"improves the readability of the desktop text against backgrounds of a "
++"similar color."
++msgstr ""
++"點擊這裡可以啟用桌面文字外框陰影。這也可以增加桌面文字在相似顏色的背景下的可"
++"讀性。"
+
+ #. i18n: file bgadvanced_ui.ui line 274
+ #: rc.cpp:83
+ #, no-c-format
+ msgid "&Lines for icon text:"
+-msgstr "圖示文字行數(&L):"
++msgstr "圖示文字列數(&L):"
+
+ #. i18n: file bgadvanced_ui.ui line 280
+ #: rc.cpp:86 rc.cpp:89
+@@ -524,7 +530,8 @@
+ msgid ""
+ "Choose here the maximum number of text lines below an icon on the desktop. "
+ "Longer text will be truncated at the end of the last line."
+-msgstr "在此選擇桌面上圖示下方文字的最大行數。太長的文字會在最後一行結尾處被縮短。"
++msgstr ""
++"在此選擇桌面上圖示下方文字的最大列數。太長的文字會在最後一列結尾處被縮短。"
+
+ #. i18n: file bgadvanced_ui.ui line 305
+ #: rc.cpp:92
+@@ -538,7 +545,9 @@
+ msgid ""
+ "Choose here the maximum width of text lines (in pixel) below an icon on the "
+ "desktop. If set to 'Auto' a default width based on the current font is used."
+-msgstr "在此選擇桌面上圖示下方文字的最大寬度(以像素計)。如果設為「自動」則會使用依目前字型為準的預設寬度。"
++msgstr ""
++"在此選擇桌面上圖示下方文字的最大寬度(以像素計)。如果設為「自動」則會使用依目"
++"前字型為準的預設寬度。"
+
+ #. i18n: file bgadvanced_ui.ui line 322
+ #: rc.cpp:98
+@@ -566,7 +575,9 @@
+ "background(s). If you have different backgrounds for the different desktops "
+ "caching can make switching desktops smoother at the expense of higher memory "
+ "use."
+-msgstr "在這個方塊,您可以輸入 KDE 應該使用多少記憶體來快取背景。如果您在不同的桌面有不同的背景,那使用較多快取記憶體可以使桌面切換的更流暢。"
++msgstr ""
++"在這個方塊,您可以輸入 KDE 應該使用多少記憶體來快取背景。如果您在不同的桌面有"
++"不同的背景,那使用較多快取記憶體可以使桌面切換的更流暢。"
+
+ #. i18n: file bgadvanced_ui.ui line 363
+ #: rc.cpp:113
+@@ -584,10 +595,12 @@
+ #: rc.cpp:122 rc.cpp:128
+ #, no-c-format
+ msgid ""
+-"Choose the desktop you wish to configure the background for from this list. If "
+-"you want the same background settings to be applied to all desktops select the "
+-"\"All Desktops\" option."
+-msgstr "從清單選擇您要改變背景的桌面。如果您希望相同的背景套用到所有桌面,請點選 \"所有桌面\"選項。"
++"Choose the desktop you wish to configure the background for from this list. "
++"If you want the same background settings to be applied to all desktops "
++"select the \"All Desktops\" option."
++msgstr ""
++"從清單選擇您要改變背景的桌面。如果您希望相同的背景套用到所有桌面,請點選 \"所"
++"有桌面\"選項。"
+
+ #. i18n: file bgdialog_ui.ui line 48
+ #: rc.cpp:125
+@@ -636,9 +649,12 @@
+ #: rc.cpp:149
+ #, no-c-format
+ msgid ""
+-"Click this button to set the icon text colors and shadow, set up a program to "
+-"run for the background picture or control the size of the background cache."
+-msgstr "點擊這個按鈕以設定圖示文字顏色及陰影,設定背景圖片執行的程式或者控制背景圖片的快取大小。"
++"Click this button to set the icon text colors and shadow, set up a program "
++"to run for the background picture or control the size of the background "
++"cache."
++msgstr ""
++"點擊這個按鈕以設定圖示文字顏色及陰影,設定背景圖片執行的程式或者控制背景圖片"
++"的快取大小。"
+
+ #. i18n: file bgdialog_ui.ui line 303
+ #: rc.cpp:155
+@@ -661,45 +677,50 @@
+ "You can choose here how a background picture is shown on the desktop:\n"
+ "\n"
+ "- Centered: Center the picture on the desktop.
\n"
+-" "
+-"- Tiled: Tile the picture beginning at the top left of the desktop, "
+-"so the desktop is totally covered up.
\n"
++" - Tiled: Tile the picture beginning at the top left of the "
++"desktop, so the desktop is totally covered up.
\n"
+ "- Center Tiled: Center the picture on the desktop and then tile "
+ "around it so that the background is totally covered up.
\n"
+-"- Centered Maxpect: Magnify the picture without distorting it until "
+-"it fills either the width or height of the desktop, and then center it on the "
+-"desktop.
\n"
+-"- Scaled: Magnify the picture, until the entire desktop is covered. "
+-"This may result in some distortion of the picture.
\n"
+-"- Centered Auto Fit: If the picture fits the desktop this mode works "
+-"like the Centered option. If the picture is larger than the desktop it is "
+-"scaled down to fit while keeping the aspect ratio.
\n"
+-"- Scale and Crop: Magnify the picture without distorting it until it "
+-"fills both the width and height of the desktop (cropping the picture if "
++"
- Centered Maxpect: Magnify the picture without distorting it "
++"until it fills either the width or height of the desktop, and then center it "
++"on the desktop.
\n"
++"- Scaled: Magnify the picture, until the entire desktop is "
++"covered. This may result in some distortion of the picture.
\n"
++"- Centered Auto Fit: If the picture fits the desktop this mode "
++"works like the Centered option. If the picture is larger than the desktop it "
++"is scaled down to fit while keeping the aspect ratio.
\n"
++"- Scale and Crop: Magnify the picture without distorting it until "
++"it fills both the width and height of the desktop (cropping the picture if "
+ "necessary), and then center it on the desktop.
\n"
+ "
"
+ msgstr ""
+ "這裡您可以選擇背景圖片如何展示在桌面上:\n"
+-" "
+-"\n"
++" \n"
+ "- 置中: 圖片放置在桌面正中央。
\n"
+-" "
+-"- 鋪排: 從桌面左上角開始鋪排,所以桌面會被完整的覆蓋。
\n"
+-"- 中央鋪排: 圖片先放置在桌面正中央然後從周圍開始鋪排,所以桌面會完全被完整的覆蓋。
\n"
+-"- 置中最大化: 不會扭曲圖片比例,圖片會最大化直到填滿桌面的長或者寬,然後放置在桌面正中央。
\n"
+-"- 放大至全螢幕:圖片會最大化直到填滿整個桌面,這有可能造成圖片比例的扭曲。
\n"
+-"- 置中自動調適: 如果圖片可放進桌面,這個模式跟置中選項一樣。 如果圖片大於桌面,它將按比例縮小到適合桌面。
\n"
+-"- 縮放 & 剪裁: 不會扭曲圖片比例,圖片會最大化直到填滿桌面的長與寬(如果必要會進行剪裁),然後放置在桌面正中央。
\n"
++" - 鋪排: 從桌面左上角開始鋪排,所以桌面會被完整的覆蓋。
\n"
++"- 中央鋪排: 圖片先放置在桌面正中央然後從周圍開始鋪排,所以桌面會"
++"完全被完整的覆蓋。
\n"
++"- 置中最大化: 不會扭曲圖片比例,圖片會最大化直到填滿桌面的長或者"
++"寬,然後放置在桌面正中央。
\n"
++"- 放大至全螢幕:圖片會最大化直到填滿整個桌面,這有可能造成圖片比例"
++"的扭曲。
\n"
++"- 置中自動調適: 如果圖片可放進桌面,這個模式跟置中選項一樣。 如果"
++"圖片大於桌面,它將按比例縮小到適合桌面。
\n"
++"- 縮放 & 剪裁: 不會扭曲圖片比例,圖片會最大化直到填滿桌面的長與寬"
++"(如果必要會進行剪裁),然後放置在桌面正中央。
\n"
+ "
"
+
+ #. i18n: file bgdialog_ui.ui line 384
+ #: rc.cpp:176
+ #, no-c-format
+ msgid ""
+-"If you have selected to use a background picture you can choose various methods "
+-"of blending the background colors with the picture. The default option of \"No "
+-"Blending\" means that the picture simply obscures the background colors below."
+-msgstr "如果您選擇使用背景圖片,您可以選擇其與背景顏色間混合的不同方法。預設選項 \"不混合\"表示桌布是簡單的蓋在背景顏色上。"
++"If you have selected to use a background picture you can choose various "
++"methods of blending the background colors with the picture. The default "
++"option of \"No Blending\" means that the picture simply obscures the "
++"background colors below."
++msgstr ""
++"如果您選擇使用背景圖片,您可以選擇其與背景顏色間混合的不同方法。預設選項 \"不"
++"混合\"表示桌布是簡單的蓋在背景顏色上。"
+
+ #. i18n: file bgdialog_ui.ui line 403
+ #: rc.cpp:179
+@@ -713,7 +734,9 @@
+ msgid ""
+ "Click to choose the secondary background color. If no secondary color is "
+ "required by the pattern selected this button will be disabled."
+-msgstr "按下這邊以選擇第二個背景顏色。如果所選取的樣式不需要第二個顏色,這個按鈕將會失效。"
++msgstr ""
++"按下這邊以選擇第二個背景顏色。如果所選取的樣式不需要第二個顏色,這個按鈕將會"
++"失效。"
+
+ #. i18n: file bgdialog_ui.ui line 424
+ #: rc.cpp:185
+@@ -737,9 +760,12 @@
+ #: rc.cpp:194 rc.cpp:197
+ #, no-c-format
+ msgid ""
+-"You can use this slider to control the degree of blending. You can experiment "
+-"by moving the slider and looking at the effects in the preview image."
+-msgstr "您可以用這個滑標控制混合的程度。您可以透過移動滑標測試並在預覽影像中看到其效果。"
++"You can use this slider to control the degree of blending. You can "
++"experiment by moving the slider and looking at the effects in the preview "
++"image."
++msgstr ""
++"您可以用這個滑標控制混合的程度。您可以透過移動滑標測試並在預覽影像中看到其效"
++"果。"
+
+ #. i18n: file bgdialog_ui.ui line 496
+ #: rc.cpp:200
+@@ -751,8 +777,8 @@
+ #: rc.cpp:203
+ #, no-c-format
+ msgid ""
+-"For some types of blending, you can reverse the role of the background and the "
+-"picture by checking this option."
++"For some types of blending, you can reverse the role of the background and "
++"the picture by checking this option."
+ msgstr "對於某些方式的混合,您可以藉由確認這個選項以使背景與桌布層反轉。"
+
+ #. i18n: file bgdialog_ui.ui line 573
+@@ -783,18 +809,20 @@
+ #: rc.cpp:230
+ #, no-c-format
+ msgid "Set&up..."
+-msgstr "設定(&U)..."
++msgstr "設定(&U)…"
+
+ #. i18n: file bgdialog_ui.ui line 631
+ #: rc.cpp:233
+ #, no-c-format
+ msgid ""
+-"Click this button to select a set of images to be used as background pictures. "
+-"One picture at a time will be shown for a specified amount of time, after which "
+-"another image from the set will be shown. Images can be shown at random or in "
+-"the order you specify them."
++"Click this button to select a set of images to be used as background "
++"pictures. One picture at a time will be shown for a specified amount of "
++"time, after which another image from the set will be shown. Images can be "
++"shown at random or in the order you specify them."
+ msgstr ""
+-"點擊這個按鈕以選取一組影像當背景圖片。一張圖片會先展示一段指定的時間,然後這一組影像內的另一張圖片會接者展示。影像可以是隨機地或者是依照您指定的順序來展示。"
++"點擊這個按鈕以選取一組影像當背景圖片。一張圖片會先展示一段指定的時間,然後這"
++"一組影像內的另一張圖片會接者展示。影像可以是隨機地或者是依照您指定的順序來展"
++"示。"
+
+ #. i18n: file bgwallpaper_ui.ui line 27
+ #: rc.cpp:236
+@@ -812,7 +840,7 @@
+ #: rc.cpp:242
+ #, no-c-format
+ msgid "Change &picture after:"
+-msgstr "在...之後改變圖片(&P):"
++msgstr "在…之後改變圖片(&P):"
+
+ #. i18n: file bgwallpaper_ui.ui line 146
+ #: rc.cpp:251
+@@ -833,7 +861,7 @@
+ #~ msgstr "Monitor"
+
+ #~ msgid "Advanced Options..."
+-#~ msgstr "進階選項..."
++#~ msgstr "進階選項…"
+
+ #~ msgid "BGAdvancedBase"
+ #~ msgstr "進階"
+@@ -844,8 +872,13 @@
+ #~ msgid "&Secondary color:"
+ #~ msgstr "第二種顏色(&S):"
+
+-#~ msgid "Click the button to choose the secondary background color. If no secondary color is required by the pattern selected the button will be disabled."
+-#~ msgstr "按下這邊以選擇第二個背景顏色。如果選取的樣式不需要第二個顏色,這個按鈕將失效。"
++#~ msgid ""
++#~ "Click the button to choose the secondary background color. If no "
++#~ "secondary color is required by the pattern selected the button will be "
++#~ "disabled."
++#~ msgstr ""
++#~ "按下這邊以選擇第二個背景顏色。如果選取的樣式不需要第二個顏色,這個按鈕將失"
++#~ "效。"
+
+ #~ msgid "Click the button to choose the primary background color."
+ #~ msgstr "按下這邊以選擇主要背景顏色。"
+@@ -862,14 +895,32 @@
+ #~ msgid "&Common background"
+ #~ msgstr "相同背景(&C)"
+
+-#~ msgid "Check this option if you want to have the same background settings for all desktops. If this option is not checked, the background settings can be customized for each desktop."
+-#~ msgstr "選取這個選項如果您希望對所有桌面有相同的背景設定。如果沒有設定這個選項,每個桌面可以有不同的背景。"
++#~ msgid ""
++#~ "Check this option if you want to have the same background settings for "
++#~ "all desktops. If this option is not checked, the background settings can "
++#~ "be customized for each desktop."
++#~ msgstr ""
++#~ "選取這個選項如果您希望對所有桌面有相同的背景設定。如果沒有設定這個選項,每"
++#~ "個桌面可以有不同的背景。"
+
+ #~ msgid "&Mode:"
+ #~ msgstr "模式(&M):"
+
+-#~ msgid "You can select the manner in which the background is painted. The choices are: - Flat: Use a solid color (\"Color 1\").
- Pattern: Use a two-color pattern. Click \"Setup\" to choose the pattern.
- Gradients: Blend two colors using a predefined gradient (horizontal, vertical, etc.).
- Program: Use an application which paints the background, for example, with a day/night map of the world that is refreshed periodically. Click \"Setup\" to select and configure the program.
"
+-#~ msgstr "您可以選擇桌面繪製的習慣,選擇為:- 單純: 使用固定顏色 (\"顏色 1\")。
- 花樣: 使用二種顏色的花樣。按下 \"設定\" 以選擇花樣。
- 漸層: 使用預先定義的方式混合二種顏色 (水平,垂直等)。
- 程式: 使用繪製背景的程式,例如定期更新的世界日夜圖。按下 \"設定\" 以選擇並設定程式。
"
++#~ msgid ""
++#~ "You can select the manner in which the background is painted. The choices "
++#~ "are: - Flat: Use a solid color (\"Color 1\").
"
++#~ "- Pattern: Use a two-color pattern. Click \"Setup\" to choose "
++#~ "the pattern.
- Gradients: Blend two colors using a "
++#~ "predefined gradient (horizontal, vertical, etc.).
- Program:"
++#~ "em> Use an application which paints the background, for example, with a "
++#~ "day/night map of the world that is refreshed periodically. Click \"Setup"
++#~ "\" to select and configure the program.
"
++#~ msgstr ""
++#~ "您可以選擇桌面繪製的習慣,選擇為:- 單純: 使用固定顏色 (\"顏"
++#~ "色 1\")。
- 花樣: 使用二種顏色的花樣。按下 \"設定\" 以選擇"
++#~ "花樣。
- 漸層: 使用預先定義的方式混合二種顏色 (水平,垂直"
++#~ "等)。
- 程式: 使用繪製背景的程式,例如定期更新的世界日夜"
++#~ "圖。按下 \"設定\" 以選擇並設定程式。
"
+
+ #~ msgid "Color &1:"
+ #~ msgstr "顏色 &1:"
+@@ -877,14 +928,22 @@
+ #~ msgid "Color &2:"
+ #~ msgstr "顏色 &2:"
+
+-#~ msgid "If the background mode you selected has additional options to configure, click here."
++#~ msgid ""
++#~ "If the background mode you selected has additional options to configure, "
++#~ "click here."
+ #~ msgstr "如果您選擇的背景模式有額外的選項可以設定,就按這裡。"
+
+ #~ msgid "&Wallpaper"
+ #~ msgstr "桌布(&W)"
+
+-#~ msgid "If you check this option, you can choose a set of graphic files to be used as wallpaper, one at a time, for an interval ranging from 1 minute to 4 hours. You can also choose to have the graphics selected at random or in the order you specified them."
+-#~ msgstr "如果選擇這個選項,您可以選擇一組要作為桌布的影像,每次一個,並每 1 分鐘到 4 小時自動變更。您也可以選擇要隨機變更或依照您指定的順序變更。"
++#~ msgid ""
++#~ "If you check this option, you can choose a set of graphic files to be "
++#~ "used as wallpaper, one at a time, for an interval ranging from 1 minute "
++#~ "to 4 hours. You can also choose to have the graphics selected at random "
++#~ "or in the order you specified them."
++#~ msgstr ""
++#~ "如果選擇這個選項,您可以選擇一組要作為桌布的影像,每次一個,並每 1 分鐘到 "
++#~ "4 小時自動變更。您也可以選擇要隨機變更或依照您指定的順序變更。"
+
+ #~ msgid "&No wallpaper"
+ #~ msgstr "沒有桌布(&N)"
+@@ -905,28 +964,40 @@
+ #~ msgstr "點擊以選擇您要作為桌布的圖片。"
+
+ #~ msgid "&Browse..."
+-#~ msgstr "瀏覽(&B)..."
++#~ msgstr "瀏覽(&B)…"
+
+-#~ msgid "If the graphic you want is not in a standard directory, you can still find it by clicking here."
++#~ msgid ""
++#~ "If the graphic you want is not in a standard directory, you can still "
++#~ "find it by clicking here."
+ #~ msgstr "如果您要使用的圖片不在標準目錄中,您可以按下這邊以找到他。"
+
+ #~ msgid "S&etup Multiple..."
+-#~ msgstr "設定多重(&E)..."
++#~ msgstr "設定多重(&E)…"
+
+-#~ msgid "Click here to select graphics to be used for wallpaper, and to configure other options."
++#~ msgid ""
++#~ "Click here to select graphics to be used for wallpaper, and to configure "
++#~ "other options."
+ #~ msgstr "按下這邊以選擇要作為桌布的圖片,並設定其他選項。"
+
+ #~ msgid "&Limit pixmap cache"
+ #~ msgstr "限制點陣圖快取(&L)"
+
+-#~ msgid "Checking this box limits the amount of memory that KDE will use to save pixmap (raster graphics). It is advisable to do this, especially if you do not have a lot of memory."
+-#~ msgstr "選擇這個選項以限制 KDE 用來儲存圖片的記憶體空間(光柵圖)。這是我們建議使用的,尤其當您沒有很多記憶體時。"
++#~ msgid ""
++#~ "Checking this box limits the amount of memory that KDE will use to save "
++#~ "pixmap (raster graphics). It is advisable to do this, especially if you "
++#~ "do not have a lot of memory."
++#~ msgstr ""
++#~ "選擇這個選項以限制 KDE 用來儲存圖片的記憶體空間(光柵圖)。這是我們建議使用"
++#~ "的,尤其當您沒有很多記憶體時。"
+
+ #~ msgid "Cache &size:"
+ #~ msgstr "快取大小(&S):"
+
+-#~ msgid "In this box you can enter how much memory KDE should use for caching pixmaps for faster access."
+-#~ msgstr "在這個方塊,您可以輸入 KDE 應該使用多少記憶體來快取點陣圖以更快地顯示。"
++#~ msgid ""
++#~ "In this box you can enter how much memory KDE should use for caching "
++#~ "pixmaps for faster access."
++#~ msgstr ""
++#~ "在這個方塊,您可以輸入 KDE 應該使用多少記憶體來快取點陣圖以更快地顯示。"
+
+ #~ msgid "Horizontal Blending"
+ #~ msgstr "水平混合"
+@@ -964,7 +1035,9 @@
+ #~ msgid "Preview"
+ #~ msgstr "預覽"
+
+-#~ msgid "Unable to remove the pattern! The pattern is global and can only be removed by the System Administrator."
++#~ msgid ""
++#~ "Unable to remove the pattern! The pattern is global and can only be "
++#~ "removed by the System Administrator."
+ #~ msgstr "無法移除樣式! 樣式是全域性的,而且只有系統管理者可以移除。"
+
+ #~ msgid "Cannot Remove Pattern"
+@@ -1024,7 +1097,7 @@
+ #~ msgstr "背景"
+
+ #~ msgid "Add Image..."
+-#~ msgstr "增加影像..."
++#~ msgstr "增加影像…"
+
+ #~ msgid "&Remove Image"
+ #~ msgstr "移除影像(&R)"
+@@ -1039,10 +1112,10 @@
+ #~ msgstr "程式(&G)"
+
+ #~ msgid "Se&tup Background Program..."
+-#~ msgstr "設定背景程式(&T)..."
++#~ msgstr "設定背景程式(&T)…"
+
+ #~ msgid "Choose Pattern..."
+-#~ msgstr "選擇樣式..."
++#~ msgstr "選擇樣式…"
+
+ #~ msgid "Advanced Options"
+ #~ msgstr "進階選項"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmbell.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmbell.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmbell.po 2005-09-10 13:15:15.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmbell.po 2011-11-11 15:45:17.000000000 +0100
+@@ -15,7 +15,7 @@
+ "Project-Id-Version: kcmbell\n"
+ "POT-Creation-Date: 2005-05-18 21:24+0200\n"
+ "PO-Revision-Date: 2005-08-11 20:42+0800\n"
+-"Last-Translator: Chao-Hsiung Liao \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Chinese (traditional) \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -34,18 +34,21 @@
+ "You can use the standard system bell (PC speaker) or a more sophisticated "
+ "system notification, see the \"System Notifications\" control module for the "
+ "\"Something Special Happened in the Program\" event."
+-msgstr "您可以使用標準的系統響鈴 (PC 喇叭) 或是較複雜的系統通知, 參閱 \"系統通知\" 控制模組中的 \"程式特殊事件\"。"
++msgstr ""
++"您可以使用標準的系統響鈴 (PC 喇叭) 或是較複雜的系統通知, 參閱 \"系統通知\" 控"
++"制模組中的 \"程式特殊事件\"。"
+
+ #: bell.cpp:91
+ msgid ""
+ "System Bell
Here you can customize the sound of the standard system "
+ "bell, i.e. the \"beep\" you always hear when there is something wrong. Note "
+-"that you can further customize this sound using the \"Accessibility\" control "
+-"module; for example, you can choose a sound file to be played instead of the "
+-"standard bell."
++"that you can further customize this sound using the \"Accessibility\" "
++"control module; for example, you can choose a sound file to be played "
++"instead of the standard bell."
+ msgstr ""
+-"系統響鈴
您可以在這邊自訂您系統的標準鈴聲, 也就是當發生錯誤時您所聽到的\"beep\"聲音。 注意您可以在\"輔助工具\" "
+-"控制模組做更進一步的設定, 例如播放聲音檔案而不是標準鈴聲。"
++"系統響鈴
您可以在這邊自訂您系統的標準鈴聲, 也就是當發生錯誤時您所聽"
++"到的\"beep\"聲音。 注意您可以在\"輔助工具\" 控制模組做更進一步的設定, 例如播"
++"放聲音檔案而不是標準鈴聲。"
+
+ #: bell.cpp:97
+ msgid "&Volume:"
+@@ -53,9 +56,11 @@
+
+ #: bell.cpp:102
+ msgid ""
+-"Here you can customize the volume of the system bell. For further customization "
+-"of the bell, see the \"Accessibility\" control module."
+-msgstr "您可以在這邊自訂系統鈴聲的音量。 對於更進一步的自訂, 請參照 \"輔助工具\" 控制模組。"
++"Here you can customize the volume of the system bell. For further "
++"customization of the bell, see the \"Accessibility\" control module."
++msgstr ""
++"您可以在這邊自訂系統鈴聲的音量。 對於更進一步的自訂, 請參照 \"輔助工具\" 控"
++"制模組。"
+
+ #: bell.cpp:106
+ msgid "&Pitch:"
+@@ -67,9 +72,11 @@
+
+ #: bell.cpp:111
+ msgid ""
+-"Here you can customize the pitch of the system bell. For further customization "
+-"of the bell, see the \"Accessibility\" control module."
+-msgstr "您可以在這邊自訂系統鈴聲的音階。 對於更進一步的自訂, 請參照 \"輔助工具\" 控制模組。"
++"Here you can customize the pitch of the system bell. For further "
++"customization of the bell, see the \"Accessibility\" control module."
++msgstr ""
++"您可以在這邊自訂系統鈴聲的音階。 對於更進一步的自訂, 請參照 \"輔助工具\" 控"
++"制模組。"
+
+ #: bell.cpp:115
+ msgid "&Duration:"
+@@ -83,7 +90,9 @@
+ msgid ""
+ "Here you can customize the duration of the system bell. For further "
+ "customization of the bell, see the \"Accessibility\" control module."
+-msgstr "您可以在這邊自訂系統鈴聲的持續時間。 對於更進一步的自訂, 請參照 \"輔助工具\" 控制模組。"
++msgstr ""
++"您可以在這邊自訂系統鈴聲的持續時間。 對於更進一步的自訂, 請參照 \"輔助工具"
++"\" 控制模組。"
+
+ #: bell.cpp:124
+ msgid "&Test"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmcgi.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmcgi.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmcgi.po 2005-11-09 07:38:42.000000000 +0100
++++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmcgi.po 2011-11-11 15:45:17.000000000 +0100
+@@ -7,7 +7,7 @@
+ "Project-Id-Version: kcmcgi\n"
+ "POT-Creation-Date: 2005-05-18 21:24+0200\n"
+ "PO-Revision-Date: 2005-10-25 19:10+0800\n"
+-"Last-Translator: Chao-Hsiung Liao \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Chinese (Traditional) \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -31,7 +31,7 @@
+
+ #: kcmcgi.cpp:59
+ msgid "Add..."
+-msgstr "新增..."
++msgstr "新增…"
+
+ #: kcmcgi.cpp:71
+ msgid "kcmcgi"
+@@ -48,8 +48,8 @@
+ #: kcmcgi.cpp:147
+ msgid ""
+ "CGI Scripts
The CGI KIO slave lets you execute local CGI programs "
+-"without the need to run a web server. In this control module you can configure "
+-"the paths that are searched for CGI scripts."
++"without the need to run a web server. In this control module you can "
++"configure the paths that are searched for CGI scripts."
+ msgstr ""
+-"CGI 程式
CGI KIO slave 讓您不需要執行網頁伺服器便可執行本機的 CGI 程式。 在這個控制模組中,您可以 設定欲搜尋 "
+-"CGI 程式碼的路徑。"
++"CGI 程式
CGI KIO slave 讓您不需要執行網頁伺服器便可執行本機的 CGI 程"
++"式。 在這個控制模組中,您可以 設定欲搜尋 CGI 程式碼的路徑。"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmcolors.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmcolors.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmcolors.po 2006-10-01 18:34:18.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmcolors.po 2011-11-11 15:45:17.000000000 +0100
+@@ -8,7 +8,7 @@
+ "Project-Id-Version: kcmcolors\n"
+ "POT-Creation-Date: 2006-08-22 02:34+0200\n"
+ "PO-Revision-Date: 2005-10-25 19:11+0800\n"
+-"Last-Translator: Chao-Hsiung Liao \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Chinese (traditional \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -29,31 +29,33 @@
+
+ #: colorscm.cpp:100
+ msgid ""
+-"Colors
This module allows you to choose the color scheme used for the "
+-"KDE desktop. The different elements of the desktop, such as title bars, menu "
+-"text, etc., are called \"widgets\". You can choose the widget whose color you "
+-"want to change by selecting it from a list, or by clicking on a graphical "
+-"representation of the desktop."
+-" You can save color settings as complete color schemes, which can also be "
+-"modified or deleted. KDE comes with several predefined color schemes on which "
+-"you can base your own."
+-"
All KDE applications will obey the selected color scheme. Non-KDE "
+-"applications may also obey some or all of the color settings, if this option is "
+-"enabled."
+-msgstr ""
+-"
色彩
這個模組可以讓您選擇 KDE "
+-"桌面的色彩主題。桌面上的不同元素,像是標題列、選單文字等等,被稱作「介面工具」。您可以經由在清單中選取,或單擊對應的部分來選取您想要改變色彩的介面工具。"
+-" 您可以將色彩設定儲存成完整的色彩主題,而且稍後可以再修改或刪除。KDE 包含數個預先定義好的色彩主題供您使用。"
+-"
所有的 KDE 應用程式都會遵循選定的色彩主題。非 KDE 應用程式或許會遵循部份或全部的顏色設定。如果啟用這個選項。"
++"
Colors
This module allows you to choose the color scheme used for "
++"the KDE desktop. The different elements of the desktop, such as title bars, "
++"menu text, etc., are called \"widgets\". You can choose the widget whose "
++"color you want to change by selecting it from a list, or by clicking on a "
++"graphical representation of the desktop. You can save color settings as "
++"complete color schemes, which can also be modified or deleted. KDE comes "
++"with several predefined color schemes on which you can base your own.
All "
++"KDE applications will obey the selected color scheme. Non-KDE applications "
++"may also obey some or all of the color settings, if this option is enabled."
++msgstr ""
++"
色彩
這個模組可以讓您選擇 KDE 桌面的色彩主題。桌面上的不同元素,像是"
++"標題列、選單文字等等,被稱作「介面工具」。您可以經由在清單中選取,或單擊對應"
++"的部分來選取您想要改變色彩的介面工具。 您可以將色彩設定儲存成完整的色彩主"
++"題,而且稍後可以再修改或刪除。KDE 包含數個預先定義好的色彩主題供您使用。
"
++"所有的 KDE 應用程式都會遵循選定的色彩主題。非 KDE 應用程式或許會遵循部份或全"
++"部的顏色設定。如果啟用這個選項。"
+
+ #: colorscm.cpp:133
+ msgid ""
+ "This is a preview of the color settings which will be applied if you click "
+ "\"Apply\" or \"OK\". You can click on different parts of this preview image. "
+-"The widget name in the \"Widget color\" box will change to reflect the part of "
+-"the preview image you clicked."
++"The widget name in the \"Widget color\" box will change to reflect the part "
++"of the preview image you clicked."
+ msgstr ""
+-"這是色彩設定的預覽,您可以單擊「套用」或「確定」套用此設定。您也可以單擊此預覽影像的不同部分。「介面工具色彩」方塊中的介面工具名稱會根據您單擊的部分而改變。"
++"這是色彩設定的預覽,您可以單擊「套用」或「確定」套用此設定。您也可以單擊此預"
++"覽影像的不同部分。「介面工具色彩」方塊中的介面工具名稱會根據您單擊的部分而改"
++"變。"
+
+ #: colorscm.cpp:145
+ msgid "Color Scheme"
+@@ -63,22 +65,26 @@
+ msgid ""
+ "This is a list of predefined color schemes, including any that you may have "
+ "created. You can preview an existing color scheme by selecting it from the "
+-"list. The current scheme will be replaced by the selected color scheme."
+-"
Warning: if you have not yet applied any changes you may have made to the "
+-"current scheme, those changes will be lost if you select another color scheme."
++"list. The current scheme will be replaced by the selected color scheme.
"
++"Warning: if you have not yet applied any changes you may have made to the "
++"current scheme, those changes will be lost if you select another color "
++"scheme."
+ msgstr ""
+-"這是預先定義的色彩主題清單,包含您之前所建立的。您可以經由選擇清單中的主題以預覽之。目前的主題將會被所選擇的主題所取代。"
+-"
警告:如果您曾對目前主題進行過任何變更但尚未套用它,這些變更將會在您選擇其他色彩主題後遺失。"
++"這是預先定義的色彩主題清單,包含您之前所建立的。您可以經由選擇清單中的主題以"
++"預覽之。目前的主題將會被所選擇的主題所取代。
警告:如果您曾對目前主題進行過"
++"任何變更但尚未套用它,這些變更將會在您選擇其他色彩主題後遺失。"
+
+ #: colorscm.cpp:162
+ msgid "&Save Scheme..."
+-msgstr "儲存主題(&S)..."
++msgstr "儲存主題(&S)…"
+
+ #: colorscm.cpp:165
+ msgid ""
+ "Press this button if you want to save the current color settings as a color "
+ "scheme. You will be prompted for a name."
+-msgstr "如果您想把目前的顏色設定儲存為一個色彩主題,按下這個按鈕。您將必須提供一個名稱。"
++msgstr ""
++"如果您想把目前的顏色設定儲存為一個色彩主題,按下這個按鈕。您將必須提供一個名"
++"稱。"
+
+ #: colorscm.cpp:169
+ msgid "R&emove Scheme"
+@@ -86,19 +92,22 @@
+
+ #: colorscm.cpp:173
+ msgid ""
+-"Press this button to remove the selected color scheme. Note that this button is "
+-"disabled if you do not have permission to delete the color scheme."
+-msgstr "按下這個按鈕以移除所選擇的色彩主題。注意如果您沒有刪除此色彩主題的權限時,這個功能將被關閉。"
++"Press this button to remove the selected color scheme. Note that this button "
++"is disabled if you do not have permission to delete the color scheme."
++msgstr ""
++"按下這個按鈕以移除所選擇的色彩主題。注意如果您沒有刪除此色彩主題的權限時,這"
++"個功能將被關閉。"
+
+ #: colorscm.cpp:177
+ msgid "I&mport Scheme..."
+-msgstr "匯入主題(&M)..."
++msgstr "匯入主題(&M)…"
+
+ #: colorscm.cpp:180
+ msgid ""
+-"Press this button to import a new color scheme. Note that the color scheme will "
+-"only be available for the current user."
+-msgstr "按下這個按鈕以匯入新的色彩主題。注意此色彩主題只有目前的使用者才能使用。"
++"Press this button to import a new color scheme. Note that the color scheme "
++"will only be available for the current user."
++msgstr ""
++"按下這個按鈕以匯入新的色彩主題。注意此色彩主題只有目前的使用者才能使用。"
+
+ #: colorscm.cpp:188
+ msgid "&Widget Color"
+@@ -201,7 +210,9 @@
+ "Click here to select an element of the KDE desktop whose color you want to "
+ "change. You may either choose the \"widget\" here, or click on the "
+ "corresponding part of the preview image above."
+-msgstr "單擊此處以選擇您要改變色彩的 KDE 桌面元素。您可以在這邊選擇「介面工具」,或單擊上方預覽影像對應的部分。"
++msgstr ""
++"單擊此處以選擇您要改變色彩的 KDE 桌面元素。您可以在這邊選擇「介面工具」,或單"
++"擊上方預覽影像對應的部分。"
+
+ #: colorscm.cpp:238
+ msgid ""
+@@ -226,7 +237,9 @@
+ msgid ""
+ "Use this slider to change the contrast level of the current color scheme. "
+ "Contrast does not affect all of the colors, only the edges of 3D objects."
+-msgstr "使用這個滑動鈕來改變目前色彩主題的對比度。對比不會影響全部的色彩,只會影響 3D 物件的邊界。"
++msgstr ""
++"使用這個滑動鈕來改變目前色彩主題的對比度。對比不會影響全部的色彩,只會影響 "
++"3D 物件的邊界。"
+
+ #: colorscm.cpp:266
+ msgid ""
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmcomponentchooser.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmcomponentchooser.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmcomponentchooser.po 2008-08-19 20:43:10.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmcomponentchooser.po 2011-11-11 15:45:17.000000000 +0100
+@@ -9,7 +9,7 @@
+ "Project-Id-Version: kcmcomponentchooser\n"
+ "POT-Creation-Date: 2008-07-08 01:18+0200\n"
+ "PO-Revision-Date: 2005-10-25 19:31+0800\n"
+-"Last-Translator: Chao-Hsiung Liao \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Chinese (traditional) \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -46,8 +46,8 @@
+
+ #: componentchooser.cpp:408
+ msgid ""
+-"You changed the default component of your choice. Do you want to save that "
+-"change now?"
++"You changed the default component of your choice. Do you want to save "
++"that change now?"
+ msgstr "您的選擇已經變更預設的元件,您現在要儲存此變更嗎?"
+
+ #: componentchooser.cpp:412
+@@ -56,8 +56,8 @@
+
+ #: componentchooser.cpp:423 componentchooser.cpp:428
+ msgid ""
+-"Choose from the list below which component should be used by default for the %1 "
+-"service."
++"Choose from the list below which component should be used by default for the "
++"%1 service."
+ msgstr "從下列清單中選擇 %1 服務預設使用的元件。"
+
+ #: kcm_componentchooser.cpp:34
+@@ -94,7 +94,7 @@
+ #: rc.cpp:12 rc.cpp:39 rc.cpp:72
+ #, no-c-format
+ msgid "..."
+-msgstr "..."
++msgstr "…"
+
+ #. i18n: file componentchooser_ui.ui line 43
+ #: rc.cpp:15
+@@ -106,15 +106,17 @@
+ #: rc.cpp:18
+ #, no-c-format
+ msgid ""
+-"Here you can change the component program. Components are programs that handle "
+-"basic tasks, like the terminal emulator, the text editor and the email client. "
+-"Different KDE applications sometimes need to invoke a console emulator, send a "
+-"mail or display some text. To do so consistently, these applications always "
+-"call the same components. You can choose here which programs these components "
+-"are."
++"Here you can change the component program. Components are programs that "
++"handle basic tasks, like the terminal emulator, the text editor and the "
++"email client. Different KDE applications sometimes need to invoke a console "
++"emulator, send a mail or display some text. To do so consistently, these "
++"applications always call the same components. You can choose here which "
++"programs these components are."
+ msgstr ""
+-"您將可在此改變元件程式。元件指的是處理基本工作的程式, 例如終端機程式,文字編輯器及電子郵件程式等。眾多的KDE應用程式有時需要 "
+-"引入終端機程式,寄發電子郵件或者顯示一些文字。為求一致,這些應用程式 都會呼叫同樣的元件。您可在此選擇這些元件所使用的程式。"
++"您將可在此改變元件程式。元件指的是處理基本工作的程式, 例如終端機程式,文字編"
++"輯器及電子郵件程式等。眾多的KDE應用程式有時需要 引入終端機程式,寄發電子郵件"
++"或者顯示一些文字。為求一致,這些應用程式 都會呼叫同樣的元件。您可在此選擇這些"
++"元件所使用的程式。"
+
+ #. i18n: file componentchooser_ui.ui line 75
+ #: rc.cpp:21
+@@ -126,10 +128,12 @@
+ #: rc.cpp:24
+ #, no-c-format
+ msgid ""
+-"Here you can read a small description of the currently selected component. To "
+-"change the selected component, click on the list to the left. To change the "
+-"component program, please choose it below."
+-msgstr "您可於此讀到目前所選元件的簡單描述。要改變所選的元件,請點選左方的列表。 要改變元件程式,請在下方選擇。"
++"Here you can read a small description of the currently selected component. "
++"To change the selected component, click on the list to the left. To change "
++"the component program, please choose it below."
++msgstr ""
++"您可於此讀到目前所選元件的簡單描述。要改變所選的元件,請點選左方的列表。 要改"
++"變元件程式,請在下方選擇。"
+
+ #. i18n: file componentchooser_ui.ui line 119
+ #: rc.cpp:27
+@@ -139,39 +143,32 @@
+ "This list shows the configurable component types. Click the component you "
+ "want to configure.
\n"
+ "In this dialog you can change KDE default components. Components are "
+-"programs that handle basic tasks, like the terminal emulator, the text editor "
+-"and the email client. Different KDE applications sometimes need to invoke a "
+-"console emulator, send a mail or display some text. To do so consistently, "
+-"these applications always call the same components. Here you can select which "
+-"programs these components are.
\n"
++"programs that handle basic tasks, like the terminal emulator, the text "
++"editor and the email client. Different KDE applications sometimes need to "
++"invoke a console emulator, send a mail or display some text. To do so "
++"consistently, these applications always call the same components. Here you "
++"can select which programs these components are.
\n"
+ ""
+ msgstr ""
+ "\n"
+ "這個列表顯示可設定元件的類別。請點選您想設定的元件。
\n"
+-"在這個對話框您可改變KDE的預設元件。您將可在此改變元件程式。元件指 的是處理基本工作的程式,例如終端機程式,文字編輯器及電子郵件程式等。 "
+-"眾多的KDE應用程式有時需要引入終端機程式,寄發電子郵件或者顯示一些文 字。為求一致,這些應用程式都會呼叫同樣的元件。 "
+-"您可在此選擇這些元件所使用的程式。
\n"
++"在這個對話框您可改變KDE的預設元件。您將可在此改變元件程式。元件指 的是處理"
++"基本工作的程式,例如終端機程式,文字編輯器及電子郵件程式等。 眾多的KDE應用程"
++"式有時需要引入終端機程式,寄發電子郵件或者顯示一些文 字。為求一致,這些應用程"
++"式都會呼叫同樣的元件。 您可在此選擇這些元件所使用的程式。
\n"
+ ""
+
+ #. i18n: file emailclientconfig_ui.ui line 83
+ #: rc.cpp:33
+ #, no-c-format
+ msgid ""
+-" "
+-"- %t: Recipient's address
"
+-"- %s: Subject
"
+-"- %c: Carbon Copy (CC)
"
+-"- %b: Blind Carbon Copy (BCC)
"
+-"- %B: Template body text
"
+-"- %A: Attachment
"
++" - %t: Recipient's address
- %s: Subject
- %c: Carbon "
++"Copy (CC)
- %b: Blind Carbon Copy (BCC)
- %B: Template body "
++"text
- %A: Attachment
"
+ msgstr ""
+-" "
+-"- %t: 收件者電子郵件位址
"
+-"- %s: 主旨
"
+-"- %c: 副本 (CC)
"
+-"- %b: 密件副本 (BCC)
"
+-"- %B: 本文文字範本
"
+-"- %A: 附加檔案
"
++" - %t: 收件者電子郵件位址
- %s: 主旨
- %c: 副本 (CC)"
++"li>
- %b: 密件副本 (BCC)
- %B: 本文文字範本
- %A: 附加檔案 "
++"li>
"
+
+ #. i18n: file emailclientconfig_ui.ui line 86
+ #: rc.cpp:36
+@@ -179,26 +176,17 @@
+ msgid ""
+ "Press this button to select your favorite email client. Please note that the "
+ "file you select has to have the executable attribute set in order to be "
+-"accepted."
+-"
You can also use several placeholders which will be replaced with the "
+-"actual values when the email client is called:"
+-" "
+-"- %t: Recipient's address
"
+-"- %s: Subject
"
+-"- %c: Carbon Copy (CC)
"
+-"- %b: Blind Carbon Copy (BCC)
"
+-"- %B: Template body text
"
+-"- %A: Attachment
"
++"accepted.
You can also use several placeholders which will be replaced "
++"with the actual values when the email client is called: - %t: "
++"Recipient's address
- %s: Subject
- %c: Carbon Copy (CC)
"
++"- %b: Blind Carbon Copy (BCC)
- %B: Template body text
- %A: "
++"Attachment
"
+ msgstr ""
+-"按下這個按鈕以選擇您偏好的電子郵件軟體。 請注意 您選擇的檔案必須具有可執行之屬性才會被接受。"
+-"
您也可以使用數個在電子郵件軟體被呼叫時將以實際數值取代的占位符"
+-" "
+-"- %t: 收件者電子郵件位址
"
+-"- %s: 主旨
"
+-"- %c: 副本 (CC)
"
+-"- %b: 密件副本 (BCC)
"
+-"- %B: 本文文字範本
"
+-"- %A: 附加檔案
"
++"按下這個按鈕以選擇您偏好的電子郵件軟體。 請注意 您選擇的檔案必須具有可執行之"
++"屬性才會被接受。
您也可以使用數個在電子郵件軟體被呼叫時將以實際數值取代的"
++"占位符 - %t: 收件者電子郵件位址
- %s: 主旨
- %c: 副本 "
++"(CC)
- %b: 密件副本 (BCC)
- %B: 本文文字範本
- %A: 附加"
++"檔案
"
+
+ #. i18n: file emailclientconfig_ui.ui line 100
+ #: rc.cpp:42
+@@ -216,9 +204,11 @@
+ #: rc.cpp:48
+ #, no-c-format
+ msgid ""
+-"Activate this option if you want the selected email client to be executed in a "
+-"terminal (e.g. Konsole)."
+-msgstr "如果您想要讓所選擇的電子郵件軟體在終端機中執行,請選擇這個選項 (終端機:e.g. Konsole)."
++"Activate this option if you want the selected email client to be executed in "
++"a terminal (e.g. Konsole)."
++msgstr ""
++"如果您想要讓所選擇的電子郵件軟體在終端機中執行,請選擇這個選項 (終端機:e.g. "
++"Konsole)."
+
+ #. i18n: file emailclientconfig_ui.ui line 141
+ #: rc.cpp:51
+@@ -236,7 +226,7 @@
+ #: rc.cpp:57
+ #, no-c-format
+ msgid "Use a different &email client:"
+-msgstr "使用其他的電子郵件軟體 (&e):"
++msgstr "使用其他的電子郵件軟體(&E):"
+
+ #. i18n: file emailclientconfig_ui.ui line 155
+ #: rc.cpp:60
+@@ -248,7 +238,7 @@
+ #: rc.cpp:63
+ #, no-c-format
+ msgid "Use a different &terminal program:"
+-msgstr "使用其他的終端機軟體 (&t):"
++msgstr "使用其他的終端機軟體(&T):"
+
+ #. i18n: file terminalemulatorconfig_ui.ui line 97
+ #: rc.cpp:66
+@@ -260,14 +250,14 @@
+ #: rc.cpp:69
+ #, no-c-format
+ msgid ""
+-"Press this button to select your favorite terminal client. Please note that the "
+-"file you select has to have the executable attribute set in order to be "
+-"accepted."
+-"
Also note that some programs that utilize Terminal Emulator will not work "
+-"if you add command line arguments (Example: konsole -ls)."
++"Press this button to select your favorite terminal client. Please note that "
++"the file you select has to have the executable attribute set in order to be "
++"accepted.
Also note that some programs that utilize Terminal Emulator "
++"will not work if you add command line arguments (Example: konsole -ls)."
+ msgstr ""
+-"按這個按鈕來選擇您喜愛的終端機客戶端。請注意您所選的檔案必須設定可執行屬性才能被接受。"
+-"
同時也注意某些使用終端機模擬器的程式可能無法依您下的命令列引數運作(例如:konsole -ls)。"
++"按這個按鈕來選擇您喜愛的終端機客戶端。請注意您所選的檔案必須設定可執行屬性才"
++"能被接受。
同時也注意某些使用終端機模擬器的程式可能無法依您下的命令列引數"
++"運作(例如:konsole -ls)。"
+
+ #. i18n: file terminalemulatorconfig_ui.ui line 152
+ #: rc.cpp:75
+@@ -280,7 +270,9 @@
+ #~ msgstr "使用 KMail 如同偏好的電子郵件軟體(&U)"
+
+ #, fuzzy
+-#~ msgid "Kontact is the \"all in one\" Mail/Calendar/Contacts program for the KDE desktop."
++#~ msgid ""
++#~ "Kontact is the \"all in one\" Mail/Calendar/Contacts program for the KDE "
++#~ "desktop."
+ #~ msgstr "Kmail 是 KDE 的標準郵件程式。"
+
+ #~ msgid "Form1"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmcrypto.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmcrypto.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmcrypto.po 2007-10-08 12:00:12.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmcrypto.po 2011-11-11 15:45:17.000000000 +0100
+@@ -9,7 +9,7 @@
+ "Project-Id-Version: kcmcrypto\n"
+ "POT-Creation-Date: 2007-07-30 01:13+0200\n"
+ "PO-Revision-Date: 2007-09-18 14:29+0800\n"
+-"Last-Translator: Franklin Weng \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Chinese Traditional \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -22,10 +22,12 @@
+
+ #: crypto.cpp:226
+ msgid ""
+-"Crypto
This module allows you to configure SSL for use with most KDE "
+-"applications, as well as manage your personal certificates and the known "
++"Crypto
This module allows you to configure SSL for use with most "
++"KDE applications, as well as manage your personal certificates and the known "
+ "certificate authorities."
+-msgstr "編碼
這個模組可以讓您設定 SSL 給大多數的 KDE 程式使用,並可以管理您個人憑證與已知的憑證授權。"
++msgstr ""
++"編碼
這個模組可以讓您設定 SSL 給大多數的 KDE 程式使用,並可以管理您"
++"個人憑證與已知的憑證授權。"
+
+ #: crypto.cpp:239
+ msgid "kcmcrypto"
+@@ -45,28 +47,30 @@
+
+ #: crypto.cpp:270
+ msgid ""
+-"TLS is the newest revision of the SSL protocol. It integrates better with other "
+-"protocols and has replaced SSL in protocols such as POP3 and SMTP."
+-msgstr "TLS 是 SSL 協定的最新版本。它對於其他的通訊協定有更佳的整合性,同時也已取代了像 POP3 與 SMTP 這類協定中的 SSL 。"
++"TLS is the newest revision of the SSL protocol. It integrates better with "
++"other protocols and has replaced SSL in protocols such as POP3 and SMTP."
++msgstr ""
++"TLS 是 SSL 協定的最新版本。它對於其他的通訊協定有更佳的整合性,同時也已取代了"
++"像 POP3 與 SMTP 這類協定中的 SSL 。"
+
+ #: crypto.cpp:275
+ msgid "Enable SSLv&2"
+-msgstr "啟用 SSLv2 (&2)"
++msgstr "啟用 SSLv2(&2)"
+
+ #: crypto.cpp:278
+ msgid ""
+-"SSL v2 is the second revision of the SSL protocol. It is most common to enable "
+-"v2 and v3."
++"SSL v2 is the second revision of the SSL protocol. It is most common to "
++"enable v2 and v3."
+ msgstr "SSL v2 是 SSL 的第二版。一般都會啟用 SSLv2 與 SSLv3。"
+
+ #: crypto.cpp:282
+ msgid "Enable SSLv&3"
+-msgstr "啟用 SSLv3 (&3)"
++msgstr "啟用 SSLv3(&3)"
+
+ #: crypto.cpp:285
+ msgid ""
+-"SSL v3 is the third revision of the SSL protocol. It is most common to enable "
+-"v2 and v3."
++"SSL v3 is the third revision of the SSL protocol. It is most common to "
++"enable v2 and v3."
+ msgstr "SSL v3 是 SSL 的第三版。一般都會啟用 SSLv2 與 SSLv3。"
+
+ #: crypto.cpp:291
+@@ -77,7 +81,9 @@
+ msgid ""
+ "Select the ciphers you wish to enable when using the SSL v2 protocol. The "
+ "actual protocol used will be negotiated with the server at connection time."
+-msgstr "選擇您要用在 SSL v2 協定上的編碼。實際使用的編碼要在連線時與伺服器協調後才能確定。"
++msgstr ""
++"選擇您要用在 SSL v2 協定上的編碼。實際使用的編碼要在連線時與伺服器協調後才能"
++"確定。"
+
+ #: crypto.cpp:302
+ msgid ""
+@@ -93,7 +99,9 @@
+ msgid ""
+ "Select the ciphers you wish to enable when using the SSL v3 protocol. The "
+ "actual protocol used will be negotiated with the server at connection time."
+-msgstr "選擇您要用在 SSL v3 協定上的編碼。實際使用的編碼要在連線時與伺服器協調後才能確定。"
++msgstr ""
++"選擇您要用在 SSL v3 協定上的編碼。實際使用的編碼要在連線時與伺服器協調後才能"
++"確定。"
+
+ #: crypto.cpp:332
+ msgid "Cipher Wizard"
+@@ -102,9 +110,9 @@
+ #: crypto.cpp:335
+ msgid ""
+ "Use these preconfigurations to more easily configure the SSL encryption "
+-"settings. You can choose among the following modes: "
+-""
+ msgstr ""
+ "\n"
+-"你所設定使用不同的 cookie 處理方式的網站列表。 對這些網站,系統會使用自訂的 cookie 處理方式,原不是預設的處理方式。\n"
++"你所設定使用不同的 cookie 處理方式的網站列表。 對這些網站,系統會使用自訂的 "
++"cookie 處理方式,原不是預設的處理方式。\n"
+ ""
+
+ #. i18n: file kcookiespoliciesdlg_ui.ui line 295
+@@ -1022,26 +1024,28 @@
+ "\n"
+ "Setup proxy configuration.\n"
+ "\n"
+-"A proxy server is an intermediate machine that sits between your computer and "
+-"the Internet and provides services such as web page caching and filtering. "
+-"Caching proxy servers give you faster access to web sites you have already "
+-"visited by locally storing or caching those pages; filtering proxy servers "
+-"usually provide the ability to block out requests for ads, spam, or anything "
+-"else you want to block.\n"
+-"
\n"
+-"If you are uncertain whether or not you need to use a proxy server to connect "
+-"to the Internet, consult your Internet service provider's setup guide or your "
+-"system administrator.\n"
++"A proxy server is an intermediate machine that sits between your computer "
++"and the Internet and provides services such as web page caching and "
++"filtering. Caching proxy servers give you faster access to web sites you "
++"have already visited by locally storing or caching those pages; filtering "
++"proxy servers usually provide the ability to block out requests for ads, "
++"spam, or anything else you want to block.\n"
++"
\n"
++"If you are uncertain whether or not you need to use a proxy server to "
++"connect to the Internet, consult your Internet service provider's setup "
++"guide or your system administrator.\n"
+ "
"
+ msgstr ""
+ "\n"
+ "設定代理伺服器組態。\n"
+ "\n"
+-"代理伺服器是位於您的電腦和網際網路的中介程式,提供網頁快取和/或過濾的服務。
"
+-"快取式代理伺服器會將您曾經參訪過的網站內容儲存起來,以加速加速網際網路資料讀取速度;過濾式快取伺服器,則提供阻擋廣告、垃圾以及其他任何你想要阻擋的東西的能"
+-"力。\n"
++"代理伺服器是位於您的電腦和網際網路的中介程式,提供網頁快取和/或過濾的服務。"
++"p>
快取式代理伺服器會將您曾經參訪過的網站內容儲存起來,以加速加速網際網路資"
++"料讀取速度;過濾式快取伺服器,則提供阻擋廣告、垃圾以及其他任何你想要阻擋的東"
++"西的能力。\n"
+ "
\n"
+-"若您不知道是否需要設定代理伺服器,請先參考您的網路服務供應商的設定指南,或詢問系統管理員。\n"
++"若您不知道是否需要設定代理伺服器,請先參考您的網路服務供應商的設定指南,或詢"
++"問系統管理員。\n"
+ "
"
+
+ #. i18n: file kproxydlg_ui.ui line 59
+@@ -1067,30 +1071,27 @@
+ #, no-c-format
+ msgid ""
+ "\n"
+-"Automatically detect and configure the proxy settings."
+-"\n"
+-"Automatic detection is performed using the Web Proxy Auto-Discovery Protocol "
+-"(WPAD)."
+-"
\n"
++"Automatically detect and configure the proxy settings.
\n"
++"Automatic detection is performed using the Web Proxy Auto-Discovery "
++"Protocol (WPAD).
\n"
+ "NOTE: This option might not work properly or not work at all in some "
+ "UNIX/Linux distributions. If you encounter a problem when using this option, "
+ "please check the FAQ section at http://konqueror.kde.org.\n"
+ "
"
+ msgstr ""
+ "\n"
+-"自動偵測並設定代理伺服器設定值。"
+-"\n"
+-"自動偵測是使用 網頁代理伺服器自動發現協定 (WPAD) 進行的。"
+-"
\n"
+-"注意:這個選項在某些 UNIX/Linux 發行版本可能無法正常運作或者完全無法運作。如果您在使用這個選項時遇到問題,請查閱在 "
+-"http://konqueror.kde.org 的 FAQ 章節。\n"
++"自動偵測並設定代理伺服器設定值。
\n"
++"自動偵測是使用 網頁代理伺服器自動發現協定 (WPAD) 進行的。
\n"
++"注意:這個選項在某些 UNIX/Linux 發行版本可能無法正常運作或者完全無法運"
++"作。如果您在使用這個選項時遇到問題,請查閱在 http://konqueror.kde.org 的 FAQ "
++"章節。\n"
+ "
"
+
+ #. i18n: file kproxydlg_ui.ui line 94
+ #: rc.cpp:291
+ #, no-c-format
+ msgid "U&se the following proxy configuration URL"
+-msgstr "使用下列代理伺服器設定網址(&s):"
++msgstr "使用下列代理伺服器設定網址(&S):"
+
+ #. i18n: file kproxydlg_ui.ui line 97
+ #: rc.cpp:294
+@@ -1115,26 +1116,24 @@
+ #, no-c-format
+ msgid ""
+ "\n"
+-"Use environment variables to configure the proxy settings."
+-"\n"
+-"Environment variables such as HTTP_PROXY and NO_PROXY "
+-"are usually used in multi-user UNIX installations, where both graphical and "
+-"non-graphical applications need to share the same proxy configuration "
++"Use environment variables to configure the proxy settings.
\n"
++"Environment variables such as HTTP_PROXY and NO_PROXY are "
++"usually used in multi-user UNIX installations, where both graphical and non-"
++"graphical applications need to share the same proxy configuration "
+ "information.\n"
+ "
"
+ msgstr ""
+ "\n"
+-"使用環境變數來設定代理伺服器設定值。"
+-"\n"
+-"環境變數,像是 HTTP_PROXY 和 NO_PROXY 常常在多使用者的 UNIX "
+-"系統中使用,而無論是圖型介面程式或是文字介面程式都共用同樣的代理伺服器資訊。\n"
++"使用環境變數來設定代理伺服器設定值。
\n"
++"環境變數,像是 HTTP_PROXY 和 NO_PROXY 常常在多使用者的 UNIX 系"
++"統中使用,而無論是圖型介面程式或是文字介面程式都共用同樣的代理伺服器資訊。\n"
+ "
"
+
+ #. i18n: file kproxydlg_ui.ui line 187
+ #: rc.cpp:309 rc.cpp:321
+ #, no-c-format
+ msgid "Setup..."
+-msgstr "設定..."
++msgstr "設定…"
+
+ #. i18n: file kproxydlg_ui.ui line 190
+ #: rc.cpp:312
+@@ -1231,26 +1230,25 @@
+ #, no-c-format
+ msgid ""
+ "\n"
+-"Use persistent proxy connection."
+-"\n"
++"Use persistent proxy connection.
\n"
+ "Although a persistent proxy connection is faster, note that it only works "
+-"correctly with proxies that are fully HTTP 1.1 compliant. Do not "
+-"use this option in combination with non-HTTP 1.1 compliant proxy servers such "
+-"as JunkBuster and WWWOfle.\n"
++"correctly with proxies that are fully HTTP 1.1 compliant. Do not use "
++"this option in combination with non-HTTP 1.1 compliant proxy servers such as "
++"JunkBuster and WWWOfle.\n"
+ "
"
+ msgstr ""
+ "\n"
+-"使用 HTTP/1.1 來連線."
+-"\n"
+-"雖然 HTTP/1.1 中的持續性連線比較快速,但是只能使用在支援 HTTP/1.1 的 代理伺服器上。請勿 "
+-"在不支援 HTTP/1.1 的代理伺服器啟動這個選項。 (例如 JunkBuster 和 WWWOfle)\n"
++"使用 HTTP/1.1 來連線.
\n"
++"雖然 HTTP/1.1 中的持續性連線比較快速,但是只能使用在支援 HTTP/1.1 的 代理伺服"
++"器上。請勿 在不支援 HTTP/1.1 的代理伺服器啟動這個選項。 (例如 "
++"JunkBuster 和 WWWOfle)\n"
+ "
"
+
+ #. i18n: file manualproxy_ui.ui line 27
+ #: rc.cpp:372
+ #, no-c-format
+ msgid "Ser&vers"
+-msgstr "伺服器(&v)"
++msgstr "伺服器(&V)"
+
+ #. i18n: file manualproxy_ui.ui line 95
+ #: rc.cpp:384
+@@ -1276,15 +1274,17 @@
+ msgid ""
+ "Enter the port number of the FTP proxy server. Default 8080. Another common "
+ "value is 3128."
+-msgstr "請輸入 FTP 代理伺服器通訊埠號碼。預設值為 8080。另一個常用的值是 3128。"
++msgstr ""
++"請輸入 FTP 代理伺服器通訊埠號碼。預設值為 8080。另一個常用的值是 3128。"
+
+ #. i18n: file manualproxy_ui.ui line 133
+ #: rc.cpp:396 rc.cpp:399
+ #, no-c-format
+ msgid ""
+-"Enter the port number of the HTTP proxy server. Default is 8080. Another common "
+-"value is 3128."
+-msgstr "請輸入 HTTP 代理伺服器通訊埠號碼。預設值為 8080。另一個常用的值是 3128。"
++"Enter the port number of the HTTP proxy server. Default is 8080. Another "
++"common value is 3128."
++msgstr ""
++"請輸入 HTTP 代理伺服器通訊埠號碼。預設值為 8080。另一個常用的值是 3128。"
+
+ #. i18n: file manualproxy_ui.ui line 175
+ #: rc.cpp:402
+@@ -1311,17 +1311,15 @@
+ "\n"
+ "Reverse the use of the exception list. Checking this box will result in the "
+ "proxy servers being used only when the requested URL matches one of the "
+-"addresses listed here."
+-"This feature is useful if all you want or need is to use a proxy server for "
+-"a few specific sites."
+-"
If you have more complex requirements you might want to use a configuration "
+-"script.\n"
++"addresses listed here.
This feature is useful if all you want or need is "
++"to use a proxy server for a few specific sites.
If you have more complex "
++"requirements you might want to use a configuration script.\n"
+ "
"
+ msgstr ""
+ "\n"
+-"反轉例外列表的功能。核取此選項會使得只有當要求的 URL 符合此位址列表其中之一時才使用代理伺服器。"
+-"如果您只需要在少數特定網站使用代理伺服器時這個功能相當有幫助。"
+-"
如果您有更複雜的需求,您可能需要使用設定命令稿。\n"
++"反轉例外列表的功能。核取此選項會使得只有當要求的 URL 符合此位址列表其中之一時"
++"才使用代理伺服器。
如果您只需要在少數特定網站使用代理伺服器時這個功能相當有"
++"幫助。
如果您有更複雜的需求,您可能需要使用設定命令稿。\n"
+ "
"
+
+ #. i18n: file manualproxy_ui.ui line 228
+@@ -1358,7 +1356,7 @@
+ #: rc.cpp:434
+ #, no-c-format
+ msgid "C&hange..."
+-msgstr "改變(&H)..."
++msgstr "改變(&H)…"
+
+ #. i18n: file manualproxy_ui.ui line 270
+ #: rc.cpp:437
+@@ -1377,12 +1375,13 @@
+ #, no-c-format
+ msgid ""
+ "\n"
+-"Enter the host or domain to which this policy applies, e.g. www.kde.org "
+-"or .kde.org.\n"
++"Enter the host or domain to which this policy applies, e.g. www.kde.org"
++"b> or .kde.org.\n"
+ ""
+ msgstr ""
+ "\n"
+-"請輸入此要套用此政策的主機或網域。例如 www.kde.org 或 .kde.org。\n"
++"請輸入此要套用此政策的主機或網域。例如 www.kde.org 或 .kde.org"
++"i>。\n"
+ ""
+
+ #. i18n: file policydlg_ui.ui line 53
+@@ -1449,7 +1448,8 @@
+ msgid ""
+ "Check this to enable SOCKS4 and SOCKS5 support in KDE applications and I/O "
+ "subsystems."
+-msgstr "核取此項以啟用在 KDE 應用程式與輸出/入子系統中的 SOCKS4 與 SOCKS5 的支援。"
++msgstr ""
++"核取此項以啟用在 KDE 應用程式與輸出/入子系統中的 SOCKS4 與 SOCKS5 的支援。"
+
+ #. i18n: file socksbase.ui line 48
+ #: rc.cpp:494
+@@ -1496,7 +1496,9 @@
+ "Select custom if you wish to use an unlisted SOCKS library. Please note that "
+ "this may not always work as it depends on the API of the library which you "
+ "specify (below)."
+-msgstr "如果您希望使用未列出的 SOCKS 函式庫,請選擇自訂。請注意當它依附於您在下面指定的函式庫的 API 時並不一定能運作。"
++msgstr ""
++"如果您希望使用未列出的 SOCKS 函式庫,請選擇自訂。請注意當它依附於您在下面指定"
++"的函式庫的 API 時並不一定能運作。"
+
+ #. i18n: file socksbase.ui line 117
+ #: rc.cpp:515
+@@ -1532,12 +1534,12 @@
+ #: rc.cpp:530
+ #, no-c-format
+ msgid ""
+-"Here you can specify additional directories to search for the SOCKS libraries. "
+-"/usr/lib, /usr/local/lib, /usr/local/socks5/lib and /opt/socks5/lib are already "
+-"searched by default."
++"Here you can specify additional directories to search for the SOCKS "
++"libraries. /usr/lib, /usr/local/lib, /usr/local/socks5/lib and /opt/socks5/"
++"lib are already searched by default."
+ msgstr ""
+-"您可以在這裡指定用來搜尋 SOCKS 函式庫的額外目錄。/usr/lib、/usr/local/lib、/usr/local/socks5/lib 與 "
+-"/opt/socks5/lib 都已經預設為搜尋路徑。"
++"您可以在這裡指定用來搜尋 SOCKS 函式庫的額外目錄。/usr/lib、/usr/local/lib、/"
++"usr/local/socks5/lib 與 /opt/socks5/lib 都已經預設為搜尋路徑。"
+
+ #. i18n: file socksbase.ui line 186
+ #: rc.cpp:533
+@@ -1581,21 +1583,20 @@
+ msgid ""
+ "\n"
+ "Enter the site or domain name where a fake browser identification should be "
+-"used."
+-"\n"
+-"NOTE: Wildcard syntax such as \\\"*,?\\\" is NOT allowed: instead, use "
+-"the top level address of a site to make generic matches; for example, if you "
+-"want all KDE sites to receive a fake browser identification, you would enter "
+-".kde.org
- the fake identity would then be sent to any KDE site "
+-"that ends with .kde.org
.\n"
++"used.
\n"
++"NOTE: Wildcard syntax such as \\\"*,?\\\" is NOT allowed: instead, "
++"use the top level address of a site to make generic matches; for example, if "
++"you want all KDE sites to receive a fake browser identification, you would "
++"enter .kde.org
- the fake identity would then be sent to any "
++"KDE site that ends with .kde.org
.\n"
+ "
"
+ msgstr ""
+ "\n"
+-"請輸入您想使用偽裝識別碼的網址或網域。"
+-"\n"
+-"請注意:您不可以使用萬用字元,如「*,?」。請輸入最頂層的網址讓所有在它之下找到的網址歸成一類;例如,若您要所有 KDE "
+-"網站都收到偽裝識別碼,您要輸入 .kde.org
- 偽裝識別碼就會送到任何以 .kde.org
"
+-"結尾的 KDE 網站。\n"
++"請輸入您想使用偽裝識別碼的網址或網域。
\n"
++"請注意:您不可以使用萬用字元,如「*,?」。請輸入最頂層的網址讓所有在它"
++"之下找到的網址歸成一類;例如,若您要所有 KDE 網站都收到偽裝識別碼,您要輸入 "
++".kde.org
- 偽裝識別碼就會送到任何以 .kde.org
結尾"
++"的 KDE 網站。\n"
+ "
"
+
+ #. i18n: file uagentproviderdlg_ui.ui line 60
+@@ -1641,22 +1642,23 @@
+ #, no-c-format
+ msgid ""
+ "\n"
+-"Here you can modify the default browser-identification text or set a site "
+-"(eg. www.kde.org)
or a domain (eg. kde.org)
"
+-"specific identification text."
+-"\n"
++"Here you can modify the default browser-identification text or set a site "
++"(eg. www.kde.org)
or a domain (eg. kde.org)
"
++"specific identification text.
\n"
+ "To add a new site specific identification text, click the New
"
+ "button and supply the necessary information. To change an existing site "
+-"specific entry, click on the Change
button. The Delete
"
+-"button will remove the selected site specific identification text, causing the "
+-"setting to be used for that site or domain.\n"
++"specific entry, click on the Change
button. The Delete"
++"code> button will remove the selected site specific identification text, "
++"causing the setting to be used for that site or domain.\n"
+ "
"
+ msgstr ""
+ "\n"
+-"您可以在這邊修改網站(如www.kde.org)
或網域(如kde.org)
的預設瀏覽器識別碼。"
+-"\n"
+-"要增加新的特定網站識別文字,只要單擊 新增
按鈕,並提供對話窗中所需的資訊。要變更一個現存的網站識別項目,單擊 "
+-"變更
按鈕。刪除
按鈕將會移除您所選擇的特定網站識別文字,並將預設的設定使用於該網站或網域。\n"
++"您可以在這邊修改網站(如www.kde.org)
或網域(如kde.org)"
++"code>的預設瀏覽器識別碼。\n"
++"要增加新的特定網站識別文字,只要單擊 新增
按鈕,並提供對話窗中所"
++"需的資訊。要變更一個現存的網站識別項目,單擊 變更
按鈕。刪"
++"除
按鈕將會移除您所選擇的特定網站識別文字,並將預設的設定使用於該網站或"
++"網域。\n"
+ "
"
+
+ #. i18n: file useragentdlg_ui.ui line 33
+@@ -1670,22 +1672,20 @@
+ #, no-c-format
+ msgid ""
+ "\n"
+-"Send the browser identification to web sites."
+-"\n"
++"Send the browser identification to web sites.
\n"
+ "NOTE: Many sites rely on this information to display pages properly, "
+ "hence, it is highly recommended that you do not totally disable this feature "
+-"but rather customize it."
+-"
\n"
++"but rather customize it.
\n"
+ "By default, only minimal identification information is sent to remote sites. "
+ "The identification text that will be sent is shown below.\n"
+ "
"
+ msgstr ""
+ "\n"
+-"送出瀏覽器識別碼給網站。"
+-"\n"
+-"注意:許多網站需要這類訊息來使得網頁能正常顯示,因此強烈地建議您不要關掉所有的選項,但您可以自行設定。"
+-"
\n"
+-"預設的情況,只有最少的識別碼資訊會送至遠端網站。要送出的識別文字會顯示在下面。\n"
++"送出瀏覽器識別碼給網站。
\n"
++"注意:許多網站需要這類訊息來使得網頁能正常顯示,因此強烈地建議您不要關"
++"掉所有的選項,但您可以自行設定。
\n"
++"預設的情況,只有最少的識別碼資訊會送至遠端網站。要送出的識別文字會顯示在下"
++"面。\n"
+ "
"
+
+ #. i18n: file useragentdlg_ui.ui line 54
+@@ -1698,16 +1698,16 @@
+ #: rc.cpp:617
+ #, no-c-format
+ msgid ""
+-"The browser identification text sent to the sites you visit. Use the provided "
+-"options to customize it."
++"The browser identification text sent to the sites you visit. Use the "
++"provided options to customize it."
+ msgstr "將瀏覽器資訊送給瀏覽的網站。你可以使用提供的選項來自訂。"
+
+ #. i18n: file useragentdlg_ui.ui line 88
+ #: rc.cpp:620
+ #, no-c-format
+ msgid ""
+-"The browser identification text sent to the sites you visit. You can customize "
+-"it using the options provided below."
++"The browser identification text sent to the sites you visit. You can "
++"customize it using the options provided below."
+ msgstr "這是在瀏覽時將送至遠端網站之瀏覽器識別碼。您可以利用下列選項自訂它。"
+
+ #. i18n: file useragentdlg_ui.ui line 96
+@@ -1733,21 +1733,21 @@
+ #: rc.cpp:632
+ #, no-c-format
+ msgid ""
+-"Includes your operating system's version number in the browser identification "
+-"text."
++"Includes your operating system's version number in the browser "
++"identification text."
+ msgstr "在瀏覽器識別碼中包含您的作業系統版本。"
+
+ #. i18n: file useragentdlg_ui.ui line 148
+ #: rc.cpp:635
+ #, no-c-format
+ msgid "Add &platform name"
+-msgstr "新增平台名稱(&P)"
++msgstr "新增平臺名稱(&P)"
+
+ #. i18n: file useragentdlg_ui.ui line 151
+ #: rc.cpp:638
+ #, no-c-format
+ msgid "Includes your platform type in the browser identification text"
+-msgstr "在瀏覽器識別碼中包含您的平台類型。"
++msgstr "在瀏覽器識別碼中包含您的平臺類型。"
+
+ #. i18n: file useragentdlg_ui.ui line 159
+ #: rc.cpp:641
+@@ -1801,8 +1801,8 @@
+ #: rc.cpp:665
+ #, no-c-format
+ msgid ""
+-"List of sites for which the specified identification text will be used instead "
+-"of the default one."
++"List of sites for which the specified identification text will be used "
++"instead of the default one."
+ msgstr "對於這些網站,一個指定的瀏覽器資訊會被送出,而不是預設的瀏覽器。"
+
+ #. i18n: file useragentdlg_ui.ui line 267
+@@ -1839,10 +1839,12 @@
+ #: rc.cpp:695
+ #, no-c-format
+ msgid ""
+-"When FTP connections are passive the client connects to the server, instead of "
+-"the other way round, so firewalls do not block the connection; old FTP servers "
+-"may not support Passive FTP though."
+-msgstr "當 FTP 連線是客戶端以被動連線到伺服器,而非其他方式,防火牆將不會阻擋該連線;舊式 FTP 伺服器可能不支援被動 FTP 通行。"
++"When FTP connections are passive the client connects to the server, instead "
++"of the other way round, so firewalls do not block the connection; old FTP "
++"servers may not support Passive FTP though."
++msgstr ""
++"當 FTP 連線是客戶端以被動連線到伺服器,而非其他方式,防火牆將不會阻擋該連線;"
++"舊式 FTP 伺服器可能不支援被動 FTP 通行。"
+
+ #. i18n: file kio_ftprc.kcfg line 16
+ #: rc.cpp:698
+@@ -1854,9 +1856,11 @@
+ #: rc.cpp:701
+ #, no-c-format
+ msgid ""
+-"While a file is being uploaded its extension is \".part\". When fully uploaded "
+-"it is renamed to its real name."
+-msgstr "當檔案開始上傳時為它加上延伸檔名「.part」。當檔案完整的上傳時將它的名稱改變為真實名稱。"
++"While a file is being uploaded its extension is \".part\". When fully "
++"uploaded it is renamed to its real name."
++msgstr ""
++"當檔案開始上傳時為它加上延伸檔名「.part」。當檔案完整的上傳時將它的名稱改變為"
++"真實名稱。"
+
+ #: smbrodlg.cpp:43
+ msgid "This is the configuration for the samba client only, not the server."
+@@ -1872,30 +1876,32 @@
+
+ #: smbrodlg.cpp:171
+ msgid ""
+-"Windows Shares
Konqueror is able to access shared windows filesystems "
+-"if properly configured. If there is a specific computer from which you want to "
+-"browse, fill in the Browse server field. This is mandatory if you do "
+-"not run Samba locally. The Broadcast address and WINS address "
+-"fields will also be available, if you use the native code, or the location of "
+-"the 'smb.conf' file from which the options are read, when using Samba. In any "
+-"case, the broadcast address (interfaces in smb.conf) must be set up if it is "
+-"guessed incorrectly or you have multiple cards. A WINS server usually improves "
+-"performance, and reduces the network load a lot."
+-"The bindings are used to assign a default user for a given server, possibly "
+-"with the corresponding password, or for accessing specific shares. If you "
+-"choose to, new bindings will be created for logins and shares accessed during "
+-"browsing. You can edit all of them from here. Passwords will be stored locally, "
+-"and scrambled so as to render them unreadable to the human eye. For security "
+-"reasons, you may not want to do that, as entries with passwords are clearly "
+-"indicated as such."
+-"
"
+-msgstr ""
+-"
Windows 資源
Konqueror 可以存取視窗檔案系統的資源。如果有指定要瀏覽的電腦,請將之填入 瀏覽伺服器 "
+-"欄位中。如果您沒有在本地端執行 Samba 時,這是必要的。廣播位址 與 WINS 位址 "
+-"欄位在您要使用原生碼時是可用的,或是在使用 Samba 時由 smb.conf 中取得選項。在任一種狀況,瀏覽器位址 (smb.conf 中的介面) "
+-"在猜測錯誤或您有多張網路介面時,是必須指定的。WINS 伺服器通常可以增進效能,並且有效減少網路負載。"
+-"連結使用於指定特定伺服器的預設使用者,可能對應到密碼或存取指定的資源。如果您選擇這樣,新的連結將會為登入與資源而在瀏覽時建立。您可以在這邊編輯它們。密碼是"
+-"儲存在本地端的,並且經過編碼使它無法被讀取。基於安全因素,您可能要注意之。包含密碼的項目將會清楚的指示。"
++"
Windows Shares
Konqueror is able to access shared windows "
++"filesystems if properly configured. If there is a specific computer from "
++"which you want to browse, fill in the Browse server field. This is "
++"mandatory if you do not run Samba locally. The Broadcast address "
++"and WINS address fields will also be available, if you use the "
++"native code, or the location of the 'smb.conf' file from which the options "
++"are read, when using Samba. In any case, the broadcast address (interfaces "
++"in smb.conf) must be set up if it is guessed incorrectly or you have "
++"multiple cards. A WINS server usually improves performance, and reduces the "
++"network load a lot.The bindings are used to assign a default user for a "
++"given server, possibly with the corresponding password, or for accessing "
++"specific shares. If you choose to, new bindings will be created for logins "
++"and shares accessed during browsing. You can edit all of them from here. "
++"Passwords will be stored locally, and scrambled so as to render them "
++"unreadable to the human eye. For security reasons, you may not want to do "
++"that, as entries with passwords are clearly indicated as such.
"
++msgstr ""
++"
Windows 資源
Konqueror 可以存取視窗檔案系統的資源。如果有指定要瀏覽"
++"的電腦,請將之填入 瀏覽伺服器 欄位中。如果您沒有在本地端執行 Samba "
++"時,這是必要的。廣播位址 與 WINS 位址 欄位在您要使用原生碼"
++"時是可用的,或是在使用 Samba 時由 smb.conf 中取得選項。在任一種狀況,瀏覽器位"
++"址 (smb.conf 中的介面) 在猜測錯誤或您有多張網路介面時,是必須指定的。WINS 伺"
++"服器通常可以增進效能,並且有效減少網路負載。連結使用於指定特定伺服器的預設"
++"使用者,可能對應到密碼或存取指定的資源。如果您選擇這樣,新的連結將會為登入與"
++"資源而在瀏覽時建立。您可以在這邊編輯它們。密碼是儲存在本地端的,並且經過編碼"
++"使它無法被讀取。基於安全因素,您可能要注意之。包含密碼的項目將會清楚的指示。"
+ "
"
+
+ #: socks.cpp:42
+@@ -1928,27 +1934,24 @@
+
+ #: socks.cpp:270
+ msgid ""
+-"
SOCKS
"
+-"This module allows you to configure KDE support for a SOCKS server or "
+-"proxy.
"
+-"SOCKS is a protocol to traverse firewalls as described in RFC 1928. "
+-"
If you have no idea what this is and if your system administrator does not "
+-"tell you to use it, leave it disabled.
"
+-msgstr ""
+-"SOCKS
"
+-"這個模組允許您設定 KDE 對 SOCKS 伺服器或代理伺服器的支援。
"
+-"SOCKS 是用來穿過防火牆的協定,正如 RFC 1928 "
+-"所述。"
+-"
如果您不知道這是什麼或您的系統管理者沒有要您使用它,請讓它保持停用。
"
++"SOCKS
This module allows you to configure KDE support for a SOCKS "
++"server or proxy.
SOCKS is a protocol to traverse firewalls as "
++"described in RFC 1928.
If you "
++"have no idea what this is and if your system administrator does not tell you "
++"to use it, leave it disabled.
"
++msgstr ""
++"SOCKS
這個模組允許您設定 KDE 對 SOCKS 伺服器或代理伺服器的支援。"
++"p>
SOCKS 是用來穿過防火牆的協定,正如 RFC 1928 所述。
如果您不知道這是什麼或您的系統管理者沒有要您使用它,"
++"請讓它保持停用。
"
+
+ #: useragentdlg.cpp:225
+ msgid ""
+-""
+-"Found an existing identification for"
+-"
%1"
+-"
Do you want to replace it?"
+-msgstr "找到既存之關於
%1
的識別碼,您是否要置換它?"
++"Found an existing identification for
%1
Do you "
++"want to replace it?"
++msgstr ""
++"找到既存之關於
%1
的識別碼,您是否要置換它?"
++"center>"
+
+ #: useragentdlg.cpp:230
+ msgid "Duplicate Identification"
+@@ -1964,23 +1967,25 @@
+
+ #: useragentdlg.cpp:383
+ msgid ""
+-"Browser Identification
The browser-identification module allows you to "
+-"have full control over how Konqueror will identify itself to web sites you "
+-"browse.This ability to fake identification is necessary because some web "
+-"sites do not display properly when they detect that they are not talking to "
+-"current versions of either Netscape Navigator or Internet Explorer, even if the "
+-"browser actually supports all the necessary features to render those pages "
+-"properly. For such sites, you can use this feature to try to browse them. "
+-"Please understand that this might not always work, since such sites might be "
+-"using non-standard web protocols and or specifications.
NOTE: "
+-"To obtain specific help on a particular section of the dialog box, simply click "
+-"on the quick help button on the window title bar, then click on the section for "
+-"which you are seeking help."
+-msgstr ""
+-"
瀏覽器識別碼
瀏覽器識別碼控制視窗提供您來控制 Konqueror 回報遠端網站的資訊。"
+-" 這項功能提供了必要的偽裝的識別碼,這是因為某些網站在未能偵測到Netscape Navigator 或 Internet Explorer "
+-"時無法正常顯示,即使這些「未支援的瀏覽器」實際上支援必須的功能並能正常的顯示。因此您必須更改預設的瀏覽器識別碼來瀏覽這些網站"
+-"
注意:要獲得對話盒特定部分的說明,只要按下視窗標題列的快速說明按鈕,然後按下您想求助的段落。"
++"
Browser Identification
The browser-identification module allows you "
++"to have full control over how Konqueror will identify itself to web sites "
++"you browse.This ability to fake identification is necessary because some "
++"web sites do not display properly when they detect that they are not talking "
++"to current versions of either Netscape Navigator or Internet Explorer, even "
++"if the browser actually supports all the necessary features to render those "
++"pages properly. For such sites, you can use this feature to try to browse "
++"them. Please understand that this might not always work, since such sites "
++"might be using non-standard web protocols and or specifications.
NOTE:"
++"u> To obtain specific help on a particular section of the dialog box, simply "
++"click on the quick help button on the window title bar, then click on the "
++"section for which you are seeking help."
++msgstr ""
++"瀏覽器識別碼
瀏覽器識別碼控制視窗提供您來控制 Konqueror 回報遠端網站"
++"的資訊。
這項功能提供了必要的偽裝的識別碼,這是因為某些網站在未能偵測到"
++"Netscape Navigator 或 Internet Explorer 時無法正常顯示,即使這些「未支援的瀏"
++"覽器」實際上支援必須的功能並能正常的顯示。因此您必須更改預設的瀏覽器識別碼來"
++"瀏覽這些網站
注意:要獲得對話盒特定部分的說明,只要按下視窗標題列的"
++"快速說明按鈕,然後按下您想求助的段落。"
+
+ #~ msgid "MS Windows encoding:"
+ #~ msgstr "MS Windows 編碼:"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmkonqhtml.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmkonqhtml.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmkonqhtml.po 2008-02-13 10:55:26.000000000 +0100
++++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmkonqhtml.po 2011-11-11 15:45:17.000000000 +0100
+@@ -8,7 +8,7 @@
+ "Project-Id-Version: kcmkonqhtml 1.12\n"
+ "POT-Creation-Date: 2007-10-22 01:14+0200\n"
+ "PO-Revision-Date: 2005-10-27 21:45+0800\n"
+-"Last-Translator: Chao-Hsiung Liao \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Chinese (traditional) \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -33,9 +33,11 @@
+
+ #: appearance.cpp:33
+ msgid ""
+-"Konqueror Fonts
On this page, you can configure which fonts Konqueror "
+-"should use to display the web pages you view."
+-msgstr "Konqueror 字型
在此分頁,您可以設定 Konqueror 應該使用哪種字型來顯示您檢視的網頁。"
++"Konqueror Fonts
On this page, you can configure which fonts "
++"Konqueror should use to display the web pages you view."
++msgstr ""
++"Konqueror 字型
在此分頁,您可以設定 Konqueror 應該使用哪種字型來顯示"
++"您檢視的網頁。"
+
+ #: appearance.cpp:43
+ msgid "Font Si&ze"
+@@ -51,8 +53,8 @@
+
+ #: appearance.cpp:53
+ msgid ""
+-"Konqueror will never display text smaller than this size,"
+-"
overriding any other settings"
++"Konqueror will never display text smaller than this size,
overriding any "
++"other settings"
+ msgstr "Konqueror 永遠不會顯示小於這個大小的文字,
此設定值會覆蓋其他設定"
+
+ #: appearance.cpp:57
+@@ -125,7 +127,9 @@
+ msgid ""
+ "Select the default encoding to be used; normally, you will be fine with 'Use "
+ "language encoding' and should not have to change this."
+-msgstr "選擇要使用的預設編碼;通常,您只要選擇「使用語言編碼」即可,而不需要改變此選項。"
++msgstr ""
++"選擇要使用的預設編碼;通常,您只要選擇「使用語言編碼」即可,而不需要改變此選"
++"項。"
+
+ #: domainlistview.cpp:47
+ msgid "Host/Domain"
+@@ -137,11 +141,11 @@
+
+ #: domainlistview.cpp:55
+ msgid "&New..."
+-msgstr "新增(&N)..."
++msgstr "新增(&N)…"
+
+ #: domainlistview.cpp:59
+ msgid "Chan&ge..."
+-msgstr "改變(&H)..."
++msgstr "改變(&H)…"
+
+ #: domainlistview.cpp:63
+ msgid "De&lete"
+@@ -149,11 +153,11 @@
+
+ #: domainlistview.cpp:67
+ msgid "&Import..."
+-msgstr "匯入(&I)..."
++msgstr "匯入(&I)…"
+
+ #: domainlistview.cpp:73
+ msgid "&Export..."
+-msgstr "匯出(&E)..."
++msgstr "匯出(&E)…"
+
+ #: domainlistview.cpp:82
+ msgid "Click on this button to manually add a host or domain specific policy."
+@@ -213,60 +217,65 @@
+
+ #: filteropts.cpp:76
+ msgid "Import..."
+-msgstr "匯入..."
++msgstr "匯入…"
+
+ #: filteropts.cpp:78
+ msgid "Export..."
+-msgstr "匯出..."
++msgstr "匯出…"
+
+ #: filteropts.cpp:88
+ msgid ""
+ "Enable or disable AdBlocK filters. When enabled a set of expressions to be "
+ "blocked should be defined in the filter list for blocking to take effect."
+-msgstr "啟用或停用 AdBlocK 過濾器。當啟用時應在過濾器清單中定義要阻擋的表示式才能使阻擋功能生效。"
++msgstr ""
++"啟用或停用 AdBlocK 過濾器。當啟用時應在過濾器清單中定義要阻擋的表示式才能使阻"
++"擋功能生效。"
+
+ #: filteropts.cpp:91
+ msgid ""
+-"When enabled blocked images will be removed from the page completely otherwise "
+-"a placeholder 'blocked' image will be used."
+-msgstr "當啟用時被阻擋的圖片會完全從網頁中移除,另外就是使用「被阻擋的」佔位符圖片。"
++"When enabled blocked images will be removed from the page completely "
++"otherwise a placeholder 'blocked' image will be used."
++msgstr ""
++"當啟用時被阻擋的圖片會完全從網頁中移除,另外就是使用「被阻擋的」佔位符圖片。"
+
+ #: filteropts.cpp:93
+ msgid ""
+-"This is the list of URL filters that will be applied to all linked images and "
+-"frames. The filters are processed in order so place more generic filters "
++"This is the list of URL filters that will be applied to all linked images "
++"and frames. The filters are processed in order so place more generic filters "
+ "towards the top of the list."
+-msgstr "這是套用到所有連結的圖片與框架的 URL 過濾器清單。此過濾器是照順序處理的,因此較通用的過濾器要置於清單的頂端。"
++msgstr ""
++"這是套用到所有連結的圖片與框架的 URL 過濾器清單。此過濾器是照順序處理的,因此"
++"較通用的過濾器要置於清單的頂端。"
+
+ #: filteropts.cpp:96
+ msgid ""
+-"Enter an expression to filter. Expressions can be defined as either a filename "
+-"style wildcard e.g. http://www.site.com/ads* or as a full regular expression by "
+-"surrounding the string with '/' e.g. //(ad|banner)\\./"
++"Enter an expression to filter. Expressions can be defined as either a "
++"filename style wildcard e.g. http://www.site.com/ads* or as a full regular "
++"expression by surrounding the string with '/' e.g. //(ad|banner)\\./"
+ msgstr ""
+-"輸入要過濾的表示式。表示式可以定義為檔案名稱風格的萬用字元如 http://www.site.com/ads*,或是使用 '/' 字元框住完整的正規表示式如 "
+-"//(ad|banner)\\./"
++"輸入要過濾的表示式。表示式可以定義為檔案名稱風格的萬用字元如 http://www.site."
++"com/ads*,或是使用 '/' 字元框住完整的正規表示式如 //(ad|banner)\\./"
+
+ #: filteropts.cpp:324
+ msgid ""
+ "Konqueror AdBlocK
Konqueror AdBlocK allows you to create a list of "
+-"filters that are checked against linked images and frames. URL's that match are "
+-"either discarded or replaced with a placeholder image. "
++"filters that are checked against linked images and frames. URL's that match "
++"are either discarded or replaced with a placeholder image. "
+ msgstr ""
+-"Konqueror AdBlocK
Konqueror AdBlocK 讓您建立一個過濾器清單來檢查連結的圖片和框架。符合的 URL "
+-"會被取消或以佔位符圖片代替。"
++"Konqueror AdBlocK
Konqueror AdBlocK 讓您建立一個過濾器清單來檢查連結"
++"的圖片和框架。符合的 URL 會被取消或以佔位符圖片代替。"
+
+ #: htmlopts.cpp:41
+ msgid ""
+ "Konqueror Browser
Here you can configure Konqueror's browser "
+ "functionality. Please note that the file manager functionality has to be "
+-"configured using the \"File Manager\" configuration module. You can make some "
+-"settings how Konqueror should handle the HTML code in the web pages it loads. "
+-"It is usually not necessary to change anything here."
+-msgstr ""
+-"Konqueror 瀏覽器
您可以在這裡設定 Konqueror "
+-"的瀏覽功能。請注意檔案管理功能必須使用「檔案管理程式」組態模組來設定。您可以設定 Konqueror 要如何處理它所載入的網頁中的 HTML "
+-"碼。通常是不需要在這裡做任何改變的。"
++"configured using the \"File Manager\" configuration module. You can make "
++"some settings how Konqueror should handle the HTML code in the web pages it "
++"loads. It is usually not necessary to change anything here."
++msgstr ""
++"Konqueror 瀏覽器
您可以在這裡設定 Konqueror 的瀏覽功能。請注意檔案管"
++"理功能必須使用「檔案管理程式」組態模組來設定。您可以設定 Konqueror 要如何處理"
++"它所載入的網頁中的 HTML 碼。通常是不需要在這裡做任何改變的。"
+
+ #: htmlopts.cpp:49
+ msgid "Boo&kmarks"
+@@ -279,8 +288,11 @@
+ #: htmlopts.cpp:51
+ msgid ""
+ "If this box is checked, Konqueror will allow you to change the title of the "
+-"bookmark and choose a folder in which to store it when you add a new bookmark."
+-msgstr "如果核取此方塊,Konqueror 將允許您在加入新書籤時改變書籤的標題並選擇要將之儲存於哪個資料夾。"
++"bookmark and choose a folder in which to store it when you add a new "
++"bookmark."
++msgstr ""
++"如果核取此方塊,Konqueror 將允許您在加入新書籤時改變書籤的標題並選擇要將之儲"
++"存於哪個資料夾。"
+
+ #: htmlopts.cpp:55
+ msgid "Show only marked bookmarks in bookmark toolbar"
+@@ -290,7 +302,9 @@
+ msgid ""
+ "If this box is checked, Konqueror will show only those bookmarks in the "
+ "bookmark toolbar which you have marked to do so in the bookmark editor."
+-msgstr "如果核取這個方塊,Konqueror 在書籤工具列中將只顯示您在書籤編輯器中標記的書籤。"
++msgstr ""
++"如果核取這個方塊,Konqueror 在書籤工具列中將只顯示您在書籤編輯器中標記的書"
++"籤。"
+
+ #: htmlopts.cpp:65
+ msgid "Form Com&pletion"
+@@ -302,9 +316,11 @@
+
+ #: htmlopts.cpp:67
+ msgid ""
+-"If this box is checked, Konqueror will remember the data you enter in web forms "
+-"and suggest it in similar fields for all forms."
+-msgstr "如果核取此方塊, Konqueror 會記住您在網頁表單中輸入的資料,並且在所有表單中的類似欄位自動輸入。"
++"If this box is checked, Konqueror will remember the data you enter in web "
++"forms and suggest it in similar fields for all forms."
++msgstr ""
++"如果核取此方塊, Konqueror 會記住您在網頁表單中輸入的資料,並且在所有表單中的"
++"類似欄位自動輸入。"
+
+ #: htmlopts.cpp:72
+ msgid "&Maximum completions:"
+@@ -325,9 +341,11 @@
+
+ #: htmlopts.cpp:87
+ msgid ""
+-"This will open a new tab instead of a new window in various situations, such as "
+-"choosing a link or a folder with the middle mouse button."
+-msgstr "這個選項會在許多情況下開啟新分頁而非新視窗,像是以滑鼠中鍵選擇連結或資料夾時。"
++"This will open a new tab instead of a new window in various situations, such "
++"as choosing a link or a folder with the middle mouse button."
++msgstr ""
++"這個選項會在許多情況下開啟新分頁而非新視窗,像是以滑鼠中鍵選擇連結或資料夾"
++"時。"
+
+ #: htmlopts.cpp:92
+ msgid "Hide the tab bar when only one tab is open"
+@@ -335,8 +353,8 @@
+
+ #: htmlopts.cpp:93
+ msgid ""
+-"This will display the tab bar only if there are two or more tabs. Otherwise it "
+-"will always be displayed."
++"This will display the tab bar only if there are two or more tabs. Otherwise "
++"it will always be displayed."
+ msgstr "這樣只有在開啟兩個以上的分頁使才會顯示分頁列。否則它將永遠顯示。"
+
+ #: htmlopts.cpp:108
+@@ -349,9 +367,11 @@
+
+ #: htmlopts.cpp:111
+ msgid ""
+-"If this option is set, the shape of the cursor will change (usually to a hand) "
+-"if it is moved over a hyperlink."
+-msgstr "如果設定此選項,當游標移至超連結上時,其形狀會有所變化(通常是變成手的形狀)。"
++"If this option is set, the shape of the cursor will change (usually to a "
++"hand) if it is moved over a hyperlink."
++msgstr ""
++"如果設定此選項,當游標移至超連結上時,其形狀會有所變化(通常是變成手的形"
++"狀)。"
+
+ #: htmlopts.cpp:115
+ msgid "M&iddle click opens URL in selection"
+@@ -372,7 +392,9 @@
+ "If this box is checked, you can go back in history by right clicking on a "
+ "Konqueror view. To access the context menu, press the right mouse button and "
+ "move."
+-msgstr "如果核取此方塊,您可以在 Konqueror 檢視中按滑鼠右鍵以回到紀錄中的上一步。要使用前後選單,按下滑鼠右鍵並移動。"
++msgstr ""
++"如果核取此方塊,您可以在 Konqueror 檢視中按滑鼠右鍵以回到紀錄中的上一步。要使"
++"用前後選單,按下滑鼠右鍵並移動。"
+
+ #: htmlopts.cpp:132
+ msgid "A&utomatically load images"
+@@ -380,14 +402,15 @@
+
+ #: htmlopts.cpp:133
+ msgid ""
+-"If this box is checked, Konqueror will automatically load any images that are "
+-"embedded in a web page. Otherwise, it will display placeholders for the images, "
+-"and you can then manually load the images by clicking on the image button."
+-"
Unless you have a very slow network connection, you will probably want to "
+-"check this box to enhance your browsing experience."
+-msgstr ""
+-"如果核取此方塊, Konqueror 會自動載入任何內嵌於網頁中的影像。否則它只會顯示該影像的保留位置,而您可以單擊影像按鈕手動載入影像。"
+-"
除非您的網路連線速度很慢,不然核取此方塊可以增強您的瀏覽經驗。"
++"If this box is checked, Konqueror will automatically load any images that "
++"are embedded in a web page. Otherwise, it will display placeholders for the "
++"images, and you can then manually load the images by clicking on the image "
++"button.
Unless you have a very slow network connection, you will probably "
++"want to check this box to enhance your browsing experience."
++msgstr ""
++"如果核取此方塊, Konqueror 會自動載入任何內嵌於網頁中的影像。否則它只會顯示該"
++"影像的保留位置,而您可以單擊影像按鈕手動載入影像。
除非您的網路連線速度很"
++"慢,不然核取此方塊可以增強您的瀏覽經驗。"
+
+ #: htmlopts.cpp:138
+ msgid "Dra&w frame around not completely loaded images"
+@@ -395,13 +418,14 @@
+
+ #: htmlopts.cpp:139
+ msgid ""
+-"If this box is checked, Konqueror will draw a frame as placeholder around not "
+-"yet fully loaded images that are embedded in a web page."
+-"
Especially if you have a slow network connection, you will probably want to "
+-"check this box to enhance your browsing experience."
+-msgstr ""
+-"如果核取此方塊, Konqueror 會在尚未完全載入的圖片周圍先繪出一個框架作為網頁中的保留位置。"
+-"
除非您的網路連線速度很慢,不然核取此方塊可以增強您的瀏覽經驗。"
++"If this box is checked, Konqueror will draw a frame as placeholder around "
++"not yet fully loaded images that are embedded in a web page.
Especially "
++"if you have a slow network connection, you will probably want to check this "
++"box to enhance your browsing experience."
++msgstr ""
++"如果核取此方塊, Konqueror 會在尚未完全載入的圖片周圍先繪出一個框架作為網頁中"
++"的保留位置。
除非您的網路連線速度很慢,不然核取此方塊可以增強您的瀏覽經"
++"驗。"
+
+ #: htmlopts.cpp:144
+ msgid "Allow automatic delayed &reloading/redirecting"
+@@ -411,7 +435,9 @@
+ msgid ""
+ "Some web pages request an automatic reload or redirection after a certain "
+ "period of time. By unchecking this box Konqueror will ignore these requests."
+-msgstr "有些網頁會在一段時間後要求自動重新載入或重新導向。若核消此方塊, Konqueror 會忽略這些要求。"
++msgstr ""
++"有些網頁會在一段時間後要求自動重新載入或重新導向。若核消此方塊, Konqueror 會"
++"忽略這些要求。"
+
+ #: htmlopts.cpp:158
+ msgid "Und&erline links:"
+@@ -436,21 +462,15 @@
+ #: htmlopts.cpp:167
+ msgid ""
+ "Controls how Konqueror handles underlining hyperlinks:"
+-"
"
+-""
+-"- Enabled: Always underline links
"
+-"- Disabled: Never underline links
"
+-"- Only on Hover: Underline when the mouse is moved over the link
"
+-"
"
+-"
Note: The site's CSS definitions can override this value"
+-msgstr ""
+-"控制 Konqueror 如何處理超連結加底線:"
+-"
"
+-""
+-"- 啟用:永遠為連結加底線
"
+-"- 停用:永遠不為連結加底線
"
+-"- 只有停留其上時:當滑鼠越過連結時才加底線
"
+-"
注意:網站的 CSS 定義可以覆蓋此設定"
++"
- Enabled: Always underline links
- Disabled: "
++"Never underline links
- Only on Hover: Underline when the mouse "
++"is moved over the link
Note: The site's CSS definitions can "
++"override this value"
++msgstr ""
++"控制 Konqueror 如何處理超連結加底線:
- 啟用:永遠為連結加底"
++"線
- 停用:永遠不為連結加底線
- 只有停留其上時:當"
++"滑鼠越過連結時才加底線
注意:網站的 CSS 定義可以覆蓋此設定"
++"i>"
+
+ #: htmlopts.cpp:178
+ msgid "A&nimations:"
+@@ -474,20 +494,14 @@
+
+ #: htmlopts.cpp:187
+ msgid ""
+-"Controls how Konqueror shows animated images:"
+-"
"
+-""
+-"- Enabled: Show all animations completely.
"
+-"- Disabled: Never show animations, show the start image only.
"
+-"- Show only once: Show all animations completely but do not repeat "
+-"them.
"
+-msgstr ""
+-"控制 Konqueror 如何顯示動畫影像:"
+-"
"
+-""
+-"- 啟用:完整顯所有動畫。
"
+-"- 停用:永遠不顯示動畫,只顯示起始影像。
"
+-"- 只顯示一次:完整顯所有動畫但不重複播放。
"
++"Controls how Konqueror shows animated images:
- Enabled: "
++"Show all animations completely.
- Disabled: Never show "
++"animations, show the start image only.
- Show only once: Show "
++"all animations completely but do not repeat them.
"
++msgstr ""
++"控制 Konqueror 如何顯示動畫影像:
- 啟用:完整顯所有動畫。"
++"li>
- 停用:永遠不顯示動畫,只顯示起始影像。
- 只顯示一次"
++"b>:完整顯所有動畫但不重複播放。
"
+
+ #: javaopts.cpp:62 jsopts.cpp:48 pluginopts.cpp:59
+ msgid "Global Settings"
+@@ -531,58 +545,69 @@
+
+ #: javaopts.cpp:123
+ msgid ""
+-"Enables the execution of scripts written in Java that can be contained in HTML "
+-"pages. Note that, as with any browser, enabling active contents can be a "
+-"security problem."
+-msgstr "啟用內嵌於 HTML 網頁中以 Java 寫成的命令稿之執行。請注意,不論在任何瀏覽器中,啟用動態內容都有可能造成安全性問題。"
++"Enables the execution of scripts written in Java that can be contained in "
++"HTML pages. Note that, as with any browser, enabling active contents can be "
++"a security problem."
++msgstr ""
++"啟用內嵌於 HTML 網頁中以 Java 寫成的命令稿之執行。請注意,不論在任何瀏覽器"
++"中,啟用動態內容都有可能造成安全性問題。"
+
+ #: javaopts.cpp:126
+ msgid ""
+ "This box contains the domains and hosts you have set a specific Java policy "
+ "for. This policy will be used instead of the default policy for enabling or "
+-"disabling Java applets on pages sent by these domains or hosts. "
+-"Select a policy and use the controls on the right to modify it."
++"disabling Java applets on pages sent by these domains or hosts.
Select a "
++"policy and use the controls on the right to modify it."
+ msgstr ""
+-"此方塊包含您要設定特定 Java 政策的網域或主機。這個政策會取代預設政策以決定要啟用或停用由這些網域或主機所傳送的 Java applet 。"
+-"
選擇一個政策並使用右邊的控制項來編輯它。"
++"此方塊包含您要設定特定 Java 政策的網域或主機。這個政策會取代預設政策以決定要"
++"啟用或停用由這些網域或主機所傳送的 Java applet 。
選擇一個政策並使用右邊的"
++"控制項來編輯它。"
+
+ #: javaopts.cpp:133
+ msgid ""
+ "Click this button to choose the file that contains the Java policies. These "
+-"policies will be merged with the existing ones. Duplicate entries are ignored."
+-msgstr "單擊此按鈕以選擇含有 Java 政策的檔案。這些政策會被合併到現有的政策中。重複的項目會被忽略。"
++"policies will be merged with the existing ones. Duplicate entries are "
++"ignored."
++msgstr ""
++"單擊此按鈕以選擇含有 Java 政策的檔案。這些政策會被合併到現有的政策中。重複的"
++"項目會被忽略。"
+
+ #: javaopts.cpp:136
+ msgid ""
+-"Click this button to save the Java policy to a zipped file. The file, named "
+-"java_policy.tgz, will be saved to a location of your choice."
+-msgstr "單擊此按鈕來把 Java 政策儲存為壓縮的檔案。這個名為java_policy.tgz的檔案會儲存到您選擇的位置。"
++"Click this button to save the Java policy to a zipped file. The file, named "
++"java_policy.tgz, will be saved to a location of your choice."
++msgstr ""
++"單擊此按鈕來把 Java 政策儲存為壓縮的檔案。這個名為java_policy.tgz的檔"
++"案會儲存到您選擇的位置。"
+
+ #: javaopts.cpp:140
+ msgid ""
+-"Here you can set specific Java policies for any particular host or domain. To "
+-"add a new policy, simply click the New... button and supply the "
++"Here you can set specific Java policies for any particular host or domain. "
++"To add a new policy, simply click the New... button and supply the "
+ "necessary information requested by the dialog box. To change an existing "
+-"policy, click on the Change... button and choose the new policy from the "
+-"policy dialog box. Clicking on the Delete button will remove the "
+-"selected policy, causing the default policy setting to be used for that domain."
+-msgstr ""
+-"您可以在這裡設定任何特定主機或網域的特定 Java 政策。要增加新政策,只要單擊新增..."
+-"按鈕並提供對話方塊要求的必要資訊。要改變現有的政策,單擊改變...按鈕並從政策對話方塊選擇新政策。單擊刪除"
+-"按鈕會移除選擇的政策,並使用預設政策設定於該網域。"
++"policy, click on the Change... button and choose the new policy from "
++"the policy dialog box. Clicking on the Delete button will remove the "
++"selected policy, causing the default policy setting to be used for that "
++"domain."
++msgstr ""
++"您可以在這裡設定任何特定主機或網域的特定 Java 政策。要增加新政策,只要單擊"
++"新增...按鈕並提供對話方塊要求的必要資訊。要改變現有的政策,單擊改變..."
++"按鈕並從政策對話方塊選擇新政策。單擊刪除按鈕會移除選擇的政策,並使"
++"用預設政策設定於該網域。"
+
+ #: javaopts.cpp:153
+ msgid ""
+-"Enabling the security manager will cause the jvm to run with a Security Manager "
+-"in place. This will keep applets from being able to read and write to your file "
+-"system, creating arbitrary sockets, and other actions which could be used to "
+-"compromise your system. Disable this option at your own risk. You can modify "
+-"your $HOME/.java.policy file with the Java policytool utility to give code "
+-"downloaded from certain sites more permissions."
+-msgstr ""
+-"啟用安全性管理員會使 jvm 在適當的安全性管理下執行。這會防止 applet 讀寫您的檔案系統、任意建立 socket 或其他妨礎 "
+-"系統安全性的動作。停用此選項需要自負風險。您可以使用 Java policytool 公用程式來編輯您的 $HOME/.java.policy "
+-"檔案以給予下載自某些網站的程式更多權限。"
++"Enabling the security manager will cause the jvm to run with a Security "
++"Manager in place. This will keep applets from being able to read and write "
++"to your file system, creating arbitrary sockets, and other actions which "
++"could be used to compromise your system. Disable this option at your own "
++"risk. You can modify your $HOME/.java.policy file with the Java policytool "
++"utility to give code downloaded from certain sites more permissions."
++msgstr ""
++"啟用安全性管理員會使 jvm 在適當的安全性管理下執行。這會防止 applet 讀寫您的檔"
++"案系統、任意建立 socket 或其他妨礎 系統安全性的動作。停用此選項需要自負風險。"
++"您可以使用 Java policytool 公用程式來編輯您的 $HOME/.java.policy 檔案以給予下"
++"載自某些網站的程式更多權限。"
+
+ #: javaopts.cpp:161
+ msgid "Enabling this will cause the jvm to use KIO for network transport "
+@@ -590,31 +615,34 @@
+
+ #: javaopts.cpp:163
+ msgid ""
+-"Enter the path to the java executable. If you want to use the jre in your path, "
+-"simply leave it as 'java'. If you need to use a different jre, enter the path "
+-"to the java executable (e.g. /usr/lib/jdk/bin/java), or the path to the "
+-"directory that contains 'bin/java' (e.g. /opt/IBMJava2-13)."
+-msgstr ""
+-"輸入至 java 可執行檔的路徑。如果您想使用在您的路徑中的 jre ,只要保留「java」。如果您需要使用不同的 jre ,輸入到該 java "
+-"可執行檔的路徑(如 /usr/lib/jdk/bin/java),或是到包含「bin/java」目錄的路徑(如 /opt/IBMJava2-13)。"
++"Enter the path to the java executable. If you want to use the jre in your "
++"path, simply leave it as 'java'. If you need to use a different jre, enter "
++"the path to the java executable (e.g. /usr/lib/jdk/bin/java), or the path to "
++"the directory that contains 'bin/java' (e.g. /opt/IBMJava2-13)."
++msgstr ""
++"輸入至 java 可執行檔的路徑。如果您想使用在您的路徑中的 jre ,只要保留"
++"「java」。如果您需要使用不同的 jre ,輸入到該 java 可執行檔的路徑(如 /usr/"
++"lib/jdk/bin/java),或是到包含「bin/java」目錄的路徑(如 /opt/IBMJava2-13)。"
+
+ #: javaopts.cpp:168
+ msgid ""
+-"If you want special arguments to be passed to the virtual machine, enter them "
+-"here."
++"If you want special arguments to be passed to the virtual machine, enter "
++"them here."
+ msgstr "如果您想要傳送特殊的參數給虛擬機器,可以在此輸入。"
+
+ #: javaopts.cpp:170
+ msgid ""
+-"When all the applets have been destroyed, the applet server should shut down. "
+-"However, starting the jvm takes a lot of time. If you would like to keep the "
+-"java process running while you are browsing, you can set the timeout value to "
+-"whatever you like. To keep the java process running for the whole time that the "
+-"konqueror process is, leave the Shutdown Applet Server checkbox unchecked."
+-msgstr ""
+-"當所有的 applet 都消滅時, applet 伺服器應該要關閉。然而啟動 jvm 需要不少時間。如果您想要在瀏覽時保持 java "
+-"程序的執行,您可以把逾時時間設為任何您想要的時間。要讓 java 程序在整個 konqueror 程序中執行,就不要核取 關閉 applet 伺服器 "
+-"核取方塊。"
++"When all the applets have been destroyed, the applet server should shut "
++"down. However, starting the jvm takes a lot of time. If you would like to "
++"keep the java process running while you are browsing, you can set the "
++"timeout value to whatever you like. To keep the java process running for the "
++"whole time that the konqueror process is, leave the Shutdown Applet Server "
++"checkbox unchecked."
++msgstr ""
++"當所有的 applet 都消滅時, applet 伺服器應該要關閉。然而啟動 jvm 需要不少時"
++"間。如果您想要在瀏覽時保持 java 程序的執行,您可以把逾時時間設為任何您想要的"
++"時間。要讓 java 程序在整個 konqueror 程序中執行,就不要核取 關閉 applet 伺服"
++"器 核取方塊。"
+
+ #: javaopts.cpp:283 pluginopts.cpp:626
+ msgid "Doma&in-Specific"
+@@ -646,8 +674,8 @@
+ "JavaScript) that can be contained in HTML pages. Note that, as with any "
+ "browser, enabling scripting languages can be a security problem."
+ msgstr ""
+-"啟用內嵌於 HTML 網頁中以 ECMA-Script(也稱為 JavaScript)寫成的命令稿的執行。請注意,在任何瀏覽器中啟用 scripting "
+-"語言可能造成安全性的問題。"
++"啟用內嵌於 HTML 網頁中以 ECMA-Script(也稱為 JavaScript)寫成的命令稿的執行。"
++"請注意,在任何瀏覽器中啟用 scripting 語言可能造成安全性的問題。"
+
+ #: jsopts.cpp:58
+ msgid "Report &errors"
+@@ -669,42 +697,49 @@
+ #: jsopts.cpp:72
+ msgid ""
+ "Here you can set specific JavaScript policies for any particular host or "
+-"domain. To add a new policy, simply click the New... "
+-"button and supply the necessary information requested by the dialog box. To "
+-"change an existing policy, click on the Change... "
+-"button and choose the new policy from the policy dialog box. Clicking on the "
+-"Delete button will remove the selected policy causing the default policy "
+-"setting to be used for that domain. The Import and Export "
+-"button allows you to easily share your policies with other people by allowing "
+-"you to save and retrieve them from a zipped file."
+-msgstr ""
+-"您可以在這裡設定任何特定主機或網域的特定 JavaScript 政策。要增加新政策,只要單擊新增..."
+-"按鈕並提供對話方塊要求的必要資訊。要改變現有的政策,單擊改變...按鈕並從政策對話方塊選擇新政策。單擊刪除"
+-"按鈕會移除選擇的政策並使用預設政策設定於該網域。匯入與匯出按鈕讓你可以用壓縮檔案的方式儲存與接收政策,以便和別人分享您的政策。"
++"domain. To add a new policy, simply click the New... button and "
++"supply the necessary information requested by the dialog box. To change an "
++"existing policy, click on the Change... button and choose the new "
++"policy from the policy dialog box. Clicking on the Delete button will "
++"remove the selected policy causing the default policy setting to be used for "
++"that domain. The Import and Export button allows you to easily "
++"share your policies with other people by allowing you to save and retrieve "
++"them from a zipped file."
++msgstr ""
++"您可以在這裡設定任何特定主機或網域的特定 JavaScript 政策。要增加新政策,只要"
++"單擊新增...按鈕並提供對話方塊要求的必要資訊。要改變現有的政策,單擊"
++"改變...按鈕並從政策對話方塊選擇新政策。單擊刪除按鈕會移除選擇的政"
++"策並使用預設政策設定於該網域。匯入與匯出按鈕讓你可以用壓縮檔案"
++"的方式儲存與接收政策,以便和別人分享您的政策。"
+
+ #: jsopts.cpp:82
+ msgid ""
+ "This box contains the domains and hosts you have set a specific JavaScript "
+-"policy for. This policy will be used instead of the default policy for enabling "
+-"or disabling JavaScript on pages sent by these domains or hosts. "
++"policy for. This policy will be used instead of the default policy for "
++"enabling or disabling JavaScript on pages sent by these domains or hosts. "
+ "
Select a policy and use the controls on the right to modify it."
+ msgstr ""
+-"此方塊包含您要設定特定 JavaScript 政策的網域或主機。這個政策會取代預設政策以決定要啟用或停用由這些網域或主機所傳送的網頁的JavaScript 。"
+-"
選擇一個政策並使用右邊的控制項來編輯它。"
++"此方塊包含您要設定特定 JavaScript 政策的網域或主機。這個政策會取代預設政策以"
++"決定要啟用或停用由這些網域或主機所傳送的網頁的JavaScript 。
選擇一個政策並"
++"使用右邊的控制項來編輯它。"
+
+ #: jsopts.cpp:89
+ msgid ""
+ "Click this button to choose the file that contains the JavaScript policies. "
+ "These policies will be merged with the existing ones. Duplicate entries are "
+ "ignored."
+-msgstr "單擊此按鈕以選擇含有 JavaScript 政策的檔案。這些政策會被合併到現有的政策中。重複的項目會被忽略。"
++msgstr ""
++"單擊此按鈕以選擇含有 JavaScript 政策的檔案。這些政策會被合併到現有的政策中。"
++"重複的項目會被忽略。"
+
+ #: jsopts.cpp:92
+ msgid ""
+ "Click this button to save the JavaScript policy to a zipped file. The file, "
+-"named javascript_policy.tgz, will be saved to a location of your choice."
++"named javascript_policy.tgz, will be saved to a location of your "
++"choice."
+ msgstr ""
+-"單擊此按鈕來把 JavaScript 政策儲存為壓縮的檔案。這個名為javascript_policy.tgz的檔案會儲存到您選擇的位置。"
++"單擊此按鈕來把 JavaScript 政策儲存為壓縮的檔案。這個名為javascript_policy."
++"tgz的檔案會儲存到您選擇的位置。"
+
+ #: jsopts.cpp:98
+ msgid "Global JavaScript Policies"
+@@ -779,23 +814,22 @@
+
+ #: jspolicies.cpp:183
+ msgid ""
+-"Accept popup window requests only when links are activated through an explicit "
+-"mouse click or keyboard operation."
++"Accept popup window requests only when links are activated through an "
++"explicit mouse click or keyboard operation."
+ msgstr "只有當連結是經過明確的滑鼠或鍵盤操作而作用的彈出式視窗要求才接受。"
+
+ #: jspolicies.cpp:190
+ msgid ""
+-"If you disable this, Konqueror will stop interpreting the window.open() "
+-"JavaScript command. This is useful if you regularly visit sites that make "
+-"extensive use of this command to pop up ad banners."
+-"
"
+-"
Note: Disabling this option might also break certain sites that "
+-"require window.open() for proper operation. Use this feature carefully."
+-msgstr ""
+-"如果您停用此選項, Konqueror 會停止解譯 window.open() JavaScript 命令。如果您時常參觀大量使用此命令來彈出廣 "
+-"告的網站時會很有用。"
+-"
"
+-"
注意:停用此選項也可能會中斷某些需要window.open()才能正確操作的網站。請小心使用此功能。"
++"If you disable this, Konqueror will stop interpreting the window.open()"
++"i> JavaScript command. This is useful if you regularly visit sites that make "
++"extensive use of this command to pop up ad banners.
Note: "
++"Disabling this option might also break certain sites that require window."
++"open() for proper operation. Use this feature carefully."
++msgstr ""
++"如果您停用此選項, Konqueror 會停止解譯 window.open() JavaScript 命"
++"令。如果您時常參觀大量使用此命令來彈出廣 告的網站時會很有用。
注"
++"意:停用此選項也可能會中斷某些需要window.open()才能正確操作的網"
++"站。請小心使用此功能。"
+
+ #: jspolicies.cpp:204
+ msgid "Resize window:"
+@@ -811,18 +845,20 @@
+
+ #: jspolicies.cpp:226
+ msgid ""
+-"Ignore attempts of scripts to change the window size. The web page will "
+-"think it changed the size but the actual window is not affected."
+-msgstr "忽略命令稿改變視窗大小的嘗試。讓網頁認為它已經變更了大小但是實際視窗的大小不會受影響。"
++"Ignore attempts of scripts to change the window size. The web page will "
++"think it changed the size but the actual window is not affected."
++msgstr ""
++"忽略命令稿改變視窗大小的嘗試。讓網頁認為它已經變更了大小但是實際視窗的"
++"大小不會受影響。"
+
+ #: jspolicies.cpp:233
+ msgid ""
+-"Some websites change the window size on their own by using "
+-"window.resizeBy() or window.resizeTo(). This option specifies the "
+-"treatment of such attempts."
++"Some websites change the window size on their own by using window.resizeBy"
++"() or window.resizeTo(). This option specifies the treatment of "
++"such attempts."
+ msgstr ""
+-"某些網站會使用 window.resizeBy() 或 window.resizeTo() "
+-"來改變它們本身視窗的大小。這個選項指定了要如何處理這類的意圖。"
++"某些網站會使用 window.resizeBy() 或 window.resizeTo() 來改變它"
++"們本身視窗的大小。這個選項指定了要如何處理這類的意圖。"
+
+ #: jspolicies.cpp:242
+ msgid "Move window:"
+@@ -834,18 +870,20 @@
+
+ #: jspolicies.cpp:264
+ msgid ""
+-"Ignore attempts of scripts to change the window position. The web page will "
+-"think it moved the window but the actual position is not affected."
+-msgstr "忽略命令稿改變視窗位置的嘗試。讓網頁認為它已經移動了視窗但是實際視窗的位置不會受影響。"
++"Ignore attempts of scripts to change the window position. The web page will "
++"think it moved the window but the actual position is not affected."
++msgstr ""
++"忽略命令稿改變視窗位置的嘗試。讓網頁認為它已經移動了視窗但是實際視窗的"
++"位置不會受影響。"
+
+ #: jspolicies.cpp:271
+ msgid ""
+-"Some websites change the window position on their own by using "
+-"window.moveBy() or window.moveTo(). This option specifies the "
+-"treatment of such attempts."
++"Some websites change the window position on their own by using window."
++"moveBy() or window.moveTo(). This option specifies the treatment "
++"of such attempts."
+ msgstr ""
+-"某些網站會使用 window.moveBy() 或 window.moveTo() "
+-"來改變它們本身視窗的位置。這個選項指定了要如何處理這類的意圖。"
++"某些網站會使用 window.moveBy() 或 window.moveTo() 來改變它們本"
++"身視窗的位置。這個選項指定了要如何處理這類的意圖。"
+
+ #: jspolicies.cpp:280
+ msgid "Focus window:"
+@@ -857,19 +895,23 @@
+
+ #: jspolicies.cpp:302
+ msgid ""
+-"Ignore attempts of scripts to focus the window. The web page will think "
+-"it brought the focus to the window but the actual focus will remain unchanged."
+-msgstr "忽略命令稿改變視窗焦點的嘗試。讓網頁認為它已經獲得了視窗焦點但是實際視窗的焦點不會受影響。"
++"Ignore attempts of scripts to focus the window. The web page will think"
++"i> it brought the focus to the window but the actual focus will remain "
++"unchanged."
++msgstr ""
++"忽略命令稿改變視窗焦點的嘗試。讓網頁認為它已經獲得了視窗焦點但是實際視"
++"窗的焦點不會受影響。"
+
+ #: jspolicies.cpp:310
+ msgid ""
+-"Some websites set the focus to their browser window on their own by using "
+-"window.focus(). This usually leads to the window being moved to the front "
+-"interrupting whatever action the user was dedicated to at that time. This "
+-"option specifies the treatment of such attempts."
+-msgstr ""
+-"某些網站會使用 window.focus() "
+-"來使它們本身瀏覽器視窗獲得焦點。這樣通常會將它的視窗最上方因而中斷了使用者當時要進行的動作。帶到這個選項指定了要如何處理這類的意圖。"
++"Some websites set the focus to their browser window on their own by using "
++"window.focus(). This usually leads to the window being moved to the "
++"front interrupting whatever action the user was dedicated to at that time. "
++"This option specifies the treatment of such attempts."
++msgstr ""
++"某些網站會使用 window.focus() 來使它們本身瀏覽器視窗獲得焦點。這樣通常"
++"會將它的視窗最上方因而中斷了使用者當時要進行的動作。帶到這個選項指定了要如何"
++"處理這類的意圖。"
+
+ #: jspolicies.cpp:321
+ msgid "Modify status bar text:"
+@@ -881,18 +923,21 @@
+
+ #: jspolicies.cpp:343
+ msgid ""
+-"Ignore attempts of scripts to change the status bar text. The web page will "
+-"think it changed the text but the actual text will remain unchanged."
+-msgstr "忽略命令稿改變狀態列文字的嘗試。讓網頁認為它已經改變了狀態列文字但是實際的文字不會受影響。"
++"Ignore attempts of scripts to change the status bar text. The web page will "
++"think it changed the text but the actual text will remain unchanged."
++msgstr ""
++"忽略命令稿改變狀態列文字的嘗試。讓網頁認為它已經改變了狀態列文字但是實"
++"際的文字不會受影響。"
+
+ #: jspolicies.cpp:351
+ msgid ""
+-"Some websites change the status bar text by setting window.status or "
+-"window.defaultStatus, thus sometimes preventing displaying the real URLs of "
+-"hyperlinks. This option specifies the treatment of such attempts."
+-msgstr ""
+-"某些網站會使用 window.status 或 window.defaultStatus "
+-"來改變狀態列的文字,這樣一來有時會妨礙真實網址的顯示。這個選項指定了要如何處理這類的意圖。"
++"Some websites change the status bar text by setting window.status or "
++"window.defaultStatus, thus sometimes preventing displaying the real "
++"URLs of hyperlinks. This option specifies the treatment of such attempts."
++msgstr ""
++"某些網站會使用 window.status 或 window.defaultStatus 來改變狀態"
++"列的文字,這樣一來有時會妨礙真實網址的顯示。這個選項指定了要如何處理這類的意"
++"圖。"
+
+ #: khttpoptdlg.cpp:16
+ msgid "Accept languages:"
+@@ -932,19 +977,18 @@
+
+ #: main.cpp:159
+ msgid ""
+-"JavaScript
On this page, you can configure whether JavaScript programs "
+-"embedded in web pages should be allowed to be executed by Konqueror."
+-"Java
On this page, you can configure whether Java applets embedded in "
+-"web pages should be allowed to be executed by Konqueror."
+-"
"
+-"
Note: Active content is always a security risk, which is why "
+-"Konqueror allows you to specify very fine-grained from which hosts you want to "
+-"execute Java and/or JavaScript programs."
+-msgstr ""
+-"JavaScript
在此分頁,您可以設定 Konqueror 是否允許執行內嵌於網頁中的 JavaScript 程式。"
+-"Java
在此分頁,您可以設定 Konqueror 是否允許執行內嵌於網頁中的 Java Applet 程式。"
+-"
"
+-"
注意:動態的內容常常會有安全性的顧慮,這也是為什麼 Konqueror 讓您指定您想執行來自哪個主機的 Java 和/或 "
++"JavaScript
On this page, you can configure whether JavaScript "
++"programs embedded in web pages should be allowed to be executed by Konqueror."
++"Java
On this page, you can configure whether Java applets embedded "
++"in web pages should be allowed to be executed by Konqueror.
Note:"
++"b> Active content is always a security risk, which is why Konqueror allows "
++"you to specify very fine-grained from which hosts you want to execute Java "
++"and/or JavaScript programs."
++msgstr ""
++"JavaScript
在此分頁,您可以設定 Konqueror 是否允許執行內嵌於網頁中的 "
++"JavaScript 程式。Java
在此分頁,您可以設定 Konqueror 是否允許執行內嵌"
++"於網頁中的 Java Applet 程式。
注意:動態的內容常常會有安全性的"
++"顧慮,這也是為什麼 Konqueror 讓您指定您想執行來自哪個主機的 Java 和/或 "
+ "JavaScript 程式。"
+
+ #: pluginopts.cpp:61
+@@ -975,43 +1019,54 @@
+ #: pluginopts.cpp:98
+ msgid ""
+ "Enables the execution of plugins that can be contained in HTML pages, e.g. "
+-"Macromedia Flash. Note that, as with any browser, enabling active contents can "
+-"be a security problem."
+-msgstr "啟用包含於 HTML 頁面中的外掛程式的執行,如 Macromedia Flash 。注意,在任何瀏覽器中啟用動態內容可能造成安全性的問題。"
++"Macromedia Flash. Note that, as with any browser, enabling active contents "
++"can be a security problem."
++msgstr ""
++"啟用包含於 HTML 頁面中的外掛程式的執行,如 Macromedia Flash 。注意,在任何瀏"
++"覽器中啟用動態內容可能造成安全性的問題。"
+
+ #: pluginopts.cpp:102
+ msgid ""
+-"This box contains the domains and hosts you have set a specific plugin policy "
+-"for. This policy will be used instead of the default policy for enabling or "
+-"disabling plugins on pages sent by these domains or hosts. "
++"This box contains the domains and hosts you have set a specific plugin "
++"policy for. This policy will be used instead of the default policy for "
++"enabling or disabling plugins on pages sent by these domains or hosts. "
+ "
Select a policy and use the controls on the right to modify it."
+ msgstr ""
+-"此方塊包含您要設定特定外掛程式政策的網域或主機。這個政策會取代預設政策以決定要啟用或停用由這些網域或主機所傳送的外掛程式。"
+-"
選擇一個政策並使用右邊的控制項來修改它。"
++"此方塊包含您要設定特定外掛程式政策的網域或主機。這個政策會取代預設政策以決定"
++"要啟用或停用由這些網域或主機所傳送的外掛程式。
選擇一個政策並使用右邊的控制"
++"項來修改它。"
+
+ #: pluginopts.cpp:108
+ msgid ""
+-"Click this button to choose the file that contains the plugin policies. These "
+-"policies will be merged with the existing ones. Duplicate entries are ignored."
+-msgstr "單擊此按鈕以選擇含有外掛程式政策的檔案。這些政策會被合併到現有的政策中。重複的項目會被忽略。"
++"Click this button to choose the file that contains the plugin policies. "
++"These policies will be merged with the existing ones. Duplicate entries are "
++"ignored."
++msgstr ""
++"單擊此按鈕以選擇含有外掛程式政策的檔案。這些政策會被合併到現有的政策中。重複"
++"的項目會被忽略。"
+
+ #: pluginopts.cpp:111
+ msgid ""
+-"Click this button to save the plugin policy to a zipped file. The file, named "
+-"plugin_policy.tgz, will be saved to a location of your choice."
+-msgstr "單擊此按鈕來把外掛程式政策儲存為壓縮的檔案。這個名為plugin_policy.tgz的檔案會儲存到您選擇的位置。"
++"Click this button to save the plugin policy to a zipped file. The file, "
++"named plugin_policy.tgz, will be saved to a location of your choice."
++msgstr ""
++"單擊此按鈕來把外掛程式政策儲存為壓縮的檔案。這個名為plugin_policy.tgz"
++"的檔案會儲存到您選擇的位置。"
+
+ #: pluginopts.cpp:114
+ msgid ""
+-"Here you can set specific plugin policies for any particular host or domain. To "
+-"add a new policy, simply click the New... button and supply the "
++"Here you can set specific plugin policies for any particular host or domain. "
++"To add a new policy, simply click the New... button and supply the "
+ "necessary information requested by the dialog box. To change an existing "
+-"policy, click on the Change... button and choose the new policy from the "
+-"policy dialog box. Clicking on the Delete button will remove the "
+-"selected policy causing the default policy setting to be used for that domain."
+-msgstr ""
+-"您可以在這裡設定任何特定主機或網域的特定外掛程式政策。要增加新政策,只要單擊新增...按鈕並提供對話方塊要求的必要資訊。要改變現有的政策,單擊改變...按鈕並從政策對話方塊選擇新政策。單擊刪除按鈕會移除選擇的政策並使用預設政策設定於該網域。"
++"policy, click on the Change... button and choose the new policy from "
++"the policy dialog box. Clicking on the Delete button will remove the "
++"selected policy causing the default policy setting to be used for that "
++"domain."
++msgstr ""
++"您可以在這裡設定任何特定主機或網域的特定外掛程式政策。要增加新政策,只要單擊"
++"新增...按鈕並提供對話方塊要求的必要資訊。要改變現有的政策,單擊改"
++"變...按鈕並從政策對話方塊選擇新政策。單擊刪除按鈕會移除選擇的政策"
++"並使用預設政策設定於該網域。"
+
+ #: pluginopts.cpp:129 pluginopts.cpp:523
+ msgid "Netscape Plugins"
+@@ -1049,19 +1104,21 @@
+
+ #: pluginopts.cpp:257
+ msgid ""
+-"
Konqueror Plugins
The Konqueror web browser can use Netscape plugins "
+-"to show special content, just like the Navigator does. Please note that the way "
+-"you have to install Netscape plugins may depend on your distribution. A typical "
+-"place to install them is, for example, '/opt/netscape/plugins'."
+-msgstr ""
+-"Konqueror 外掛程式
Konqueror 網頁瀏覽器可以使用 Netscape 外掛程式來顯示特別的內容,正如 Navigator "
+-"一般。請注意,安裝 Netscape 外掛程式的方式可能取決於您的發行版本 (distribution)。舉例來說,典型的安裝位置是 "
+-"「/opt/netscape/plugin」。"
++"Konqueror Plugins
The Konqueror web browser can use Netscape "
++"plugins to show special content, just like the Navigator does. Please note "
++"that the way you have to install Netscape plugins may depend on your "
++"distribution. A typical place to install them is, for example, '/opt/"
++"netscape/plugins'."
++msgstr ""
++"Konqueror 外掛程式
Konqueror 網頁瀏覽器可以使用 Netscape 外掛程式來"
++"顯示特別的內容,正如 Navigator 一般。請注意,安裝 Netscape 外掛程式的方式可能"
++"取決於您的發行版本 (distribution)。舉例來說,典型的安裝位置是 「/opt/"
++"netscape/plugin」。"
+
+ #: pluginopts.cpp:283
+ msgid ""
+-"Do you want to apply your changes before the scan? Otherwise the changes will "
+-"be lost."
++"Do you want to apply your changes before the scan? Otherwise the changes "
++"will be lost."
+ msgstr "您是否要在掃描前套用您的變更?否則這些變更將會遺失。"
+
+ #: pluginopts.cpp:302
+@@ -1118,7 +1175,8 @@
+ msgid ""
+ "Enter the name of a host (like www.kde.org) or a domain, starting with a dot "
+ "(like .kde.org or .org)"
+-msgstr "輸入主機名稱(如 www.kde.org )或以 . 開頭的網域(如 .kde.org 或 .org )"
++msgstr ""
++"輸入主機名稱(如 www.kde.org )或以 . 開頭的網域(如 .kde.org 或 .org )"
+
+ #: policydlg.cpp:112
+ msgid "You must first enter a domain name."
+@@ -1153,8 +1211,8 @@
+ #: rc.cpp:15
+ #, no-c-format
+ msgid ""
+-"This will open a new tab opened from a page after the current tab, instead of "
+-"after the last tab."
++"This will open a new tab opened from a page after the current tab, instead "
++"of after the last tab."
+ msgstr "這會在目前分頁之後開啟新的分頁,而非在最後一個分頁之後。"
+
+ #. i18n: file advancedTabOptions.ui line 79
+@@ -1167,8 +1225,8 @@
+ #: rc.cpp:21
+ #, no-c-format
+ msgid ""
+-"This will ask you whether you are sure you want to close a window when it has "
+-"multiple tabs opened in it."
++"This will ask you whether you are sure you want to close a window when it "
++"has multiple tabs opened in it."
+ msgstr "這會詢問您是否確定要關閉一個已經開啟多重分頁的視窗。"
+
+ #. i18n: file advancedTabOptions.ui line 90
+@@ -1194,8 +1252,8 @@
+ #: rc.cpp:33
+ #, no-c-format
+ msgid ""
+-"Whether or not JavaScript popups if allowed shall open in a new tab or in a new "
+-"window."
++"Whether or not JavaScript popups if allowed shall open in a new tab or in a "
++"new window."
+ msgstr "是否允許 JavaScript 彈出視窗,如果允許,要在新的分頁和新的視窗中開啟。"
+
+ #. i18n: file advancedTabOptions.ui line 112
+@@ -1208,9 +1266,11 @@
+ #: rc.cpp:39
+ #, no-c-format
+ msgid ""
+-"When checking this the previous used or opened tab will be activated when you "
+-"close the current active tab instead of the one right to the current tab."
+-msgstr "當您關閉目前使用中的分頁時會使用前一個用過或開啟的分頁而非位於目前分頁右邊的分頁。"
++"When checking this the previous used or opened tab will be activated when "
++"you close the current active tab instead of the one right to the current tab."
++msgstr ""
++"當您關閉目前使用中的分頁時會使用前一個用過或開啟的分頁而非位於目前分頁右邊的"
++"分頁。"
+
+ #. i18n: file advancedTabOptions.ui line 123
+ #: rc.cpp:42
+@@ -1224,11 +1284,12 @@
+ msgid ""
+ "When you click a URL in another KDE program or call kfmclient to open a URL, "
+ "the current desktop will be searched for a non-minimized Konqueror and, if "
+-"found, the URL opened as a new tab within it. Otherwise a new Konqueror window "
+-"will be opened with the required URL."
++"found, the URL opened as a new tab within it. Otherwise a new Konqueror "
++"window will be opened with the required URL."
+ msgstr ""
+-"當您在其他程式點選網址或者呼叫 kfmclient 開啟網址,目前的桌面將搜尋未最小化的 "
+-"Konqueror,如果找到了,該網址會在其中開啟為新的分頁。否則將會開啟一個新的 Konqueror 視窗給該要求的網址。"
++"當您在其他程式點選網址或者呼叫 kfmclient 開啟網址,目前的桌面將搜尋未最小化"
++"的 Konqueror,如果找到了,該網址會在其中開啟為新的分頁。否則將會開啟一個新的 "
++"Konqueror 視窗給該要求的網址。"
+
+ #. i18n: file nsconfigwidget.ui line 17
+ #: rc.cpp:48
+@@ -1264,13 +1325,14 @@
+ #: rc.cpp:63
+ #, no-c-format
+ msgid ""
+-"If this option is enabled, KDE will look for new Netscape plugins every time it "
+-"starts up. This makes it easier for you if you often install new plugins, but "
+-"it may also slow down KDE startup. You might want to disable this option, "
+-"especially if you seldom install plugins."
+-msgstr ""
+-"如果啟用此選項, KDE 會在每次啟動時尋找新的 Netscape 外掛程式。如果您時常安裝新的外掛程式,這可以讓它簡單一些,但它也會減慢 KDE "
+-"的啟動速度。您可能會想要停用此選項,特別是當您不常安裝外掛程式的時候。"
++"If this option is enabled, KDE will look for new Netscape plugins every time "
++"it starts up. This makes it easier for you if you often install new plugins, "
++"but it may also slow down KDE startup. You might want to disable this "
++"option, especially if you seldom install plugins."
++msgstr ""
++"如果啟用此選項, KDE 會在每次啟動時尋找新的 Netscape 外掛程式。如果您時常安裝"
++"新的外掛程式,這可以讓它簡單一些,但它也會減慢 KDE 的啟動速度。您可能會想要停"
++"用此選項,特別是當您不常安裝外掛程式的時候。"
+
+ #. i18n: file nsconfigwidget.ui line 106
+ #: rc.cpp:66
+@@ -1321,7 +1383,14 @@
+ msgstr "使用 a&rtsdsp 以透過 aRts 導引外掛程式音效"
+
+ #~ msgid "Sho&w Java console"
+-#~ msgstr "顯示 Java 控制台(&W)"
++#~ msgstr "顯示 Java 控制臺(&W)"
+
+-#~ msgid "If this box is checked, Konqueror will open a console window that Java programs can use for character-based input/output. Well-written Java applets do not need this, but the console can help to find problems with Java applets."
+-#~ msgstr "如果核取此方塊, Konqueror 會開啟一個讓 Java 程式可以使用以文字為基礎的輸入/輸出控制台視窗。撰寫得好的 Java applet 不需要這個,但控制台可以幫助找出 Java applet 的問題。"
++#~ msgid ""
++#~ "If this box is checked, Konqueror will open a console window that Java "
++#~ "programs can use for character-based input/output. Well-written Java "
++#~ "applets do not need this, but the console can help to find problems with "
++#~ "Java applets."
++#~ msgstr ""
++#~ "如果核取此方塊, Konqueror 會開啟一個讓 Java 程式可以使用以文字為基礎的輸"
++#~ "入/輸出控制臺視窗。撰寫得好的 Java applet 不需要這個,但控制臺可以幫助找"
++#~ "出 Java applet 的問題。"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmkonq.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmkonq.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmkonq.po 2008-08-19 20:43:10.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmkonq.po 2011-11-11 15:45:17.000000000 +0100
+@@ -11,8 +11,7 @@
+ "Project-Id-Version: kcmkonq\n"
+ "POT-Creation-Date: 2008-06-08 01:37+0200\n"
+ "PO-Revision-Date: 2006-09-04 09:09+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Chinese Traditional \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -21,9 +20,10 @@
+
+ #: behaviour.cpp:46
+ msgid ""
+-"Konqueror Behavior
You can configure how Konqueror behaves as a file "
+-"manager here."
+-msgstr "Konqueror 行為
您可以在這裡設定 Konqueror 做為檔案管理程式的行為。"
++"Konqueror Behavior
You can configure how Konqueror behaves as a "
++"file manager here."
++msgstr ""
++"Konqueror 行為
您可以在這裡設定 Konqueror 做為檔案管理程式的行為。"
+
+ #: behaviour.cpp:50
+ msgid "Misc Options"
+@@ -31,13 +31,15 @@
+
+ #: behaviour.cpp:66
+ msgid "Open folders in separate &windows"
+-msgstr "在不同的視窗開啟目錄(&w)"
++msgstr "在不同的視窗開啟目錄(&W)"
+
+ #: behaviour.cpp:67
+ msgid ""
+ "If this option is checked, Konqueror will open a new window when you open a "
+ "folder, rather than showing that folder's contents in the current window."
+-msgstr "如果核取此選項,當您開啟一個目錄時 Konqueror 會開啟一個新視窗,而不是在目前的視窗顯示目錄內容。"
++msgstr ""
++"如果核取此選項,當您開啟一個目錄時 Konqueror 會開啟一個新視窗,而不是在目前的"
++"視窗顯示目錄內容。"
+
+ #: behaviour.cpp:74
+ msgid "&Show network operations in a single window"
+@@ -45,10 +47,12 @@
+
+ #: behaviour.cpp:77
+ msgid ""
+-"Checking this option will group the progress information for all network file "
+-"transfers into a single window with a list. When the option is not checked, all "
+-"transfers appear in a separate window."
+-msgstr "選擇此選項會將所有網路檔案傳輸的處理資訊整合到單一視窗的列表中。當不選擇此選項時,所有的傳輸資訊會出現在不同的視窗。"
++"Checking this option will group the progress information for all network "
++"file transfers into a single window with a list. When the option is not "
++"checked, all transfers appear in a separate window."
++msgstr ""
++"選擇此選項會將所有網路檔案傳輸的處理資訊整合到單一視窗的列表中。當不選擇此選"
++"項時,所有的傳輸資訊會出現在不同的視窗。"
+
+ #: behaviour.cpp:85
+ msgid "Show file &tips"
+@@ -56,9 +60,11 @@
+
+ #: behaviour.cpp:88
+ msgid ""
+-"Here you can control if, when moving the mouse over a file, you want to see a "
+-"small popup window with additional information about that file"
+-msgstr "您可以在此控制,如果您希望在把滑鼠移到一個檔案上時彈出一個顯示該檔案的額外資訊的小視窗"
++"Here you can control if, when moving the mouse over a file, you want to see "
++"a small popup window with additional information about that file"
++msgstr ""
++"您可以在此控制,如果您希望在把滑鼠移到一個檔案上時彈出一個顯示該檔案的額外資"
++"訊的小視窗"
+
+ #: behaviour.cpp:108
+ msgid "Show &previews in file tips"
+@@ -66,9 +72,11 @@
+
+ #: behaviour.cpp:111
+ msgid ""
+-"Here you can control if you want the popup window to contain a larger preview "
+-"for the file, when moving the mouse over it."
+-msgstr "您可以在此控制,如果您希望在把滑鼠移到一個檔案上時彈出一個顯示該檔案的大型預覽 的視窗。"
++"Here you can control if you want the popup window to contain a larger "
++"preview for the file, when moving the mouse over it."
++msgstr ""
++"您可以在此控制,如果您希望在把滑鼠移到一個檔案上時彈出一個顯示該檔案的大型預"
++"覽 的視窗。"
+
+ #: behaviour.cpp:114
+ msgid "Rename icons in&line"
+@@ -76,8 +84,8 @@
+
+ #: behaviour.cpp:115
+ msgid ""
+-"Checking this option will allow files to be renamed by clicking directly on the "
+-"icon name. "
++"Checking this option will allow files to be renamed by clicking directly on "
++"the icon name. "
+ msgstr "選取這個選項會允許直接按一下圖示名稱來更改檔名。"
+
+ #: behaviour.cpp:121
+@@ -90,10 +98,12 @@
+
+ #: behaviour.cpp:131
+ msgid ""
+-"This is the URL (e.g. a folder or a web page) where Konqueror will jump to when "
+-"the \"Home\" button is pressed. This is usually your home folder, symbolized by "
+-"a 'tilde' (~)."
+-msgstr "當「家」按鈕被按下時 konqueror 將跳到這個 URL (可能是一個目錄或網頁)。這通常是您的家目錄,以一個「符號」(~)來代表。"
++"This is the URL (e.g. a folder or a web page) where Konqueror will jump to "
++"when the \"Home\" button is pressed. This is usually your home folder, "
++"symbolized by a 'tilde' (~)."
++msgstr ""
++"當「家」按鈕被按下時 konqueror 將跳到這個 URL (可能是一個目錄或網頁)。這通"
++"常是您的家目錄,以一個「符號」(~)來代表。"
+
+ #: behaviour.cpp:139
+ msgid "Show 'Delete' context me&nu entries which bypass the trashcan"
+@@ -102,10 +112,11 @@
+ #: behaviour.cpp:143
+ msgid ""
+ "Check this if you want 'Delete' menu commands to be displayed on the desktop "
+-"and in the file manager's context menus. You can always delete files by holding "
+-"the Shift key while calling 'Move to Trash'."
++"and in the file manager's context menus. You can always delete files by "
++"holding the Shift key while calling 'Move to Trash'."
+ msgstr ""
+-"如果您希望「刪除」選單指令顯示在桌面和檔案管理程式的快顯選單中請核取此項。您隨時可以按住 Shift 按鍵並選擇「移至資源回收桶」來刪除檔案。"
++"如果您希望「刪除」選單指令顯示在桌面和檔案管理程式的快顯選單中請核取此項。您"
++"隨時可以按住 Shift 按鍵並選擇「移至資源回收桶」來刪除檔案。"
+
+ #: behaviour.cpp:148
+ msgid "Ask Confirmation For"
+@@ -114,16 +125,13 @@
+ #: behaviour.cpp:150
+ msgid ""
+ "This option tells Konqueror whether to ask for a confirmation when you "
+-"\"delete\" a file. "
+-""
+-"- Move To Trash: moves the file to your trash folder, from where it "
+-"can be recovered very easily.
"
++"\"delete\" a file. - Move To Trash: moves the file to your "
++"trash folder, from where it can be recovered very easily.
"
+ "- Delete: simply deletes the file.
"
+ msgstr ""
+-"這個選項會告訴 Konqueror ,當您「刪除」檔案時,是否要求做確認。 "
+-""
+-"- 移至資源回收桶: 搬移檔案至您的資源回收桶目錄,它可以非常容易的從那裡復原。
"
+-"- 刪除: 直接刪除檔案。
"
++"這個選項會告訴 Konqueror ,當您「刪除」檔案時,是否要求做確認。 - "
++"移至資源回收桶: 搬移檔案至您的資源回收桶目錄,它可以非常容易的從那裡復"
++"原。
- 刪除: 直接刪除檔案。
"
+
+ #: behaviour.cpp:159
+ msgid "&Move to trash"
+@@ -131,7 +139,7 @@
+
+ #: behaviour.cpp:161
+ msgid "D&elete"
+-msgstr "刪除(&e)"
++msgstr "刪除(&E)"
+
+ #: browser.cpp:51
+ msgid "&Appearance"
+@@ -153,7 +161,9 @@
+ msgid ""
+ "Multiple Desktops
In this module, you can configure how many virtual "
+ "desktops you want and how these should be labeled."
+-msgstr "多重桌面
在此模組中,您可以設定您需要多少虛擬桌面以及這些桌面的標籤為何。"
++msgstr ""
++"多重桌面
在此模組中,您可以設定您需要多少虛擬桌面以及這些桌面的標籤為"
++"何。"
+
+ #: desktop.cpp:71
+ msgid "N&umber of desktops: "
+@@ -161,9 +171,10 @@
+
+ #: desktop.cpp:77
+ msgid ""
+-"Here you can set how many virtual desktops you want on your KDE desktop. Move "
+-"the slider to change the value."
+-msgstr "您可以設定想要在您的 KDE 桌面上放多少個虛擬桌面。移動捲軸可以改變數量大小。"
++"Here you can set how many virtual desktops you want on your KDE desktop. "
++"Move the slider to change the value."
++msgstr ""
++"您可以設定想要在您的 KDE 桌面上放多少個虛擬桌面。移動捲軸可以改變數量大小。"
+
+ #: desktop.cpp:88
+ msgid "Desktop &Names"
+@@ -213,54 +224,51 @@
+
+ #: desktopbehavior_impl.cpp:157 desktopbehavior_impl.cpp:203
+ msgid ""
+-" "
+-""
+-"- No action: as you might guess, nothing happens!
"
++" - No action: as you might guess, nothing happens!
"
+ "- Window list menu: a menu showing all windows on all virtual "
+-"desktops pops up. You can click on the desktop name to switch to that desktop, "
+-"or on a window name to shift focus to that window, switching desktops if "
+-"necessary, and restoring the window if it is hidden. Hidden or minimized "
+-"windows are represented with their names in parentheses.
"
+-"- Desktop menu: a context menu for the desktop pops up. Among other "
+-"things, this menu has options for configuring the display, locking the screen, "
+-"and logging out of KDE.
"
+-"- Application menu: the \"K\" menu pops up. This might be useful for "
+-"quickly accessing applications if you like to keep the panel (also known as "
+-"\"Kicker\") hidden from view.
"
+-msgstr ""
+-" "
+-""
+-"- 不動作:您可以猜得到,不會發生任何事!
"
+-"- 視窗列表選單:會彈出一個顯示所有在虛擬桌面視窗的選單。您可以藉著單擊桌面名稱來切換桌面,或單擊視窗名稱來轉換視窗,如果需要會同時切換桌"
+-"面,若視窗是隱藏的則會將它復原。隱藏或最小化的視窗會以括弧包含它們的名稱來表示。
"
+-"- 桌面選單:會彈出桌面的內容選單。這個選單有設定顯示、鎖定螢幕及登出 KDE 的選項。
"
+-"- 應用程式選單:會彈出「K」選單。如果您喜歡隱藏面板(也稱為「Kicker」),這對快速切換應用程式會很有用。
"
++"desktops pops up. You can click on the desktop name to switch to that "
++"desktop, or on a window name to shift focus to that window, switching "
++"desktops if necessary, and restoring the window if it is hidden. Hidden or "
++"minimized windows are represented with their names in parentheses. "
++"- Desktop menu: a context menu for the desktop pops up. Among "
++"other things, this menu has options for configuring the display, locking the "
++"screen, and logging out of KDE.
- Application menu: the \"K"
++"\" menu pops up. This might be useful for quickly accessing applications if "
++"you like to keep the panel (also known as \"Kicker\") hidden from view."
++"li>
"
++msgstr ""
++" - 不動作:您可以猜得到,不會發生任何事!
- 視窗列表"
++"選單:會彈出一個顯示所有在虛擬桌面視窗的選單。您可以藉著單擊桌面名稱來切"
++"換桌面,或單擊視窗名稱來轉換視窗,如果需要會同時切換桌面,若視窗是隱藏的則會"
++"將它復原。隱藏或最小化的視窗會以括弧包含它們的名稱來表示。
- 桌面"
++"選單:會彈出桌面的內容選單。這個選單有設定顯示、鎖定螢幕及登出 KDE 的選"
++"項。
- 應用程式選單:會彈出「K」選單。如果您喜歡隱藏面板(也"
++"稱為「Kicker」),這對快速切換應用程式會很有用。
"
+
+ #: desktopbehavior_impl.cpp:178
+ msgid ""
+-"You can choose what happens when you click the middle button of your pointing "
+-"device on the desktop: "
+-""
+-"- No action: as you might guess, nothing happens!
"
+-"- Window list menu: a menu showing all windows on all virtual "
+-"desktops pops up. You can click on the desktop name to switch to that desktop, "
+-"or on a window name to shift focus to that window, switching desktops if "
+-"necessary, and restoring the window if it is hidden. Hidden or minimized "
+-"windows are represented with their names in parentheses.
"
+-"- Desktop menu: a context menu for the desktop pops up. Among other "
+-"things, this menu has options for configuring the display, locking the screen, "
+-"and logging out of KDE.
"
+-"- Application menu: the \"K\" menu pops up. This might be useful for "
+-"quickly accessing applications if you like to keep the panel (also known as "
+-"\"Kicker\") hidden from view.
"
+-msgstr ""
+-"您可以選擇當您在桌面上敲擊指標裝置中間按鈕時會發生什麼事: "
+-""
+-"- 不動作: 您可以猜得到,沒事發生!
"
+-"- 視窗列表選單:會彈出一個顯示所有在虛擬桌面視窗的選單。您可以藉著單擊桌面名稱來切換桌面,或單擊視窗名稱來轉換視窗,如果需要會同時切換桌"
+-"面,若視窗是隱藏的則會將它復原。隱藏或最小化的視窗會以括弧包含它們的名稱來表示。
"
+-"- 桌面選單:會彈出桌面的內容選單。這個選單有設定顯示、鎖定螢幕及登出 KDE 的選項。
"
+-"- 應用程式選單:會彈出「K」選單。如果您喜歡隱藏面板(也稱為「Kicker」),這對快速切換應用程式會很有用。
"
++"You can choose what happens when you click the middle button of your "
++"pointing device on the desktop: - No action: as you might "
++"guess, nothing happens!
- Window list menu: a menu showing "
++"all windows on all virtual desktops pops up. You can click on the desktop "
++"name to switch to that desktop, or on a window name to shift focus to that "
++"window, switching desktops if necessary, and restoring the window if it is "
++"hidden. Hidden or minimized windows are represented with their names in "
++"parentheses.
- Desktop menu: a context menu for the desktop "
++"pops up. Among other things, this menu has options for configuring the "
++"display, locking the screen, and logging out of KDE.
"
++"- Application menu: the \"K\" menu pops up. This might be useful "
++"for quickly accessing applications if you like to keep the panel (also known "
++"as \"Kicker\") hidden from view.
"
++msgstr ""
++"您可以選擇當您在桌面上敲擊指標裝置中間按鈕時會發生什麼事: - 不動"
++"作: 您可以猜得到,沒事發生!
- 視窗列表選單:會彈出一個"
++"顯示所有在虛擬桌面視窗的選單。您可以藉著單擊桌面名稱來切換桌面,或單擊視窗名"
++"稱來轉換視窗,如果需要會同時切換桌面,若視窗是隱藏的則會將它復原。隱藏或最小"
++"化的視窗會以括弧包含它們的名稱來表示。
- 桌面選單:會彈出桌面"
++"的內容選單。這個選單有設定顯示、鎖定螢幕及登出 KDE 的選項。
- 應用"
++"程式選單:會彈出「K」選單。如果您喜歡隱藏面板(也稱為「Kicker」),這對"
++"快速切換應用程式會很有用。
"
+
+ #: desktopbehavior_impl.cpp:269
+ msgid "No Action"
+@@ -346,7 +354,8 @@
+ msgid ""
+ "This is the maximum number of lines that can be used to draw icon text. Long "
+ "file names are truncated at the end of the last line."
+-msgstr "這是用來繪製圖示文字的最大行數。過長的檔案名稱會在最後一行的結尾處被截斷。"
++msgstr ""
++"這是用來繪製圖示文字的最大列數。過長的檔案名稱會在最後一列的結尾處被截斷。"
+
+ #: fontopts.cpp:165
+ msgid "&Width for icon text:"
+@@ -367,7 +376,9 @@
+ "Checking this option will result in filenames being underlined, so that they "
+ "look like links on a web page. Note: to complete the analogy, make sure that "
+ "single click activation is enabled in the mouse control module."
+-msgstr "核取這個選項將會在檔名加上底線,這樣看起來會像是網頁上的連結。注意:要完整地模擬這個情況,請確定在滑鼠控制模組中的單鍵啟動功能是開啟的。"
++msgstr ""
++"核取這個選項將會在檔名加上底線,這樣看起來會像是網頁上的連結。注意:要完整地"
++"模擬這個情況,請確定在滑鼠控制模組中的單鍵啟動功能是開啟的。"
+
+ #: fontopts.cpp:194
+ msgid "Display file sizes in b&ytes"
+@@ -378,7 +389,9 @@
+ "Checking this option will result in file sizes being displayed in bytes. "
+ "Otherwise file sizes are being displayed in kilobytes or megabytes if "
+ "appropriate."
+-msgstr "選擇該選項會以位元組來顯示檔案大小。否則,檔案大小會以千位元組或百萬位元組中較適合者來顯示。"
++msgstr ""
++"選擇該選項會以位元組來顯示檔案大小。否則,檔案大小會以千位元組或百萬位元組中"
++"較適合者來顯示。"
+
+ #: fontopts.cpp:223
+ msgid ""
+@@ -400,28 +413,28 @@
+
+ #: previews.cpp:65
+ msgid ""
+-"Allow previews, \"Folder Icons Reflect Contents\", and retrieval of "
+-"meta-data on protocols:
"
++"Allow previews, \"Folder Icons Reflect Contents\", and retrieval of meta-"
++"data on protocols:
"
+ msgstr "允許預覽、「資料夾圖示反應其內容」與在協定上中繼資料的取回:
"
+
+ #: previews.cpp:68
+ msgid ""
+-"Preview Options
Here you can modify the behavior of Konqueror when it "
+-"shows the files in a folder."
+-"The list of protocols:
check the protocols over which previews should "
+-"be shown; uncheck those over which they should not. For instance, you might "
+-"want to show previews over SMB if the local network is fast enough, but you "
+-"might disable it for FTP if you often visit very slow FTP sites with large "
+-"images."
+-"Maximum File Size:
select the maximum file size for which previews "
+-"should be generated. For instance, if set to 1 MB (the default), no preview "
+-"will be generated for files bigger than 1 MB, for speed reasons."
+-msgstr ""
+-"預覽選項
您可以在此編輯當 Konqueror 顯示目錄中的檔案時的行為。"
+-"協定列表:
核取用來顯示預覽的協定,取消不該預覽的協定。例如,當區域網路夠快時,您可能會想顯示 SMB "
+-"上的預覽。但是假如您常上一些很慢的FTP 站,您可能會想關閉 FTP 的部分。"
+-"檔案大小的最大值:
選擇要產生預覽的檔案大小最大值。舉例來說,如果設為 1 MB (預設值),所有大於 1 MB "
+-"的檔案都不會產生預覽,這是基於速度的考量。"
++"Preview Options
Here you can modify the behavior of Konqueror when "
++"it shows the files in a folder.The list of protocols:
check the "
++"protocols over which previews should be shown; uncheck those over which they "
++"should not. For instance, you might want to show previews over SMB if the "
++"local network is fast enough, but you might disable it for FTP if you often "
++"visit very slow FTP sites with large images.Maximum File Size:
"
++"select the maximum file size for which previews should be generated. For "
++"instance, if set to 1 MB (the default), no preview will be generated for "
++"files bigger than 1 MB, for speed reasons."
++msgstr ""
++"預覽選項
您可以在此編輯當 Konqueror 顯示目錄中的檔案時的行為。協"
++"定列表:
核取用來顯示預覽的協定,取消不該預覽的協定。例如,當區域網路夠快"
++"時,您可能會想顯示 SMB 上的預覽。但是假如您常上一些很慢的FTP 站,您可能會想關"
++"閉 FTP 的部分。檔案大小的最大值:
選擇要產生預覽的檔案大小最大值。舉"
++"例來說,如果設為 1 MB (預設值),所有大於 1 MB 的檔案都不會產生預覽,這是基"
++"於速度的考量。"
+
+ #: previews.cpp:81
+ msgid "Select Protocols"
+@@ -439,10 +452,11 @@
+ msgid ""
+ "This option makes it possible to choose when the file previews, smart folder "
+ "icons, and meta-data in the File Manager should be activated.\n"
+-"In the list of protocols that appear, select which ones are fast enough for you "
+-"to allow previews to be generated."
++"In the list of protocols that appear, select which ones are fast enough for "
++"you to allow previews to be generated."
+ msgstr ""
+-"此選項讓您可以選擇何時要預覽檔案,智慧式資料夾圖示,與啟動檔案管理員中的中繼資料。\n"
++"此選項讓您可以選擇何時要預覽檔案,智慧式資料夾圖示,與啟動檔案管理員中的中繼"
++"資料。\n"
+ "在出現的協定列表中,選擇對您來說產生預覽速度夠快的方案。"
+
+ #: previews.cpp:124
+@@ -464,12 +478,13 @@
+ #: previews.cpp:145
+ msgid ""
+ "Select this to use thumbnails that are found inside some file types (e.g. "
+-"JPEG). This will increase speed and reduce disk usage. Deselect it if you have "
+-"files that have been processed by programs which create inaccurate thumbnails, "
+-"such as ImageMagick."
+-msgstr ""
+-"選擇此選項以使用在某些檔案類型(如 JPEG)中找到的 Thumbnail。 這樣會增進速度並減少硬碟的使用量。如果您的檔案曾被 ImageMagick 這 "
+-"類會建立不準確的 Thumbnail 的程式處理過,請不要選擇此選項。"
++"JPEG). This will increase speed and reduce disk usage. Deselect it if you "
++"have files that have been processed by programs which create inaccurate "
++"thumbnails, such as ImageMagick."
++msgstr ""
++"選擇此選項以使用在某些檔案類型(如 JPEG)中找到的 Thumbnail。 這樣會增進速度並"
++"減少硬碟的使用量。如果您的檔案曾被 ImageMagick 這 類會建立不準確的 Thumbnail "
++"的程式處理過,請不要選擇此選項。"
+
+ #. i18n: file desktopbehavior.ui line 34
+ #: rc.cpp:3
+@@ -490,7 +505,9 @@
+ "Uncheck this option if you do not want to have icons on the desktop. Without "
+ "icons the desktop will be somewhat faster but you will no longer be able to "
+ "drag files to the desktop."
+-msgstr "如果您不希望桌面上有圖示,請取消此選項。沒有圖示桌面會稍微快一點,但您將不再能拖拉檔案到桌面。"
++msgstr ""
++"如果您不希望桌面上有圖示,請取消此選項。沒有圖示桌面會稍微快一點,但您將不再"
++"能拖拉檔案到桌面。"
+
+ #. i18n: file desktopbehavior.ui line 92
+ #: rc.cpp:12
+@@ -507,8 +524,8 @@
+ "like netscape that check the root window for running instances, disable this "
+ "option."
+ msgstr ""
+-"若您想執行能在桌面上畫圖的 X11 程式,諸如 xsnow、xpenguin 或是 xmountain 請點選該選項。若對應用程式有任何問題,如 "
+-"netscape,請檢查主視窗且關閉該選項。"
++"若您想執行能在桌面上畫圖的 X11 程式,諸如 xsnow、xpenguin 或是 xmountain 請點"
++"選該選項。若對應用程式有任何問題,如 netscape,請檢查主視窗且關閉該選項。"
+
+ #. i18n: file desktopbehavior.ui line 105
+ #: rc.cpp:18
+@@ -559,12 +576,13 @@
+ #: rc.cpp:39
+ #, no-c-format
+ msgid ""
+-"If this option is selected, applications will not have their menu bar attached "
+-"to their own window anymore. Instead, there is one menu bar at the top of the "
+-"screen which shows the menus of the currently active application. You might "
+-"recognize this behavior from Mac OS."
++"If this option is selected, applications will not have their menu bar "
++"attached to their own window anymore. Instead, there is one menu bar at the "
++"top of the screen which shows the menus of the currently active application. "
++"You might recognize this behavior from Mac OS."
+ msgstr ""
+-"如果選取這個選項,程式的選單不會在自己的視窗上,而是在螢幕最上方的選單列上顯示目前作用的應用程式選單。 您可能了解這個行為就像是 Mac OS 的視窗一樣。"
++"如果選取這個選項,程式的選單不會在自己的視窗上,而是在螢幕最上方的選單列上顯"
++"示目前作用的應用程式選單。 您可能了解這個行為就像是 Mac OS 的視窗一樣。"
+
+ #. i18n: file desktopbehavior.ui line 159
+ #: rc.cpp:42
+@@ -594,7 +612,7 @@
+ #: rc.cpp:54 rc.cpp:57 rc.cpp:60
+ #, no-c-format
+ msgid "Edit..."
+-msgstr "編輯..."
++msgstr "編輯…"
+
+ #. i18n: file desktopbehavior.ui line 304
+ #: rc.cpp:63
+@@ -606,7 +624,7 @@
+ #: rc.cpp:66
+ #, no-c-format
+ msgid "Automatically &line up icons"
+-msgstr "自動排列圖示(&l)"
++msgstr "自動排列圖示(&L)"
+
+ #. i18n: file desktopbehavior.ui line 318
+ #: rc.cpp:69
+@@ -629,14 +647,17 @@
+ "If you check this option, any files in your desktop directory that begin "
+ "with a period (.) will be shown. Usually, such files contain configuration "
+ "information, and remain hidden from view.
\n"
+-"For example, files which are named \".directory\" are plain text files which "
+-"contain information for Konqueror, such as the icon to use in displaying a "
+-"directory, the order in which files should be sorted, etc. You should not "
+-"change or delete these files unless you know what you are doing.
"
+-msgstr ""
+-"如果您核取這個選項,任何在您桌面目錄以句點 (.) 開頭的檔案會被顯示。通常,這類的檔案包含設定資訊,而且保持隱藏的狀態。
\n"
+-"例如,命名為「.directory」的檔案是包含 Konqueror "
+-"資訊的純文字檔案,像是顯示目錄的圖示、檔案的排列順序等。您不應該改變或刪除這些檔案,除非您知道您在做什麼。
"
++"For example, files which are named \".directory\" are plain text files "
++"which contain information for Konqueror, such as the icon to use in "
++"displaying a directory, the order in which files should be sorted, etc. You "
++"should not change or delete these files unless you know what you are doing."
++"p>"
++msgstr ""
++"
如果您核取這個選項,任何在您桌面目錄以句點 (.) 開頭的檔案會被顯示。通常,"
++"這類的檔案包含設定資訊,而且保持隱藏的狀態。
\n"
++"例如,命名為「.directory」的檔案是包含 Konqueror 資訊的純文字檔案,像是顯"
++"示目錄的圖示、檔案的排列順序等。您不應該改變或刪除這些檔案,除非您知道您在做"
++"什麼。
"
+
+ #. i18n: file desktopbehavior.ui line 336
+ #: rc.cpp:79
+@@ -693,9 +714,11 @@
+ #: rootopts.cpp:81
+ msgid ""
+ "This folder contains all the files which you see on your desktop. You can "
+-"change the location of this folder if you want to, and the contents will move "
+-"automatically to the new location as well."
+-msgstr "這個目錄包含所有在您桌面上看到的檔案。如果您想要的話,您可以改變目錄位置,而內容將會自動地搬移至新的位置。"
++"change the location of this folder if you want to, and the contents will "
++"move automatically to the new location as well."
++msgstr ""
++"這個目錄包含所有在您桌面上看到的檔案。如果您想要的話,您可以改變目錄位置,而"
++"內容將會自動地搬移至新的位置。"
+
+ #: rootopts.cpp:89
+ msgid "A&utostart path:"
+@@ -703,11 +726,13 @@
+
+ #: rootopts.cpp:96
+ msgid ""
+-"This folder contains applications or links to applications (shortcuts) that you "
+-"want to have started automatically whenever KDE starts. You can change the "
+-"location of this folder if you want to, and the contents will move "
++"This folder contains applications or links to applications (shortcuts) that "
++"you want to have started automatically whenever KDE starts. You can change "
++"the location of this folder if you want to, and the contents will move "
+ "automatically to the new location as well."
+-msgstr "這個目錄包含當 KDE 啟動時,您想要自動啟動的程式或程式連結(捷徑)。如果您想要的話,您可以改變目錄位置,而內容將會自動地搬移至新的位置。"
++msgstr ""
++"這個目錄包含當 KDE 啟動時,您想要自動啟動的程式或程式連結(捷徑)。如果您想要"
++"的話,您可以改變目錄位置,而內容將會自動地搬移至新的位置。"
+
+ #: rootopts.cpp:105
+ msgid "D&ocuments path:"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmkonsole.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmkonsole.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmkonsole.po 2008-08-19 20:43:10.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmkonsole.po 2011-11-11 15:45:17.000000000 +0100
+@@ -9,8 +9,7 @@
+ "Project-Id-Version: kcmkonsole\n"
+ "POT-Creation-Date: 2008-07-08 01:18+0200\n"
+ "PO-Revision-Date: 2006-06-19 09:15+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Chinese Traditional \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -31,13 +30,14 @@
+
+ #: kcmkonsole.cpp:43
+ msgid ""
+-"Konsole
With this module you can configure Konsole, the KDE terminal "
+-"application. You can configure the generic Konsole options (which can also be "
+-"configured using the RMB) and you can edit the schemas and sessions available "
+-"to Konsole."
++"Konsole
With this module you can configure Konsole, the KDE "
++"terminal application. You can configure the generic Konsole options (which "
++"can also be configured using the RMB) and you can edit the schemas and "
++"sessions available to Konsole."
+ msgstr ""
+-"konsole 藉著這個程式您可以調整 konsole (KDE "
+-"終端機程式)的設定值,您可以在此調整一些通用的設定,或是您也可以使用RMB來達到同樣的目的。您還可以在此編輯 konsole 的風格設定。"
++"konsole 藉著這個程式您可以調整 konsole (KDE 終端機程式)的設定值,您"
++"可以在此調整一些通用的設定,或是您也可以使用RMB來達到同樣的目的。您還可以在此"
++"編輯 konsole 的風格設定。"
+
+ #: kcmkonsole.cpp:51
+ msgid ""
+@@ -55,10 +55,10 @@
+
+ #: kcmkonsole.cpp:162
+ msgid ""
+-"The Ctrl+S/Ctrl+Q flow control setting will only affect newly started Konsole "
+-"sessions.\n"
+-"The 'stty' command can be used to change the flow control settings of existing "
+-"Konsole sessions."
++"The Ctrl+S/Ctrl+Q flow control setting will only affect newly started "
++"Konsole sessions.\n"
++"The 'stty' command can be used to change the flow control settings of "
++"existing Konsole sessions."
+ msgstr ""
+ "Ctrl+S/Ctrl+Q 流程控制設定只會影響最新啟動的 Konsole 工作階段。\n"
+ "「stty」指令則可用來改變既存 Konsole 工作階段的流程控制設定。"
+@@ -66,14 +66,15 @@
+ #: kcmkonsole.cpp:170
+ msgid ""
+ "You have chosen to enable bidirectional text rendering by default.\n"
+-"Note that bidirectional text may not always be shown correctly, especially when "
+-"selecting parts of text written right-to-left. This is a known issue which "
+-"cannot be resolved at the moment due to the nature of text handling in "
++"Note that bidirectional text may not always be shown correctly, especially "
++"when selecting parts of text written right-to-left. This is a known issue "
++"which cannot be resolved at the moment due to the nature of text handling in "
+ "console-based applications."
+ msgstr ""
+ "您已經選擇預設啟動雙向文字描繪。\n"
+-"注意雙向文字描繪可能不會每次都能正確顯示,特別是在選取部分由右至左書寫的文字時。這是一個已知的問題但目前仍無法解決,因為它涉及 console "
+-"類應用程式處理文字方式的問題。"
++"注意雙向文字描繪可能不會每次都能正確顯示,特別是在選取部分由右至左書寫的文字"
++"時。這是一個已知的問題但目前仍無法解決,因為它涉及 console 類應用程式處理文字"
++"方式的問題。"
+
+ #. i18n: file kcmkonsoledialog.ui line 42
+ #: rc.cpp:3
+@@ -163,7 +164,7 @@
+ #: rc.cpp:45
+ #, no-c-format
+ msgid "&Line spacing:"
+-msgstr "行距(&L):"
++msgstr "列距(&L):"
+
+ #. i18n: file kcmkonsoledialog.ui line 297
+ #: rc.cpp:48
+@@ -385,7 +386,7 @@
+ #: rc.cpp:156
+ #, no-c-format
+ msgid "Sa&ve Schema..."
+-msgstr "儲存風格(&V)..."
++msgstr "儲存風格(&V)…"
+
+ #. i18n: file schemadialog.ui line 347
+ #: rc.cpp:159
+@@ -403,7 +404,7 @@
+ #: rc.cpp:165
+ #, no-c-format
+ msgid "..."
+-msgstr "..."
++msgstr "…"
+
+ #. i18n: file schemadialog.ui line 415
+ #: rc.cpp:168
+@@ -553,7 +554,7 @@
+ #: rc.cpp:246
+ #, no-c-format
+ msgid "Sa&ve Session..."
+-msgstr "儲存工作階段(&V)..."
++msgstr "儲存工作階段(&V)…"
+
+ #. i18n: file sessiondialog.ui line 270
+ #: rc.cpp:249
+@@ -684,8 +685,8 @@
+ #: sessioneditor.cpp:304
+ msgid ""
+ "The Execute entry is not a valid command.\n"
+-"You can still save this session, but it will not show up in Konsole's Session "
+-"list."
++"You can still save this session, but it will not show up in Konsole's "
++"Session list."
+ msgstr ""
+ "「執行」項目並非有效指令。\n"
+ "您仍然可以儲存此工作階段,但它將不會顯示在 Konsole 的工作階段清單。"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmkurifilt.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmkurifilt.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmkurifilt.po 2006-10-01 18:34:17.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmkurifilt.po 2011-11-11 15:45:17.000000000 +0100
+@@ -24,7 +24,7 @@
+ "Project-Id-Version: kcmkurifilt\n"
+ "POT-Creation-Date: 2006-09-29 02:33+0200\n"
+ "PO-Revision-Date: 2005-10-28 19:15+0800\n"
+-"Last-Translator: Chao-Hsiung Liao \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -33,28 +33,27 @@
+
+ #: filteropts.cpp:38
+ msgid "Under construction..."
+-msgstr "建構中..."
++msgstr "建構中…"
+
+ #: main.cpp:49
+ msgid ""
+ "Enhanced Browsing
In this module you can configure some enhanced "
+-"browsing features of KDE. "
+-"Internet Keywords
Internet Keywords let you type in the name of a "
+-"brand, a project, a celebrity, etc... and go to the relevant location. For "
+-"example you can just type \"KDE\" or \"K Desktop Environment\" in Konqueror to "
+-"go to KDE's homepage."
+-"Web Shortcuts
Web Shortcuts are a quick way of using Web search "
+-"engines. For example, type \"altavista:frobozz\" or \"av:frobozz\" and "
+-"Konqueror will do a search on AltaVista for \"frobozz\". Even easier: just "
+-"press Alt+F2 (if you have not changed this shortcut) and enter the shortcut in "
+-"the KDE Run Command dialog."
++"browsing features of KDE. Internet Keywords
Internet Keywords let "
++"you type in the name of a brand, a project, a celebrity, etc... and go to "
++"the relevant location. For example you can just type \"KDE\" or \"K Desktop "
++"Environment\" in Konqueror to go to KDE's homepage.Web Shortcuts
Web "
++"Shortcuts are a quick way of using Web search engines. For example, type "
++"\"altavista:frobozz\" or \"av:frobozz\" and Konqueror will do a search on "
++"AltaVista for \"frobozz\". Even easier: just press Alt+F2 (if you have not "
++"changed this shortcut) and enter the shortcut in the KDE Run Command dialog."
+ msgstr ""
+ "加強型瀏覽
在這個模組你可以設定 KDE 的一些加強型瀏覽功能。 "
+-"Internet 關鍵字
Internet 關鍵字讓你打商標,計劃,名人等等...名稱然後跳到相關的位置。 例如,你可以在 Konqueror "
+-"中只打 \"KDE\" 或 \"K Desktop Environment\" 來跳到 KDE 的首頁。"
+-"網頁捷徑
網頁捷徑是一種使用網路搜尋引擎的快速方法。 例如,打 \"altavista:frobozz\" 或 \"av:frobozz\" "
+-"然後 Konqueror 就會在 AltaVista 做 \"frobozz\" 搜尋。 甚至更容易:只要按 Alt-F2 (假如你沒有改變這個捷徑) 然後在 "
+-"KDE 執行命令對話視窗輸入捷徑。"
++"Internet 關鍵字
Internet 關鍵字讓你打商標,計劃,名人等等...名稱然後"
++"跳到相關的位置。 例如,你可以在 Konqueror 中只打 \"KDE\" 或 \"K Desktop "
++"Environment\" 來跳到 KDE 的首頁。網頁捷徑
網頁捷徑是一種使用網路搜尋"
++"引擎的快速方法。 例如,打 \"altavista:frobozz\" 或 \"av:frobozz\" 然後 "
++"Konqueror 就會在 AltaVista 做 \"frobozz\" 搜尋。 甚至更容易:只要按 Alt-F2 "
++"(假如你沒有改變這個捷徑) 然後在 KDE 執行命令對話視窗輸入捷徑。"
+
+ #: main.cpp:63
+ msgid "&Filters"
+@@ -71,14 +70,14 @@
+ #, no-c-format
+ msgid ""
+ "\n"
+-"Enable shortcuts that allow you to quickly search for information on the web. "
+-"For example, entering the shortcut gg:KDE will result in a search of the "
+-"word KDE on the Google(TM) search engine.\n"
++"Enable shortcuts that allow you to quickly search for information on the "
++"web. For example, entering the shortcut gg:KDE will result in a "
++"search of the word KDE on the Google(TM) search engine.\n"
+ ""
+ msgstr ""
+ "\n"
+-"假如選取這個選項,KDE 會讓你快速的搜尋網際網路上的資訊。例如,輸入捷徑 gg:KDE 就會使用 Google(TM) 搜尋引擎來搜尋 "
+-"KDE 這個字。\n"
++"假如選取這個選項,KDE 會讓你快速的搜尋網際網路上的資訊。例如,輸入捷徑 gg:"
++"KDE 就會使用 Google(TM) 搜尋引擎來搜尋 KDE 這個字。\n"
+ ""
+
+ #. i18n: file plugins/ikws/ikwsopts_ui.ui line 56
+@@ -91,8 +90,8 @@
+ #: rc.cpp:14 rc.cpp:66
+ #, no-c-format
+ msgid ""
+-"Choose the delimiter that separates the keyword from the phrase or word to be "
+-"searched."
++"Choose the delimiter that separates the keyword from the phrase or word to "
++"be searched."
+ msgstr "選擇要搜尋的語詞或文字中用來分開關鍵字的符號。"
+
+ #. i18n: file plugins/ikws/ikwsopts_ui.ui line 81
+@@ -106,13 +105,14 @@
+ #, no-c-format
+ msgid ""
+ "\n"
+-"Select the search engine to use for input boxes that provide automatic lookup "
+-"services when you type in normal words and phrases instead of a URL. To disable "
+-"this feature select None from the list.\n"
++"Select the search engine to use for input boxes that provide automatic "
++"lookup services when you type in normal words and phrases instead of a URL. "
++"To disable this feature select None from the list.\n"
+ ""
+ msgstr ""
+ "\n"
+-"選擇當您在輸入方塊中鍵入單字或語詞而非網址時用來搜尋的引擎。要停用這個功能請在此列表中選擇 無。\n"
++"選擇當您在輸入方塊中鍵入單字或語詞而非網址時用來搜尋的引擎。要停用這個功能請"
++"在此列表中選擇 無。\n"
+ ""
+
+ #. i18n: file plugins/ikws/ikwsopts_ui.ui line 95
+@@ -125,7 +125,7 @@
+ #: rc.cpp:33
+ #, no-c-format
+ msgid "Chan&ge..."
+-msgstr "更改(&G)..."
++msgstr "更改(&G)…"
+
+ #. i18n: file plugins/ikws/ikwsopts_ui.ui line 126
+ #: rc.cpp:36
+@@ -149,7 +149,7 @@
+ #: rc.cpp:45
+ #, no-c-format
+ msgid "&New..."
+-msgstr "新增(&N)..."
++msgstr "新增(&N)…"
+
+ #. i18n: file plugins/ikws/ikwsopts_ui.ui line 151
+ #: rc.cpp:48
+@@ -173,8 +173,8 @@
+ #: rc.cpp:57
+ #, no-c-format
+ msgid ""
+-"List of search providers, their associated shortcuts and whether they shall be "
+-"listed in menus."
++"List of search providers, their associated shortcuts and whether they shall "
++"be listed in menus."
+ msgstr "這個清單包含了搜尋提供者和它們相關的捷徑以及是否要在選單中列出它們。"
+
+ #. i18n: file plugins/ikws/ikwsopts_ui.ui line 221
+@@ -218,32 +218,29 @@
+ #, no-c-format
+ msgid ""
+ "\n"
+-"Enter the URI that is used to do a search on the search engine here."
+-"
The whole text to be searched for can be specified as \\{@} or \\{0}."
+-"
\n"
++"Enter the URI that is used to do a search on the search engine here.
The "
++"whole text to be searched for can be specified as \\{@} or \\{0}.
\n"
+ "Recommended is \\{@}, since it removes all query variables (name=value) from "
+ "the resulting string whereas \\{0} will be substituted with the unmodified "
+-"query string."
+-"
You can use \\{1} ... \\{n} to specify certain words from the query and "
+-"\\{name} to specify a value given by 'name=value' in the user query."
+-"
In addition it is possible to specify multiple references (names, numbers "
+-"and strings) at once (\\{name1,name2,...,\"string\"})."
+-"
The first matching value (from the left) will be used as substitution "
+-"value for the resulting URI."
+-"
A quoted string can be used as default value if nothing matches from the "
+-"left of the reference list.\n"
++"query string.
You can use \\{1} ... \\{n} to specify certain words from "
++"the query and \\{name} to specify a value given by 'name=value' in the user "
++"query.
In addition it is possible to specify multiple references (names, "
++"numbers and strings) at once (\\{name1,name2,...,\"string\"}).
The first "
++"matching value (from the left) will be used as substitution value for the "
++"resulting URI.
A quoted string can be used as default value if nothing "
++"matches from the left of the reference list.\n"
+ ""
+ msgstr ""
+ "\n"
+-"在這裡輸入一個 URI 以進行搜尋引擎搜尋。"
+-"
使用整個字串進行搜尋時,可以使用 \\{@} 或 \\{0} 來進行。"
+-"
\n"
+-"我們建議您最好是使用 \\{@},因為它會從結果字串中移除所有查詢變數 (name=value) 而 \\{0} 則會使用未修改的查詢字串。"
+-"
您可以使用 \\{1} ... \\{n} 來從查詢中指定某個字或 \\{name} 來在使用者查詢中指定特定數值的 'name=value'。"
+-"
另外也可以一次 (\\{name1,name2,...,\"string\"}) 指定多個參考 (names, numbers and "
+-"strings)。"
+-"
第一個符合的數值(從左數來)會做為結果 URI 的數值。"
+-"
如果從參考列表中找不到符合項目,用引號框起來的數值也可以做為預設數值。\n"
++"在這裡輸入一個 URI 以進行搜尋引擎搜尋。
使用整個字串進行搜尋時,可以使用 "
++"\\{@} 或 \\{0} 來進行。
\n"
++"我們建議您最好是使用 \\{@},因為它會從結果字串中移除所有查詢變數 "
++"(name=value) 而 \\{0} 則會使用未修改的查詢字串。
您可以使用 \\{1} ... "
++"\\{n} 來從查詢中指定某個字或 \\{name} 來在使用者查詢中指定特定數值的 "
++"'name=value'。
另外也可以一次 (\\{name1,name2,...,\"string\"}) 指定多個參"
++"考 (names, numbers and strings)。
第一個符合的數值(從左數來)會做為結果 "
++"URI 的數值。
如果從參考列表中找不到符合項目,用引號框起來的數值也可以做為"
++"預設數值。\n"
+ ""
+
+ #. i18n: file plugins/ikws/searchproviderdlg_ui.ui line 66
+@@ -258,12 +255,13 @@
+ msgid ""
+ "\n"
+ "The shortcuts entered here can be used as a pseudo-URI scheme in KDE. For "
+-"example, the shortcut av can be used as in av:my search\n"
++"example, the shortcut av can be used as in av:my search"
++"b>\n"
+ ""
+ msgstr ""
+ "\n"
+-"在這裡輸入的捷徑可被用來當作在 KDE 的 pseudo-URI scheme。 例如,捷徑 av 可被用來當作在 av"
+-":my search\n"
++"在這裡輸入的捷徑可被用來當作在 KDE 的 pseudo-URI scheme。 例如,捷徑 av"
++"em> 可被用來當作在 av:my search\n"
+ ""
+
+ #. i18n: file plugins/ikws/searchproviderdlg_ui.ui line 90
+@@ -280,17 +278,19 @@
+
+ #: plugins/ikws/ikwsopts.cpp:96
+ msgid ""
+-"In this module you can configure the web shortcuts feature. Web shortcuts allow "
+-"you to quickly search or lookup words on the Internet. For example, to search "
+-"for information about the KDE project using the Google engine, you simply type "
+-"gg:KDE or google:KDE."
+-"If you select a default search engine, normal words or phrases will be "
+-"looked up at the specified search engine by simply typing them into "
+-"applications, such as Konqueror, that have built-in support for such a feature."
++"In this module you can configure the web shortcuts feature. Web shortcuts "
++"allow you to quickly search or lookup words on the Internet. For example, to "
++"search for information about the KDE project using the Google engine, you "
++"simply type gg:KDE or google:KDE.
If you select a default "
++"search engine, normal words or phrases will be looked up at the specified "
++"search engine by simply typing them into applications, such as Konqueror, "
++"that have built-in support for such a feature."
+ msgstr ""
+-"在這個模組中您可以設定網頁捷徑功能。網頁捷徑讓您可以快速的在網際網路上搜尋或查詢單字。例如:要使用 Google 引擎搜尋關於 KDE 計畫的資訊,您只要輸入 "
+-"gg:KDE 或 google:KDE。"
+-"
如果您選擇預設的搜尋引擎,一般的文字或語詞會在指定的搜尋引擎中查詢,只要將它們鍵入有內建此項功能的應用程式,像是 Konqueror。"
++"在這個模組中您可以設定網頁捷徑功能。網頁捷徑讓您可以快速的在網際網路上搜尋或"
++"查詢單字。例如:要使用 Google 引擎搜尋關於 KDE 計畫的資訊,您只要輸入 gg:"
++"KDE 或 google:KDE。
如果您選擇預設的搜尋引擎,一般的文字或語詞會"
++"在指定的搜尋引擎中查詢,只要將它們鍵入有內建此項功能的應用程式,像是 "
++"Konqueror。"
+
+ #: plugins/ikws/kurisearchfilter.cpp:87
+ msgid "Search F&ilters"
+@@ -307,8 +307,8 @@
+ #: plugins/ikws/searchproviderdlg.cpp:86
+ msgid ""
+ "The URI does not contain a \\{...} placeholder for the user query.\n"
+-"This means that the same page is always going to be visited, regardless of what "
+-"the user types."
++"This means that the same page is always going to be visited, regardless of "
++"what the user types."
+ msgstr ""
+ "URI 不包含一個 \\{...} 佔位符給使用者查詢。\n"
+ "這表示相同的網頁一直被瀏覽,而不管使用者打什麼。"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmkwindecoration.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmkwindecoration.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmkwindecoration.po 2005-11-09 07:38:42.000000000 +0100
++++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmkwindecoration.po 2011-11-11 15:45:17.000000000 +0100
+@@ -18,7 +18,7 @@
+ "Project-Id-Version: kcmkwindecoration\n"
+ "POT-Creation-Date: 2005-10-28 02:43+0200\n"
+ "PO-Revision-Date: 2005-08-12 16:25+0800\n"
+-"Last-Translator: Chao-Hsiung Liao \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -51,12 +51,13 @@
+
+ #: buttons.cpp:683
+ msgid ""
+-"To add or remove titlebar buttons, simply drag "
+-"items between the available item list and the titlebar preview. Similarly, drag "
+-"items within the titlebar preview to re-position them."
++"To add or remove titlebar buttons, simply drag items between the "
++"available item list and the titlebar preview. Similarly, drag items within "
++"the titlebar preview to re-position them."
+ msgstr ""
+-"若要增加或是移除標題列按鍵, 只要將你打算處理的小按鍵們從列表中拉拉拉拉... 拉過來放著預覽即可. 若是你打算移動他們的順序, "
+-"也可以用相同的招數來搞定他們."
++"若要增加或是移除標題列按鍵, 只要將你打算處理的小按鍵們從列表中拉拉拉拉... "
++"拉過來放著預覽即可. 若是你打算移動他們的順序, 也可以用相同的招數來搞定他"
++"們."
+
+ #: buttons.cpp:780
+ msgid "Resize"
+@@ -120,7 +121,9 @@
+ msgid ""
+ "Enabling this checkbox will show window button tooltips. If this checkbox is "
+ "off, no window button tooltips will be shown."
+-msgstr "若是選取此功能,將會顯示視窗按鍵的小提示。當然如果你沒有選取這個功能,不會有任何的視窗按鍵小提示出現。"
++msgstr ""
++"若是選取此功能,將會顯示視窗按鍵的小提示。當然如果你沒有選取這個功能,不會有"
++"任何的視窗按鍵小提示出現。"
+
+ #: kwindecoration.cpp:130
+ msgid "Use custom titlebar button &positions"
+@@ -128,9 +131,11 @@
+
+ #: kwindecoration.cpp:132
+ msgid ""
+-"The appropriate settings can be found in the \"Buttons\" Tab; please note that "
+-"this option is not available on all styles yet."
+-msgstr "這些設定將可以在「按鈕」標籤那裡找到;請注意目前暫時 在任何樣式中都沒有可以設定的選項 。"
++"The appropriate settings can be found in the \"Buttons\" Tab; please note "
++"that this option is not available on all styles yet."
++msgstr ""
++"這些設定將可以在「按鈕」標籤那裡找到;請注意目前暫時 在任何樣式中都沒有可以設"
++"定的選項 。"
+
+ #: kwindecoration.cpp:163
+ msgid "&Window Decoration"
+@@ -186,23 +191,23 @@
+
+ #: kwindecoration.cpp:591
+ msgid ""
+-"Window Manager Decoration
"
+-"This module allows you to choose the window border decorations, as well as "
+-"titlebar button positions and custom decoration options.
"
+-"To choose a theme for your window decoration click on its name and apply your "
+-"choice by clicking the \"Apply\" button below. If you do not want to apply your "
+-"choice you can click the \"Reset\" button to discard your changes."
+-"You can configure each theme in the \"Configure [...]\" tab. There are "
+-"different options specific for each theme.
"
+-"In \"General Options (if available)\" you can activate the \"Buttons\" tab "
+-"by checking the \"Use custom titlebar button positions\" box. In the "
+-"\"Buttons\" tab you can change the positions of the buttons to your liking.
"
++"Window Manager Decoration
This module allows you to choose the "
++"window border decorations, as well as titlebar button positions and custom "
++"decoration options.
To choose a theme for your window decoration click on "
++"its name and apply your choice by clicking the \"Apply\" button below. If "
++"you do not want to apply your choice you can click the \"Reset\" button to "
++"discard your changes.You can configure each theme in the \"Configure [...]"
++"\" tab. There are different options specific for each theme.
In "
++"\"General Options (if available)\" you can activate the \"Buttons\" tab by "
++"checking the \"Use custom titlebar button positions\" box. In the \"Buttons"
++"\" tab you can change the positions of the buttons to your liking.
"
+ msgstr ""
+-"視窗管理程式裝飾
"
+-"這個模組讓您可以選擇視窗邊框的裝飾、標題列按鈕位置和自訂裝飾選項。
要為您的視窗裝飾選擇主題,按下它的名稱並且按下方的「套用」按鈕來套用您的選擇。如"
+-"果您不想套用您的選擇,您可以按「重設」按鈕來放棄您的改變。"
+-"您可以在「設定 [...]」分頁中設定每一個主題。那裡有各個主題的不同選項。
"
+-"在「一般選項(如果可用)」中您可以核取「使用自訂標題按鈕位置」方塊來使用「按鈕」分頁。在「按鈕」分頁中您可以依您的喜好改變按鈕的位置。
"
++"視窗管理程式裝飾
這個模組讓您可以選擇視窗邊框的裝飾、標題列按鈕位"
++"置和自訂裝飾選項。
要為您的視窗裝飾選擇主題,按下它的名稱並且按下方的「套"
++"用」按鈕來套用您的選擇。如果您不想套用您的選擇,您可以按「重設」按鈕來放棄您"
++"的改變。您可以在「設定 [...]」分頁中設定每一個主題。那裡有各個主題的不同選"
++"項。
在「一般選項(如果可用)」中您可以核取「使用自訂標題按鈕位置」方塊來"
++"使用「按鈕」分頁。在「按鈕」分頁中您可以依您的喜好改變按鈕的位置。
"
+
+ #: preview.cpp:48
+ msgid ""
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmkwinrules.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmkwinrules.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmkwinrules.po 2008-08-19 20:43:10.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmkwinrules.po 2011-11-11 15:45:17.000000000 +0100
+@@ -8,8 +8,7 @@
+ "Project-Id-Version: kcmkwinrules\n"
+ "POT-Creation-Date: 2008-07-08 01:18+0200\n"
+ "PO-Revision-Date: 2006-08-14 14:43+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Chinese Traditional \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -107,13 +106,14 @@
+ #: kcm.cpp:81
+ msgid ""
+ "Window-specific Settings
Here you can customize window settings "
+-"specifically only for some windows. "
+-"Please note that this configuration will not take effect if you do not use "
+-"KWin as your window manager. If you do use a different window manager, please "
+-"refer to its documentation for how to customize window behavior."
++"specifically only for some windows.
Please note that this configuration "
++"will not take effect if you do not use KWin as your window manager. If you "
++"do use a different window manager, please refer to its documentation for how "
++"to customize window behavior."
+ msgstr ""
+-"
特定視窗設定配置模組
在這裏您可以自行設定特定視窗的一些設定。"
+-"請注意若您不是使用 KWin 作視窗管理器,這些設定不會生效。如果您正在使用其他的視窗管理器,請參考它的文件。"
++"
特定視窗設定配置模組
在這裏您可以自行設定特定視窗的一些設定。請注"
++"意若您不是使用 KWin 作視窗管理器,這些設定不會生效。如果您正在使用其他的視窗"
++"管理器,請參考它的文件。"
+
+ #: kcm.cpp:97
+ msgid "Remember settings separately for every window"
+@@ -201,8 +201,8 @@
+ #: rc.cpp:27
+ #, no-c-format
+ msgid ""
+-"For selecting all windows belonging to a specific application, selecting only "
+-"window class should usually work."
++"For selecting all windows belonging to a specific application, selecting "
++"only window class should usually work."
+ msgstr "要選擇特定應用程式的所有視窗,只需選擇一個視窗類別就行了。"
+
+ #. i18n: file detectwidgetbase.ui line 187
+@@ -215,13 +215,14 @@
+ #: rc.cpp:33
+ #, no-c-format
+ msgid ""
+-"For selecting a specific window in an application, both window class and window "
+-"role should be selected. Window class will determine the application, and "
+-"window role the specific window in the application; many applications do not "
+-"provide useful window roles though."
++"For selecting a specific window in an application, both window class and "
++"window role should be selected. Window class will determine the application, "
++"and window role the specific window in the application; many applications do "
++"not provide useful window roles though."
+ msgstr ""
+-"要選擇應用程式中某個視窗,您需要一併選擇視窗類別和視窗角色。視窗類別會判別是哪個應用程式,而視窗角色則會判別是當中的哪一個視窗。不過,很多應用程式都沒有提供有用"
+-"的視窗角色。"
++"要選擇應用程式中某個視窗,您需要一併選擇視窗類別和視窗角色。視窗類別會判別是"
++"哪個應用程式,而視窗角色則會判別是當中的哪一個視窗。不過,很多應用程式都沒有"
++"提供有用的視窗角色。"
+
+ #. i18n: file detectwidgetbase.ui line 198
+ #: rc.cpp:36
+@@ -234,9 +235,11 @@
+ #, no-c-format
+ msgid ""
+ "With some (non-KDE) applications whole window class can be sufficient for "
+-"selecting a specific window in an application, as they set whole window class "
+-"to contain both application and window role."
+-msgstr "一些(非KDE)應用程式只需使用整個視窗類別就足夠了。因為它們可以設定整個視窗類別來一併包含應用程式和視窗角色。"
++"selecting a specific window in an application, as they set whole window "
++"class to contain both application and window role."
++msgstr ""
++"一些(非KDE)應用程式只需使用整個視窗類別就足夠了。因為它們可以設定整個視窗類別"
++"來一併包含應用程式和視窗角色。"
+
+ #. i18n: file detectwidgetbase.ui line 209
+ #: rc.cpp:42
+@@ -248,24 +251,22 @@
+ #: rc.cpp:45
+ #, no-c-format
+ msgid ""
+-"A single shortcut can be easily assigned or cleared using the two buttons. Only "
+-"shortcuts with modifiers can be used."
+-"
\n"
++"A single shortcut can be easily assigned or cleared using the two buttons. "
++"Only shortcuts with modifiers can be used.
\n"
+ "It is possible to have several possible shortcuts, and the first available "
+ "shortcut will be used. The shortcuts are specified using space-separated "
+-"shortcut sets. One set is specified as base+(list"
+-"), where base are modifiers and list is a list of keys."
+-"
\n"
+-"For example \"Shift+Alt+(123) Shift+Ctrl+(ABC)\" will first try "
+-"Shift+Alt+1, then others with Shift+Ctrl+C as the last one."
++"shortcut sets. One set is specified as base+(list), where base "
++"are modifiers and list is a list of keys.
\n"
++"For example \"Shift+Alt+(123) Shift+Ctrl+(ABC)\" will first try "
++"Shift+Alt+1, then others with Shift+Ctrl+C as the last one."
+ msgstr ""
+-"您可以很容易地使用這兩個按鈕來加入/清除一組單快捷鍵。只有附上修飾鍵的快捷鍵才可使用。"
+-"
\n"
+-"系統是可以對單一快捷鍵指定多個按鈕組合的,但只有最先可用的一個會生效。而每組快捷鍵的在指定時要以空白分隔。格式為:修飾鍵+(按鈕組合"
+-")。"
+-"
\n"
+-"例如 \"Shift+Alt+(123) Shift+Ctrl+(ABC)\",會把先試一下Shift+Alt+1,不可用就試"
+-"Shift+Alt+2...如此類推,最後是Shift+Alt+C。當中可用的一個會用作該單一快捷鍵。"
++"您可以很容易地使用這兩個按鈕來加入/清除一組單快捷鍵。只有附上修飾鍵的快捷鍵才"
++"可使用。
\n"
++"系統是可以對單一快捷鍵指定多個按鈕組合的,但只有最先可用的一個會生效。而每組"
++"快捷鍵的在指定時要以空白分隔。格式為:修飾鍵+(按鈕組合)。
\n"
++"例如 \"Shift+Alt+(123) Shift+Ctrl+(ABC)\",會把先試一下Shift+Alt"
++"+1,不可用就試Shift+Alt+2...如此類推,最後是Shift+Alt+C。當"
++"中可用的一個會用作該單一快捷鍵。"
+
+ #. i18n: file editshortcutbase.ui line 81
+ #: rc.cpp:50
+@@ -283,13 +284,13 @@
+ #: rc.cpp:56
+ #, no-c-format
+ msgid "&New..."
+-msgstr "新增(&N)..."
++msgstr "新增(&N)…"
+
+ #. i18n: file ruleslistbase.ui line 40
+ #: rc.cpp:59
+ #, no-c-format
+ msgid "&Modify..."
+-msgstr "修改(&M)..."
++msgstr "修改(&M)…"
+
+ #. i18n: file ruleslistbase.ui line 59
+ #: rc.cpp:65
+@@ -643,7 +644,7 @@
+ #: rc.cpp:614
+ #, no-c-format
+ msgid "Edit..."
+-msgstr "編輯..."
++msgstr "編輯…"
+
+ #. i18n: file ruleswidgetbase.ui line 1937
+ #: rc.cpp:617
+@@ -743,57 +744,50 @@
+
+ #: ruleswidget.cpp:55
+ msgid ""
+-"Enable this checkbox to alter this window property for the specified window(s)."
++"Enable this checkbox to alter this window property for the specified window"
++"(s)."
+ msgstr "開啟這個選項來改變這個視窗屬性(可用於多個指定的視窗)。"
+
+ #: ruleswidget.cpp:57
+ msgid ""
+-"Specify how the window property should be affected:"
+-""
+-"- Do Not Affect: The window property will not be affected and "
+-"therefore the default handling for it will be used. Specifying this will block "
+-"more generic window settings from taking effect.
"
+-"- Apply Initially: The window property will be only set to the given "
+-"value after the window is created. No further changes will be affected.
"
+-"- Remember: The value of the window property will be remembered and "
+-"every time time the window is created, the last remembered value will be "
+-"applied.
"
+-"- Force: The window property will be always forced to the given "
+-"value.
"
+-"- Apply Now: The window property will be set to the given value "
+-"immediately and will not be affected later (this action will be deleted "
+-"afterwards).
"
+-"- Force temporarily: The window property will be forced to the given "
+-"value until it is hidden (this action will be deleted after the window is "
+-"hidden).
"
++"Specify how the window property should be affected:- Do Not Affect:"
++" The window property will not be affected and therefore the default "
++"handling for it will be used. Specifying this will block more generic window "
++"settings from taking effect.
- Apply Initially: The window "
++"property will be only set to the given value after the window is created. No "
++"further changes will be affected.
- Remember: The value of "
++"the window property will be remembered and every time time the window is "
++"created, the last remembered value will be applied.
- Force: "
++"The window property will be always forced to the given value."
++"li>
- Apply Now: The window property will be set to the given "
++"value immediately and will not be affected later (this action will be "
++"deleted afterwards).
- Force temporarily: The window property "
++"will be forced to the given value until it is hidden (this action will be "
++"deleted after the window is hidden).
"
+ msgstr ""
+-"指定視窗屬性會如何被影響:"
+-""
+-"- 不影響:視窗屬性不會被影響。會使用預設的處理。指定作此值會禁止更多通用的設定生效。
"
+-"- 初始化套用:視窗屬性只會在視窗被建立時設成指定值,不會再有其他變更會影響到。
"
+-"- 記住:上一次的變更會被記住。每一次視窗被建立時,記住的設定就會被套用。
"
+-"- 強制:視窗屬性何時都會強制設成該值。
"
+-"- 立刻生效:視窗屬性會立刻設成指定值。不過稍後就會無效(這個動作之後會被刪除)。
"
+-"- 暫時強制:視窗屬性會被強制設成該值直至它被隱藏。(這個動作在隱藏後會被刪除)
"
++"指定視窗屬性會如何被影響:- 不影響:視窗屬性不會被影響。會使用"
++"預設的處理。指定作此值會禁止更多通用的設定生效。
- 初始化套用:"
++"em>視窗屬性只會在視窗被建立時設成指定值,不會再有其他變更會影響到。"
++"li>
- 記住:上一次的變更會被記住。每一次視窗被建立時,記住的設定就"
++"會被套用。
- 強制:視窗屬性何時都會強制設成該值。
- "
++"立刻生效:視窗屬性會立刻設成指定值。不過稍後就會無效(這個動作之後會被刪"
++"除)。
- 暫時強制:視窗屬性會被強制設成該值直至它被隱藏。(這個"
++"動作在隱藏後會被刪除)
"
+
+ #: ruleswidget.cpp:72
+ msgid ""
+-"Specify how the window property should be affected:"
+-""
+-"- Do Not Affect: The window property will not be affected and "
+-"therefore the default handling for it will be used. Specifying this will block "
+-"more generic window settings from taking effect.
"
+-"- Force: The window property will be always forced to the given "
+-"value.
"
+-"- Force temporarily: The window property will be forced to the given "
+-"value until it is hidden (this action will be deleted after the window is "
+-"hidden).
"
++"Specify how the window property should be affected:- Do Not Affect:"
++" The window property will not be affected and therefore the default "
++"handling for it will be used. Specifying this will block more generic window "
++"settings from taking effect.
- Force: The window property "
++"will be always forced to the given value.
- Force temporarily:"
++"em> The window property will be forced to the given value until it is hidden "
++"(this action will be deleted after the window is hidden).
"
+ msgstr ""
+-"指定視窗屬性會如何被影響:"
+-""
+-"- 不影響:視窗屬性不會被影響。會使用預設的處理。指定作此值會禁止更多通用的設定生效。
"
+-"- 強制:視窗屬性何時都會強制設成該值。
"
+-"- 暫時強制:視窗屬性會被強制設成該值直至它被隱藏。(這個動作在隱藏後會被刪除)
"
++"指定視窗屬性會如何被影響:- 不影響:視窗屬性不會被影響。會使用"
++"預設的處理。指定作此值會禁止更多通用的設定生效。
- 強制:視窗"
++"屬性何時都會強制設成該值。
- 暫時強制:視窗屬性會被強制設成該"
++"值直至它被隱藏。(這個動作在隱藏後會被刪除)
"
+
+ #: ruleswidget.cpp:117
+ msgid "All Desktops"
+@@ -811,12 +805,14 @@
+ #: ruleswidget.cpp:665
+ msgid ""
+ "You have specified the window class as unimportant.\n"
+-"This means the settings will possibly apply to windows from all applications. "
+-"If you really want to create a generic setting, it is recommended you at least "
+-"limit the window types to avoid special window types."
++"This means the settings will possibly apply to windows from all "
++"applications. If you really want to create a generic setting, it is "
++"recommended you at least limit the window types to avoid special window "
++"types."
+ msgstr ""
+ "您已指定視窗類別為'不重要'。\n"
+-"這表示這個設定會套用至所有應用程式的所有視窗。如果您是希望這樣做來建立一個通用設定,我們建議您至少要限制視窗類型,來避免特殊的視窗類型。"
++"這表示這個設定會套用至所有應用程式的所有視窗。如果您是希望這樣做來建立一個通"
++"用設定,我們建議您至少要限制視窗類型,來避免特殊的視窗類型。"
+
+ #: ruleswidget.cpp:690
+ msgid "Edit Window-Specific Settings"
+@@ -824,12 +820,13 @@
+
+ #: ruleswidget.cpp:713
+ msgid ""
+-"This configuration dialog allows altering settings only for the selected window "
+-"or application. Find the setting you want to affect, enable the setting using "
+-"the checkbox, select in what way the setting should be affected and to which "
+-"value."
++"This configuration dialog allows altering settings only for the selected "
++"window or application. Find the setting you want to affect, enable the "
++"setting using the checkbox, select in what way the setting should be "
++"affected and to which value."
+ msgstr ""
+-"這個組態對話盒允許只針對選擇的視窗或應用程式的特別設定。找到您想用的設定值,使用核取方塊啟用此設定值,選擇設定值要以何種方式生效、要影響哪個數值。"
++"這個組態對話盒允許只針對選擇的視窗或應用程式的特別設定。找到您想用的設定值,"
++"使用核取方塊啟用此設定值,選擇設定值要以何種方式生效、要影響哪個數值。"
+
+ #: ruleswidget.cpp:717
+ msgid "Consult the documentation for more details."
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmkwm.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmkwm.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmkwm.po 2006-07-22 10:04:12.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmkwm.po 2011-11-11 15:45:17.000000000 +0100
+@@ -6,8 +6,7 @@
+ "Project-Id-Version: kcmkwm\n"
+ "POT-Creation-Date: 2006-04-11 03:54+0200\n"
+ "PO-Revision-Date: 2006-06-19 09:16+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Chinese Traditional \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -65,14 +64,16 @@
+ #: main.cpp:190
+ msgid ""
+ "Window Behavior
Here you can customize the way windows behave when "
+-"being moved, resized or clicked on. You can also specify a focus policy as well "
+-"as a placement policy for new windows. "
+-"Please note that this configuration will not take effect if you do not use "
+-"KWin as your window manager. If you do use a different window manager, please "
+-"refer to its documentation for how to customize window behavior."
++"being moved, resized or clicked on. You can also specify a focus policy as "
++"well as a placement policy for new windows.
Please note that this "
++"configuration will not take effect if you do not use KWin as your window "
++"manager. If you do use a different window manager, please refer to its "
++"documentation for how to customize window behavior."
+ msgstr ""
+-"
視窗行為
在這裡你可以自定當視窗被移動,改變大小或按下時視窗的行為。你也可以指定焦點策略和新視窗的配置策略。"
+-"請注意假如你不是使用 KWin 當作你的視窗管理員,這個設定將不會產生作用。假如你使用其他的視窗管理員,請參考它的文件來看如何自定視窗行為。"
++"
視窗行為
在這裡你可以自定當視窗被移動,改變大小或按下時視窗的行為。"
++"你也可以指定焦點策略和新視窗的配置策略。請注意假如你不是使用 KWin 當作你的"
++"視窗管理員,這個設定將不會產生作用。假如你使用其他的視窗管理員,請參考它的文"
++"件來看如何自定視窗行為。"
+
+ #: mouse.cpp:152
+ msgid "&Titlebar double-click:"
+@@ -199,8 +200,8 @@
+
+ #: mouse.cpp:239
+ msgid ""
+-"In this column you can customize mouse clicks into the titlebar or the frame of "
+-"an active window."
++"In this column you can customize mouse clicks into the titlebar or the frame "
++"of an active window."
+ msgstr "在這一欄你可以自定滑鼠在作用中的視窗標題列或邊框上按下的功能。"
+
+ #: mouse.cpp:244 mouse.cpp:265 mouse.cpp:305 mouse.cpp:732
+@@ -217,32 +218,32 @@
+
+ #: mouse.cpp:252
+ msgid ""
+-"Behavior on left click into the titlebar or frame of an active "
+-"window."
++"Behavior on left click into the titlebar or frame of an active"
++"em> window."
+ msgstr "在作用中的視窗標題列或邊框上按下滑鼠左鍵的行為。"
+
+ #: mouse.cpp:255
+ msgid ""
+-"Behavior on right click into the titlebar or frame of an "
+-"active window."
++"Behavior on right click into the titlebar or frame of an "
++"active window."
+ msgstr "在作用中的視窗標題列或邊框上按下滑鼠右鍵的行為。"
+
+ #: mouse.cpp:276
+ msgid ""
+-"Behavior on middle click into the titlebar or frame of an "
+-"active window."
++"Behavior on middle click into the titlebar or frame of an "
++"active window."
+ msgstr "在作用中的視窗標題列或邊框上按下滑鼠中鍵的行為。"
+
+ #: mouse.cpp:285
+ msgid ""
+-"Behavior on left click into the titlebar or frame of an "
+-"inactive window."
++"Behavior on left click into the titlebar or frame of an "
++"inactive window."
+ msgstr "在非作用中的視窗標題列或邊框上按下滑鼠左鍵的行為。"
+
+ #: mouse.cpp:288
+ msgid ""
+-"Behavior on right click into the titlebar or frame of an "
+-"inactive window."
++"Behavior on right click into the titlebar or frame of an "
++"inactive window."
+ msgstr "在非作用中的視窗標題列或邊框上按下滑鼠右鍵的行為。"
+
+ #: mouse.cpp:294
+@@ -251,8 +252,8 @@
+
+ #: mouse.cpp:296
+ msgid ""
+-"In this column you can customize mouse clicks into the titlebar or the frame of "
+-"an inactive window."
++"In this column you can customize mouse clicks into the titlebar or the frame "
++"of an inactive window."
+ msgstr "在這一欄你可以自定滑鼠在非作用中的視窗標題列或邊框上按下的功能。"
+
+ #: mouse.cpp:300 mouse.cpp:649
+@@ -269,8 +270,8 @@
+
+ #: mouse.cpp:319
+ msgid ""
+-"Behavior on middle click into the titlebar or frame of an "
+-"inactive window."
++"Behavior on middle click into the titlebar or frame of an "
++"inactive window."
+ msgstr "在非作用中的視窗標題列或邊框上按下滑鼠中鍵的行為。"
+
+ #: mouse.cpp:329
+@@ -299,27 +300,35 @@
+
+ #: mouse.cpp:606
+ msgid ""
+-"Here you can customize mouse click behavior when clicking on an inactive inner "
+-"window ('inner' means: not titlebar, not frame)."
+-msgstr "在這裡你可以自定當滑鼠在非作用中的內部視窗按下的行為('內部'代表: 非標題列,非邊框)。"
++"Here you can customize mouse click behavior when clicking on an inactive "
++"inner window ('inner' means: not titlebar, not frame)."
++msgstr ""
++"在這裡你可以自定當滑鼠在非作用中的內部視窗按下的行為('內部'代表: 非標題列,非"
++"邊框)。"
+
+ #: mouse.cpp:625
+ msgid ""
+ "In this row you can customize left click behavior when clicking into an "
+ "inactive inner window ('inner' means: not titlebar, not frame)."
+-msgstr "在這一列你可以自定當左鍵在非作用中的內部視窗按下的行為('內部'代表: 非標題列,非邊框)。"
++msgstr ""
++"在這一列你可以自定當左鍵在非作用中的內部視窗按下的行為('內部'代表: 非標題列,"
++"非邊框)。"
+
+ #: mouse.cpp:628
+ msgid ""
+ "In this row you can customize right click behavior when clicking into an "
+ "inactive inner window ('inner' means: not titlebar, not frame)."
+-msgstr "在這一列你可以自定當右鍵在非作用中的內部視窗按下的行為('內部'代表: 非標題列,非邊框)。"
++msgstr ""
++"在這一列你可以自定當右鍵在非作用中的內部視窗按下的行為('內部'代表: 非標題列,"
++"非邊框)。"
+
+ #: mouse.cpp:638
+ msgid ""
+ "In this row you can customize middle click behavior when clicking into an "
+ "inactive inner window ('inner' means: not titlebar, not frame)."
+-msgstr "在這一列你可以自定當中鍵在非作用中的內部視窗按下的行為('內部'代表: 非標題列,非邊框)。"
++msgstr ""
++"在這一列你可以自定當中鍵在非作用中的內部視窗按下的行為('內部'代表: 非標題列,"
++"非邊框)。"
+
+ #: mouse.cpp:646
+ msgid "Activate, Raise & Pass Click"
+@@ -363,8 +372,8 @@
+
+ #: mouse.cpp:707
+ msgid ""
+-"Here you can customize KDE's behavior when middle clicking into a window while "
+-"pressing the modifier key."
++"Here you can customize KDE's behavior when middle clicking into a window "
++"while pressing the modifier key."
+ msgstr "在這裡你可以自定當 [按住 ALT 鍵 + 視窗上按下中鍵] 時 KDE 的行為。"
+
+ #: mouse.cpp:714
+@@ -373,8 +382,8 @@
+
+ #: mouse.cpp:715
+ msgid ""
+-"Here you can customize KDE's behavior when scrolling with the mouse wheel in a "
+-"window while pressing the modifier key."
++"Here you can customize KDE's behavior when scrolling with the mouse wheel "
++"in a window while pressing the modifier key."
+ msgstr "在這裡你可以自定 [同時按住輔助鍵並使用滑鼠滾輪] 時 KDE 的行為。"
+
+ #: mouse.cpp:721
+@@ -420,31 +429,30 @@
+ #: windows.cpp:140
+ msgid ""
+ "The focus policy is used to determine the active window, i.e. the window you "
+-"can work in. "
+-" "
+-"- Click to focus: A window becomes active when you click into it. "
+-"This is the behavior you might know from other operating systems.
"
+-"- Focus follows mouse: Moving the mouse pointer actively on to a "
+-"normal window activates it. New windows will receive the focus, without you "
+-"having to point the mouse at them explicitly. Very practical if you are using "
+-"the mouse a lot.
"
+-"- Focus under mouse: The window that happens to be under the mouse "
+-"pointer is active. If the mouse points nowhere, the last window that was under "
+-"the mouse has focus. New windows will not automatically receive the focus.
"
+-"- Focus strictly under mouse: Only the window under the mouse "
+-"pointer is active. If the mouse points nowhere, nothing has focus.
"
+-"Note that 'Focus under mouse' and 'Focus strictly under mouse' prevent certain "
+-"features such as the Alt+Tab walk through windows dialog in the KDE mode from "
+-"working properly."
+-msgstr ""
+-"焦點策略用來決定作用視窗,換句話說就是你工作的視窗。 "
+-" "
+-"- 按鍵取得焦點: 當你在它上面點選使得視窗變成作用中視窗。這種方式你可能在其他作業系統看過。
"
+-"- 焦點隨滑鼠移動: "
+-"只要移動滑鼠游標到一個正常視窗上它就會作用。新視窗會收到焦點,不需要您很明確的指向它們。這相當有用,假如你常用滑鼠。
"
+-"- 焦點在滑鼠之下:在滑鼠下的視窗變成作用中。假如滑鼠游標那兒都不在,焦點會在游標最後經過的視窗上。新視窗不會自動收到焦點。
"
+-"- 焦點完全地在滑鼠之下:只有在滑鼠游標下的視窗是作用的。假如滑鼠游標那兒都不在,則沒有東西有焦點。
"
+-"請注意 [焦點在滑鼠之下] 和 [焦點完全地在滑鼠之下] 會使某些功能失效,如在 KDE 模式中以 Alt+Tab 來切換視窗對話盒。"
++"can work in. - Click to focus: A window becomes active when "
++"you click into it. This is the behavior you might know from other operating "
++"systems.
- Focus follows mouse: Moving the mouse pointer "
++"actively on to a normal window activates it. New windows will receive the "
++"focus, without you having to point the mouse at them explicitly. Very "
++"practical if you are using the mouse a lot.
- Focus under mouse:"
++"em> The window that happens to be under the mouse pointer is active. If the "
++"mouse points nowhere, the last window that was under the mouse has focus. "
++"New windows will not automatically receive the focus.
- Focus "
++"strictly under mouse: Only the window under the mouse pointer is "
++"active. If the mouse points nowhere, nothing has focus.
Note that "
++"'Focus under mouse' and 'Focus strictly under mouse' prevent certain "
++"features such as the Alt+Tab walk through windows dialog in the KDE mode "
++"from working properly."
++msgstr ""
++"焦點策略用來決定作用視窗,換句話說就是你工作的視窗。 - 按鍵取得焦"
++"點: 當你在它上面點選使得視窗變成作用中視窗。這種方式你可能在其他作業系"
++"統看過。
- 焦點隨滑鼠移動: 只要移動滑鼠游標到一個正常視窗上它"
++"就會作用。新視窗會收到焦點,不需要您很明確的指向它們。這相當有用,假如你常用"
++"滑鼠。
- 焦點在滑鼠之下:在滑鼠下的視窗變成作用中。假如滑鼠游"
++"標那兒都不在,焦點會在游標最後經過的視窗上。新視窗不會自動收到焦點。
"
++"- 焦點完全地在滑鼠之下:只有在滑鼠游標下的視窗是作用的。假如滑鼠游"
++"標那兒都不在,則沒有東西有焦點。
請注意 [焦點在滑鼠之下] 和 [焦點完全地"
++"在滑鼠之下] 會使某些功能失效,如在 KDE 模式中以 Alt+Tab 來切換視窗對話盒。"
+
+ #: windows.cpp:165
+ msgid "Auto &raise"
+@@ -468,9 +476,11 @@
+
+ #: windows.cpp:196
+ msgid ""
+-"When this option is enabled, a window in the background will automatically come "
+-"to the front when the mouse pointer has been over it for some time."
+-msgstr "假如 [自動前景] 啟動,當滑鼠游標停在上面一會兒,在背景的視窗會自動跑到前景來。"
++"When this option is enabled, a window in the background will automatically "
++"come to the front when the mouse pointer has been over it for some time."
++msgstr ""
++"假如 [自動前景] 啟動,當滑鼠游標停在上面一會兒,在背景的視窗會自動跑到前景"
++"來。"
+
+ #: windows.cpp:198
+ msgid ""
+@@ -483,13 +493,17 @@
+ "When this option is enabled, the active window will be brought to the front "
+ "when you click somewhere into the window contents. To change it for inactive "
+ "windows, you need to change the settings in the Actions tab."
+-msgstr "當此選項啟用,你按在視窗內容上時,作用中視窗自動被帶到前面來。要將它變更為非作用中視窗,您需要改變「動作」分頁中的設定。"
++msgstr ""
++"當此選項啟用,你按在視窗內容上時,作用中視窗自動被帶到前面來。要將它變更為非"
++"作用中視窗,您需要改變「動作」分頁中的設定。"
+
+ #: windows.cpp:207
+ msgid ""
+-"When this option is enabled, there will be a delay after which the window the "
+-"mouse pointer is over will become active (receive focus)."
+-msgstr "當啟用此選項,滑鼠游標停在視窗上超過這個延遲時間,視窗會變成作用中(取得焦點)。"
++"When this option is enabled, there will be a delay after which the window "
++"the mouse pointer is over will become active (receive focus)."
++msgstr ""
++"當啟用此選項,滑鼠游標停在視窗上超過這個延遲時間,視窗會變成作用中(取得焦"
++"點)。"
+
+ #: windows.cpp:209
+ msgid ""
+@@ -508,20 +522,24 @@
+ #: windows.cpp:221
+ msgid ""
+ "Hold down the Alt key and press the Tab key repeatedly to walk through the "
+-"windows on the current desktop (the Alt+Tab combination can be reconfigured).\n"
++"windows on the current desktop (the Alt+Tab combination can be "
++"reconfigured).\n"
+ "\n"
+ "If this checkbox is checked a popup widget is shown, displaying the icons of "
+ "all windows to walk through and the title of the currently selected one.\n"
+ "\n"
+-"Otherwise, the focus is passed to a new window each time Tab is pressed, with "
+-"no popup widget. In addition, the previously activated window will be sent to "
+-"the back in this mode."
++"Otherwise, the focus is passed to a new window each time Tab is pressed, "
++"with no popup widget. In addition, the previously activated window will be "
++"sent to the back in this mode."
+ msgstr ""
+-"保持 Alt 鍵按住並且重覆按 Tab 鍵來在目前桌面的所有視窗間切換(Alt+Tab 的組合可以自行設定)。\n"
++"保持 Alt 鍵按住並且重覆按 Tab 鍵來在目前桌面的所有視窗間切換(Alt+Tab 的組合"
++"可以自行設定)。\n"
+ "\n"
+-"如果核取此方塊則會出現彈出式元件, 顯示所有視窗的圖示來切換和目前選擇的標題。\n"
++"如果核取此方塊則會出現彈出式元件, 顯示所有視窗的圖示來切換和目前選擇的標"
++"題。\n"
+ "\n"
+-"否則,焦點會隨著每一次 Tab 按下傳到新的視窗。沒有彈出式元件。此外,在此模式中前一個作用中視窗會被送到後方。"
++"否則,焦點會隨著每一次 Tab 按下傳到新的視窗。沒有彈出式元件。此外,在此模式中"
++"前一個作用中視窗會被送到後方。"
+
+ #: windows.cpp:233
+ msgid "&Traverse windows on all desktops"
+@@ -529,8 +547,8 @@
+
+ #: windows.cpp:236
+ msgid ""
+-"Leave this option disabled if you want to limit walking through windows to the "
+-"current desktop."
++"Leave this option disabled if you want to limit walking through windows to "
++"the current desktop."
+ msgstr "如果你想要讓視窗可以在桌面之間切換,打開這個選項。"
+
+ #: windows.cpp:240
+@@ -542,7 +560,9 @@
+ "Enable this option if you want keyboard or active desktop border navigation "
+ "beyond the edge of a desktop to take you to the opposite edge of the new "
+ "desktop."
+-msgstr "如果您想要鍵盤或使用桌面邊框導覽在您超過桌面邊緣時帶您到對應邊緣的新桌面,請啟用此選項。"
++msgstr ""
++"如果您想要鍵盤或使用桌面邊框導覽在您超過桌面邊緣時帶您到對應邊緣的新桌面,請"
++"啟用此選項。"
+
+ #: windows.cpp:247
+ msgid "Popup desktop name on desktop &switch"
+@@ -550,8 +570,8 @@
+
+ #: windows.cpp:250
+ msgid ""
+-"Enable this option if you wish to see the current desktop name popup whenever "
+-"the current desktop is changed."
++"Enable this option if you wish to see the current desktop name popup "
++"whenever the current desktop is changed."
+ msgstr "當您選取了這個選項後,每當您改變了桌面時,桌面的名字將會跳出來提示您。"
+
+ #: windows.cpp:535
+@@ -564,8 +584,8 @@
+
+ #: windows.cpp:538
+ msgid ""
+-"Animate the action of reducing the window to its titlebar (shading) as well as "
+-"the expansion of a shaded window"
++"Animate the action of reducing the window to its titlebar (shading) as well "
++"as the expansion of a shaded window"
+ msgstr "視窗收起到標題列和展開收起的視窗的動畫"
+
+ #: windows.cpp:541
+@@ -574,14 +594,14 @@
+
+ #: windows.cpp:551
+ msgid ""
+-"If Shade Hover is enabled, a shaded window will un-shade automatically when the "
+-"mouse pointer has been over the title bar for some time."
++"If Shade Hover is enabled, a shaded window will un-shade automatically when "
++"the mouse pointer has been over the title bar for some time."
+ msgstr "假如徘徊收起啟動,當滑鼠游標停在標題列一會兒,收起的視窗會自動展開。"
+
+ #: windows.cpp:554
+ msgid ""
+-"Sets the time in milliseconds before the window unshades when the mouse pointer "
+-"goes over the shaded window."
++"Sets the time in milliseconds before the window unshades when the mouse "
++"pointer goes over the shaded window."
+ msgstr "用毫秒設定當滑鼠在收起的視窗上視窗展開前的時間。"
+
+ #: windows.cpp:565
+@@ -590,10 +610,12 @@
+
+ #: windows.cpp:568
+ msgid ""
+-"If this option is enabled, moving the mouse to a screen border will change your "
+-"desktop. This is e.g. useful if you want to drag windows from one desktop to "
+-"the other."
+-msgstr "當這個選項被選取了以後,每當滑鼠移到畫面的邊界時,系統會自動的幫您切換您的桌面。例如您要將一個視窗拖移到其他桌面時,這將會是很很方便的功能。"
++"If this option is enabled, moving the mouse to a screen border will change "
++"your desktop. This is e.g. useful if you want to drag windows from one "
++"desktop to the other."
++msgstr ""
++"當這個選項被選取了以後,每當滑鼠移到畫面的邊界時,系統會自動的幫您切換您的桌"
++"面。例如您要將一個視窗拖移到其他桌面時,這將會是很很方便的功能。"
+
+ #: windows.cpp:571
+ msgid "D&isabled"
+@@ -616,7 +638,9 @@
+ "Here you can set a delay for switching desktops using the active borders "
+ "feature. Desktops will be switched after the mouse has been pushed against a "
+ "screen border for the specified number of milliseconds."
+-msgstr "這裡您可以設定當滑鼠移到畫面邊界時,所要延遲切換桌面的秒數。桌面將會在觸及畫面邊界時,經過您所設定的時間後自動切換(單位是微秒)。"
++msgstr ""
++"這裡您可以設定當滑鼠移到畫面邊界時,所要延遲切換桌面的秒數。桌面將會在觸及畫"
++"面邊界時,經過您所設定的時間後自動切換(單位是微秒)。"
+
+ #: windows.cpp:592
+ msgid "Focus stealing prevention level:"
+@@ -657,34 +681,31 @@
+ "This option specifies how much KWin will try to prevent unwanted focus "
+ "stealing caused by unexpected activation of new windows. (Note: This feature "
+ "does not work with the Focus Under Mouse or Focus Strictly Under Mouse focus "
+-"policies.)"
+-"
"
+-"- None: Prevention is turned off and new windows always become "
+-"activated.
"
+-"- Low: Prevention is enabled; when some window does not have support "
+-"for the underlying mechanism and KWin cannot reliably decide whether to "
+-"activate the window or not, it will be activated. This setting may have both "
+-"worse and better results than normal level, depending on the applications.
"
+-"- Normal: Prevention is enabled.
"
+-"- High: New windows get activated only if no window is currently "
+-"active or if they belong to the currently active application. This setting is "
+-"probably not really usable when not using mouse focus policy.
"
+-"- Extreme: All windows must be explicitly activated by the user.
"
+-"
"
+-"Windows that are prevented from stealing focus are marked as demanding "
+-"attention, which by default means their taskbar entry will be highlighted. This "
+-"can be changed in the Notifications control module.
"
+-msgstr ""
+-"這個選項指定 KWin 要如何防止未預期開啟的新視窗取得焦點。(注意:這項功能在焦點追隨滑鼠或焦點相黏追隨滑鼠政策下無法運作。)"
+-"
"
+-"- 無:關閉防堵功能,新視窗都能取得焦點。
"
+-"- 低:啟用防堵功能;當某些視窗不支援取得優先權(underlying)機制而 KWin "
+-"不能有效決定是否讓該視窗取得焦點時則讓它成為作用中視窗。這個設定值造成的結果可能比普通等級好,也可能不好,取決於應用程式自身。
"
+-"- 普通:啟用防堵功能。
"
+-"- 高:新視窗只有在當時沒有作用中的視窗或者它們自身屬於目前作用中的應用程式才能取得焦點。這個設定在不使用滑鼠焦點政策時可能不怎麼實用。<"
+-"/li>"
+-"
- 最高:所有的視窗都需要經由使用者明定。
"
+-"要防止失去焦點的視窗需要標記為隨選注意,亦即預設突顯它們的工作列項目。這可以在通知控制模組中改變。
"
++"policies.)- None: Prevention is turned off and new windows "
++"always become activated.
- Low: Prevention is enabled; when "
++"some window does not have support for the underlying mechanism and KWin "
++"cannot reliably decide whether to activate the window or not, it will be "
++"activated. This setting may have both worse and better results than normal "
++"level, depending on the applications.
- Normal: Prevention is "
++"enabled.
- High: New windows get activated only if no window "
++"is currently active or if they belong to the currently active application. "
++"This setting is probably not really usable when not using mouse focus policy."
++"
- Extreme: All windows must be explicitly activated by the "
++"user.
Windows that are prevented from stealing focus are "
++"marked as demanding attention, which by default means their taskbar entry "
++"will be highlighted. This can be changed in the Notifications control module."
++"
"
++msgstr ""
++"這個選項指定 KWin 要如何防止未預期開啟的新視窗取得焦點。(注意:這項功能在"
++"焦點追隨滑鼠或焦點相黏追隨滑鼠政策下無法運作。)
- 無:關閉防堵"
++"功能,新視窗都能取得焦點。
- 低:啟用防堵功能;當某些視窗不支"
++"援取得優先權(underlying)機制而 KWin 不能有效決定是否讓該視窗取得焦點時則讓它"
++"成為作用中視窗。這個設定值造成的結果可能比普通等級好,也可能不好,取決於應用"
++"程式自身。
- 普通:啟用防堵功能。
- 高:新視窗"
++"只有在當時沒有作用中的視窗或者它們自身屬於目前作用中的應用程式才能取得焦點。"
++"這個設定在不使用滑鼠焦點政策時可能不怎麼實用。
- 最高:所有的"
++"視窗都需要經由使用者明定。
要防止失去焦點的視窗需要標記為隨選"
++"注意,亦即預設突顯它們的工作列項目。這可以在通知控制模組中改變。
"
+
+ #: windows.cpp:625
+ msgid "Hide utility windows for inactive applications"
+@@ -692,13 +713,14 @@
+
+ #: windows.cpp:627
+ msgid ""
+-"When turned on, utility windows (tool windows, torn-off menus,...) of inactive "
+-"applications will be hidden and will be shown only when the application becomes "
+-"active. Note that applications have to mark the windows with the proper window "
+-"type for this feature to work."
++"When turned on, utility windows (tool windows, torn-off menus,...) of "
++"inactive applications will be hidden and will be shown only when the "
++"application becomes active. Note that applications have to mark the windows "
++"with the proper window type for this feature to work."
+ msgstr ""
+-"當開啟時,非作用中應用程式的公用視窗(工具視窗,浮動選單,...)會被隱藏,只有在該應用程式變為作用中時才會顯示。注意應用程式必須以正確的視窗類型標記其視窗才能"
+-"使此功能生效。"
++"當開啟時,非作用中應用程式的公用視窗(工具視窗,浮動選單,...)會被隱藏,只有在"
++"該應用程式變為作用中時才會顯示。注意應用程式必須以正確的視窗類型標記其視窗才"
++"能使此功能生效。"
+
+ #: windows.cpp:780
+ msgid "Windows"
+@@ -711,10 +733,11 @@
+ #: windows.cpp:790
+ msgid ""
+ "Enable this option if you want a window's content to be fully shown while "
+-"moving it, instead of just showing a window 'skeleton'. The result may not be "
+-"satisfying on slow machines without graphic acceleration."
++"moving it, instead of just showing a window 'skeleton'. The result may not "
++"be satisfying on slow machines without graphic acceleration."
+ msgstr ""
+-"開啟這個選項假如你要移動視窗時完全顯示視窗的內容,否則只會顯示視窗的 '框'。 在一台很慢的機器上而且沒有圖型加速卡時,結果可能不會令人滿意。"
++"開啟這個選項假如你要移動視窗時完全顯示視窗的內容,否則只會顯示視窗的 '框'。 "
++"在一臺很慢的機器上而且沒有圖型加速卡時,結果可能不會令人滿意。"
+
+ #: windows.cpp:794
+ msgid "Display content in &resizing windows"
+@@ -726,7 +749,8 @@
+ "it, instead of just showing a window 'skeleton'. The result may not be "
+ "satisfying on slow machines."
+ msgstr ""
+-"開啟這個選項假如你要改變視窗大小時完全顯示視窗的內容,否則只會顯示視窗的 '框'。在一台很慢的機器上而且沒有圖型加速卡時,結果可能不會令人太滿意。"
++"開啟這個選項假如你要改變視窗大小時完全顯示視窗的內容,否則只會顯示視窗的 "
++"'框'。在一臺很慢的機器上而且沒有圖型加速卡時,結果可能不會令人太滿意。"
+
+ #: windows.cpp:800
+ msgid "Display window &geometry when moving or resizing"
+@@ -734,10 +758,12 @@
+
+ #: windows.cpp:802
+ msgid ""
+-"Enable this option if you want a window's geometry to be displayed while it is "
+-"being moved or resized. The window position relative to the top-left corner of "
+-"the screen is displayed together with its size."
+-msgstr "如果您想在移動或改變視窗大小時顯示幾何狀態,啟用此選項。這將顯示視窗相對於螢幕左上角的位置及其大小。"
++"Enable this option if you want a window's geometry to be displayed while it "
++"is being moved or resized. The window position relative to the top-left "
++"corner of the screen is displayed together with its size."
++msgstr ""
++"如果您想在移動或改變視窗大小時顯示幾何狀態,啟用此選項。這將顯示視窗相對於螢"
++"幕左上角的位置及其大小。"
+
+ #: windows.cpp:812
+ msgid "Animate minimi&ze and restore"
+@@ -745,8 +771,8 @@
+
+ #: windows.cpp:814
+ msgid ""
+-"Enable this option if you want an animation shown when windows are minimized or "
+-"restored."
++"Enable this option if you want an animation shown when windows are minimized "
++"or restored."
+ msgstr "開啟這個選項假如你要當視窗最小化或還原時有動畫顯示。"
+
+ #: windows.cpp:828
+@@ -769,9 +795,11 @@
+
+ #: windows.cpp:844
+ msgid ""
+-"When enabled, this feature activates the border of maximized windows and allows "
+-"you to move or resize them, just like for normal windows"
+-msgstr "當選項啟動,這個功能會啟動最大化視窗的邊界並且允許你移動和改變它們的大小,就像正常視窗一樣"
++"When enabled, this feature activates the border of maximized windows and "
++"allows you to move or resize them, just like for normal windows"
++msgstr ""
++"當選項啟動,這個功能會啟動最大化視窗的邊界並且允許你移動和改變它們的大小,就"
++"像正常視窗一樣"
+
+ #: windows.cpp:850
+ msgid "&Placement:"
+@@ -803,26 +831,21 @@
+
+ #: windows.cpp:865
+ msgid ""
+-"The placement policy determines where a new window will appear on the desktop. "
+-" "
+-"- Smart will try to achieve a minimum overlap of windows
"
+-"- Maximizing will try to maximize every window to fill the whole "
+-"screen. It might be useful to selectively affect placement of some windows "
+-"using the window-specific settings.
"
+-"- Cascade will cascade the windows
"
+-"- Random will use a random position
"
+-"- Centered will place the window centered
"
+-"- Zero-Cornered will place the window in the top-left corner
"
+-"
"
+-msgstr ""
+-"配置策略決定一個新視窗會出現在桌面那裡。 "
+-""
+-"- 聰明 會試著儘量不讓視窗重疊
"
+-"- 最大化 會試著最大化每個視窗以填滿螢幕。它在選擇性影響某些使用指定視窗設定的視窗排列會很有幫助。
"
+-"- 重疊顯示 會層疊視窗
"
+-"- 隨機放置 會使用隨機位置
"
+-"- 置中會將視窗置中
"
+-"- 零-角落會將視窗置於左上角
"
++"The placement policy determines where a new window will appear on the "
++"desktop. - Smart will try to achieve a minimum overlap of "
++"windows
- Maximizing will try to maximize every window to "
++"fill the whole screen. It might be useful to selectively affect placement of "
++"some windows using the window-specific settings.
- Cascade "
++"will cascade the windows
- Random will use a random "
++"position
- Centered will place the window centered
"
++"- Zero-Cornered will place the window in the top-left corner"
++"li>
"
++msgstr ""
++"配置策略決定一個新視窗會出現在桌面那裡。 - 聰明 會試著儘量不讓"
++"視窗重疊
- 最大化 會試著最大化每個視窗以填滿螢幕。它在選擇性"
++"影響某些使用指定視窗設定的視窗排列會很有幫助。
- 重疊顯示 會"
++"層疊視窗
- 隨機放置 會使用隨機位置
- 置中會將"
++"視窗置中
- 零-角落會將視窗置於左上角
"
+
+ #: windows.cpp:904
+ msgid "Snap Zones"
+@@ -834,13 +857,16 @@
+
+ #: windows.cpp:910
+ msgid "&Border snap zone:"
+-msgstr "邊框黏貼區域 (&B):"
++msgstr "邊框黏貼區域(&B):"
+
+ #: windows.cpp:912
+ msgid ""
+-"Here you can set the snap zone for screen borders, i.e. the 'strength' of the "
+-"magnetic field which will make windows snap to the border when moved near it."
+-msgstr "在這裡你可以為螢幕邊框設定黏貼區域,換句話說, 就是當視窗靠近時會讓視窗黏貼到邊框的磁場 '強度'。"
++"Here you can set the snap zone for screen borders, i.e. the 'strength' of "
++"the magnetic field which will make windows snap to the border when moved "
++"near it."
++msgstr ""
++"在這裡你可以為螢幕邊框設定黏貼區域,換句話說, 就是當視窗靠近時會讓視窗黏貼到"
++"邊框的磁場 '強度'。"
+
+ #: windows.cpp:919
+ msgid "&Window snap zone:"
+@@ -848,10 +874,12 @@
+
+ #: windows.cpp:921
+ msgid ""
+-"Here you can set the snap zone for windows, i.e. the 'strength' of the magnetic "
+-"field which will make windows snap to each other when they're moved near "
+-"another window."
+-msgstr "在這裡你可以為視窗設定黏貼區域,換句話說,就是當視窗彼此靠近時會讓視窗黏貼在一起的磁性 '強度'。"
++"Here you can set the snap zone for windows, i.e. the 'strength' of the "
++"magnetic field which will make windows snap to each other when they're moved "
++"near another window."
++msgstr ""
++"在這裡你可以為視窗設定黏貼區域,換句話說,就是當視窗彼此靠近時會讓視窗黏貼在"
++"一起的磁性 '強度'。"
+
+ #: windows.cpp:925
+ msgid "Snap windows onl&y when overlapping"
+@@ -859,10 +887,12 @@
+
+ #: windows.cpp:926
+ msgid ""
+-"Here you can set that windows will be only snapped if you try to overlap them, "
+-"i.e. they will not be snapped if the windows comes only near another window or "
+-"border."
+-msgstr "在這裡你可以設定只有你試著重疊視窗時視窗才會黏貼,例如, 視窗不會黏貼假如視窗只是靠近另一個視窗或邊框。"
++"Here you can set that windows will be only snapped if you try to overlap "
++"them, i.e. they will not be snapped if the windows comes only near another "
++"window or border."
++msgstr ""
++"在這裡你可以設定只有你試著重疊視窗時視窗才會黏貼,例如, 視窗不會黏貼假如視窗"
++"只是靠近另一個視窗或邊框。"
+
+ #: windows.cpp:1023 windows.cpp:1027
+ msgid ""
+@@ -872,38 +902,22 @@
+
+ #: windows.cpp:1226
+ msgid ""
+-"It seems that alpha channel support is not available."
+-"
"
+-"
Please make sure you have "
+-"Xorg ≥ 6.8, and installed the kompmgr that came with kwin."
+-"
Also, make sure you have the following entries in your XConfig (e.g. "
+-"/etc/X11/xorg.conf):"
+-"
"
+-"
Section \"Extensions\""
+-"
Option \"Composite\" \"Enable\""
+-"
EndSection"
+-"
"
+-"
And if your GPU provides hardware-accelerated Xrender support (mainly "
+-"nVidia cards):"
+-"
"
+-"
Option \"RenderAccel\" \"true\""
+-"
In Section \"Device\""
+-msgstr ""
+-"似乎不支援 alpha 色頻。"
+-"
"
+-"
請確定您具備 Xorg ≥ 6.8"
+-",並且安裝了 kwin 及 kompmgr。"
+-"
並且,請確定在您的 XConfig 有下列項目(e.g. /etc/X11/xorg.conf):"
+-"
"
+-"
Section \"Extensions\""
+-"
Option \"Composite\" \"Enable\""
+-"
EndSection"
+-"
"
+-"
And if your GPU provides hardware-accelerated Xrender support (mainly "
+-"nVidia cards):"
+-"
"
+-"
Option \"RenderAccel\" \"true\""
+-"
In Section \"Device\""
++"It seems that alpha channel support is not available."
++"b>
Please make sure you have Xorg ≥ 6.8, and installed the kompmgr that came with kwin."
++"
Also, make sure you have the following entries in your XConfig (e.g. /"
++"etc/X11/xorg.conf):
Section \"Extensions\"
Option \"Composite\" "
++"\"Enable\"
EndSection
And if your GPU provides hardware-"
++"accelerated Xrender support (mainly nVidia cards):
Option "
++"\"RenderAccel\" \"true\"
In Section \"Device\""
++msgstr ""
++"似乎不支援 alpha 色頻。
請確定您具備 Xorg ≥ 6.8,並且安裝了 kwin 及 kompmgr。
並且,"
++"請確定在您的 XConfig 有下列項目(e.g. /etc/X11/xorg.conf):
Section "
++"\"Extensions\"
Option \"Composite\" \"Enable\"
EndSection"
++"i>
And if your GPU provides hardware-accelerated Xrender support "
++"(mainly nVidia cards):
Option \"RenderAccel\" \"true\""
++"i>
In Section \"Device\""
+
+ #: windows.cpp:1246
+ msgid "Apply translucency only to decoration"
+@@ -1003,6 +1017,8 @@
+
+ #: windows.cpp:1624
+ msgid ""
+-"Translucency support is new and may cause problems"
+-"
including crashes (sometimes the translucency engine, seldom even X)."
+-msgstr "透明功能是很新的,因而可能造成問題
甚至當機(有時是透明引擎,偶爾是 X)。"
++"Translucency support is new and may cause problems
including crashes "
++"(sometimes the translucency engine, seldom even X)."
++msgstr ""
++"透明功能是很新的,因而可能造成問題
甚至當機(有時是透明引擎,偶爾是 "
++"X)。"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmlaunch.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmlaunch.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmlaunch.po 2005-09-10 13:15:15.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmlaunch.po 2011-11-11 15:45:17.000000000 +0100
+@@ -8,7 +8,7 @@
+ "Project-Id-Version: kcmlaunch\n"
+ "POT-Creation-Date: 2005-05-18 21:24+0200\n"
+ "PO-Revision-Date: 2003-12-16 15:58+0800\n"
+-"Last-Translator: \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -37,7 +37,8 @@
+ msgstr ""
+ "忙碌指標
\n"
+ "在應用程式啟動時, KDE 會提供一個忙碌的滑鼠指標來通知您.\n"
+-"要啟用忙碌指標的服務, 從選項中選擇一種視覺回饋某些應用程式可能不認識此種啟動方式\n"
++"要啟用忙碌指標的服務, 從選項中選擇一種視覺回饋某些應用程式可能不認識此種啟動"
++"方式\n"
+ "注意。在這種情況下,滑鼠游標將會在'啟動作業逾時'所設定的秒數之後\n"
+ "停止閃動"
+
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmlayout.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmlayout.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmlayout.po 2008-08-19 20:43:10.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmlayout.po 2011-11-11 15:45:17.000000000 +0100
+@@ -11,8 +11,7 @@
+ "Project-Id-Version: kcmlayout\n"
+ "POT-Creation-Date: 2008-07-08 01:18+0200\n"
+ "PO-Revision-Date: 2006-06-19 09:46+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Chinese Traditional \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -972,12 +971,12 @@
+ #, no-c-format
+ msgid ""
+ "Keyboard Layout
Here you can choose your keyboard layout and model. "
+-"The 'model' refers to the type of keyboard that is connected to your computer, "
+-"while the keyboard layout defines \"which key does what\" and may be different "
+-"for different countries."
++"The 'model' refers to the type of keyboard that is connected to your "
++"computer, while the keyboard layout defines \"which key does what\" and may "
++"be different for different countries."
+ msgstr ""
+-"鍵盤配置
"
+-"您可以在這邊選擇鍵盤的配置與型號。「型號」對應到連接在您電腦上鍵盤的類型,而這是用來定義「每個按鍵的作用」的,所以不同國家會有所不同。"
++"鍵盤配置
您可以在這邊選擇鍵盤的配置與型號。「型號」對應到連接在您電"
++"腦上鍵盤的類型,而這是用來定義「每個按鍵的作用」的,所以不同國家會有所不同。"
+
+ #. i18n: file kcmlayoutwidget.ui line 84
+ #: rc.cpp:12
+@@ -1003,12 +1002,14 @@
+ msgid ""
+ "Here you can choose a keyboard model. This setting is independent of your "
+ "keyboard layout and refers to the \"hardware\" model, i.e. the way your "
+-"keyboard is manufactured. Modern keyboards that come with your computer usually "
+-"have two extra keys and are referred to as \"104-key\" models, which is "
+-"probably what you want if you do not know what kind of keyboard you have.\n"
++"keyboard is manufactured. Modern keyboards that come with your computer "
++"usually have two extra keys and are referred to as \"104-key\" models, which "
++"is probably what you want if you do not know what kind of keyboard you "
++"have.\n"
+ msgstr ""
+-"您可以在這邊選擇鍵盤型號。這個設定獨立於您的鍵盤配置,且對應到「硬體」型號,也就是鍵盤製造的方式。您電腦所使用的現代的鍵盤通常有二個額外的按鍵並對應到「104鍵"
+-"」型號,當您不確定您的鍵盤型號時,通常可以使用這種。\n"
++"您可以在這邊選擇鍵盤型號。這個設定獨立於您的鍵盤配置,且對應到「硬體」型號,"
++"也就是鍵盤製造的方式。您電腦所使用的現代的鍵盤通常有二個額外的按鍵並對應到"
++"「104鍵」型號,當您不確定您的鍵盤型號時,通常可以使用這種。\n"
+
+ #. i18n: file kcmlayoutwidget.ui line 126
+ #: rc.cpp:25
+@@ -1048,7 +1049,8 @@
+ "docked flag. By clicking on this flag you can easily switch between layouts. "
+ "The first layout will be default one."
+ msgstr ""
+-"如果這個清單中出現一個以上的配置, KDE 面板將會提供一個停駐的旗幟。經由點選這個旗幟,您可以輕易的在各種配置間切換。第一個配置將是預設配置。"
++"如果這個清單中出現一個以上的配置, KDE 面板將會提供一個停駐的旗幟。經由點選這"
++"個旗幟,您可以輕易的在各種配置間切換。第一個配置將是預設配置。"
+
+ #. i18n: file kcmlayoutwidget.ui line 213
+ #: rc.cpp:46
+@@ -1074,16 +1076,20 @@
+ msgid ""
+ "This is the list of available keyboard layouts in your system. You can add "
+ "layout to the active list by selecting it and pressing \"Add\" button."
+-msgstr "這是在您的系統中可以使用的鍵盤配置清單。您可以選擇一個配置並且按下「加入」按鈕將它加入作用中清單。"
++msgstr ""
++"這是在您的系統中可以使用的鍵盤配置清單。您可以選擇一個配置並且按下「加入」按"
++"鈕將它加入作用中清單。"
+
+ #. i18n: file kcmlayoutwidget.ui line 327
+ #: rc.cpp:64
+ #, no-c-format
+ msgid ""
+-"This is the command which is executed when switching to the selected layout. It "
+-"may help you if you want to debug layout switching, or if you want to switch "
+-"layouts without the help of KDE."
+-msgstr "這是在切換到選擇的配置時要執行的指令。如果你想要為配置切換除錯,或是想不靠 KDE 幫助切換鍵盤時,它可能會有所幫助。"
++"This is the command which is executed when switching to the selected layout. "
++"It may help you if you want to debug layout switching, or if you want to "
++"switch layouts without the help of KDE."
++msgstr ""
++"這是在切換到選擇的配置時要執行的指令。如果你想要為配置切換除錯,或是想不靠 "
++"KDE 幫助切換鍵盤時,它可能會有所幫助。"
+
+ #. i18n: file kcmlayoutwidget.ui line 338
+ #: rc.cpp:67
+@@ -1095,9 +1101,10 @@
+ #: rc.cpp:70
+ #, no-c-format
+ msgid ""
+-"If after you switch to this layout some keyboard shortcuts based on latin keys "
+-"do not work try to enable this option."
+-msgstr "如果稍候您切換到這個配置導致有些基於拉丁按鍵的快捷鍵無法運作請啟用這個選項。"
++"If after you switch to this layout some keyboard shortcuts based on latin "
++"keys do not work try to enable this option."
++msgstr ""
++"如果稍候您切換到這個配置導致有些基於拉丁按鍵的快捷鍵無法運作請啟用這個選項。"
+
+ #. i18n: file kcmlayoutwidget.ui line 349
+ #: rc.cpp:73
+@@ -1118,11 +1125,12 @@
+ "Here you can choose a variant of selected keyboard layout. Layout variants "
+ "usually represent different key maps for the same language. For example, "
+ "Ukrainian layout might have four variants: basic, winkeys (as in Windows), "
+-"typewriter (as in typewriters) and phonetic (each Ukrainian letter is placed on "
+-"a transliterated latin one).\n"
++"typewriter (as in typewriters) and phonetic (each Ukrainian letter is placed "
++"on a transliterated latin one).\n"
+ msgstr ""
+-"您可以在這裡選擇額外鍵盤配置的變化。配置的變化通常代表著同樣語言下不同的按鍵配置。例如烏克蘭配置可能有四種變化:基本、視窗按鍵(用於 "
+-"Windows)、打字機(如同打字機)和拼音(每個烏克蘭字母都安排在對應拉丁字母的位置上)。\n"
++"您可以在這裡選擇額外鍵盤配置的變化。配置的變化通常代表著同樣語言下不同的按鍵"
++"配置。例如烏克蘭配置可能有四種變化:基本、視窗按鍵(用於 Windows)、打字機(如同"
++"打字機)和拼音(每個烏克蘭字母都安排在對應拉丁字母的位置上)。\n"
+
+ #. i18n: file kcmlayoutwidget.ui line 429
+ #: rc.cpp:83
+@@ -1142,7 +1150,9 @@
+ msgid ""
+ "If you select \"Application\" or \"Window\" switching policy, changing the "
+ "keyboard layout will only affect the current application or window."
+-msgstr "如果你選擇「應用程式」或「視窗」切換政策,變更鍵盤配置將只影響目前的應用程式或視窗。"
++msgstr ""
++"如果你選擇「應用程式」或「視窗」切換政策,變更鍵盤配置將只影響目前的應用程式"
++"或視窗。"
+
+ #. i18n: file kcmlayoutwidget.ui line 491
+ #: rc.cpp:92
+@@ -1190,13 +1200,15 @@
+ #: rc.cpp:113
+ #, no-c-format
+ msgid ""
+-"If you have more than two layouts and turn this option on, switching with the "
+-"keyboard shortcut or clicking on the kxkb indicator will only cycle through the "
+-"last few layouts. You can specify the number of layouts to rotate below. You "
+-"can still access all layouts by right-clicking on the kxkb indicator."
++"If you have more than two layouts and turn this option on, switching with "
++"the keyboard shortcut or clicking on the kxkb indicator will only cycle "
++"through the last few layouts. You can specify the number of layouts to "
++"rotate below. You can still access all layouts by right-clicking on the kxkb "
++"indicator."
+ msgstr ""
+-"如果您有兩個以上的配置並且開啟這個選項,使用鍵盤捷徑切換或者按下 kxkb 指示器將只會在最新的配置中循環。您可以在下面指定循環的配置數量。您仍然可以在 "
+-"kxkb 指示器上按右鍵來使用所有的配置。"
++"如果您有兩個以上的配置並且開啟這個選項,使用鍵盤捷徑切換或者按下 kxkb 指示器"
++"將只會在最新的配置中循環。您可以在下面指定循環的配置數量。您仍然可以在 kxkb "
++"指示器上按右鍵來使用所有的配置。"
+
+ #. i18n: file kcmlayoutwidget.ui line 559
+ #: rc.cpp:116
+@@ -1247,12 +1259,11 @@
+ #, no-c-format
+ msgid ""
+ "If supported, this option allows you to setup the state of NumLock after KDE "
+-"startup."
+-"You can configure NumLock to be turned on or off, or configure KDE not to "
+-"set NumLock state."
++"startup.
You can configure NumLock to be turned on or off, or configure "
++"KDE not to set NumLock state."
+ msgstr ""
+-"如果能夠支援的話,這個項目能夠讓您設定在啟動 KDE 後數字鎖定鍵的狀態。"
+-"
您可以把數字鎖定設定為開啟或者是關閉,或者是不要讓 KDE 去調整數字鎖定的狀態。"
++"如果能夠支援的話,這個項目能夠讓您設定在啟動 KDE 後數字鎖定鍵的狀態。
您可"
++"以把數字鎖定設定為開啟或者是關閉,或者是不要讓 KDE 去調整數字鎖定的狀態。"
+
+ #. i18n: file kcmmiscwidget.ui line 47
+ #: rc.cpp:149
+@@ -1288,10 +1299,12 @@
+ #: rc.cpp:164 rc.cpp:170
+ #, no-c-format
+ msgid ""
+-"If supported, this option allows you to set the delay after which a pressed key "
+-"will start generating keycodes. The 'Repeat rate' option controls the frequency "
+-"of these keycodes."
+-msgstr "如果支援,這個選項讓您可以設定按下按鍵到產生字碼的延遲。「重複速率」選項控制了這些字碼的頻率。"
++"If supported, this option allows you to set the delay after which a pressed "
++"key will start generating keycodes. The 'Repeat rate' option controls the "
++"frequency of these keycodes."
++msgstr ""
++"如果支援,這個選項讓您可以設定按下按鍵到產生字碼的延遲。「重複速率」選項控制"
++"了這些字碼的頻率。"
+
+ #. i18n: file kcmmiscwidget.ui line 153
+ #: rc.cpp:167
+@@ -1330,12 +1343,14 @@
+ #, no-c-format
+ msgid ""
+ "If you check this option, pressing and holding down a key emits the same "
+-"character over and over again. For example, pressing and holding down the Tab "
+-"key will have the same effect as that of pressing that key several times in "
+-"succession: Tab characters continue to be emitted until you release the key."
++"character over and over again. For example, pressing and holding down the "
++"Tab key will have the same effect as that of pressing that key several times "
++"in succession: Tab characters continue to be emitted until you release the "
++"key."
+ msgstr ""
+-"如果您選取這個項目,當您持續按住按鍵時會不斷重複送出同一個字元。例如,持續按住 Tab 鍵的效果就如同連續按下好幾次 Tab 鍵:直到您鬆開按鍵之前會不斷送出 "
+-"Tab 字元。"
++"如果您選取這個項目,當您持續按住按鍵時會不斷重複送出同一個字元。例如,持續按"
++"住 Tab 鍵的效果就如同連續按下好幾次 Tab 鍵:直到您鬆開按鍵之前會不斷送出 Tab "
++"字元。"
+
+ #. i18n: file kcmmiscwidget.ui line 263
+ #: rc.cpp:191
+@@ -1349,16 +1364,16 @@
+ msgid ""
+ "If supported, this option allows you to hear audible clicks from your "
+ "computer's speakers when you press the keys on your keyboard. This might be "
+-"useful if your keyboard does not have mechanical keys, or if the sound that the "
+-"keys make is very soft."
+-"
You can change the loudness of the key click feedback by dragging the slider "
+-"button or by clicking the up/down arrows on the spin box. Setting the volume to "
+-"0% turns off the key click."
++"useful if your keyboard does not have mechanical keys, or if the sound that "
++"the keys make is very soft.
You can change the loudness of the key click "
++"feedback by dragging the slider button or by clicking the up/down arrows on "
++"the spin box. Setting the volume to 0% turns off the key click."
+ msgstr ""
+-"如果能夠支援的話,這個選項能夠讓您在按鍵盤上的按鍵時聽到來自 PC "
+-"喇叭的聲響。當您使用非機械式鍵盤的話,或者是該鍵盤在打字輸入資料時發出的聲音相當柔軟的話,這可能是相當有用的。"
+-"
調整該拉條進行音量調整動作,把音量設定為 "
+-"
您可以拉動滑鈕或按下飛梭方塊的上/下箭頭來改變按鍵反饋的音量。設定音量為 0% 的話,就是關閉按鍵音量的設定。"
++"如果能夠支援的話,這個選項能夠讓您在按鍵盤上的按鍵時聽到來自 PC 喇叭的聲響。"
++"當您使用非機械式鍵盤的話,或者是該鍵盤在打字輸入資料時發出的聲音相當柔軟的"
++"話,這可能是相當有用的。
調整該拉條進行音量調整動作,把音量設定為
您可以"
++"拉動滑鈕或按下飛梭方塊的上/下箭頭來改變按鍵反饋的音量。設定音量為 0% 的話,就"
++"是關閉按鍵音量的設定。"
+
+ #. i18n: file kcmmiscwidget.ui line 282
+ #: rc.cpp:197
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmlocale.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmlocale.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmlocale.po 2006-10-01 18:34:18.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmlocale.po 2011-11-11 15:45:17.000000000 +0100
+@@ -8,7 +8,7 @@
+ "Project-Id-Version: kcmlocale\n"
+ "POT-Creation-Date: 2006-08-23 02:32+0200\n"
+ "PO-Revision-Date: 2005-08-07 07:18+0800\n"
+-"Last-Translator: Chao-Hsiung Liao \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Chinese (traditional) \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -116,9 +116,10 @@
+
+ #: kcmlocale.cpp:406
+ msgid ""
+-"This will add a language to the list. If the language is already in the list, "
+-"the old one will be moved instead."
+-msgstr "這會新增一個語系至列表。如果列表上已經有這個語系,舊的語系將會被新的取代。"
++"This will add a language to the list. If the language is already in the "
++"list, the old one will be moved instead."
++msgstr ""
++"這會新增一個語系至列表。如果列表上已經有這個語系,舊的語系將會被新的取代。"
+
+ #: kcmlocale.cpp:410
+ msgid "This will remove the highlighted language from the list."
+@@ -126,7 +127,8 @@
+
+ #: kcmlocale.cpp:413
+ msgid ""
+-"KDE programs will be displayed in the first available language in this list.\n"
++"KDE programs will be displayed in the first available language in this "
++"list.\n"
+ "If none of the languages are available, US English will be used."
+ msgstr ""
+ "KDE 應用程式將會以列表中第一個可用的語系顯示。\n"
+@@ -134,23 +136,25 @@
+
+ #: kcmlocale.cpp:420
+ msgid ""
+-"Here you can choose your country or region. The settings for languages, numbers "
+-"etc. will automatically switch to the corresponding values."
+-msgstr "您可以在這邊選擇您的國家或地區。語言、數字等等的設定將會自動切換成對應的數值。"
++"Here you can choose your country or region. The settings for languages, "
++"numbers etc. will automatically switch to the corresponding values."
++msgstr ""
++"您可以在這邊選擇您的國家或地區。語言、數字等等的設定將會自動切換成對應的數"
++"值。"
+
+ #: kcmlocale.cpp:427
+ msgid ""
+ "Here you can choose the languages that will be used by KDE. If the first "
+-"language in the list is not available, the second will be used, etc. If only US "
+-"English is available, no translations have been installed. You can get "
++"language in the list is not available, the second will be used, etc. If only "
++"US English is available, no translations have been installed. You can get "
+ "translation packages for many languages from the place you got KDE from."
+-"Note that some applications may not be translated to your languages; in this "
+-"case, they will automatically fall back to US English."
++"
Note that some applications may not be translated to your languages; in "
++"this case, they will automatically fall back to US English."
+ msgstr ""
+-"您可以在這邊選擇 KDE "
+-"所使用的語言。如果列表中的第一個語系無法使用,會使用第二個語系代替,並以此類推。如果只有美式英語可用,可能是沒有安裝其他翻譯檔。您可以從您取得 KDE "
+-"的地方找到很多種語言的翻譯檔套件。"
+-"
注意有些應用程式可能沒有翻譯成您的語言;在這種情形下它們會自動回復為美式英語。"
++"您可以在這邊選擇 KDE 所使用的語言。如果列表中的第一個語系無法使用,會使用第二"
++"個語系代替,並以此類推。如果只有美式英語可用,可能是沒有安裝其他翻譯檔。您可"
++"以從您取得 KDE 的地方找到很多種語言的翻譯檔套件。
注意有些應用程式可能沒有"
++"翻譯成您的語言;在這種情形下它們會自動回復為美式英語。"
+
+ #: klocalesample.cpp:52
+ msgid "Numbers:"
+@@ -210,20 +214,21 @@
+
+ #: localenum.cpp:165
+ msgid ""
+-"Here you can define the decimal separator used to display numbers (i.e. a dot "
+-"or a comma in most countries)."
+-"
Note that the decimal separator used to display monetary values has to be "
+-"set separately (see the 'Money' tab)."
++"Here you can define the decimal separator used to display numbers (i.e. a "
++"dot or a comma in most countries).
Note that the decimal separator used to "
++"display monetary values has to be set separately (see the 'Money' tab)."
+ msgstr ""
+-"您可以在這邊定義顯示數字時所使用的小數點分隔符號 (一般為點號)。"
+-"
注意,用來顯示金錢數值的小數點分隔符號必須另外設定 (請參照「金錢」頁)。"
++"您可以在這邊定義顯示數字時所使用的小數點分隔符號 (一般為點號)。
注意,用來"
++"顯示金錢數值的小數點分隔符號必須另外設定 (請參照「金錢」頁)。"
+
+ #: localenum.cpp:174
+ msgid ""
+-"Here you can define the thousands separator used to display numbers."
+-"
Note that the thousands separator used to display monetary values has to be "
+-"set separately (see the 'Money' tab)."
+-msgstr "您可以在這邊定義顯示數字時所使用的千分位分隔符號。
注意,用來顯示金錢數值的千分位分隔符號必須另外設定 (請參照「金錢」頁)。"
++"Here you can define the thousands separator used to display numbers.
Note "
++"that the thousands separator used to display monetary values has to be set "
++"separately (see the 'Money' tab)."
++msgstr ""
++"您可以在這邊定義顯示數字時所使用的千分位分隔符號。
注意,用來顯示金錢數值的"
++"千分位分隔符號必須另外設定 (請參照「金錢」頁)。"
+
+ #: localenum.cpp:182
+ msgid ""
+@@ -233,10 +238,12 @@
+
+ #: localenum.cpp:188
+ msgid ""
+-"Here you can specify text used to prefix negative numbers. This should not be "
+-"empty, so you can distinguish positive and negative numbers. It is normally set "
+-"to minus (-)."
+-msgstr "您可以在這邊指定負數值的前置文字。這不應該是空白的,如此您才能區分正負數值。一般均使用減號 (-)。"
++"Here you can specify text used to prefix negative numbers. This should not "
++"be empty, so you can distinguish positive and negative numbers. It is "
++"normally set to minus (-)."
++msgstr ""
++"您可以在這邊指定負數值的前置文字。這不應該是空白的,如此您才能區分正負數值。"
++"一般均使用減號 (-)。"
+
+ #: localemon.cpp:54
+ msgid "Currency symbol:"
+@@ -292,56 +299,68 @@
+
+ #: localemon.cpp:278
+ msgid ""
+-"Here you can enter your usual currency symbol, e.g. $ or DM."
+-"
Please note that the Euro symbol may not be available on your system, "
+-"depending on the distribution you use."
+-msgstr "您可以在這邊輸入您一般使用的貨幣符號,例如 $ 或 DM 。
請注意,歐元符號可能無法在您的系統上使用,這與您使用的版本有關。"
++"Here you can enter your usual currency symbol, e.g. $ or DM.
Please note "
++"that the Euro symbol may not be available on your system, depending on the "
++"distribution you use."
++msgstr ""
++"您可以在這邊輸入您一般使用的貨幣符號,例如 $ 或 DM 。
請注意,歐元符號可能"
++"無法在您的系統上使用,這與您使用的版本有關。"
+
+ #: localemon.cpp:285
+ msgid ""
+ "Here you can define the decimal separator used to display monetary values."
+ "
Note that the decimal separator used to display other numbers has to be "
+ "defined separately (see the 'Numbers' tab)."
+-msgstr "您可以在這邊定義顯示金錢數值時的小數分隔符號。
注意,用於顯示其他數字的小數分隔符號必須另外定義 (請參照「數字」頁)。"
++msgstr ""
++"您可以在這邊定義顯示金錢數值時的小數分隔符號。
注意,用於顯示其他數字的小數"
++"分隔符號必須另外定義 (請參照「數字」頁)。"
+
+ #: localemon.cpp:293
+ msgid ""
+ "Here you can define the thousands separator used to display monetary values."
+ "
Note that the thousands separator used to display other numbers has to be "
+ "defined separately (see the 'Numbers' tab)."
+-msgstr "您可以在這邊定義顯示金錢數值時的千分位分隔符號。
注意,用於顯示其他數字的千分位分隔符號必須另外設定定義 (請參照「數字」頁)。"
++msgstr ""
++"您可以在這邊定義顯示金錢數值時的千分位分隔符號。
注意,用於顯示其他數字的千"
++"分位分隔符號必須另外設定定義 (請參照「數字」頁)。"
+
+ #: localemon.cpp:301
+ msgid ""
+-"This determines the number of fract digits for monetary values, i.e. the number "
+-"of digits you find behind the decimal separator. Correct value is 2 "
+-"for almost all people."
+-msgstr "這決定了要金錢數值中顯示的小數位數,也就是您可以在小數點後面看到的位數。一般而言都會設為 2。"
++"This determines the number of fract digits for monetary values, i.e. the "
++"number of digits you find behind the decimal separator. Correct "
++"value is 2 for almost all people."
++msgstr ""
++"這決定了要金錢數值中顯示的小數位數,也就是您可以在小數點後面看到的位"
++"數。一般而言都會設為 2。"
+
+ #: localemon.cpp:308
+ msgid ""
+-"If this option is checked, the currency sign will be prefixed (i.e. to the left "
+-"of the value) for all positive monetary values. If not, it will be postfixed "
+-"(i.e. to the right)."
+-msgstr "如果選擇這個選項,對所有為正數的金錢數值,貨幣符號將會被放在前面 (左邊)。否則便會被放在後面 (右邊)。"
++"If this option is checked, the currency sign will be prefixed (i.e. to the "
++"left of the value) for all positive monetary values. If not, it will be "
++"postfixed (i.e. to the right)."
++msgstr ""
++"如果選擇這個選項,對所有為正數的金錢數值,貨幣符號將會被放在前面 (左邊)。否則"
++"便會被放在後面 (右邊)。"
+
+ #: localemon.cpp:314
+ msgid ""
+-"If this option is checked, the currency sign will be prefixed (i.e. to the left "
+-"of the value) for all negative monetary values. If not, it will be postfixed "
+-"(i.e. to the right)."
+-msgstr "如果選擇這個選項,對所有為負數的金錢數值,貨幣符號將會被放在前面 (左邊)。否則便會被放在後面 (右邊)。"
++"If this option is checked, the currency sign will be prefixed (i.e. to the "
++"left of the value) for all negative monetary values. If not, it will be "
++"postfixed (i.e. to the right)."
++msgstr ""
++"如果選擇這個選項,對所有為負數的金錢數值,貨幣符號將會被放在前面 (左邊)。否則"
++"便會被放在後面 (右邊)。"
+
+ #: localemon.cpp:320
+ msgid ""
+-"Here you can select how a positive sign will be positioned. This only affects "
+-"monetary values."
++"Here you can select how a positive sign will be positioned. This only "
++"affects monetary values."
+ msgstr "您可以在這邊選擇正號要放在哪邊。這只會影響對金錢的顯示。"
+
+ #: localemon.cpp:325
+ msgid ""
+-"Here you can select how a negative sign will be positioned. This only affects "
+-"monetary values."
++"Here you can select how a negative sign will be positioned. This only "
++"affects monetary values."
+ msgstr "您可以在這邊選擇負號要放在哪邊。這只會影響對金錢的顯示。"
+
+ #: localetime.cpp:94
+@@ -494,146 +513,80 @@
+
+ #: localetime.cpp:464
+ msgid ""
+-"
The text in this textbox will be used to format time strings. The sequences "
+-"below will be replaced:
"
+-""
+-""
+-"HH | "
+-"The hour as a decimal number using a 24-hour clock (00-23). |
"
+-""
+-"hH | "
+-"The hour (24-hour clock) as a decimal number (0-23). |
"
+-""
+-"PH | "
+-"The hour as a decimal number using a 12-hour clock (01-12). |
"
+-""
+-"pH | "
+-"The hour (12-hour clock) as a decimal number (1-12). |
"
+-""
+-"MM | "
+-"The minutes as a decimal number (00-59). | "
+-"
"
+-"
"
+-"SS | "
+-"The seconds as a decimal number (00-59). |
"
+-""
+-"AMPM | "
+-"Either \"am\" or \"pm\" according to the given time value. Noon is treated "
+-"as \"pm\" and midnight as \"am\". |
"
+-msgstr ""
+-"這個文字方塊中的文字是用於指定時間字串的。下面的串列將會被置換:
"
+-""
+-""
+-"HH | "
+-"使用二位數的24小時制顯示 (00-23)。 |
"
+-""
+-"hH | "
+-"使用24小時制顯示 (0-23)。 |
"
+-""
+-"PH | "
+-"使用二位數的12小時制顯示 (01-12)。 |
"
+-""
+-"pH | "
+-"使用12小時制顯示 (1-12)。 |
"
+-""
+-"MM | "
+-"使用二位數顯示分 (00-59)。 | "
+-"
"
+-"
"
+-"SS | "
+-"使用二位數顯示秒 (00-59)。 |
"
+-""
+-"AMPM | "
+-"給定「上午」或「下午」。中午被當作「下午」,而午夜當作「早上」處理。 |
"
++"The text in this textbox will be used to format time strings. The "
++"sequences below will be replaced:
HH | The "
++"hour as a decimal number using a 24-hour clock (00-23). | "
++"tr>
hH | The hour (24-hour clock) as a decimal number (0-"
++"23). |
PH | The hour as a decimal number using a "
++"12-hour clock (01-12). |
pH | The hour (12-hour "
++"clock) as a decimal number (1-12). |
MM | The "
++"minutes as a decimal number (00-59). |
|
SS | The "
++"seconds as a decimal number (00-59). |
AMPM"
++"td> | Either \"am\" or \"pm\" according to the given time value. Noon is "
++"treated as \"pm\" and midnight as \"am\". |
"
++msgstr ""
++"這個文字方塊中的文字是用於指定時間字串的。下面的串列將會被置換:"
++"p>
HH | 使用二位數的24小時制顯示 (00-23)。 | "
++"tr>
hH | 使用24小時制顯示 (0-23)。 | "
++"tr>
PH | 使用二位數的12小時制顯示 (01-12)。 | "
++"tr>
pH | 使用12小時制顯示 (1-12)。 | "
++"tr>
MM | 使用二位數顯示分 (00-59)。"
++"td> |
|
SS | 使用二位數顯示秒 (00-59)。 | "
++"tr>
AMPM | 給定「上午」或「下午」。中午被當作「下午」,而"
++"午夜當作「早上」處理。 |
"
+
+ #: localetime.cpp:487
+ msgid ""
+-""
+-""
+-"YYYY | "
+-"The year with century as a decimal number. |
"
+-""
+-"YY | "
+-"The year without century as a decimal number (00-99). |
"
+-""
+-"MM | "
+-"The month as a decimal number (01-12). |
"
+-""
+-"mM | "
+-"The month as a decimal number (1-12). |
"
+-""
+-"SHORTMONTH | "
+-"The first three characters of the month name. |
"
+-""
+-"MONTH | "
+-"The full month name. |
"
+-""
+-"DD | "
+-"The day of month as a decimal number (01-31). |
"
+-""
+-"dD | "
+-"The day of month as a decimal number (1-31). |
"
+-""
+-"SHORTWEEKDAY | "
+-"The first three characters of the weekday name. |
"
+-""
+-"WEEKDAY | "
+-"The full weekday name. |
"
+-msgstr ""
+-""
+-""
+-"YYYY | "
+-"含世紀數值的年份。 |
"
+-""
+-"YY | "
+-"不含世紀數值的年份 (00-99)。 |
"
+-""
+-"MM | "
+-"使用二位數顯示月份 (01-12)。 |
"
+-""
+-"mM | "
+-"使用數字顯示月份 (1-12)。 |
"
+-""
+-"SHORTMONTH | "
+-"使用月份名稱的前三個字元顯示月份。 |
"
+-""
+-"MONTH | "
+-"使用完整月份名稱顯示月份。 |
"
+-""
+-"DD | "
+-"使用二位數字顯示每月日數 (01-31)。 |
"
+-""
+-"dD | "
+-"使用數字顯示每月日數 (1-31)。 |
"
+-""
+-"SHORTWEEKDAY | "
+-"使用星期名稱的前三個字元顯示星期。 |
"
+-""
+-"WEEKDAY | "
+-"使用完整星期名稱顯示星期。 |
"
++"YYYY | The year with century as a decimal number."
++" |
YY | The year without century as a decimal "
++"number (00-99). |
MM | The month as a decimal "
++"number (01-12). |
mM | The month as a decimal "
++"number (1-12). |
SHORTMONTH | The first three "
++"characters of the month name. |
MONTH | The "
++"full month name. |
DD | The day of month as a "
++"decimal number (01-31). |
dD | The day of month "
++"as a decimal number (1-31). |
SHORTWEEKDAY | The "
++"first three characters of the weekday name. |
WEEKDAY"
++"td> | The full weekday name. |
"
++msgstr ""
++"YYYY | 含世紀數值的年份。 | "
++"tr>
YY | 不含世紀數值的年份 (00-99)。 | "
++"tr>
MM | 使用二位數顯示月份 (01-12)。 | "
++"tr>
mM | 使用數字顯示月份 (1-12)。 | "
++"tr>
SHORTMONTH | 使用月份名稱的前三個字元顯示月份。"
++"td> |
MONTH | 使用完整月份名稱顯示月份。 | "
++"tr>
DD | 使用二位數字顯示每月日數 (01-31)。 | "
++"tr>
dD | 使用數字顯示每月日數 (1-31)。 | "
++"tr>
SHORTWEEKDAY | 使用星期名稱的前三個字元顯示星期。"
++"td> |
WEEKDAY | 使用完整星期名稱顯示星期。 |
"
++"table>"
+
+ #: localetime.cpp:508
+ msgid ""
+ "The text in this textbox will be used to format long dates. The sequences "
+ "below will be replaced:
"
+-msgstr "這個文字方塊中的文字用以顯示長格式的日期。下面的串列將會被取代:
"
++msgstr ""
++"這個文字方塊中的文字用以顯示長格式的日期。下面的串列將會被取代:
"
+
+ #: localetime.cpp:514
+ msgid ""
+-"The text in this textbox will be used to format short dates. For instance, "
+-"this is used when listing files. The sequences below will be replaced:
"
+-msgstr "這個文字方塊中的文字用以顯示短格式的日期。一般在列出檔案時使用。下面的串列將會被取代:
"
++"The text in this textbox will be used to format short dates. For "
++"instance, this is used when listing files. The sequences below will be "
++"replaced:
"
++msgstr ""
++"這個文字方塊中的文字用以顯示短格式的日期。一般在列出檔案時使用。下面的串列"
++"將會被取代:
"
+
+ #: localetime.cpp:521
+ msgid ""
+-"This option determines which day will be considered as the first one of the "
+-"week.
"
++"This option determines which day will be considered as the first one of "
++"the week.
"
+ msgstr "這個選擇決定了那一天會被認為是一週的第一天。
"
+
+ #: localetime.cpp:528
+ msgid ""
+-"This option determines whether possessive form of month names should be used "
+-"in dates.
"
++"This option determines whether possessive form of month names should be "
++"used in dates.
"
+ msgstr "這個選擇決定了在日期中是否使用月名稱的所有格。
"
+
+ #: localeother.cpp:48
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmmedia.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmmedia.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmmedia.po 2008-08-19 20:43:10.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmmedia.po 2011-11-11 15:45:17.000000000 +0100
+@@ -8,8 +8,7 @@
+ "Project-Id-Version: kcmmedia\n"
+ "POT-Creation-Date: 2008-07-08 01:18+0200\n"
+ "PO-Revision-Date: 2006-01-20 15:17+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Traditional Chinese \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -58,7 +57,7 @@
+
+ #: main.cpp:100
+ msgid "FIXME : Write me..."
+-msgstr "FIXME : 尚未完成..."
++msgstr "FIXME : 尚未完成…"
+
+ #: managermodule.cpp:40
+ msgid "No support for HAL on this system"
+@@ -82,11 +81,11 @@
+ #: rc.cpp:6
+ #, no-c-format
+ msgid ""
+-"Select this if you want to enable the Hardware Abstraction Layer "
+-"(http://hal.freedesktop.org/wiki/Software/hal) support."
++"Select this if you want to enable the Hardware Abstraction Layer (http://hal."
++"freedesktop.org/wiki/Software/hal) support."
+ msgstr ""
+-"如果您要打開硬體抽象層(Hardware Abstraction Layer, HAL, "
+-"http://hal.freedesktop.org/wiki/Software/hal) 支援,請選擇此選項。"
++"如果您要打開硬體抽象層(Hardware Abstraction Layer, HAL, http://hal."
++"freedesktop.org/wiki/Software/hal) 支援,請選擇此選項。"
+
+ #. i18n: file managermoduleview.ui line 35
+ #: rc.cpp:9
+@@ -124,16 +123,18 @@
+ #: rc.cpp:24
+ #, no-c-format
+ msgid ""
+-"Here is the list of the available types of medium which can be monitored. You "
+-"can filter the available actions by selecting a type of medium. If you want to "
+-"see all the actions, select \"All Mime Types\"."
+-msgstr "這裡是一份媒體型態的清單。您可以選取一種型態來過濾可用的動作。如果您要檢視所有可用的動作,請選擇「所有的 MIME 型態」。"
++"Here is the list of the available types of medium which can be monitored. "
++"You can filter the available actions by selecting a type of medium. If you "
++"want to see all the actions, select \"All Mime Types\"."
++msgstr ""
++"這裡是一份媒體型態的清單。您可以選取一種型態來過濾可用的動作。如果您要檢視所"
++"有可用的動作,請選擇「所有的 MIME 型態」。"
+
+ #. i18n: file notifiermoduleview.ui line 90
+ #: rc.cpp:27
+ #, no-c-format
+ msgid "&Add..."
+-msgstr "新增...(&A)"
++msgstr "新增…(&A)"
+
+ #. i18n: file notifiermoduleview.ui line 93
+ #: rc.cpp:30
+@@ -151,7 +152,7 @@
+ #: rc.cpp:39
+ #, no-c-format
+ msgid "&Edit..."
+-msgstr "編輯...(&E)"
++msgstr "編輯…(&E)"
+
+ #. i18n: file notifiermoduleview.ui line 115
+ #: rc.cpp:42
+@@ -171,7 +172,9 @@
+ msgid ""
+ "Click here to perform this action automatically on detection of the selected "
+ "medium type (this option is disabled when \"All Mime Types\" is selected)."
+-msgstr "按這裡可以在偵測到特定的媒體型態時自動執行這個動作,如果選取的是「所有的 MIME 型態」則會關閉這個功能。"
++msgstr ""
++"按這裡可以在偵測到特定的媒體型態時自動執行這個動作,如果選取的是「所有的 "
++"MIME 型態」則會關閉這個功能。"
+
+ #. i18n: file notifiermoduleview.ui line 153
+ #: rc.cpp:51
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmnic.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmnic.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmnic.po 2007-01-15 10:56:32.000000000 +0100
++++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmnic.po 2011-11-11 15:45:17.000000000 +0100
+@@ -9,7 +9,7 @@
+ "Project-Id-Version: kcmnic\n"
+ "POT-Creation-Date: 2006-12-31 02:37+0100\n"
+ "PO-Revision-Date: 2006-05-09 08:51+0800\n"
+-"Last-Translator: Tzer-Ming Liu \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Chinese Traditional \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmnotify.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmnotify.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmnotify.po 2008-08-19 20:43:10.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmnotify.po 2011-11-11 15:45:17.000000000 +0100
+@@ -8,7 +8,7 @@
+ "Project-Id-Version: kcmnotify 1.16\n"
+ "POT-Creation-Date: 2008-07-08 01:18+0200\n"
+ "PO-Revision-Date: 2005-08-12 14:11+0800\n"
+-"Last-Translator: Chao-Hsiung Liao \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Chinese (traditional) \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -29,21 +29,16 @@
+ #: knotify.cpp:56
+ msgid ""
+ "System Notifications
KDE allows for a great deal of control over how "
+-"you will be notified when certain events occur. There are several choices as to "
+-"how you are notified:"
+-""
+-"- As the application was originally designed."
+-"
- With a beep or other noise."
+-"
- Via a popup dialog box with additional information."
+-"
- By recording the event in a logfile without any additional visual or "
+-"audible alert.
"
++"you will be notified when certain events occur. There are several choices as "
++"to how you are notified:- As the application was originally designed."
++"
- With a beep or other noise.
- Via a popup dialog box with additional "
++"information.
- By recording the event in a logfile without any additional "
++"visual or audible alert.
"
+ msgstr ""
+-"系統通知
KDE 提供您極大的控制權,可供設定當發生特定事件時系統應如何向您通知。相關的通知方式有以下幾種選擇: "
+-""
+-"- 按照應用程式的原始設計方式。"
+-"
- 發出嗶聲或其他聲響。"
+-"
- 顯示即現對話方塊並帶出其他資訊。 "
+-"
- 將事件記錄至記錄檔,而不另外執行視覺或聲音警示。
"
++"系統通知
KDE 提供您極大的控制權,可供設定當發生特定事件時系統應如何向"
++"您通知。相關的通知方式有以下幾種選擇: - 按照應用程式的原始設計方式。"
++"
- 發出嗶聲或其他聲響。
- 顯示即現對話方塊並帶出其他資訊。
- 將事件記錄至"
++"記錄檔,而不另外執行視覺或聲音警示。
"
+
+ #: knotify.cpp:69
+ msgid "Event source:"
+@@ -55,7 +50,7 @@
+
+ #: knotify.cpp:89
+ msgid "System Notification Control Panel Module"
+-msgstr "系統通知控制台模組"
++msgstr "系統通知控制臺模組"
+
+ #: knotify.cpp:92
+ msgid "Original implementation"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmperformance.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmperformance.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmperformance.po 2006-10-01 18:34:18.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmperformance.po 2011-11-11 15:45:17.000000000 +0100
+@@ -8,7 +8,7 @@
+ "Project-Id-Version: kcmperformance.po\n"
+ "POT-Creation-Date: 2006-08-23 02:32+0200\n"
+ "PO-Revision-Date: 2005-05-07 18:40+0800\n"
+-"Last-Translator: Wong King Chi \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Chinese (traditional) \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -30,73 +30,78 @@
+
+ #: kcmperformance.cpp:91
+ msgid ""
+-"Konqueror Performance
You can configure several settings that improve "
+-"Konqueror performance here. These include options for reusing already running "
+-"instances and for keeping instances preloaded."
++"Konqueror Performance
You can configure several settings that "
++"improve Konqueror performance here. These include options for reusing "
++"already running instances and for keeping instances preloaded."
+ msgstr ""
+-"Konqueror Performance
您可以設定數種組態來增加 Konqueror 的效能。這些組態包括重用已執行實體和預先載入實體"
++"Konqueror Performance
您可以設定數種組態來增加 Konqueror 的效能。這些"
++"組態包括重用已執行實體和預先載入實體"
+
+ #: konqueror.cpp:37
+ msgid ""
+-"Disables the minimization of memory usage and allows you to make each browsing "
+-"activity independent from the others"
++"Disables the minimization of memory usage and allows you to make each "
++"browsing activity independent from the others"
+ msgstr "取消使用記憶體最小化,並允許每一個瀏覽動作獨立運作。"
+
+ #: konqueror.cpp:40
+ msgid ""
+ "With this option activated, only one instance of Konqueror used for file "
+-"browsing will exist in the memory of your computer at any moment, no matter how "
+-"many file browsing windows you open, thus reducing resource requirements."
+-"Be aware that this also means that, if something goes wrong, all your file "
+-"browsing windows will be closed simultaneously"
++"browsing will exist in the memory of your computer at any moment, no matter "
++"how many file browsing windows you open, thus reducing resource requirements."
++"
Be aware that this also means that, if something goes wrong, all your "
++"file browsing windows will be closed simultaneously"
+ msgstr ""
+-"這個選項啟動後,Konqueror 瀏覽檔案時,無論您開多少瀏覽視窗,只會有一個實體存在於記憶體中,如此,便能減少資源的需求。(針對瀏覽檔案時)"
+-"
這也意味著,如果一但發生錯誤,您所有的瀏覽視窗將會一併同時被關閉。"
++"這個選項啟動後,Konqueror 瀏覽檔案時,無論您開多少瀏覽視窗,只會有一個實體存"
++"在於記憶體中,如此,便能減少資源的需求。(針對瀏覽檔案時)
這也意味著,如果一"
++"但發生錯誤,您所有的瀏覽視窗將會一併同時被關閉。"
+
+ #: konqueror.cpp:48
+ msgid ""
+ "With this option activated, only one instance of Konqueror will exist in the "
+-"memory of your computer at any moment, no matter how many browsing windows you "
+-"open, thus reducing resource requirements."
+-"
Be aware that this also means that, if something goes wrong, all your "
+-"browsing windows will be closed simultaneously."
+-msgstr ""
+-"這個選項啟動後,無論您開多少瀏覽視窗,Konqueror 只會有一個實體存於記憶體中,如此,便能減少資源的需求。"
+-"
這也意味著,如果一但發生錯誤,您所有的瀏覽視窗將會一併同時被關閉。"
++"memory of your computer at any moment, no matter how many browsing windows "
++"you open, thus reducing resource requirements.
Be aware that this also "
++"means that, if something goes wrong, all your browsing windows will be "
++"closed simultaneously."
++msgstr ""
++"這個選項啟動後,無論您開多少瀏覽視窗,Konqueror 只會有一個實體存於記憶體中,"
++"如此,便能減少資源的需求。
這也意味著,如果一但發生錯誤,您所有的瀏覽視窗將"
++"會一併同時被關閉。"
+
+ #: konqueror.cpp:60
+ msgid ""
+-"If non-zero, this option allows keeping Konqueror instances in memory after all "
+-"their windows have been closed, up to the number specified in this option."
+-"
When a new Konqueror instance is needed, one of these preloaded instances "
+-"will be reused instead, improving responsiveness at the expense of the memory "
+-"required by the preloaded instances."
+-msgstr ""
+-"這個選項允許 Konqueror 關掉視窗後,可以保存實體在記憶體中,保存的數量取決於這個選項的值。"
+-"
當需要一個新的 Konqueror 實體時,預先被保存在記憶體的實體可以被重用,加快回應的速度。"
++"If non-zero, this option allows keeping Konqueror instances in memory after "
++"all their windows have been closed, up to the number specified in this "
++"option.
When a new Konqueror instance is needed, one of these preloaded "
++"instances will be reused instead, improving responsiveness at the expense of "
++"the memory required by the preloaded instances."
++msgstr ""
++"這個選項允許 Konqueror 關掉視窗後,可以保存實體在記憶體中,保存的數量取決於這"
++"個選項的值。
當需要一個新的 Konqueror 實體時,預先被保存在記憶體的實體可以"
++"被重用,加快回應的速度。"
+
+ #: konqueror.cpp:69
+ msgid ""
+-"If enabled, an instance of Konqueror will be preloaded after the ordinary KDE "
+-"startup sequence."
+-"
This will make the first Konqueror window open faster, but at the expense of "
+-"longer KDE startup times (but you will be able to work while it is loading, so "
+-"you may not even notice that it is taking longer)."
+-msgstr ""
+-"這個選項啟動後,一個 Konqueror 實體會在 KDE 啓動後被預先載入。"
+-"
雖然可以減少首次啓動 Konqueror 所需的時間,但也會減慢 KDE 啓動速度。(不過,您仍然可以在載入期間使用電腦,所以您可能没有注意到)"
++"If enabled, an instance of Konqueror will be preloaded after the ordinary "
++"KDE startup sequence.
This will make the first Konqueror window open "
++"faster, but at the expense of longer KDE startup times (but you will be able "
++"to work while it is loading, so you may not even notice that it is taking "
++"longer)."
++msgstr ""
++"這個選項啟動後,一個 Konqueror 實體會在 KDE 啓動後被預先載入。
雖然可以減少"
++"首次啓動 Konqueror 所需的時間,但也會減慢 KDE 啓動速度。(不過,您仍然可以在載"
++"入期間使用電腦,所以您可能没有注意到)"
+
+ #: konqueror.cpp:75
+ msgid ""
+-"If enabled, KDE will always try to have one preloaded Konqueror instance ready; "
+-"preloading a new instance in the background whenever there is not one "
+-"available, so that windows will always open quickly."
+-"
Warning: In some cases, it is actually possible that this will reduce "
+-"perceived performance."
+-msgstr ""
+-"這個選項啟動後,在任何時候 KDE 都會盡力預留一個 Konqueror 實體,(即只要沒有 Konqueror 實體時,KDE 會在背景載入一個)這樣 "
+-"Konqueror 視窗在任何時候都會快速開啓。"
+-"
警告:在一些情況下,這會使性能有所下降。"
++"If enabled, KDE will always try to have one preloaded Konqueror instance "
++"ready; preloading a new instance in the background whenever there is not one "
++"available, so that windows will always open quickly.
Warning: In "
++"some cases, it is actually possible that this will reduce perceived "
++"performance."
++msgstr ""
++"這個選項啟動後,在任何時候 KDE 都會盡力預留一個 Konqueror 實體,(即只要沒有 "
++"Konqueror 實體時,KDE 會在背景載入一個)這樣 Konqueror 視窗在任何時候都會快速"
++"開啓。
警告:在一些情況下,這會使性能有所下降。"
+
+ #. i18n: file konqueror_ui.ui line 27
+ #: rc.cpp:3
+@@ -162,34 +167,37 @@
+ #: rc.cpp:33
+ #, no-c-format
+ msgid ""
+-"WARNING: This option may in rare cases lead to various problems. Consult "
+-"the What's This? (Shift+F1) help for details."
+-msgstr "警告:在一些罕見的情況下,這個選項會導致某些問題。詳細資料請查詢「這是什麼」(Shift+F1)。"
++"WARNING: This option may in rare cases lead to various problems. "
++"Consult the What's This? (Shift+F1) help for details."
++msgstr ""
++"警告:在一些罕見的情況下,這個選項會導致某些問題。詳細資料請查詢「這是"
++"什麼」(Shift+F1)。"
+
+ #: system.cpp:34
+ msgid ""
+ "
During startup KDE needs to perform a check of its system configuration "
+ "(mimetypes, installed applications, etc.), and in case the configuration has "
+-"changed since the last time, the system configuration cache (KSyCoCa) needs to "
+-"be updated.
"
+-"This option delays the check, which avoid scanning all directories "
+-"containing files describing the system during KDE startup, thus making KDE "
+-"startup faster. However, in the rare case the system configuration has changed "
+-"since the last time, and the change is needed before this delayed check takes "
+-"place, this option may lead to various problems (missing applications in the K "
+-"Menu, reports from applications about missing required mimetypes, etc.).
"
+-"Changes of system configuration mostly happen by (un)installing "
+-"applications. It is therefore recommended to turn this option temporarily off "
+-"while (un)installing applications.
"
+-"For this reason, usage of this option is not recommended. The KDE crash "
+-"handler will refuse to provide backtrace for the bugreport with this option "
+-"turned on (you will need to reproduce it again with this option turned off, or "
+-"turn on the developer mode for the crash handler).
"
+-msgstr ""
+-"KDE 啓動時需要對系統組態進行檢查(如MIME "
+-"類型,已安裝的程式等),如果組態在上一次啓動之後變更過,那麼它的快取(KsyCoCa)便需要被更新。
"
+-"這個選項可以延遲檢查動作,使 KDE "
+-"啓動時不再對舆組態有關的目錄進行掃描。如此,便可以加快啓動速度。不過在一些罕見的情況下,變更需要在檢查之前生效,這樣做會導致某些問題(如 K "
+-"選單不見了程式,應用程式報告所需 MIME 類型不存在等)。
"
+-"由於這種變更大部分是由安裝/反安裝應用程式所致的,所以我們建議在那時候暫時關閉選項。
"
+-"正因如此,我們不建議您使用。選項啓動時 KDE 錯誤控制程式將不會提供回溯追蹤。(您將需要關閉選項,然後重現錯誤,或開啓錯誤控制程式的開發者模式)
"
++"changed since the last time, the system configuration cache (KSyCoCa) needs "
++"to be updated.This option delays the check, which avoid scanning all "
++"directories containing files describing the system during KDE startup, thus "
++"making KDE startup faster. However, in the rare case the system "
++"configuration has changed since the last time, and the change is needed "
++"before this delayed check takes place, this option may lead to various "
++"problems (missing applications in the K Menu, reports from applications "
++"about missing required mimetypes, etc.).
Changes of system "
++"configuration mostly happen by (un)installing applications. It is therefore "
++"recommended to turn this option temporarily off while (un)installing "
++"applications.
For this reason, usage of this option is not "
++"recommended. The KDE crash handler will refuse to provide backtrace for the "
++"bugreport with this option turned on (you will need to reproduce it again "
++"with this option turned off, or turn on the developer mode for the crash "
++"handler).
"
++msgstr ""
++"KDE 啓動時需要對系統組態進行檢查(如MIME 類型,已安裝的程式等),如果組態在"
++"上一次啓動之後變更過,那麼它的快取(KsyCoCa)便需要被更新。
這個選項可以"
++"延遲檢查動作,使 KDE 啓動時不再對舆組態有關的目錄進行掃描。如此,便可以加快啓"
++"動速度。不過在一些罕見的情況下,變更需要在檢查之前生效,這樣做會導致某些問題"
++"(如 K 選單不見了程式,應用程式報告所需 MIME 類型不存在等)。
由於這種變"
++"更大部分是由安裝/反安裝應用程式所致的,所以我們建議在那時候暫時關閉選項。"
++"p>
正因如此,我們不建議您使用。選項啓動時 KDE 錯誤控制程式將不會提供回溯追"
++"蹤。(您將需要關閉選項,然後重現錯誤,或開啓錯誤控制程式的開發者模式)
"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmprintmgr.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmprintmgr.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmprintmgr.po 2005-11-09 07:38:42.000000000 +0100
++++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmprintmgr.po 2011-11-11 15:45:17.000000000 +0100
+@@ -8,7 +8,7 @@
+ "Project-Id-Version: kcmsamba\n"
+ "POT-Creation-Date: 2005-05-18 21:24+0200\n"
+ "PO-Revision-Date: 2005-10-28 21:36+0800\n"
+-"Last-Translator: Chao-Hsiung Liao \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Chinese (traditional) \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -30,7 +30,8 @@
+ msgid ""
+ "Print management as normal user\n"
+ "Some print management operations may need administrator privileges. Use the\n"
+-"\"Administrator Mode\" button below to start this print management tool with\n"
++"\"Administrator Mode\" button below to start this print management tool "
++"with\n"
+ "administrator privileges."
+ msgstr ""
+ "以一般使用者操作列印管理程式\n"
+@@ -53,35 +54,55 @@
+ #: kcmprintmgr.cpp:60
+ msgid ""
+ "Printers
The KDE printing manager is part of KDEPrint which is the "
+-"interface to the real print subsystem of your Operating System (OS). Although "
+-"it does add some additional functionality of its own to those subsystems, "
+-"KDEPrint depends on them for its functionality. Spooling and filtering tasks, "
+-"especially, are still done by your print subsystem, or the administrative tasks "
+-"(adding or modifying printers, setting access rights, etc.)"
+-"
What print features KDEPrint supports is therefore heavily dependent on "
+-"your chosen print subsystem. For the best support in modern printing, the KDE "
+-"Printing Team recommends a CUPS based printing system."
++"interface to the real print subsystem of your Operating System (OS). "
++"Although it does add some additional functionality of its own to those "
++"subsystems, KDEPrint depends on them for its functionality. Spooling and "
++"filtering tasks, especially, are still done by your print subsystem, or the "
++"administrative tasks (adding or modifying printers, setting access rights, "
++"etc.)
What print features KDEPrint supports is therefore heavily "
++"dependent on your chosen print subsystem. For the best support in modern "
++"printing, the KDE Printing Team recommends a CUPS based printing system."
+ msgstr ""
+-"印表機
KDE 列印管理程式是 KDEPrint "
+-"的一部分,作為您的作業系統(OS)實際列印子系統的介面。雖然它本身的確在這些子系統上加入了某些功能,KDEPrint "
+-"仍需依賴它們的功能。特別是排程與過濾工作,仍是由您的列印子系統完成,包括管理類的工作(加入或修改印表機、設定存取權限等。)"
+-"
因此 KDEPrint 支援的功能深深的受您所選的列印子系統影響。為了對現在的列印工作有最佳的支援,KDE 列印功能團隊建議使用基於 CUPS "
+-"的列印系統。"
++"印表機
KDE 列印管理程式是 KDEPrint 的一部分,作為您的作業系統(OS)實"
++"際列印子系統的介面。雖然它本身的確在這些子系統上加入了某些功能,KDEPrint 仍需"
++"依賴它們的功能。特別是排程與過濾工作,仍是由您的列印子系統完成,包括管理類的"
++"工作(加入或修改印表機、設定存取權限等。)
因此 KDEPrint 支援的功能深深的受"
++"您所選的列印子系統影響。為了對現在的列印工作有最佳的支援,KDE 列印功能團隊建"
++"議使用基於 CUPS 的列印系統。"
+
+ #~ msgid "&Exports"
+-#~ msgstr "匯出 (&E)"
++#~ msgstr "匯出(&E)"
+
+ #~ msgid "&Imports"
+-#~ msgstr "匯入 (&I)"
++#~ msgstr "匯入(&I)"
+
+ #~ msgid "&Log"
+-#~ msgstr "紀錄 (&L)"
++#~ msgstr "紀錄(&L)"
+
+ #~ msgid "&Statistics"
+-#~ msgstr "統計 (&S)"
++#~ msgstr "統計(&S)"
+
+-#~ msgid "The Samba and NFS Status Monitor is a front end to the programs smbstatus and showmount. Smbstatus reports on current Samba connections, and is part of the suite of Samba tools, which implements the SMB (Session Message Block) protocol, also called the NetBIOS or LanManager protocol. This protocol can be used to provide printer sharing or drive sharing services on a network including machines running the various flavors of Microsoft Windows. Showmount is part of the NFS software package. NFS stands for Network File System and is the traditional UNIX way to share directories over the network. In this case the output of showmount -a localhost is parsed. On some systems showmount is in /usr/sbin, check if you have showmount in your PATH."
+-#~ msgstr "Samba 與 NFS 狀態監視器是 smbstatus 與 showmount 的前端介面. Smbstatus 回報目前的 Samba 連線, 並且是 Samba 套件工具的一部份. Samba 是 SMB (工作階段訊息方塊) 協定, 也被叫做 NetBIOS 或 LanManager 協定. 這個協定可以用於提供網路上的印表機或磁碟資源分享, 包含 MS Windows 系統.
Showmount 是 NFS 軟體套件的一部份. NFS 基於網路檔案系統, 是傳統的 Unix 分享檔案方法. 在這邊是使用 showmount -a localhost 來分析. 對有些系統而言, showmount 是被安裝在 /usr/sbin 下面的, 請確定 showmount 有在您的路徑中."
++#~ msgid ""
++#~ "The Samba and NFS Status Monitor is a front end to the programs "
++#~ "smbstatus and showmount. Smbstatus reports on current "
++#~ "Samba connections, and is part of the suite of Samba tools, which "
++#~ "implements the SMB (Session Message Block) protocol, also called the "
++#~ "NetBIOS or LanManager protocol. This protocol can be used to provide "
++#~ "printer sharing or drive sharing services on a network including machines "
++#~ "running the various flavors of Microsoft Windows.
Showmount is part of "
++#~ "the NFS software package. NFS stands for Network File System and is the "
++#~ "traditional UNIX way to share directories over the network. In this case "
++#~ "the output of showmount -a localhost is parsed. On some systems "
++#~ "showmount is in /usr/sbin, check if you have showmount in your PATH."
++#~ msgstr ""
++#~ "Samba 與 NFS 狀態監視器是 smbstatus 與 showmount 的前端"
++#~ "介面. Smbstatus 回報目前的 Samba 連線, 並且是 Samba 套件工具的一部份. "
++#~ "Samba 是 SMB (工作階段訊息方塊) 協定, 也被叫做 NetBIOS 或 LanManager 協"
++#~ "定. 這個協定可以用於提供網路上的印表機或磁碟資源分享, 包含 MS Windows 系"
++#~ "統.
Showmount 是 NFS 軟體套件的一部份. NFS 基於網路檔案系統, 是傳統的 "
++#~ "Unix 分享檔案方法. 在這邊是使用 showmount -a localhost 來分析. 對"
++#~ "有些系統而言, showmount 是被安裝在 /usr/sbin 下面的, 請確定 showmount 有在"
++#~ "您的路徑中."
+
+ #~ msgid "kcmsamba"
+ #~ msgstr "kcmsamba"
+@@ -125,8 +146,17 @@
+ #~ msgid "Mounted Under"
+ #~ msgstr "掛載於"
+
+-#~ msgid "This list shows the Samba and NFS shared resources mounted on your system from other hosts. The \"Type\" column tells you whether the mounted resource is a Samba or an NFS type of resource. The \"Resource\" column shows the descriptive name of the shared resource. Finally, the third column, which is labeled \"Mounted under\" shows the location on your system where the shared resource is mounted."
+-#~ msgstr "這個列表顯示您的系統掛載其他主機上 Samba 與 NFS 資源的紀錄. \"類型\" 欄位告訴您掛載的資源是 Samba 或 NFS. \"資源\" 欄位列出分享資源的名稱. 最後, \"掛載於\" 顯示您掛載這些資源的路徑."
++#~ msgid ""
++#~ "This list shows the Samba and NFS shared resources mounted on your system "
++#~ "from other hosts. The \"Type\" column tells you whether the mounted "
++#~ "resource is a Samba or an NFS type of resource. The \"Resource\" column "
++#~ "shows the descriptive name of the shared resource. Finally, the third "
++#~ "column, which is labeled \"Mounted under\" shows the location on your "
++#~ "system where the shared resource is mounted."
++#~ msgstr ""
++#~ "這個列表顯示您的系統掛載其他主機上 Samba 與 NFS 資源的紀錄. \"類型\" 欄位"
++#~ "告訴您掛載的資源是 Samba 或 NFS. \"資源\" 欄位列出分享資源的名稱. 最後, "
++#~ "\"掛載於\" 顯示您掛載這些資源的路徑."
+
+ #~ msgid "Samba log file: "
+ #~ msgstr "Samba 紀錄檔:"
+@@ -143,23 +173,51 @@
+ #~ msgid "Show closed files"
+ #~ msgstr "顯示關閉的檔案"
+
+-#~ msgid "This page presents the contents of your samba log file in a friendly layout. Check that the correct log file for your computer is listed here. If you need to, correct the name or location of the log file, and then click the \"Update\" button."
+-#~ msgstr "這一頁列出從您的 samba 紀錄檔得到的內容. 請檢查是否使用正確的紀錄檔. 如果有必要, 請更正紀錄檔的名稱與位址, 並按下 \"更新\" 按鈕."
+-
+-#~ msgid "Check this option if you want to view the details for connections opened to your computer."
++#~ msgid ""
++#~ "This page presents the contents of your samba log file in a friendly "
++#~ "layout. Check that the correct log file for your computer is listed here. "
++#~ "If you need to, correct the name or location of the log file, and then "
++#~ "click the \"Update\" button."
++#~ msgstr ""
++#~ "這一頁列出從您的 samba 紀錄檔得到的內容. 請檢查是否使用正確的紀錄檔. 如果"
++#~ "有必要, 請更正紀錄檔的名稱與位址, 並按下 \"更新\" 按鈕."
++
++#~ msgid ""
++#~ "Check this option if you want to view the details for connections opened "
++#~ "to your computer."
+ #~ msgstr "選取這個選項如果您希望檢視目前您電腦所開啟連結的詳細資料."
+
+-#~ msgid "Check this option if you want to view the events when connections to your computer were closed."
++#~ msgid ""
++#~ "Check this option if you want to view the events when connections to your "
++#~ "computer were closed."
+ #~ msgstr "選取這個選項如果您希望檢視目前您電腦所關閉連結的事件."
+
+-#~ msgid "Check this option if you want to see the files which were opened on your computer by remote users. Note that file open/close events are not logged unless the samba log level is set to at least 2 (you cannot set the log level using this module)."
+-#~ msgstr "選取這個選項如果您希望檢視遠端使用者在您電腦上開啟的檔案。注意這些開啟/關閉動作只有在 samba 紀錄等級在 2 以上時才會被紀錄(抱歉,您不能用這個模組變更紀錄等級)。"
+-
+-#~ msgid "Check this option if you want to see the events when files opened by remote users were closed. Note that file open/close events are not logged unless the samba log level is set to at least 2 (you cannot set the log level using this module)."
+-#~ msgstr "選取這個選項如果您希望檢視遠端使用者在您電腦上關閉檔案的事件。注意這些開啟/關閉動作只有在 samba 紀錄等級在 2 以上時才會被紀錄(抱歉,您不能用這個模組變更紀錄等級)。"
+-
+-#~ msgid "Click here to refresh the information on this page. The log file (shown above) will be read to obtain the events logged by samba."
+-#~ msgstr "按下這邊以更新這一頁的資訊. 紀錄檔 (上面顯示的) 將會被讀取以取得 samba 紀錄的事件."
++#~ msgid ""
++#~ "Check this option if you want to see the files which were opened on your "
++#~ "computer by remote users. Note that file open/close events are not logged "
++#~ "unless the samba log level is set to at least 2 (you cannot set the log "
++#~ "level using this module)."
++#~ msgstr ""
++#~ "選取這個選項如果您希望檢視遠端使用者在您電腦上開啟的檔案。注意這些開啟/關"
++#~ "閉動作只有在 samba 紀錄等級在 2 以上時才會被紀錄(抱歉,您不能用這個模組變"
++#~ "更紀錄等級)。"
++
++#~ msgid ""
++#~ "Check this option if you want to see the events when files opened by "
++#~ "remote users were closed. Note that file open/close events are not logged "
++#~ "unless the samba log level is set to at least 2 (you cannot set the log "
++#~ "level using this module)."
++#~ msgstr ""
++#~ "選取這個選項如果您希望檢視遠端使用者在您電腦上關閉檔案的事件。注意這些開"
++#~ "啟/關閉動作只有在 samba 紀錄等級在 2 以上時才會被紀錄(抱歉,您不能用這個"
++#~ "模組變更紀錄等級)。"
++
++#~ msgid ""
++#~ "Click here to refresh the information on this page. The log file (shown "
++#~ "above) will be read to obtain the events logged by samba."
++#~ msgstr ""
++#~ "按下這邊以更新這一頁的資訊. 紀錄檔 (上面顯示的) 將會被讀取以取得 samba 紀"
++#~ "錄的事件."
+
+ #~ msgid "Date & Time"
+ #~ msgstr "日期與時間"
+@@ -173,8 +231,19 @@
+ #~ msgid "Host/User"
+ #~ msgstr "主機/使用者"
+
+-#~ msgid "This list shows details of the events logged by samba. Note that events at the file level are not logged unless you have configured the log level for samba to 2 or greater.
As with many other lists in KDE, you can click on a column heading to sort on that column. Click again to change the sorting direction from ascending to descending or vice versa.
If the list is empty, try clicking the \"Update\" button. The samba log file will be read and the list refreshed."
+-#~ msgstr "這編列出 samba 所紀錄的詳細事件紀錄. 注意除非您把 samba 的紀錄等級設在 2 以上, 有些事件是不會被紀錄的.
如同 KDE 中其他的列表, 您可以按下欄位的頂端以依據這個欄位排序. 再按一次可以變更顯示順序.
如果列表示空的, 試著按下 \"更新\" 按鈕. samba 紀錄檔將會重新被讀取並更新列表."
++#~ msgid ""
++#~ "This list shows details of the events logged by samba. Note that events "
++#~ "at the file level are not logged unless you have configured the log level "
++#~ "for samba to 2 or greater.
As with many other lists in KDE, you can "
++#~ "click on a column heading to sort on that column. Click again to change "
++#~ "the sorting direction from ascending to descending or vice versa.
If "
++#~ "the list is empty, try clicking the \"Update\" button. The samba log file "
++#~ "will be read and the list refreshed."
++#~ msgstr ""
++#~ "這編列出 samba 所紀錄的詳細事件紀錄. 注意除非您把 samba 的紀錄等級設在 2 "
++#~ "以上, 有些事件是不會被紀錄的.
如同 KDE 中其他的列表, 您可以按下欄位的頂"
++#~ "端以依據這個欄位排序. 再按一次可以變更顯示順序.
如果列表示空的, 試著按"
++#~ "下 \"更新\" 按鈕. samba 紀錄檔將會重新被讀取並更新列表."
+
+ #~ msgid "CONNECTION OPENED"
+ #~ msgstr "*連線開啟*"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmsamba.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmsamba.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmsamba.po 2006-07-22 10:04:12.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmsamba.po 2011-11-11 15:45:17.000000000 +0100
+@@ -8,7 +8,7 @@
+ "Project-Id-Version: kcmsamba\n"
+ "POT-Creation-Date: 2005-07-06 01:31+0200\n"
+ "PO-Revision-Date: 2005-10-28 21:50+0800\n"
+-"Last-Translator: Chao-Hsiung Liao \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Chinese (traditional) \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -32,25 +32,25 @@
+
+ #: main.cpp:71
+ msgid ""
+-"The Samba and NFS Status Monitor is a front end to the programs "
+-"smbstatus and showmount. Smbstatus reports on current Samba "
+-"connections, and is part of the suite of Samba tools, which implements the SMB "
+-"(Session Message Block) protocol, also called the NetBIOS or LanManager "
+-"protocol. This protocol can be used to provide printer sharing or drive sharing "
+-"services on a network including machines running the various flavors of "
+-"Microsoft Windows."
+-" Showmount is part of the NFS software package. NFS stands for Network File "
+-"System and is the traditional UNIX way to share directories over the network. "
+-"In this case the output of showmount -a localhost "
+-"is parsed. On some systems showmount is in /usr/sbin, check if you have "
+-"showmount in your PATH."
+-msgstr ""
+-"Samba 與 NFS 狀態監視器是 smbstatus 與 showmount "
+-"的前端介面. Smbstatus 回報目前的 Samba 連線, 並且是 Samba 套件工具的一部份. Samba 是 SMB (工作階段訊息方塊) 協定, "
+-"也被叫做 NetBIOS 或 LanManager 協定. 這個協定可以用於提供網路上的印表機或磁碟資源分享, 包含 MS Windows 系統."
+-"
Showmount 是 NFS 軟體套件的一部份. NFS 基於網路檔案系統, 是傳統的 Unix 分享檔案方法. 在這邊是使用 "
+-"showmount -a localhost 來分析. 對有些系統而言, showmount 是被安裝在 /usr/sbin 下面的, 請確定 "
+-"showmount 有在您的路徑中."
++"The Samba and NFS Status Monitor is a front end to the programs "
++"smbstatus and showmount. Smbstatus reports on current "
++"Samba connections, and is part of the suite of Samba tools, which implements "
++"the SMB (Session Message Block) protocol, also called the NetBIOS or "
++"LanManager protocol. This protocol can be used to provide printer sharing or "
++"drive sharing services on a network including machines running the various "
++"flavors of Microsoft Windows.
Showmount is part of the NFS software "
++"package. NFS stands for Network File System and is the traditional UNIX way "
++"to share directories over the network. In this case the output of "
++"showmount -a localhost is parsed. On some systems showmount is in /"
++"usr/sbin, check if you have showmount in your PATH."
++msgstr ""
++"Samba 與 NFS 狀態監視器是 smbstatus 與 showmount 的前端介"
++"面. Smbstatus 回報目前的 Samba 連線, 並且是 Samba 套件工具的一部份. Samba 是 "
++"SMB (工作階段訊息方塊) 協定, 也被叫做 NetBIOS 或 LanManager 協定. 這個協定可"
++"以用於提供網路上的印表機或磁碟資源分享, 包含 MS Windows 系統.
Showmount 是 "
++"NFS 軟體套件的一部份. NFS 基於網路檔案系統, 是傳統的 Unix 分享檔案方法. 在這"
++"邊是使用 showmount -a localhost 來分析. 對有些系統而言, showmount 是"
++"被安裝在 /usr/sbin 下面的, 請確定 showmount 有在您的路徑中."
+
+ #: main.cpp:85
+ msgid "kcmsamba"
+@@ -110,15 +110,16 @@
+
+ #: kcmsambaimports.cpp:50
+ msgid ""
+-"This list shows the Samba and NFS shared resources mounted on your system from "
+-"other hosts. The \"Type\" column tells you whether the mounted resource is a "
+-"Samba or an NFS type of resource. The \"Resource\" column shows the descriptive "
+-"name of the shared resource. Finally, the third column, which is labeled "
+-"\"Mounted under\" shows the location on your system where the shared resource "
+-"is mounted."
+-msgstr ""
+-"這個列表顯示您的系統掛載其他主機上 Samba 與 NFS 資源的紀錄. \"類型\" 欄位告訴您掛載的資源是 Samba 或 NFS. \"資源\" "
+-"欄位列出分享資源的名稱. 最後, \"掛載於\" 顯示您掛載這些資源的路徑."
++"This list shows the Samba and NFS shared resources mounted on your system "
++"from other hosts. The \"Type\" column tells you whether the mounted resource "
++"is a Samba or an NFS type of resource. The \"Resource\" column shows the "
++"descriptive name of the shared resource. Finally, the third column, which is "
++"labeled \"Mounted under\" shows the location on your system where the shared "
++"resource is mounted."
++msgstr ""
++"這個列表顯示您的系統掛載其他主機上 Samba 與 NFS 資源的紀錄. \"類型\" 欄位告訴"
++"您掛載的資源是 Samba 或 NFS. \"資源\" 欄位列出分享資源的名稱. 最後, \"掛載於"
++"\" 顯示您掛載這些資源的路徑."
+
+ #: kcmsambalog.cpp:43
+ msgid "Samba log file: "
+@@ -143,11 +144,12 @@
+ #: kcmsambalog.cpp:64
+ msgid ""
+ "This page presents the contents of your samba log file in a friendly layout. "
+-"Check that the correct log file for your computer is listed here. If you need "
+-"to, correct the name or location of the log file, and then click the \"Update\" "
+-"button."
++"Check that the correct log file for your computer is listed here. If you "
++"need to, correct the name or location of the log file, and then click the "
++"\"Update\" button."
+ msgstr ""
+-"這一頁列出從您的 samba 紀錄檔得到的內容. 請檢查是否使用正確的紀錄檔. 如果有必要, 請更正紀錄檔的名稱與位址, 並按下 \"更新\" 按鈕."
++"這一頁列出從您的 samba 紀錄檔得到的內容. 請檢查是否使用正確的紀錄檔. 如果有必"
++"要, 請更正紀錄檔的名稱與位址, 並按下 \"更新\" 按鈕."
+
+ #: kcmsambalog.cpp:69
+ msgid ""
+@@ -165,27 +167,31 @@
+ msgid ""
+ "Check this option if you want to see the files which were opened on your "
+ "computer by remote users. Note that file open/close events are not logged "
+-"unless the samba log level is set to at least 2 (you cannot set the log level "
+-"using this module)."
++"unless the samba log level is set to at least 2 (you cannot set the log "
++"level using this module)."
+ msgstr ""
+-"選取這個選項如果您希望檢視遠端使用者在您電腦上開啟的檔案。注意這些開啟/關閉動作只有在 samba 紀錄等級在 2 "
+-"以上時才會被紀錄(抱歉,您不能用這個模組變更紀錄等級)。"
++"選取這個選項如果您希望檢視遠端使用者在您電腦上開啟的檔案。注意這些開啟/關閉動"
++"作只有在 samba 紀錄等級在 2 以上時才會被紀錄(抱歉,您不能用這個模組變更紀錄"
++"等級)。"
+
+ #: kcmsambalog.cpp:81
+ msgid ""
+ "Check this option if you want to see the events when files opened by remote "
+-"users were closed. Note that file open/close events are not logged unless the "
+-"samba log level is set to at least 2 (you cannot set the log level using this "
+-"module)."
+-msgstr ""
+-"選取這個選項如果您希望檢視遠端使用者在您電腦上關閉檔案的事件。注意這些開啟/關閉動作只有在 samba 紀錄等級在 2 "
+-"以上時才會被紀錄(抱歉,您不能用這個模組變更紀錄等級)。"
++"users were closed. Note that file open/close events are not logged unless "
++"the samba log level is set to at least 2 (you cannot set the log level using "
++"this module)."
++msgstr ""
++"選取這個選項如果您希望檢視遠端使用者在您電腦上關閉檔案的事件。注意這些開啟/關"
++"閉動作只有在 samba 紀錄等級在 2 以上時才會被紀錄(抱歉,您不能用這個模組變更"
++"紀錄等級)。"
+
+ #: kcmsambalog.cpp:87
+ msgid ""
+-"Click here to refresh the information on this page. The log file (shown above) "
+-"will be read to obtain the events logged by samba."
+-msgstr "按下這邊以更新這一頁的資訊. 紀錄檔 (上面顯示的) 將會被讀取以取得 samba 紀錄的事件."
++"Click here to refresh the information on this page. The log file (shown "
++"above) will be read to obtain the events logged by samba."
++msgstr ""
++"按下這邊以更新這一頁的資訊. 紀錄檔 (上面顯示的) 將會被讀取以取得 samba 紀錄的"
++"事件."
+
+ #: kcmsambalog.cpp:97
+ msgid "Date & Time"
+@@ -205,18 +211,18 @@
+
+ #: kcmsambalog.cpp:102
+ msgid ""
+-"This list shows details of the events logged by samba. Note that events at the "
+-"file level are not logged unless you have configured the log level for samba to "
+-"2 or greater."
+-"
As with many other lists in KDE, you can click on a column heading to sort "
+-"on that column. Click again to change the sorting direction from ascending to "
+-"descending or vice versa."
+-"
If the list is empty, try clicking the \"Update\" button. The samba log "
+-"file will be read and the list refreshed."
+-msgstr ""
+-"這編列出 samba 所紀錄的詳細事件紀錄. 注意除非您把 samba 的紀錄等級設在 2 以上, 有些事件是不會被紀錄的."
+-"
如同 KDE 中其他的列表, 您可以按下欄位的頂端以依據這個欄位排序. 再按一次可以變更顯示順序."
+-"
如果列表示空的, 試著按下 \"更新\" 按鈕. samba 紀錄檔將會重新被讀取並更新列表."
++"This list shows details of the events logged by samba. Note that events at "
++"the file level are not logged unless you have configured the log level for "
++"samba to 2 or greater.
As with many other lists in KDE, you can click on "
++"a column heading to sort on that column. Click again to change the sorting "
++"direction from ascending to descending or vice versa.
If the list is "
++"empty, try clicking the \"Update\" button. The samba log file will be read "
++"and the list refreshed."
++msgstr ""
++"這編列出 samba 所紀錄的詳細事件紀錄. 注意除非您把 samba 的紀錄等級設在 2 以"
++"上, 有些事件是不會被紀錄的.
如同 KDE 中其他的列表, 您可以按下欄位的頂端以依"
++"據這個欄位排序. 再按一次可以變更顯示順序.
如果列表示空的, 試著按下 \"更新"
++"\" 按鈕. samba 紀錄檔將會重新被讀取並更新列表."
+
+ #: kcmsambalog.cpp:218 kcmsambastatistics.cpp:153 kcmsambastatistics.cpp:204
+ msgid "CONNECTION OPENED"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmscreensaver.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmscreensaver.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmscreensaver.po 2008-08-19 20:43:10.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmscreensaver.po 2011-11-11 15:45:17.000000000 +0100
+@@ -8,8 +8,7 @@
+ "Project-Id-Version: kcmscreensaver\n"
+ "POT-Creation-Date: 2008-07-08 01:18+0200\n"
+ "PO-Revision-Date: 2006-06-19 09:16+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Chinese Traditional \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -35,32 +34,34 @@
+ #: advanceddialog.cpp:146
+ msgid ""
+ "Specify the priority that the screensaver will run at. A higher priority may "
+-"mean that the screensaver runs faster, though may reduce the speed that other "
+-"programs run at while the screensaver is active."
+-msgstr "指定螢幕保護程式執行的優先權。較高的優先權代表螢幕保護程式會較快執行,但是會減低在螢幕保護程式作用的同時執行的其他程式的速度。"
++"mean that the screensaver runs faster, though may reduce the speed that "
++"other programs run at while the screensaver is active."
++msgstr ""
++"指定螢幕保護程式執行的優先權。較高的優先權代表螢幕保護程式會較快執行,但是會"
++"減低在螢幕保護程式作用的同時執行的其他程式的速度。"
+
+ #: advanceddialog.cpp:147
+ msgid ""
+-"The action to take when the mouse cursor is located in the top left corner of "
+-"the screen for 15 seconds."
++"The action to take when the mouse cursor is located in the top left corner "
++"of the screen for 15 seconds."
+ msgstr "當滑鼠游標位於螢幕左上角 15 秒後要進行的動作。"
+
+ #: advanceddialog.cpp:148
+ msgid ""
+-"The action to take when the mouse cursor is located in the top right corner of "
+-"the screen for 15 seconds."
++"The action to take when the mouse cursor is located in the top right corner "
++"of the screen for 15 seconds."
+ msgstr "當滑鼠游標位於螢幕右上角 15 秒後要進行的動作。"
+
+ #: advanceddialog.cpp:149
+ msgid ""
+-"The action to take when the mouse cursor is located in the bottom left corner "
+-"of the screen for 15 seconds."
++"The action to take when the mouse cursor is located in the bottom left "
++"corner of the screen for 15 seconds."
+ msgstr "當滑鼠游標位於螢幕左下角 15 秒後要進行的動作。"
+
+ #: advanceddialog.cpp:150
+ msgid ""
+-"The action to take when the mouse cursor is located in the bottom right corner "
+-"of the screen for 15 seconds."
++"The action to take when the mouse cursor is located in the bottom right "
++"corner of the screen for 15 seconds."
+ msgstr "當滑鼠游標位於螢幕右下角 15 秒後要進行的動作。"
+
+ #: category_list.cpp:7
+@@ -197,19 +198,21 @@
+
+ #: scrnsave.cpp:89
+ msgid ""
+-"Screen Saver
This module allows you to enable and configure a screen "
+-"saver. Note that you can enable a screen saver even if you have power saving "
+-"features enabled for your display."
+-" Besides providing an endless variety of entertainment and preventing "
+-"monitor burn-in, a screen saver also gives you a simple way to lock your "
+-"display if you are going to leave it unattended for a while. If you want the "
+-"screen saver to lock the session, make sure you enable the \"Require password\" "
+-"feature of the screen saver; if you do not, you can still explicitly lock the "
+-"session using the desktop's \"Lock Session\" action."
++"
Screen Saver
This module allows you to enable and configure a "
++"screen saver. Note that you can enable a screen saver even if you have power "
++"saving features enabled for your display. Besides providing an endless "
++"variety of entertainment and preventing monitor burn-in, a screen saver also "
++"gives you a simple way to lock your display if you are going to leave it "
++"unattended for a while. If you want the screen saver to lock the session, "
++"make sure you enable the \"Require password\" feature of the screen saver; "
++"if you do not, you can still explicitly lock the session using the desktop's "
++"\"Lock Session\" action."
+ msgstr ""
+-"
螢幕保護
這個模組可以讓您啟動並組態螢幕保護。注意即使您有設定您顯示器的省電功能也可以啟動螢幕保護。"
+-"此外,提供一個無止境的數值來提供娛樂與保護顯示器,同時如果您必須離開電腦一陣子,螢幕保護也提供您一個簡單的方法來鎖定您的畫面。如果您希望螢幕保護程式鎖定畫"
+-"面,請確定您有啟動螢幕保護程式的「需要密碼」功能;如果沒有,您仍然可以使用桌面上的「鎖定畫面」按鈕。"
++"
螢幕保護
這個模組可以讓您啟動並組態螢幕保護。注意即使您有設定您顯示"
++"器的省電功能也可以啟動螢幕保護。此外,提供一個無止境的數值來提供娛樂與保護"
++"顯示器,同時如果您必須離開電腦一陣子,螢幕保護也提供您一個簡單的方法來鎖定您"
++"的畫面。如果您希望螢幕保護程式鎖定畫面,請確定您有啟動螢幕保護程式的「需要密"
++"碼」功能;如果沒有,您仍然可以使用桌面上的「鎖定畫面」按鈕。"
+
+ #: scrnsave.cpp:132
+ msgid "Screen Saver"
+@@ -221,7 +224,7 @@
+
+ #: scrnsave.cpp:150
+ msgid "&Setup..."
+-msgstr "設定(&S)..."
++msgstr "設定(&S)…"
+
+ #: scrnsave.cpp:154
+ msgid "Configure the screen saver's options, if any."
+@@ -265,14 +268,14 @@
+
+ #: scrnsave.cpp:208
+ msgid ""
+-"Prevent potential unauthorized use by requiring a password to stop the screen "
+-"saver."
++"Prevent potential unauthorized use by requiring a password to stop the "
++"screen saver."
+ msgstr "要求密碼才能停止螢幕保護程式以防止可能的非法使用。"
+
+ #: scrnsave.cpp:216
+ msgid ""
+-"The amount of time, after the screen saver has started, to ask for the unlock "
+-"password."
++"The amount of time, after the screen saver has started, to ask for the "
++"unlock password."
+ msgstr "一段時間,在螢幕保護程式啟動後,過了多久會要求解鎖密碼。"
+
+ #: scrnsave.cpp:221
+@@ -309,4 +312,4 @@
+
+ #: scrnsave.cpp:470
+ msgid "Loading..."
+-msgstr "載入中..."
++msgstr "載入中…"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmsmartcard.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmsmartcard.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmsmartcard.po 2006-10-01 18:34:18.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmsmartcard.po 2011-11-11 15:45:17.000000000 +0100
+@@ -7,7 +7,7 @@
+ "Project-Id-Version: kcmsmartcard\n"
+ "POT-Creation-Date: 2006-08-23 02:32+0200\n"
+ "PO-Revision-Date: 2005-08-12 15:21+0800\n"
+-"Last-Translator: Chao-Hsiung Liao \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Chinese (traditional) \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -43,18 +43,18 @@
+ msgid ""
+ "\n"
+ "1) The KDE daemon, 'kded' is not running. You can restart it by running the "
+-"command 'kdeinit' and then try reloading the KDE Control Center to see if this "
+-"message goes away.\n"
++"command 'kdeinit' and then try reloading the KDE Control Center to see if "
++"this message goes away.\n"
+ "\n"
+ "2) You don't appear to have smartcard support in the KDE libraries. You will "
+ "need to recompile the kdelibs package with libpcsclite installed."
+ msgstr ""
+ "\n"
+-" 1) KDE 的服務 'kded' 沒有啟動。您可以執行 'kdeinit' 來重新啟動它,然後試著重新載入 KDE "
+-"控制中心,來看看這個訊息是否已經消失。\n"
++" 1) KDE 的服務 'kded' 沒有啟動。您可以執行 'kdeinit' 來重新啟動它,然後試著重"
++"新載入 KDE 控制中心,來看看這個訊息是否已經消失。\n"
+ "\n"
+-" 2) 您的 KDE 函式庫可能沒有包含 smartcard 的支援。您必須重新編譯您的 KDE 函式庫套件 (kdelibs),來增加函式庫 "
+-"libpcsclite。"
++" 2) 您的 KDE 函式庫可能沒有包含 smartcard 的支援。您必須重新編譯您的 KDE 函式"
++"庫套件 (kdelibs),來增加函式庫 libpcsclite。"
+
+ #. i18n: file smartcardbase.ui line 31
+ #: rc.cpp:15
+@@ -66,7 +66,7 @@
+ #: rc.cpp:18
+ #, no-c-format
+ msgid "&Enable smartcard support"
+-msgstr "啟動 Smart Card 支援 (&E)"
++msgstr "啟動 Smart Card 支援(&E)"
+
+ #. i18n: file smartcardbase.ui line 61
+ #: rc.cpp:21
+@@ -80,7 +80,8 @@
+ msgid ""
+ "In most cases you should have this enabled. It allows KDE to automatically "
+ "detect card insertion and reader hotplug events."
+-msgstr "在大部份的情況下,這個設定應該設為開啟。它允許 KDE 自動偵測卡片的熱插拔事件。"
++msgstr ""
++"在大部份的情況下,這個設定應該設為開啟。它允許 KDE 自動偵測卡片的熱插拔事件。"
+
+ #. i18n: file smartcardbase.ui line 92
+ #: rc.cpp:27
+@@ -92,15 +93,17 @@
+ #: rc.cpp:30
+ #, no-c-format
+ msgid ""
+-"When you insert a smartcard, KDE can automatically launch a management tool if "
+-"no other application attempts to use the card."
+-msgstr "當您插入 Smart Card 而沒有其他的程式使用這張卡片時,KDE 可以自動的啟動卡片管理工具。"
++"When you insert a smartcard, KDE can automatically launch a management tool "
++"if no other application attempts to use the card."
++msgstr ""
++"當您插入 Smart Card 而沒有其他的程式使用這張卡片時,KDE 可以自動的啟動卡片管"
++"理工具。"
+
+ #. i18n: file smartcardbase.ui line 106
+ #: rc.cpp:33
+ #, no-c-format
+ msgid "&Beep on card insert and removal"
+-msgstr "在卡片插入或拔出時發出嗶聲 (&B)"
++msgstr "在卡片插入或拔出時發出嗶聲(&B)"
+
+ #. i18n: file smartcardbase.ui line 135
+ #: rc.cpp:36
+@@ -142,7 +145,8 @@
+ #: rc.cpp:54
+ #, no-c-format
+ msgid ""
+-"To add new readers you have to modify /etc/readers.conf file and re-start pcscd"
++"To add new readers you have to modify /etc/readers.conf file and re-start "
++"pcscd"
+ msgstr "您可以透過修改 /etc/readers.conf,並重新啟動 pcscd 來新增一個讀卡機"
+
+ #: smartcard.cpp:59
+@@ -195,5 +199,5 @@
+ "smartcards. These can be used for various tasks such as storing SSL "
+ "certificates and logging in to the system."
+ msgstr ""
+-"Smart Card
這個模組允許您設定 KDE 來支援 Smart Card。它可以用在很多的用途上,例如存放 SSL "
+-"的憑證,並使用它來登入系統。"
++"Smart Card
這個模組允許您設定 KDE 來支援 Smart Card。它可以用在很多的"
++"用途上,例如存放 SSL 的憑證,並使用它來登入系統。"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmsmserver.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmsmserver.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmsmserver.po 2005-09-10 13:15:15.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmsmserver.po 2011-11-11 15:45:17.000000000 +0100
+@@ -8,7 +8,7 @@
+ "Project-Id-Version: kcmsmsserver\n"
+ "POT-Creation-Date: 2005-05-18 21:24+0200\n"
+ "PO-Revision-Date: 2005-08-12 15:18+0800\n"
+-"Last-Translator: Chao-Hsiung Liao \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Chinese (traditional) \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -22,8 +22,8 @@
+ "whether the computer should be automatically shut down after session exit by "
+ "default."
+ msgstr ""
+-"工作階段管理員
您可以在這邊組態工作階段管理員。 "
+-"這包含了登出時是否要經過確認、是否要在登出時儲存工作階段,以及是否要在工作階段結束後自動關機。"
++"工作階段管理員
您可以在這邊組態工作階段管理員。 這包含了登出時是否要"
++"經過確認、是否要在登出時儲存工作階段,以及是否要在工作階段結束後自動關機。"
+
+ #. i18n: file smserverconfigdlg.ui line 16
+ #: rc.cpp:3
+@@ -41,7 +41,7 @@
+ #: rc.cpp:9
+ #, no-c-format
+ msgid "Conf&irm logout"
+-msgstr "確認登出 (&i)"
++msgstr "確認登出(&I)"
+
+ #. i18n: file smserverconfigdlg.ui line 54
+ #: rc.cpp:12
+@@ -68,33 +68,35 @@
+ #, no-c-format
+ msgid ""
+ "\n"
+-"- Restore previous session: Will save all applications running on exit "
+-"and restore them when they next start up
\n"
+-"- Restore manually saved session: Allows the session to be saved at "
+-"any time via \"Save Session\" in the K-Menu. This means the currently started "
+-"applications will reappear when they next start up.
\n"
+-"- Start with an empty session: Do not save anything. Will come up with "
+-"an empty desktop on next start.
\n"
++"- Restore previous session: Will save all applications running on "
++"exit and restore them when they next start up
\n"
++"- Restore manually saved session: Allows the session to be saved "
++"at any time via \"Save Session\" in the K-Menu. This means the currently "
++"started applications will reappear when they next start up.
\n"
++"- Start with an empty session: Do not save anything. Will come up "
++"with an empty desktop on next start.
\n"
+ "
"
+ msgstr ""
+ "\n"
+-"- 恢復前一個工作階段: 會在離開時儲存所有執行的應用程式並在下次啟動時將他們恢復
\n"
+-"- 恢復手動儲存的工作階段: 可以在任何時候透過 "
+-"K-選單中的「儲存工作階段」來儲存工作階段。這表示目前啟動的應用程式會在下次啟動時恢復。
\n"
+-"- 以空的工作階段啟動: 不要儲存任何東西。下次啟動時會看到的空無一物的桌面。
\n"
++"- 恢復前一個工作階段: 會在離開時儲存所有執行的應用程式並在下次啟動"
++"時將他們恢復
\n"
++"- 恢復手動儲存的工作階段: 可以在任何時候透過 K-選單中的「儲存工作階"
++"段」來儲存工作階段。這表示目前啟動的應用程式會在下次啟動時恢復。
\n"
++"- 以空的工作階段啟動: 不要儲存任何東西。下次啟動時會看到的空無一物"
++"的桌面。
\n"
+ "
"
+
+ #. i18n: file smserverconfigdlg.ui line 90
+ #: rc.cpp:28
+ #, no-c-format
+ msgid "Restore &previous session"
+-msgstr "回復先前的工作階段 (&P)"
++msgstr "回復先前的工作階段(&P)"
+
+ #. i18n: file smserverconfigdlg.ui line 98
+ #: rc.cpp:31
+ #, no-c-format
+ msgid "Restore &manually saved session"
+-msgstr "回復手動存入的工作階段 (&M)"
++msgstr "回復手動存入的工作階段(&M)"
+
+ #. i18n: file smserverconfigdlg.ui line 106
+ #: rc.cpp:34
+@@ -112,9 +114,11 @@
+ #: rc.cpp:40
+ #, no-c-format
+ msgid ""
+-"Here you can choose what should happen by default when you log out. This only "
+-"has meaning, if you logged in through KDM."
+-msgstr "在這裡您可以選擇在您登出時所要執行的動作。不過這只有在您使用 KDM 來登入系統時才會生效。"
++"Here you can choose what should happen by default when you log out. This "
++"only has meaning, if you logged in through KDM."
++msgstr ""
++"在這裡您可以選擇在您登出時所要執行的動作。不過這只有在您使用 KDM 來登入系統時"
++"才會生效。"
+
+ #. i18n: file smserverconfigdlg.ui line 130
+ #: rc.cpp:43
+@@ -126,13 +130,13 @@
+ #: rc.cpp:46
+ #, no-c-format
+ msgid "&Turn off computer"
+-msgstr "關閉電腦 (&T)"
++msgstr "關閉電腦(&T)"
+
+ #. i18n: file smserverconfigdlg.ui line 146
+ #: rc.cpp:49
+ #, no-c-format
+ msgid "&Restart computer"
+-msgstr "重新啟動電腦 (&R)"
++msgstr "重新啟動電腦(&R)"
+
+ #. i18n: file smserverconfigdlg.ui line 156
+ #: rc.cpp:52
+@@ -151,7 +155,8 @@
+ #, no-c-format
+ msgid ""
+ "Here you can enter a comma-separated list of applications that should not be "
+-"saved in sessions, and therefore will not be started when restoring a session. "
+-"For example 'xterm,xconsole'."
++"saved in sessions, and therefore will not be started when restoring a "
++"session. For example 'xterm,xconsole'."
+ msgstr ""
+-"您可以在這裡輸入不想儲存在工作階段中的應用程式清單(以 , 分隔),這樣下次恢復工作階段時它們就不會被啟動。例如「xterm,xconsole」。"
++"您可以在這裡輸入不想儲存在工作階段中的應用程式清單(以 , 分隔),這樣下次恢復工"
++"作階段時它們就不會被啟動。例如「xterm,xconsole」。"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmspellchecking.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmspellchecking.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmspellchecking.po 2005-09-10 13:15:15.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmspellchecking.po 2011-11-11 15:45:17.000000000 +0100
+@@ -8,7 +8,7 @@
+ "Project-Id-Version: kcmspellchecking\n"
+ "POT-Creation-Date: 2005-05-18 21:24+0200\n"
+ "PO-Revision-Date: 2005-08-12 13:58+0800\n"
+-"Last-Translator: Chao-Hsiung Liao \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Traditional Chinese \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -20,22 +20,16 @@
+
+ #: spellchecking.cpp:46
+ msgid ""
+-"Spell Checker
"
+-"This control module allows you to configure the KDE spell checking system. "
+-"You can configure:"
+-"
"
+-"- which spell checking program to use"
+-"
- which types of spelling errors are identified"
+-"
- which dictionary is used by default.
"
+-"
The KDE spell checking system (KSpell) provides support for two common "
+-"spell checking utilities: ASpell and ISpell. This allows you to share "
+-"dictionaries between KDE applications and non-KDE applications.
"
++"Spell Checker
This control module allows you to configure the KDE "
++"spell checking system. You can configure:
- which spell checking "
++"program to use
- which types of spelling errors are identified
- which "
++"dictionary is used by default.
The KDE spell checking system "
++"(KSpell) provides support for two common spell checking utilities: ASpell "
++"and ISpell. This allows you to share dictionaries between KDE applications "
++"and non-KDE applications.
"
+ msgstr ""
+-"拼字檢查
"
+-"這個控制模組可讓您設定 KDE 的拼字檢查系統。您可以設定:"
+-"
"
+-"- 使用哪一個拼字檢查程式"
+-"
- 要辨識哪些種類的拼字錯誤"
+-"
- 內定使用哪一個字典。
"
+-"
KDE 拼字檢查系統(KSpell)支援兩種常見的拼字檢查工具:ASpell 與 ISpell。 因此,您在使用 KDE 應用程式與非 KDE "
+-"的應用程式時都可以使用相同的字典。
"
++"拼字檢查
這個控制模組可讓您設定 KDE 的拼字檢查系統。您可以設定:"
++"
- 使用哪一個拼字檢查程式
- 要辨識哪些種類的拼字錯誤
- 內定使用哪一"
++"個字典。
KDE 拼字檢查系統(KSpell)支援兩種常見的拼字檢查工具:"
++"ASpell 與 ISpell。 因此,您在使用 KDE 應用程式與非 KDE 的應用程式時都可以使"
++"用相同的字典。"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmstyle.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmstyle.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmstyle.po 2006-10-01 18:34:17.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmstyle.po 2011-11-11 15:45:17.000000000 +0100
+@@ -6,7 +6,7 @@
+ "Project-Id-Version: kcmstyle\n"
+ "POT-Creation-Date: 2006-08-23 02:32+0200\n"
+ "PO-Revision-Date: 2005-08-13 11:14+0800\n"
+-"Last-Translator: Chao-Hsiung Liao \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Chinese(traditional) \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -28,7 +28,9 @@
+ msgid ""
+ "Style
This module allows you to modify the visual appearance of user "
+ "interface elements, such as the widget style and effects."
+-msgstr "風格
這個模組允許您修改使用者介面元件的視覺外觀,例如 Widget 的風格及特效。"
++msgstr ""
++"風格
這個模組允許您修改使用者介面元件的視覺外觀,例如 Widget 的風格及"
++"特效。"
+
+ #: kcmstyle.cpp:134
+ msgid "kcmstyle"
+@@ -48,15 +50,15 @@
+
+ #: kcmstyle.cpp:171
+ msgid "Con&figure..."
+-msgstr "設定(&F)..."
++msgstr "設定(&F)…"
+
+ #: kcmstyle.cpp:182
+ msgid "Sho&w icons on buttons"
+-msgstr "在按鍵上顯示圖示 (&W)"
++msgstr "在按鍵上顯示圖示(&W)"
+
+ #: kcmstyle.cpp:184
+ msgid "E&nable tooltips"
+-msgstr "啟動工具提示 (&N)"
++msgstr "啟動工具提示(&N)"
+
+ #: kcmstyle.cpp:186
+ msgid "Show tear-off handles in &popup menus"
+@@ -68,7 +70,7 @@
+
+ #: kcmstyle.cpp:208
+ msgid "&Enable GUI effects"
+-msgstr "啟動 GUI 效果 (&E)"
++msgstr "啟動 GUI 效果(&E)"
+
+ #: kcmstyle.cpp:216 kcmstyle.cpp:224 kcmstyle.cpp:233 kcmstyle.cpp:243
+ msgid "Disable"
+@@ -80,7 +82,7 @@
+
+ #: kcmstyle.cpp:218
+ msgid "Combobo&x effect:"
+-msgstr "Combobox 效果 (&X):"
++msgstr "Combobox 效果(&X):"
+
+ #: kcmstyle.cpp:226 kcmstyle.cpp:235
+ msgid "Fade"
+@@ -88,7 +90,7 @@
+
+ #: kcmstyle.cpp:227
+ msgid "&Tool tip effect:"
+-msgstr "工具提示效果 (&T):"
++msgstr "工具提示效果(&T):"
+
+ #: kcmstyle.cpp:236
+ msgid "Make Translucent"
+@@ -96,7 +98,7 @@
+
+ #: kcmstyle.cpp:237
+ msgid "&Menu effect:"
+-msgstr "選單效果 (&M):"
++msgstr "選單效果(&M):"
+
+ #: kcmstyle.cpp:244
+ msgid "Application Level"
+@@ -108,7 +110,7 @@
+
+ #: kcmstyle.cpp:251
+ msgid "Menu &drop shadow"
+-msgstr "選單拖曳陰影 (&D)"
++msgstr "選單拖曳陰影(&D)"
+
+ #: kcmstyle.cpp:272
+ msgid "Software Tint"
+@@ -139,11 +141,11 @@
+
+ #: kcmstyle.cpp:295
+ msgid "Menu trans&lucency type:"
+-msgstr "選單半透明型態 (&L):"
++msgstr "選單半透明型態(&L):"
+
+ #: kcmstyle.cpp:297
+ msgid "Menu &opacity:"
+-msgstr "選單不透明 (&O):"
++msgstr "選單不透明(&O):"
+
+ #: kcmstyle.cpp:326
+ msgid "High&light buttons under mouse"
+@@ -151,11 +153,11 @@
+
+ #: kcmstyle.cpp:327
+ msgid "Transparent tool&bars when moving"
+-msgstr "當移動時將工具列變透明 (&B)"
++msgstr "當移動時將工具列變透明(&B)"
+
+ #: kcmstyle.cpp:332
+ msgid "Text pos&ition:"
+-msgstr "文字位置 (&I):"
++msgstr "文字位置(&I):"
+
+ #: kcmstyle.cpp:334
+ msgid "Icons Only"
+@@ -175,11 +177,11 @@
+
+ #: kcmstyle.cpp:379
+ msgid "&Style"
+-msgstr "風格 (&S)"
++msgstr "風格(&S)"
+
+ #: kcmstyle.cpp:380
+ msgid "&Effects"
+-msgstr "特效選項 (&E)"
++msgstr "特效選項(&E)"
+
+ #: kcmstyle.cpp:381
+ msgid "&Toolbar"
+@@ -195,18 +197,12 @@
+
+ #: kcmstyle.cpp:520
+ msgid ""
+-"Selected style: %1"
+-"
"
+-"
One or more effects that you have chosen could not be applied because the "
+-"selected style does not support them; they have therefore been disabled."
+-"
"
+-"
"
+-msgstr ""
+-"被選取的風格:%1"
+-"
"
+-"
一個或多個特效被選取,不過因為它們不被支援,所以目前無法套用在系統上,同時這些被選取的特效將會被關閉。"
+-"
"
+-"
"
++"Selected style: %1
One or more effects that you have "
++"chosen could not be applied because the selected style does not support "
++"them; they have therefore been disabled.
"
++msgstr ""
++"被選取的風格:%1
一個或多個特效被選取,不過因為它們不被支"
++"援,所以目前無法套用在系統上,同時這些被選取的特效將會被關閉。
"
+
+ #: kcmstyle.cpp:532
+ msgid "Menu translucency is not available.
"
+@@ -230,25 +226,32 @@
+ "Here you can choose from a list of predefined widget styles (e.g. the way "
+ "buttons are drawn) which may or may not be combined with a theme (additional "
+ "information like a marble texture or a gradient)."
+-msgstr "您可以在這邊選擇一系列預先定義的介面工具樣式 (例如扭曲的按鈕). 這可能合併於主題中(額外的資訊如大理石紋等)。"
++msgstr ""
++"您可以在這邊選擇一系列預先定義的介面工具樣式 (例如扭曲的按鈕). 這可能合併於主"
++"題中(額外的資訊如大理石紋等)。"
+
+ #: kcmstyle.cpp:1017
+ msgid ""
+ "This area shows a preview of the currently selected style without having to "
+ "apply it to the whole desktop."
+-msgstr "這個區域讓您可以預視您所選擇的風格,而不需要將它 套用到到整個桌面才能夠檢視。"
++msgstr ""
++"這個區域讓您可以預視您所選擇的風格,而不需要將它 套用到到整個桌面才能夠檢視。"
+
+ #: kcmstyle.cpp:1021
+ msgid ""
+ "This page allows you to enable various widget style effects. For best "
+ "performance, it is advisable to disable all effects."
+-msgstr "這個頁面允許您啟動各種 Widget 的風格效果。為了得到更好的執行效率,您可以選擇關閉所有的特效。"
++msgstr ""
++"這個頁面允許您啟動各種 Widget 的風格效果。為了得到更好的執行效率,您可以選擇"
++"關閉所有的特效。"
+
+ #: kcmstyle.cpp:1023
+ msgid ""
+ "If you check this box, you can select several effects for different widgets "
+ "like combo boxes, menus or tooltips."
+-msgstr "如果您選擇了這個選項,您可以為各種 Widget 來設定特效,例如 Combo Box、選單或工具提示。"
++msgstr ""
++"如果您選擇了這個選項,您可以為各種 Widget 來設定特效,例如 Combo Box、選單或"
++"工具提示。"
+
+ #: kcmstyle.cpp:1025
+ msgid ""
+@@ -283,26 +286,27 @@
+
+ #: kcmstyle.cpp:1034
+ msgid ""
+-"When enabled, all popup menus will have a drop-shadow, otherwise drop-shadows "
+-"will not be displayed. At present, only KDE styles can have this effect "
+-"enabled."
++"When enabled, all popup menus will have a drop-shadow, otherwise drop-"
++"shadows will not be displayed. At present, only KDE styles can have this "
++"effect enabled."
+ msgstr ""
+-"當這個選項被選取的時候,將會在所有的 Popup 選單上產生陰影的效果,否則這些陰影效果將不會被顯示。值得一提的是,這個選項所產生的效果,只會發生在專為 "
+-"KDE 開發的程式上。"
++"當這個選項被選取的時候,將會在所有的 Popup 選單上產生陰影的效果,否則這些陰影"
++"效果將不會被顯示。值得一提的是,這個選項所產生的效果,只會發生在專為 KDE 開發"
++"的程式上。"
+
+ #: kcmstyle.cpp:1037
+ msgid ""
+ "Software Tint: Alpha-blend using a flat color.
\n"
+ "Software Blend: Alpha-blend using an image.
\n"
+ "XRender Blend: Use the XFree RENDER extension for image blending (if "
+-"available). This method may be slower than the Software routines on "
+-"non-accelerated displays, but may however improve performance on remote "
+-"displays.\n"
++"available). This method may be slower than the Software routines on non-"
++"accelerated displays, but may however improve performance on remote displays."
++"\n"
+ msgstr ""
+ "軟體淡色:使用固定色彩做 Alpha-混色。
\n"
+ "軟體混色:使用圖片做 Alpha-混色。
\n"
+-"XRender 混色: 使用 XFree RENDER "
+-"延伸功能做圖片混合(如果可用)。這個方法可能會比軟體或非加速的方式慢,但是可以增進遠端畫面的效能。\n"
++"XRender 混色: 使用 XFree RENDER 延伸功能做圖片混合(如果可用)。這個方"
++"法可能會比軟體或非加速的方式慢,但是可以增進遠端畫面的效能。\n"
+
+ #: kcmstyle.cpp:1042
+ msgid "By adjusting this slider you can control the menu effect opacity."
+@@ -312,7 +316,9 @@
+ msgid ""
+ "Note: that all widgets in this combobox do not apply to Qt-only "
+ "applications."
+-msgstr "注意:在這個 Combo Box 中的所有 Widget,不可以套用到 Qt-Only 的應用程式。"
++msgstr ""
++"注意:在這個 Combo Box 中的所有 Widget,不可以套用到 Qt-Only 的應用程"
++"式。"
+
+ #: kcmstyle.cpp:1047
+ msgid ""
+@@ -330,34 +336,39 @@
+ msgid ""
+ "If you check this option, the KDE application will offer tooltips when the "
+ "cursor remains over items in the toolbar."
+-msgstr "如果您選擇了這個選項,那麼當滑鼠停留在 KDE 應用程式工具列上的某個物件時,顯示出該物件的提示。"
++msgstr ""
++"如果您選擇了這個選項,那麼當滑鼠停留在 KDE 應用程式工具列上的某個物件時,顯示"
++"出該物件的提示。"
+
+ #: kcmstyle.cpp:1053
+ msgid ""
+-"Icons only: Shows only icons on toolbar buttons. Best option for low "
+-"resolutions.
"
+-"Text only: Shows only text on toolbar buttons.
"
+-"Text alongside icons: Shows icons and text on toolbar buttons. Text "
+-"is aligned alongside the icon.
Text under icons: "
++"Icons only: Shows only icons on toolbar buttons. Best option for "
++"low resolutions.
Text only: Shows only text on toolbar buttons."
++"
Text alongside icons: Shows icons and text on toolbar "
++"buttons. Text is aligned alongside the icon.
Text under icons: "
+ "Shows icons and text on toolbar buttons. Text is aligned below the icon."
+ msgstr ""
+-"只顯示圖示:在工具列上只以圖示顯示按鍵。在低解析度的環境下,這是個不錯的選擇。
"
+-"只顯示文字:在工具列上只以文字顯示按鍵。
"
+-"文字顯示在圖示旁:在工具列上同時顯示文字和圖示,而文字就顯示在圖示的旁邊。
"
+-"文字顯示在圖示上:在工具列上同時顯示文字和圖示,而文字就顯示在圖示之上。
"
++"只顯示圖示:在工具列上只以圖示顯示按鍵。在低解析度的環境下,這是個"
++"不錯的選擇。
只顯示文字:在工具列上只以文字顯示按鍵。
"
++"文字顯示在圖示旁:在工具列上同時顯示文字和圖示,而文字就顯示在圖示的旁"
++"邊。
文字顯示在圖示上:在工具列上同時顯示文字和圖示,而文字就顯"
++"示在圖示之上。
"
+
+ #: kcmstyle.cpp:1060
+ msgid ""
+ "If you enable this option, KDE Applications will show small icons alongside "
+ "some important buttons."
+-msgstr "如果您開啟了這個選項,那麼 KDE 的應用程式將會有某些重要的按鍵旁顯示小圖示。"
++msgstr ""
++"如果您開啟了這個選項,那麼 KDE 的應用程式將會有某些重要的按鍵旁顯示小圖示。"
+
+ #: kcmstyle.cpp:1062
+ msgid ""
+ "If you enable this option some pop-up menus will show so called tear-off "
+-"handles. If you click them, you get the menu inside a widget. This can be very "
+-"helpful when performing the same action multiple times."
+-msgstr "如果您啟用此選頂某些彈出式選單會顯示所謂的快速處理。如果您按下它們,您會看到視窗元件裡的選單。在進行多次相同的動作時這會很有幫助。"
++"handles. If you click them, you get the menu inside a widget. This can be "
++"very helpful when performing the same action multiple times."
++msgstr ""
++"如果您啟用此選頂某些彈出式選單會顯示所謂的快速處理。如果您按下它們,您會看到"
++"視窗元件裡的選單。在進行多次相同的動作時這會很有幫助。"
+
+ #: menupreview.cpp:160
+ #, c-format
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmtaskbar.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmtaskbar.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmtaskbar.po 2008-08-19 20:43:10.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmtaskbar.po 2011-11-11 15:45:17.000000000 +0100
+@@ -12,8 +12,7 @@
+ "Project-Id-Version: kcmtaskbar\n"
+ "POT-Creation-Date: 2008-07-08 01:18+0200\n"
+ "PO-Revision-Date: 2007-02-27 09:09+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Chinese Traditional \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -94,13 +93,14 @@
+
+ #: kcmtaskbar.cpp:144
+ msgid ""
+-"Taskbar
You can configure the taskbar here. This includes options such "
+-"as whether or not the taskbar should show all windows at once or only those on "
+-"the current desktop. You can also configure whether or not the Window List "
+-"button will be displayed."
++"Taskbar
You can configure the taskbar here. This includes options "
++"such as whether or not the taskbar should show all windows at once or only "
++"those on the current desktop. You can also configure whether or not the "
++"Window List button will be displayed."
+ msgstr ""
+-"工作列
您可以在這邊組態工作列. 這包含了如工作列是否要嵌入於面板或浮動在外面(預設: 嵌入). "
+-"您也可以組態工作列是否要顯示所有的視窗或只有目前桌面上的視窗"
++"工作列
您可以在這邊組態工作列. 這包含了如工作列是否要嵌入於面板或浮"
++"動在外面(預設: 嵌入). 您也可以組態工作列是否要顯示所有的視窗或只有目前桌面上"
++"的視窗"
+
+ #: kcmtaskbar.cpp:176
+ msgid "kcmtaskbar"
+@@ -161,8 +161,8 @@
+ #: rc.cpp:20
+ #, no-c-format
+ msgid ""
+-"Turning this option off will cause the taskbar to display only "
+-"the windows on the current desktop. \n"
++"Turning this option off will cause the taskbar to display only the "
++"windows on the current desktop. \n"
+ "\n"
+ "By default, this option is selected and all windows are shown."
+ msgstr ""
+@@ -182,28 +182,30 @@
+ msgid ""
+ "Selecting this option causes the taskbar to display a button that, when "
+ "clicked, shows a list of all windows in a popup menu."
+-msgstr "選則這個選項會使得工作列顯示一個按鈕,當按下它時,會出現一個彈出選單顯示所有視窗的列表。"
++msgstr ""
++"選則這個選項會使得工作列顯示一個按鈕,當按下它時,會出現一個彈出選單顯示所有"
++"視窗的列表。"
+
+ #. i18n: file kcmtaskbarui.ui line 105
+ #: rc.cpp:31
+ #, no-c-format
+ msgid ""
+ "The taskbar can group similar windows into single buttons. When one of these "
+-"window group buttons are clicked on a menu appears showing all the windows in "
+-"that group. This can be especially useful with the Show all windows "
+-"option.\n"
+-"\n"
+-"You can set the taskbar to Never group windows, to "
+-"Always group windows or to group windows only "
+-"When the Taskbar is Full.\n"
++"window group buttons are clicked on a menu appears showing all the windows "
++"in that group. This can be especially useful with the Show all windows"
++"em> option.\n"
++"\n"
++"You can set the taskbar to Never group windows, to "
++"Always group windows or to group windows only When "
++"the Taskbar is Full.\n"
+ "\n"
+ "By default the taskbar groups windows when it is full."
+ msgstr ""
+-"工作列可以將相近的視窗組為一個單一按鈕。當這些視窗群組按鈕被按下時會出現一個選單來顯示在群組中的所有視窗。這在顯示所有視窗"
+-"選項中會特別有用。\n"
++"工作列可以將相近的視窗組為一個單一按鈕。當這些視窗群組按鈕被按下時會出現一個"
++"選單來顯示在群組中的所有視窗。這在顯示所有視窗選項中會特別有用。\n"
+ "\n"
+-"您可以設定工作列 永不 使用群組視窗,永遠 群組視窗或者只有 "
+-"當工作列已滿 時才將視窗群組起來。\n"
++"您可以設定工作列 永不 使用群組視窗,永遠 群"
++"組視窗或者只有 當工作列已滿 時才將視窗群組起來。\n"
+ "\n"
+ "預設中工作列會在已滿的情況下群組視窗。"
+
+@@ -223,10 +225,11 @@
+ #: rc.cpp:44
+ #, no-c-format
+ msgid ""
+-"Select this option if you want the taskbar to display only "
+-"minimized windows. \n"
++"Select this option if you want the taskbar to display only minimized "
++"windows. \n"
+ "\n"
+-"By default, this option is not selected and the taskbar will show all windows."
++"By default, this option is not selected and the taskbar will show all "
++"windows."
+ msgstr ""
+ "選取這個選項如果您希望工作列只有顯示縮到最小的視窗。\n"
+ "\n"
+@@ -242,8 +245,8 @@
+ #: rc.cpp:52
+ #, no-c-format
+ msgid ""
+-"Select this option if you want window icons to appear along with their titles "
+-"in the taskbar.\n"
++"Select this option if you want window icons to appear along with their "
++"titles in the taskbar.\n"
+ "\n"
+ "By default this option is selected."
+ msgstr ""
+@@ -304,7 +307,7 @@
+ #: rc.cpp:80
+ #, no-c-format
+ msgid "Sort alphabeticall&y by application name"
+-msgstr "按字母順序排序應用程式(&y)"
++msgstr "按字母順序排序應用程式(&Y)"
+
+ #. i18n: file kcmtaskbarui.ui line 347
+ #: rc.cpp:83
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmusb.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmusb.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmusb.po 2006-07-22 10:04:12.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmusb.po 2011-11-11 15:45:17.000000000 +0100
+@@ -8,7 +8,7 @@
+ "Project-Id-Version: kcmusb\n"
+ "POT-Creation-Date: 2006-06-21 03:58+0200\n"
+ "PO-Revision-Date: 2005-10-29 15:45+0800\n"
+-"Last-Translator: Chao-Hsiung Liao \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: zh-l10n \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -28,8 +28,8 @@
+
+ #: kcmusb.cpp:34
+ msgid ""
+-"USB Devices
This module allows you to see the devices attached to your "
+-"USB bus(es)."
++"USB Devices
This module allows you to see the devices attached to "
++"your USB bus(es)."
+ msgstr "USB 裝置
這個模組可以讓您知道有什麼裝置接在您的USB bus上 ."
+
+ #: kcmusb.cpp:38
+@@ -130,9 +130,11 @@
+
+ #: usbdevices.cpp:426
+ msgid ""
+-"Could not open one or more USB controller. Make sure, you have read access to "
+-"all USB controllers that should be listed here."
+-msgstr "無法開啟一或多個 USB 控制器。請確定您對應該在此列出的所有 USB 控制器有讀取權限。"
++"Could not open one or more USB controller. Make sure, you have read access "
++"to all USB controllers that should be listed here."
++msgstr ""
++"無法開啟一或多個 USB 控制器。請確定您對應該在此列出的所有 USB 控制器有讀取權"
++"限。"
+
+ #: classes.i18n:1
+ msgid "AT-commands"
+@@ -180,7 +182,7 @@
+
+ #: classes.i18n:12
+ msgid "Control Device"
+-msgstr "控制台"
++msgstr "控制臺"
+
+ #: classes.i18n:13
+ msgid "Control/Bulk"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmview1394.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmview1394.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmview1394.po 2005-10-10 17:28:03.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmview1394.po 2011-11-11 15:45:17.000000000 +0100
+@@ -1,14 +1,14 @@
+ # Chinese/Traditional translation of kcmview1394.
+ # Woodman Tuen , 2005.
+-#
+-#
++#
++#
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: kcmview1394\n"
+ "Report-Msgid-Bugs-To: \n"
+ "POT-Creation-Date: 2005-09-27 02:32+0200\n"
+ "PO-Revision-Date: 2005-08-25 12:20+0800\n"
+-"Last-Translator: Woodman Tuen \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Chinese/Traditional \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -89,33 +89,24 @@
+ #: view1394.cpp:65
+ msgid ""
+ "On the right hand side you can see some information about your IEEE 1394 "
+-"configuration."
+-"
The meaning of the columns:"
+-"
Name: port or node name, the number can change with each bus reset"
+-"
GUID: the 64 bit GUID of the node"
+-"
Local: checked if the node is an IEEE 1394 port of your computer"
+-"
IRM: checked if the node is isochronous resource manager capable"
+-"
CRM: checked if the node is cycle master capable"
+-"
ISO: checked if the node supports isochronous transfers"
+-"
BM: checked if the node is bus manager capable"
+-"
PM: checked if the node is power management capable"
+-"
Acc: the cycle clock accuracy of the node, valid from 0 to 100"
+-"
Speed: the speed of the node"
+-"
"
++"configuration.
The meaning of the columns:
Name: port or node "
++"name, the number can change with each bus reset
GUID: the 64 bit "
++"GUID of the node
Local: checked if the node is an IEEE 1394 port "
++"of your computer
IRM: checked if the node is isochronous resource "
++"manager capable
CRM: checked if the node is cycle master "
++"capable
ISO: checked if the node supports isochronous "
++"transfers
BM: checked if the node is bus manager capable
PM"
++"b>: checked if the node is power management capable
Acc: the cycle "
++"clock accuracy of the node, valid from 0 to 100
Speed: the speed "
++"of the node
"
+ msgstr ""
+-"在右邊你可以看到您的 IEEE 1394的設定。"
+-"
每一欄的意思是:"
+-"
名稱:連接埠或裝置名稱,匯流排重設時可以將號碼更改"
+-"
GUID:裝置的 64 bit GUID"
+-"
本機:如裝置是在您的電腦上 IEEE 1394 連接埠則會選取"
+-"
IRM:如支援非同步資源管理"
+-"
CRM: 如支援 cycle master 則會選取"
+-"
ISO:如支援非同步傳送"
+-"
BM:如支援匯流排管理功能則會選取"
+-"
PM:如支援電源管理功能則會選取"
+-"
Acc:裝置的週期準確度,有效值由 0 至 100"
+-"
速度:裝置的速度"
+-"
"
++"在右邊你可以看到您的 IEEE 1394的設定。
每一欄的意思是:
名稱:連"
++"接埠或裝置名稱,匯流排重設時可以將號碼更改
GUID:裝置的 64 bit "
++"GUID
本機:如裝置是在您的電腦上 IEEE 1394 連接埠則會選取"
++"
IRM:如支援非同步資源管理
CRM: 如支援 cycle master 則會"
++"選取
ISO:如支援非同步傳送
BM:如支援匯流排管理功能則會選"
++"取
PM:如支援電源管理功能則會選取
Acc:裝置的週期準確度,"
++"有效值由 0 至 100
速度:裝置的速度
"
+
+ #: view1394.cpp:196
+ msgid "Port %1:\"%2\""
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmxinerama.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmxinerama.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmxinerama.po 2006-10-01 18:34:18.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmxinerama.po 2011-11-11 15:45:17.000000000 +0100
+@@ -7,7 +7,7 @@
+ "Project-Id-Version: kcmxinerama\n"
+ "POT-Creation-Date: 2006-08-23 02:32+0200\n"
+ "PO-Revision-Date: 2005-10-29 15:48+0800\n"
+-"Last-Translator: Chao-Hsiung Liao \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Chinese (traditional) \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -39,8 +39,8 @@
+
+ #: kcmxinerama.cpp:56
+ msgid ""
+-"Multiple Monitors
This module allows you to configure KDE support for "
+-"multiple monitors."
++"Multiple Monitors
This module allows you to configure KDE support "
++"for multiple monitors."
+ msgstr "多重螢幕
這個模組能讓您設定 KDE 的多重螢幕支援"
+
+ #: kcmxinerama.cpp:74
+@@ -54,10 +54,12 @@
+
+ #: kcmxinerama.cpp:103
+ msgid ""
+-""
+-"This module is only for configuring systems with a single desktop spread "
+-"across multiple monitors. You do not appear to have this configuration.
"
+-msgstr "這個模組只能在使用一個桌面於多重螢幕的系統上執行。您似乎無法使用此模組
"
++"This module is only for configuring systems with a single desktop "
++"spread across multiple monitors. You do not appear to have this "
++"configuration.
"
++msgstr ""
++"這個模組只能在使用一個桌面於多重螢幕的系統上執行。您似乎無法使用此模組"
++"
"
+
+ #: kcmxinerama.cpp:187
+ msgid "Your settings will only affect newly started applications."
+@@ -119,7 +121,7 @@
+ #: rc.cpp:33
+ #, no-c-format
+ msgid "&Identify All Displays"
+-msgstr "鑑別所有的畫面 (&A)"
++msgstr "鑑別所有的畫面(&A)"
+
+ #. i18n: file xineramawidget.ui line 182
+ #: rc.cpp:36
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcontrol.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcontrol.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcontrol.po 2008-02-13 10:55:26.000000000 +0100
++++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcontrol.po 2011-11-11 15:45:17.000000000 +0100
+@@ -9,7 +9,7 @@
+ "Project-Id-Version: kcontrol\n"
+ "POT-Creation-Date: 2008-01-05 01:15+0100\n"
+ "PO-Revision-Date: 2005-10-29 16:01+0800\n"
+-"Last-Translator: Chao-Hsiung Liao \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Chinese (traditional) \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -40,7 +40,9 @@
+ "Welcome to the \"KDE Control Center\", a central place to configure your "
+ "desktop environment. Select an item from the index on the left to load a "
+ "configuration module."
+-msgstr "歡迎使用「KDE 控制中心」,您可以在此統籌設定您的桌面環境。 請從左邊的索引中選擇一個項目,以便載入設定模組。"
++msgstr ""
++"歡迎使用「KDE 控制中心」,您可以在此統籌設定您的桌面環境。 請從左邊的索引中選"
++"擇一個項目,以便載入設定模組。"
+
+ #: aboutwidget.cpp:53 main.cpp:108
+ msgid "KDE Info Center"
+@@ -52,8 +54,8 @@
+
+ #: aboutwidget.cpp:57
+ msgid ""
+-"Welcome to the \"KDE Info Center\", a central place to find information about "
+-"your computer system."
++"Welcome to the \"KDE Info Center\", a central place to find information "
++"about your computer system."
+ msgstr "歡迎使用「KDE 資訙中心」,您可以在這裡找到關於您電腦系統上的資訊。"
+
+ #: aboutwidget.cpp:61
+@@ -88,13 +90,13 @@
+
+ #: dockcontainer.cpp:133
+ msgid "Loading..."
+-msgstr "載入中..."
++msgstr "載入中…"
+
+ #: dockcontainer.cpp:201 toplevel.cpp:376
+ msgid ""
+ "There are unsaved changes in the active module.\n"
+-"Do you want to apply the changes before running the new module or discard the "
+-"changes?"
++"Do you want to apply the changes before running the new module or discard "
++"the changes?"
+ msgstr ""
+ "作用中的模組留有未儲存的變更。\n"
+ "執行新模組前是否要套用變更,或者忽略變更?"
+@@ -102,8 +104,8 @@
+ #: dockcontainer.cpp:204 toplevel.cpp:379
+ msgid ""
+ "There are unsaved changes in the active module.\n"
+-"Do you want to apply the changes before exiting the Control Center or discard "
+-"the changes?"
++"Do you want to apply the changes before exiting the Control Center or "
++"discard the changes?"
+ msgstr ""
+ "作用中的模組留有未儲存的變更。\n"
+ "在離開控制中心前是否要套用變更,或者忽略變更?"
+@@ -114,41 +116,37 @@
+
+ #: helpwidget.cpp:44
+ msgid ""
+-"Use the \"What's This?\" (Shift+F1) to get help on specific options.
"
+-"To read the full manual click here.
"
++"Use the \"What's This?\" (Shift+F1) to get help on specific options."
++"p>
To read the full manual click here.
"
+ msgstr ""
+-"使用「這是什麼?」 (Shift+F1) 來取得特定選項的說明。
"
+-"要讀取完整的說明手冊請按 這裡。
"
++"使用「這是什麼?」 (Shift+F1) 來取得特定選項的說明。
要讀取完整的說"
++"明手冊請按 這裡。
"
+
+ #: helpwidget.cpp:51
+ msgid ""
+ "KDE Info Center
There is no quick help available for the active info "
+-"module."
+-"
"
+-"
Click here "
+-"to read the general Info Center manual."
++"module.
Click here to read "
++"the general Info Center manual."
+ msgstr ""
+-"KDE 資訊中心
抱歉,作用中的資訊模組並無快速說明。"
+-"
"
+-"
請按 這裡 以讀取一般資訊中心手冊。"
++"KDE 資訊中心
抱歉,作用中的資訊模組並無快速說明。
請按 這裡 以讀取一般資訊中心手冊。"
+
+ #: helpwidget.cpp:56
+ msgid ""
+ "KDE Control Center
There is no quick help available for the active "
+-"control module."
+-"
"
+-"
Click here "
+-"to read the general Control Center manual."
++"control module.
Click here to "
++"read the general Control Center manual."
+ msgstr ""
+-"KDE 控制中心
抱歉,作用中的控制模組並無快速說明。"
+-"
"
+-"
請按 這裡 以讀取一般控制中心手冊。"
++"KDE 控制中心
抱歉,作用中的控制模組並無快速說明。
請按 這裡 以讀取一般控制中心手冊。"
+
+ #: kcrootonly.cpp:30
+ msgid ""
+-"You need super user privileges to run this control module."
+-"
Click on the \"Administrator Mode\" button below."
+-msgstr "你需要超級使用者的權限來執行這個控制模組。
點選下面 \"管理者模式\" 按鈕。"
++"You need super user privileges to run this control module."
++"big>
Click on the \"Administrator Mode\" button below."
++msgstr ""
++"你需要超級使用者的權限來執行這個控制模組。
點選下面 \"管理者模"
++"式\" 按鈕。"
+
+ #: main.cpp:105
+ msgid "The KDE Control Center"
+@@ -168,7 +166,7 @@
+
+ #: modules.cpp:160
+ msgid "Loading..."
+-msgstr "載入中 ..."
++msgstr "載入中…"
+
+ #: moduletreeview.cpp:65
+ msgid "The %1 configuration group. Click to open it."
+@@ -178,7 +176,8 @@
+ msgid ""
+ "This treeview displays all available control modules. Click on one of the "
+ "modules to receive more detailed information."
+-msgstr "這個樹狀圖顯示所有可使用的控制模組。在其中一個模組上按一下來獲得更多資訊。"
++msgstr ""
++"這個樹狀圖顯示所有可使用的控制模組。在其中一個模組上按一下來獲得更多資訊。"
+
+ #: proxywidget.cpp:54
+ msgid "The currently loaded configuration module."
+@@ -186,22 +185,22 @@
+
+ #: proxywidget.cpp:88
+ msgid ""
+-"Changes in this module require root access."
+-"
Click the \"Administrator Mode\" button to allow modifications in this "
+-"module."
++"Changes in this module require root access.
Click the "
++"\"Administrator Mode\" button to allow modifications in this module."
+ msgstr ""
+-"變更這個模組需要具備系統管理員的權限才能夠進行!"
+-"
請點選 「管理者模式」 按鈕以便於切換到系統管理者權限來進行修改的動作。"
++"變更這個模組需要具備系統管理員的權限才能夠進行!
請點選 「管理者模"
++"式」 按鈕以便於切換到系統管理者權限來進行修改的動作。"
+
+ #: proxywidget.cpp:92
+ msgid ""
+ "This module requires special permissions, probably for system-wide "
+-"modifications; therefore, it is required that you provide the root password to "
+-"be able to change the module's properties. If you do not provide the password, "
+-"the module will be disabled."
++"modifications; therefore, it is required that you provide the root password "
++"to be able to change the module's properties. If you do not provide the "
++"password, the module will be disabled."
+ msgstr ""
+-"這個模組的使用需要一些額外的權限機制,以便於能夠進行一些系統面的修改動作:因此您需要提供系統管理者密碼以便能修改模組的特性。若是您不輸入系統管理者密碼的話,該模"
+-"組就無法使用。"
++"這個模組的使用需要一些額外的權限機制,以便於能夠進行一些系統面的修改動作:因"
++"此您需要提供系統管理者密碼以便能修改模組的特性。若是您不輸入系統管理者密碼的"
++"話,該模組就無法使用。"
+
+ #: proxywidget.cpp:211
+ msgid "&Reset"
+@@ -269,11 +268,11 @@
+
+ #: toplevel.cpp:281 toplevel.cpp:357
+ msgid "&Report Bug..."
+-msgstr "回報問題(&R)..."
++msgstr "回報問題(&R)…"
+
+ #: toplevel.cpp:359
+ msgid "Report Bug on Module %1..."
+-msgstr "回報模組 %1 的問題..."
++msgstr "回報模組 %1 的問題…"
+
+ #: toplevel.cpp:440
+ #, c-format
+@@ -339,8 +338,18 @@
+ #~ msgid "There was an error loading the module."
+ #~ msgstr "載入這個模組時有一個錯誤。"
+
+-#~ msgid "The diagnostics is:
%1
Possible reasons:
- An error occurred during your last KDE upgrade leaving an orphaned control module
- You have old third party modules lying around.
Check these points carefully and try to remove the module mentioned in the error message. If this fails, consider contacting your distributor or packager.
"
+-#~ msgstr "診斷結果為:
%1
可能原因是:
- 您在上一次升級 KDE 時,有部份的控制模組沒有更新。
- 您的系統中存在有舊的 Third Party 模組。
請小心的檢查上述幾點,並試著移除在錯誤訊息中所提到的模組。如果還是失敗,請聯絡您的套件廠商,或是套件的整理者。
"
++#~ msgid ""
++#~ "The diagnostics is:
%1
Possible reasons:
- An error "
++#~ "occurred during your last KDE upgrade leaving an orphaned control "
++#~ "module
- You have old third party modules lying around.
Check "
++#~ "these points carefully and try to remove the module mentioned in the "
++#~ "error message. If this fails, consider contacting your distributor or "
++#~ "packager.
"
++#~ msgstr ""
++#~ "診斷結果為:
%1
可能原因是:
- 您在上一次升級 KDE "
++#~ "時,有部份的控制模組沒有更新。
- 您的系統中存在有舊的 Third Party 模組。"
++#~ "
請小心的檢查上述幾點,並試著移除在錯誤訊息中所提到的模組。如果還是"
++#~ "失敗,請聯絡您的套件廠商,或是套件的整理者。
"
+
+ #~ msgid ""
+ #~ "There was an error loading module\n"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kdcop.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kdcop.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kdcop.po 2007-07-12 10:27:45.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kdcop.po 2011-11-11 15:45:17.000000000 +0100
+@@ -10,8 +10,7 @@
+ "Project-Id-Version: kdcop\n"
+ "POT-Creation-Date: 2007-05-15 02:14+0200\n"
+ "PO-Revision-Date: 2007-04-12 12:03+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Chinese Traditional \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kdebugdialog.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kdebugdialog.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kdebugdialog.po 2006-07-22 10:04:12.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kdebugdialog.po 2011-11-11 15:45:17.000000000 +0100
+@@ -8,7 +8,7 @@
+ "Project-Id-Version: kdebugdialog\n"
+ "POT-Creation-Date: 2005-05-18 21:24+0200\n"
+ "PO-Revision-Date: 2005-10-29 16:06+0800\n"
+-"Last-Translator: Chao-Hsiung Liao \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Chinese (traditional) \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kdepasswd.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kdepasswd.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kdepasswd.po 2006-07-22 10:04:12.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kdepasswd.po 2011-11-11 15:45:17.000000000 +0100
+@@ -8,7 +8,7 @@
+ "Project-Id-Version: KDEpasswd\n"
+ "POT-Creation-Date: 2005-07-09 01:31+0200\n"
+ "PO-Revision-Date: 2005-10-29 16:08+0800\n"
+-"Last-Translator: Chao-Hsiung Liao \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Traditional Chinese \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -32,7 +32,7 @@
+
+ #: kdepasswd.cpp:60
+ msgid "You need to be root to change the password of other users."
+-msgstr "您必須以root的身份來變更其他使用者的密碼"
++msgstr "您必須以root的身分來變更其他使用者的密碼"
+
+ #: passwddlg.cpp:19 passwddlg.cpp:87
+ msgid "Change Password"
+@@ -69,14 +69,20 @@
+ #: passwddlg.cpp:108
+ msgid ""
+ "Your password is longer than 8 characters. On some systems, this can cause "
+-"problems. You can truncate the password to 8 characters, or leave it as it is."
+-msgstr "您的密碼超過八個字。在某些系統上,這可能會造成問題。您可以將本密碼刪節成8個字,或是不予理睬,保持這樣。"
++"problems. You can truncate the password to 8 characters, or leave it as it "
++"is."
++msgstr ""
++"您的密碼超過八個字。在某些系統上,這可能會造成問題。您可以將本密碼刪節成8個"
++"字,或是不予理睬,保持這樣。"
+
+ #: passwddlg.cpp:111
+ msgid ""
+ "The password is longer than 8 characters. On some systems, this can cause "
+-"problems. You can truncate the password to 8 characters, or leave it as it is."
+-msgstr "您的密碼超過八個字。在某些系統上,這可能會造成問題。您可以將本密碼刪節成8個字,或是不予理睬,保持原樣。"
++"problems. You can truncate the password to 8 characters, or leave it as it "
++"is."
++msgstr ""
++"您的密碼超過八個字。在某些系統上,這可能會造成問題。您可以將本密碼刪節成8個"
++"字,或是不予理睬,保持原樣。"
+
+ #: passwddlg.cpp:115
+ msgid "Password Too Long"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kdeprintfax.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kdeprintfax.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kdeprintfax.po 2006-07-22 10:04:12.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kdeprintfax.po 2011-11-11 15:45:17.000000000 +0100
+@@ -10,8 +10,7 @@
+ "Project-Id-Version: kdeprintfax\n"
+ "POT-Creation-Date: 2006-04-28 03:54+0200\n"
+ "PO-Revision-Date: 2006-06-19 09:34+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Chinese Traditional \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -28,11 +27,11 @@
+
+ #: confsystem.cpp:61
+ msgid "Fax &server (if any):"
+-msgstr "傳真伺服器 (如果有的話) (&S):"
++msgstr "傳真伺服器 (如果有的話)(&S):"
+
+ #: confsystem.cpp:62
+ msgid "&Fax/Modem device:"
+-msgstr "傳真/數據機裝置 (&F):"
++msgstr "傳真/數據機裝置(&F):"
+
+ #: confsystem.cpp:65
+ msgid "Standard Modem Port"
+@@ -62,15 +61,15 @@
+
+ #: faxctrl.cpp:471
+ msgid "Sending fax to %1..."
+-msgstr "以傳真方式寄送至 %1..."
++msgstr "以傳真方式寄送至 %1…"
+
+ #: faxctrl.cpp:482
+ msgid "Skipping %1..."
+-msgstr "略過 %1..."
++msgstr "略過 %1…"
+
+ #: faxctrl.cpp:500
+ msgid "Filtering %1..."
+-msgstr "過濾 %1..."
++msgstr "過濾 %1…"
+
+ #: faxctrl.cpp:618
+ msgid "Fax log"
+@@ -110,23 +109,23 @@
+
+ #: conffax.cpp:48
+ msgid "&Resolution:"
+-msgstr "解析度 (&R):"
++msgstr "解析度(&R):"
+
+ #: conffax.cpp:50
+ msgid "&Paper size:"
+-msgstr "紙張大小 (&P):"
++msgstr "紙張大小(&P):"
+
+ #: confgeneral.cpp:41
+ msgid "&Name:"
+-msgstr "名稱 (&N):"
++msgstr "名稱(&N):"
+
+ #: confgeneral.cpp:43
+ msgid "&Company:"
+-msgstr "公司 (&C):"
++msgstr "公司(&C):"
+
+ #: confgeneral.cpp:45
+ msgid "N&umber:"
+-msgstr "電話 (&U):"
++msgstr "電話(&U):"
+
+ #: confgeneral.cpp:48
+ msgid "Replace international prefix '+' with:"
+@@ -280,7 +279,7 @@
+
+ #: kdeprintfax.cpp:82
+ msgid "F&iles:"
+-msgstr "文件 (&I):"
++msgstr "文件(&I):"
+
+ #: kdeprintfax.cpp:89
+ msgid "Enterprise"
+@@ -300,7 +299,7 @@
+
+ #: kdeprintfax.cpp:107
+ msgid "&Comment:"
+-msgstr "說明 (&C):"
++msgstr "說明(&C):"
+
+ #: kdeprintfax.cpp:118
+ msgid "Sched&ule:"
+@@ -324,7 +323,7 @@
+
+ #: kdeprintfax.cpp:172 kdeprintfax.cpp:252
+ msgid "Processing..."
+-msgstr "處理中..."
++msgstr "處理中…"
+
+ #: kdeprintfax.cpp:173 kdeprintfax.cpp:402
+ msgid "Idle"
+@@ -336,35 +335,35 @@
+
+ #: kdeprintfax.cpp:191
+ msgid "&Add File..."
+-msgstr "新增檔案... (&A)"
++msgstr "新增檔案…(&A)"
+
+ #: kdeprintfax.cpp:192
+ msgid "&Remove File"
+-msgstr "移除檔案 (&R)"
++msgstr "移除檔案(&R)"
+
+ #: kdeprintfax.cpp:193
+ msgid "&Send Fax"
+-msgstr "寄出傳真 (&S)"
++msgstr "寄出傳真(&S)"
+
+ #: kdeprintfax.cpp:194
+ msgid "A&bort"
+-msgstr "中斷 (&B)"
++msgstr "中斷(&B)"
+
+ #: kdeprintfax.cpp:195
+ msgid "A&ddress Book"
+-msgstr "通訊錄 (&D)"
++msgstr "通訊錄(&D)"
+
+ #: kdeprintfax.cpp:196
+ msgid "V&iew Log"
+-msgstr "檢視日誌檔 (&I)"
++msgstr "檢視日誌檔(&I)"
+
+ #: kdeprintfax.cpp:197
+ msgid "Vi&ew File"
+-msgstr "檢視檔案 (&E)"
++msgstr "檢視檔案(&E)"
+
+ #: kdeprintfax.cpp:198
+ msgid "&New Fax Recipient..."
+-msgstr "新增傳真收件者(&N)..."
++msgstr "新增傳真收件者(&N)…"
+
+ #: kdeprintfax.cpp:245
+ msgid "No file to fax."
+@@ -397,11 +396,11 @@
+
+ #: kdeprintfax.cpp:565
+ msgid "&Number:"
+-msgstr "電話 (&N):"
++msgstr "電話(&N):"
+
+ #: kdeprintfax.cpp:566
+ msgid "N&ame:"
+-msgstr "名稱 (&A):"
++msgstr "名稱(&A):"
+
+ #: kdeprintfax.cpp:567
+ msgid "&Enterprise:"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kdeprint_part.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kdeprint_part.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kdeprint_part.po 2005-09-10 13:15:15.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kdeprint_part.po 2011-11-11 15:45:17.000000000 +0100
+@@ -7,7 +7,7 @@
+ "Project-Id-Version: kdeprint_part\n"
+ "POT-Creation-Date: 2005-05-18 21:24+0200\n"
+ "PO-Revision-Date: 2002-10-08 11:51+1000\n"
+-"Last-Translator: Ben Wu \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Chinese (Traditional) \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kdesktop.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kdesktop.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kdesktop.po 2008-08-19 20:43:10.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kdesktop.po 2011-11-11 15:45:17.000000000 +0100
+@@ -14,7 +14,7 @@
+ "Project-Id-Version: kdesktop\n"
+ "POT-Creation-Date: 2008-07-08 01:18+0200\n"
+ "PO-Revision-Date: 2007-11-09 14:32+0800\n"
+-"Last-Translator: Chih-Wei Huang \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Chinese Traditional \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -27,8 +27,8 @@
+
+ #: lock/autologout.cc:40
+ msgid ""
+-"To prevent being logged out, resume using this session by moving the mouse "
+-"or pressing a key."
++"To prevent being logged out, resume using this session by moving the "
++"mouse or pressing a key."
+ msgstr "要避免被強制登出,請移動滑鼠或按下一鍵來恢復工作階段。"
+
+ #: lock/autologout.cc:80
+@@ -48,7 +48,7 @@
+
+ #: lock/lockdlg.cc:93
+ msgid "Sw&itch User..."
+-msgstr "切換使用者(&I)..."
++msgstr "切換使用者(&I)…"
+
+ #: lock/lockdlg.cc:94
+ msgid "Unl&ock"
+@@ -72,19 +72,18 @@
+
+ #: lock/lockdlg.cc:526
+ msgid ""
+-"You have chosen to open another desktop session instead of resuming the current "
+-"one."
+-"
The current session will be hidden and a new login screen will be "
+-"displayed."
+-"
An F-key is assigned to each session; F%1 is usually assigned to the first "
+-"session, F%2 to the second session and so on. You can switch between sessions "
+-"by pressing Ctrl, Alt and the appropriate F-key at the same time. Additionally, "
+-"the KDE Panel and Desktop menus have actions for switching between sessions."
+-msgstr ""
+-"您已經選擇要開啟一個新的工作階段,而不繼續使用目前的。"
+-"
目前的階段會被隱藏起來,並顯示一個新的登入畫面。"
+-"
一個F-key會被指定到各個階段,如F%1指定到第一個、F%2指定到第二個...如此類推。您還可以按下 Ctrl+Alt+F-key "
+-"在各個階段之間切換。另外,KDE Panel 和桌面選單會在切換期間作適當的改變。"
++"You have chosen to open another desktop session instead of resuming the "
++"current one.
The current session will be hidden and a new login screen "
++"will be displayed.
An F-key is assigned to each session; F%1 is usually "
++"assigned to the first session, F%2 to the second session and so on. You can "
++"switch between sessions by pressing Ctrl, Alt and the appropriate F-key at "
++"the same time. Additionally, the KDE Panel and Desktop menus have actions "
++"for switching between sessions."
++msgstr ""
++"您已經選擇要開啟一個新的工作階段,而不繼續使用目前的。
目前的階段會被隱藏"
++"起來,並顯示一個新的登入畫面。
一個F-key會被指定到各個階段,如F%1指定到第"
++"一個、F%2指定到第二個...如此類推。您還可以按下 Ctrl+Alt+F-key 在各個階段之間"
++"切換。另外,KDE Panel 和桌面選單會在切換期間作適當的改變。"
+
+ #: krootwm.cc:842 lock/lockdlg.cc:539
+ msgid "&Start New Session"
+@@ -113,10 +112,8 @@
+ msgstr "開始新的工作階段(&N)"
+
+ #: lock/lockprocess.cc:742
+-msgid ""
+-"Will not lock the session, as unlocking would be impossible:\n"
+-msgstr ""
+-"由於不能解除鎖定,所以將不會鎖定這個工作階段:\n"
++msgid "Will not lock the session, as unlocking would be impossible:\n"
++msgstr "由於不能解除鎖定,所以將不會鎖定這個工作階段:\n"
+
+ #: lock/lockprocess.cc:746
+ msgid "Cannot start kcheckpass."
+@@ -160,7 +157,7 @@
+
+ #: desktop.cc:789
+ msgid "&Save to Desktop..."
+-msgstr "儲存到桌面(&S)..."
++msgstr "儲存到桌面(&S)…"
+
+ #: desktop.cc:791
+ msgid "Set as &Wallpaper"
+@@ -178,8 +175,8 @@
+ msgid ""
+ "Could not log out properly.\n"
+ "The session manager cannot be contacted. You can try to force a shutdown by "
+-"pressing Ctrl+Alt+Backspace; note, however, that your current session will not "
+-"be saved with a forced shutdown."
++"pressing Ctrl+Alt+Backspace; note, however, that your current session will "
++"not be saved with a forced shutdown."
+ msgstr ""
+ "無法順利的登出。\n"
+ "無法聯絡工作階段管理員。您可以嘗試按下 Ctrl-Alt-Backspace\n"
+@@ -187,9 +184,11 @@
+
+ #: init.cc:68
+ msgid ""
+-"%1 is a file, but KDE needs it to be a directory; move it to %2.orig and create "
+-"directory?"
+-msgstr "%1 是一個檔案,但 KDE 需要它的位置作一個目錄; 把它移至 %2.orig 然後建立目錄,好嗎?"
++"%1 is a file, but KDE needs it to be a directory; move it to %2.orig and "
++"create directory?"
++msgstr ""
++"%1 是一個檔案,但 KDE 需要它的位置作一個目錄; 把它移至 %2.orig 然後建立目錄,"
++"好嗎?"
+
+ #: init.cc:68
+ msgid "Move It"
+@@ -201,8 +200,8 @@
+
+ #: init.cc:82
+ msgid ""
+-"Could not create directory %1; check for permissions or reconfigure the desktop "
+-"to use another path."
++"Could not create directory %1; check for permissions or reconfigure the "
++"desktop to use another path."
+ msgstr "無法建立目錄 %1; 請檢查權限或設定桌面使用另一路徑。"
+
+ #: kdiconview.cc:437
+@@ -219,11 +218,15 @@
+
+ #: krootwm.cc:133
+ msgid "Run Command..."
+-msgstr "執行命令..."
++msgstr "執行命令…"
++
++#: krootwm.cc:135 (Trinity Specific)
++msgid "Open Terminal Here..."
++msgstr "此處開啟終端機…"
+
+ #: krootwm.cc:137
+ msgid "Configure Desktop..."
+-msgstr "設定桌面..."
++msgstr "設定桌面…"
+
+ #: krootwm.cc:139 krootwm.cc:364
+ msgid "Disable Desktop Menu"
+@@ -289,7 +292,7 @@
+
+ #: krootwm.cc:192
+ msgid "Log Out \"%1\"..."
+-msgstr "登出 \"%1\" ..."
++msgstr "登出 \"%1\"…"
+
+ #: krootwm.cc:198
+ msgid "Start New Session"
+@@ -337,18 +340,17 @@
+
+ #: krootwm.cc:830
+ msgid ""
+-"You have chosen to open another desktop session."
+-"
The current session will be hidden and a new login screen will be "
+-"displayed."
+-"
An F-key is assigned to each session; F%1 is usually assigned to the first "
+-"session, F%2 to the second session and so on. You can switch between sessions "
+-"by pressing Ctrl, Alt and the appropriate F-key at the same time. Additionally, "
+-"the KDE Panel and Desktop menus have actions for switching between sessions.
"
+-msgstr ""
+-"您已經選擇要開啟另一個工作階段。"
+-"
目前的階段會被隱藏起來,並顯示一個新的登入畫面。"
+-"
一個F-key會被指定到各個階段,如F%1指定到第一個、F%2指定到第二個...如此類推。您還可以按下 Ctrl+Alt+F-key "
+-"在各個階段之間切換。另外,KDE Panel 和桌面選單會在切換期間作適當的改變。"
++"You have chosen to open another desktop session.
The current session "
++"will be hidden and a new login screen will be displayed.
An F-key is "
++"assigned to each session; F%1 is usually assigned to the first session, F%2 "
++"to the second session and so on. You can switch between sessions by pressing "
++"Ctrl, Alt and the appropriate F-key at the same time. Additionally, the KDE "
++"Panel and Desktop menus have actions for switching between sessions.
"
++msgstr ""
++"您已經選擇要開啟另一個工作階段。
目前的階段會被隱藏起來,並顯示一個新的登"
++"入畫面。
一個F-key會被指定到各個階段,如F%1指定到第一個、F%2指定到第二"
++"個...如此類推。您還可以按下 Ctrl+Alt+F-key 在各個階段之間切換。另外,KDE "
++"Panel 和桌面選單會在切換期間作適當的改變。"
+
+ #: krootwm.cc:841
+ msgid "Warning - New Session"
+@@ -410,7 +412,7 @@
+
+ #: kdesktopbindings.cpp:39
+ msgid "Halt without Confirmation"
+-msgstr "無須確認直接關閉這台電腦"
++msgstr "無須確認直接關閉這臺電腦"
+
+ #: kdesktopbindings.cpp:40
+ msgid "Reboot without Confirmation"
+@@ -429,10 +431,8 @@
+ msgstr "使用者 %1 在這個系統中不存在。"
+
+ #: minicli.cpp:402
+-msgid ""
+-"You do not exist.\n"
+-msgstr ""
+-"您不存在!\n"
++msgid "You do not exist.\n"
++msgstr "您不存在!\n"
+
+ #: minicli.cpp:427
+ msgid "Incorrect password; please try again."
+@@ -472,7 +472,8 @@
+ "misbehaves, the system might hang unrecoverably.\n"
+ "Are you sure you want to continue?"
+ msgstr ""
+-"執行程式在即時級別可能非常危險。如果程式運作不當,系統可能會當掉並且無法恢復。\n"
++"執行程式在即時級別可能非常危險。如果程式運作不當,系統可能會當掉並且無法恢"
++"復。\n"
+ "\n"
+ "您確定要繼續嗎?"
+
+@@ -494,24 +495,27 @@
+ #: rc.cpp:6
+ #, no-c-format
+ msgid ""
+-"Select whether realtime scheduling should be enabled for the application. "
+-"The scheduler governs which process will run and which will have to wait. Two "
+-"schedulers are available:\n"
++"Select whether realtime scheduling should be enabled for the "
++"application. The scheduler governs which process will run and which will "
++"have to wait. Two schedulers are available:\n"
+ "\n"
+ "- Normal: This is the standard, timesharing scheduler. It will "
+ "divide fairly the available processing time between all processes.
\n"
+ "- Realtime:This scheduler will run your application uninterrupted "
+ "until it gives up the processor. This can be dangerous. An application that "
+-"does not give up the processor might hang the system. You need root's password "
+-"to use the scheduler.
\n"
++"does not give up the processor might hang the system. You need root's "
++"password to use the scheduler.\n"
+ "
\n"
+ ""
+ msgstr ""
+-"您可以選擇為該程式使用哪種排程器。排程器決定該執行哪個程序和哪些程序要等待。有兩種排程器可供選擇:\n"
++"您可以選擇為該程式使用哪種排程器。排程器決定該執行哪個程序和哪些程序要等"
++"待。有兩種排程器可供選擇:\n"
+ "\n"
+-"- 普通: 這是標準的時間分享排程器。它平均分配可用的處理時間給所有的程序。
\n"
+-"- 即時: 該排程器將不中斷地執行程式,直到它釋放處理器。這可能是危險的──不釋放處理器的程式可能會導致系統當機。需要有管理者 root "
+-"的密碼才能使用該排程器。
\n"
++"- 普通: 這是標準的時間分享排程器。它平均分配可用的處理時間給所有"
++"的程序。
\n"
++"- 即時: 該排程器將不中斷地執行程式,直到它釋放處理器。這可能是危"
++"險的──不釋放處理器的程式可能會導致系統當機。需要有管理者 root 的密碼才能使用"
++"該排程器。
\n"
+ "
\n"
+ ""
+
+@@ -525,7 +529,7 @@
+ #: rc.cpp:17 rc.cpp:47
+ #, no-c-format
+ msgid "Enter the user you want to run the application as here."
+-msgstr "在這裏輸入您執行程式使用的使用者身份。"
++msgstr "在這裏輸入您執行程式使用的使用者身分。"
+
+ #. i18n: file minicli_ui.ui line 224
+ #: rc.cpp:20 rc.cpp:26
+@@ -551,7 +555,8 @@
+ msgid ""
+ "Check this option if the application you want to run is a text mode "
+ "application. The application will then be run in a terminal emulator window."
+-msgstr "如果您要執行的程式是文字模式的,請點選該選項。該程式將在模擬終端視窗中運行。"
++msgstr ""
++"如果您要執行的程式是文字模式的,請點選該選項。該程式將在模擬終端視窗中運行。"
+
+ #. i18n: file minicli_ui.ui line 279
+ #: rc.cpp:35
+@@ -564,9 +569,12 @@
+ #, no-c-format
+ msgid ""
+ "The priority that the command will be run with can be set here. From left to "
+-"right, it goes from low to high. The center position is the default value. For "
+-"priorities higher than the default, you will need to provide the root password."
+-msgstr "這裏可以設定優先級。愈左愈低,愈右愈高。中間位置是預設值。要設定比預設值高的優先級,就需要管理者 root 的密碼。"
++"right, it goes from low to high. The center position is the default value. "
++"For priorities higher than the default, you will need to provide the root "
++"password."
++msgstr ""
++"這裏可以設定優先級。愈左愈低,愈右愈高。中間位置是預設值。要設定比預設值高的"
++"優先級,就需要管理者 root 的密碼。"
+
+ #. i18n: file minicli_ui.ui line 312
+ #: rc.cpp:41
+@@ -578,10 +586,12 @@
+ #: rc.cpp:44
+ #, no-c-format
+ msgid ""
+-"Check this option if you want to run the application with a different priority. "
+-"A higher priority tells the operating system to give more processing time to "
+-"your application."
+-msgstr "如果您要用不同優先級執行該程式,請啟用該選項。指定較高優先級可以讓系統分配更多的處理時間給該程式。"
++"Check this option if you want to run the application with a different "
++"priority. A higher priority tells the operating system to give more "
++"processing time to your application."
++msgstr ""
++"如果您要用不同優先級執行該程式,請啟用該選項。指定較高優先級可以讓系統分配更"
++"多的處理時間給該程式。"
+
+ #. i18n: file minicli_ui.ui line 356
+ #: rc.cpp:50
+@@ -605,12 +615,14 @@
+ #: rc.cpp:68
+ #, no-c-format
+ msgid ""
+-"Check this option if you want to run the application with a different user id. "
+-"Every process has a user id associated with it. This id code determines file "
+-"access and other permissions. The password of the user is required to do this."
++"Check this option if you want to run the application with a different user "
++"id. Every process has a user id associated with it. This id code determines "
++"file access and other permissions. The password of the user is required to "
++"do this."
+ msgstr ""
+-"如果您要以另外一個使用者的身份來執行這個程式,請點選該選項。每一個所執行的程式都會紀錄這是誰所執行的。這決定了是誰執行這個程式,就有該執行者擁有的權限環境。該選"
+-"項需要輸入使用者的密碼。"
++"如果您要以另外一個使用者的身分來執行這個程式,請點選該選項。每一個所執行的程"
++"式都會紀錄這是誰所執行的。這決定了是誰執行這個程式,就有該執行者擁有的權限環"
++"境。該選項需要輸入使用者的密碼。"
+
+ #. i18n: file minicli_ui.ui line 470
+ #: rc.cpp:71
+@@ -622,10 +634,12 @@
+ #: rc.cpp:74 rc.cpp:77
+ #, no-c-format
+ msgid ""
+-"Enter the command you wish to execute or the address of the resource you want "
+-"to open. This can be a remote URL like \"www.kde.org\" or a local one like "
+-"\"~/.kderc\"."
+-msgstr "輸入您要執行的命令或您要開啟的資源的地址。這可以是一個遠端 URL 如“www.kde.org”或本地的如“~/.kderc”"
++"Enter the command you wish to execute or the address of the resource you "
++"want to open. This can be a remote URL like \"www.kde.org\" or a local one "
++"like \"~/.kderc\"."
++msgstr ""
++"輸入您要執行的命令或您要開啟的資源的地址。這可以是一個遠端 URL 如“www.kde."
++"org”或本地的如“~/.kderc”"
+
+ #. i18n: file minicli_ui.ui line 533
+ #: rc.cpp:80
+@@ -644,8 +658,8 @@
+ #: rc.cpp:86
+ #, no-c-format
+ msgid ""
+-"If you want the same background settings to be applied to all desktops enable "
+-"this option."
++"If you want the same background settings to be applied to all desktops "
++"enable this option."
+ msgstr "如果您希望同樣的背景設定套用到所有桌面,請開啟這選項。"
+
+ #. i18n: file kdesktop.kcfg line 16
+@@ -699,12 +713,12 @@
+ #: rc.cpp:110
+ #, no-c-format
+ msgid ""
+-"Here you can enter how much memory KDE should use for caching the "
+-"background(s). If you have different backgrounds for the different desktops "
+-"caching can make switching desktops smoother at the expense of higher memory "
+-"use."
++"Here you can enter how much memory KDE should use for caching the background"
++"(s). If you have different backgrounds for the different desktops caching "
++"can make switching desktops smoother at the expense of higher memory use."
+ msgstr ""
+-"在這裏您可以告訴 KDE 該分配多少記憶體作背景快取。如果您在不同的桌面擁有不同的背景,您可以把快取的記憶體用量調多一些來使切換桌面時更流暢。"
++"在這裏您可以告訴 KDE 該分配多少記憶體作背景快取。如果您在不同的桌面擁有不同的"
++"背景,您可以把快取的記憶體用量調多一些來使切換桌面時更流暢。"
+
+ #. i18n: file kdesktop.kcfg line 38
+ #: rc.cpp:113
+@@ -719,7 +733,9 @@
+ "Uncheck this option if you do not want to have icons on the desktop. Without "
+ "icons the desktop will be somewhat faster but you will no longer be able to "
+ "drag files to the desktop."
+-msgstr "如果您不希望在桌面顯示圖示,請關閉這選項。桌面沒有圖示的話它會快一些,但您將無法把檔案拖曳到桌面。"
++msgstr ""
++"如果您不希望在桌面顯示圖示,請關閉這選項。桌面沒有圖示的話它會快一些,但您將"
++"無法把檔案拖曳到桌面。"
+
+ #. i18n: file kdesktop.kcfg line 43
+ #: rc.cpp:119
+@@ -736,8 +752,9 @@
+ "like netscape that check the root window for running instances, disable this "
+ "option."
+ msgstr ""
+-"如果您要使用像 xsnow, xpenguin 或 xmountain 等需要在桌面繪圖的 X11 程式,您可以開啟這選項。但要是如 netscape "
+-"般會檢查根視窗以取得執行中實體的程式發生問題,請關閉這選項。"
++"如果您要使用像 xsnow, xpenguin 或 xmountain 等需要在桌面繪圖的 X11 程式,您可"
++"以開啟這選項。但要是如 netscape 般會檢查根視窗以取得執行中實體的程式發生問"
++"題,請關閉這選項。"
+
+ #. i18n: file kdesktop.kcfg line 55
+ #: rc.cpp:125
+@@ -769,8 +786,8 @@
+ #: rc.cpp:137
+ #, no-c-format
+ msgid ""
+-"You can switch between the virtual desktops by using the mouse wheel over the "
+-"desktop background."
++"You can switch between the virtual desktops by using the mouse wheel over "
++"the desktop background."
+ msgstr "您可以在桌面背景使用滑鼠滾輪,以在虛擬桌面之間切換。"
+
+ #. i18n: file kdesktop.kcfg line 83
+@@ -809,8 +826,8 @@
+ #: rc.cpp:155
+ #, no-c-format
+ msgid ""
+-"You can choose what happens when you click the middle button of your pointing "
+-"device on the desktop."
++"You can choose what happens when you click the middle button of your "
++"pointing device on the desktop."
+ msgstr "您可選擇當您在桌面使用滑鼠中鍵時,會發生什麼事。"
+
+ #. i18n: file kdesktop.kcfg line 98
+@@ -868,9 +885,11 @@
+ #, no-c-format
+ msgid ""
+ "Check here to enable a shadow outline around the desktop font. This also "
+-"improves the readability of the desktop text against backgrounds of a similar "
+-"color."
+-msgstr "按這裏啟用桌面字型的陰影輪廓。這也可以在文字和背景顏色差不多的時候增加文字的可讀性。"
++"improves the readability of the desktop text against backgrounds of a "
++"similar color."
++msgstr ""
++"按這裏啟用桌面字型的陰影輪廓。這也可以在文字和背景顏色差不多的時候增加文字的"
++"可讀性。"
+
+ #. i18n: file kdesktop.kcfg line 145
+ #: rc.cpp:185
+@@ -884,15 +903,16 @@
+ msgid ""
+ "If you check this option, any files in your desktop directory that begin "
+ "with a period (.) will be shown. Usually, such files contain configuration "
+-"information, and remain hidden from view.
\\n"
+-"For example, files which are named \\\".directory\\\" are plain text files "
+-"which contain information for Konqueror, such as the icon to use in displaying "
+-"a directory, the order in which files should be sorted, etc. You should not "
+-"change or delete these files unless you know what you are doing.
"
+-msgstr ""
+-"如果您開啟這選項,那麼所有在桌面目錄中以點(.)開頭的檔案都會被顯示出來。一般來說,它們都包含了配置資訊,並且被隱藏起來。
"
+-"\\n例如名為\\\".directory\\\"的檔案是一些包含了 Konqueror "
+-"資訊的純文字檔案。它們包含了如代表目錄的圖示、檔案排列的樣式等。除非您清楚自己在做什麼事,否則您不應碰這些檔案。"
++"information, and remain hidden from view.\\nFor example, files which "
++"are named \\\".directory\\\" are plain text files which contain information "
++"for Konqueror, such as the icon to use in displaying a directory, the order "
++"in which files should be sorted, etc. You should not change or delete these "
++"files unless you know what you are doing.
"
++msgstr ""
++"如果您開啟這選項,那麼所有在桌面目錄中以點(.)開頭的檔案都會被顯示出來。一"
++"般來說,它們都包含了配置資訊,並且被隱藏起來。
\\n例如名為\\\".directory\\"
++"\"的檔案是一些包含了 Konqueror 資訊的純文字檔案。它們包含了如代表目錄的圖示、"
++"檔案排列的樣式等。除非您清楚自己在做什麼事,否則您不應碰這些檔案。"
+
+ #. i18n: file kdesktop.kcfg line 150
+ #: rc.cpp:191
+@@ -931,7 +951,9 @@
+ msgid ""
+ "Sets the sort criterion. Possible choices are NameCaseSensitive = 0, "
+ "NameCaseInsensitive = 1, Size = 2, Type = 3, Date = 4."
+-msgstr "設定排列準則。可用的選項為 區分大小寫 = 0, 不分大小寫 = 1, 大小 = 2, 類型 = 3, 日期 = 4"
++msgstr ""
++"設定排列準則。可用的選項為 區分大小寫 = 0, 不分大小寫 = 1, 大小 = 2, 類型 = "
++"3, 日期 = 4"
+
+ #. i18n: file kdesktop.kcfg line 176
+ #: rc.cpp:212
+@@ -969,11 +991,13 @@
+ #: rc.cpp:230
+ #, no-c-format
+ msgid ""
+-"If this option is selected, applications will not have their menu bar attached "
+-"to their own window anymore. Instead, there is one menu bar at the top of the "
+-"screen which shows the menus of the currently active application. You might "
+-"recognize this behavior from Mac OS."
+-msgstr "這個選項開啟後,應用程式的選單列不會再在它們的視窗裏。在螢幕頂端會顯示目前使用的應用程式的選單列。您可從 Mac OS 中找到這種風格。"
++"If this option is selected, applications will not have their menu bar "
++"attached to their own window anymore. Instead, there is one menu bar at the "
++"top of the screen which shows the menus of the currently active application. "
++"You might recognize this behavior from Mac OS."
++msgstr ""
++"這個選項開啟後,應用程式的選單列不會再在它們的視窗裏。在螢幕頂端會顯示目前使"
++"用的應用程式的選單列。您可從 Mac OS 中找到這種風格。"
+
+ #. i18n: file kdesktop.kcfg line 218
+ #: rc.cpp:233
+@@ -1026,7 +1050,21 @@
+ "Usually the screen saver is suspended when display power saving kicks in,\n"
+ " as nothing can be seen on the screen anyway, obviously. However, some "
+ "screen savers\n"
+-" actually perform useful computations, so it is not desirable to suspend "
+-"them."
++" actually perform useful computations, so it is not desirable to "
++"suspend them."
+ msgstr ""
+-"通常當顯示器的省電裝置作用時,螢幕保護程式應該被暫停,因為將看不到任何的畫面。不過,某些螢幕保護程式實際上會進行有用的計算,這種情況下就不該暫停它。"
++"通常當顯示器的省電裝置作用時,螢幕保護程式應該被暫停,因為將看不到任何的畫"
++"面。不過,某些螢幕保護程式實際上會進行有用的計算,這種情況下就不該暫停它。"
++
++#, fuzzy
++#~ msgid "Disable screen saver during presentation or TV"
++#~ msgstr "Bildschirmschoner während Präsentation/TV deaktivieren"
++
++#, fuzzy
++#~ msgid ""
++#~ "Enable this option if you want to disable the screen saver while watching "
++#~ "TV or movies."
++#~ msgstr ""
++#~ "Aktivieren Sie diese Einstellung, wenn der Bildschirmschoner während "
++#~ "einer Präsentation oder wenn Sie am Computer fernsehen, nicht starten "
++#~ "soll."
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kdesud.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kdesud.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kdesud.po 2005-09-10 13:15:15.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kdesud.po 2011-11-11 15:45:17.000000000 +0100
+@@ -3,7 +3,7 @@
+ "Project-Id-Version: kdesud 1.1\n"
+ "POT-Creation-Date: 2005-07-23 01:32+0200\n"
+ "PO-Revision-Date: 2001-08-27 17:07+CST\n"
+-"Last-Translator: TopTech Localization Team \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: TopTech Localization Team \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kdesu.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kdesu.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kdesu.po 2008-02-13 10:55:26.000000000 +0100
++++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kdesu.po 2011-11-11 15:45:17.000000000 +0100
+@@ -10,8 +10,7 @@
+ "Project-Id-Version: kdesu\n"
+ "POT-Creation-Date: 2007-11-14 01:15+0100\n"
+ "PO-Revision-Date: 2006-08-10 10:52+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Chinese Traditional \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -96,10 +95,8 @@
+ msgstr "沒有指定指令。"
+
+ #: kdesu.cpp:344
+-msgid ""
+-"Su returned with an error.\n"
+-msgstr ""
+-"Su 回傳錯誤。\n"
++msgid "Su returned with an error.\n"
++msgstr "Su 回傳錯誤。\n"
+
+ #: kdesu.cpp:365
+ msgid "Command:"
+@@ -126,17 +123,22 @@
+ msgid ""
+ "The action you requested needs root privileges. Please enter root's password "
+ "below or click Ignore to continue with your current privileges."
+-msgstr "你要求的動作需要 root 權限。請在下面輸入 root 的密碼,或是按「忽略」繼續保持目前的權限。"
++msgstr ""
++"你要求的動作需要 root 權限。請在下面輸入 root 的密碼,或是按「忽略」繼續保持"
++"目前的權限。"
+
+ #: sudlg.cpp:40
+ msgid ""
+-"The action you requested needs additional privileges. Please enter the password "
+-"for \"%1\" below or click Ignore to continue with your current privileges."
+-msgstr "你要求的動作需要額外的權限。請在下面輸入 \"%1\" 的密碼,或是按「忽略」繼續保持目前的權限。"
++"The action you requested needs additional privileges. Please enter the "
++"password for \"%1\" below or click Ignore to continue with your current "
++"privileges."
++msgstr ""
++"你要求的動作需要額外的權限。請在下面輸入 \"%1\" 的密碼,或是按「忽略」繼續保"
++"持目前的權限。"
+
+ #: sudlg.cpp:48
+ msgid "&Ignore"
+-msgstr "忽略 (&I)"
++msgstr "忽略(&I)"
+
+ #: sudlg.cpp:64
+ msgid "Conversation with su failed."
+@@ -153,8 +155,8 @@
+ #: sudlg.cpp:80
+ msgid ""
+ "You are not allowed to use 'su';\n"
+-"on some systems, you need to be in a special group (often: wheel) to use this "
+-"program."
++"on some systems, you need to be in a special group (often: wheel) to use "
++"this program."
+ msgstr ""
+ "你不允許使用「su」;\n"
+ " 有些系統上,你必須屬於特定的群組(經常是: wheel )才能使用這個程式。"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kdialog.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kdialog.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kdialog.po 2006-07-22 10:04:12.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kdialog.po 2011-11-11 15:45:17.000000000 +0100
+@@ -7,7 +7,7 @@
+ "Project-Id-Version: kdialog\n"
+ "POT-Creation-Date: 2006-04-27 03:54+0200\n"
+ "PO-Revision-Date: 2005-10-29 20:14+0800\n"
+-"Last-Translator: Chao-Hsiung Liao \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: zh-l10n \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -131,7 +131,8 @@
+
+ #: kdialog.cpp:94
+ msgid ""
+-"Allows the --getopenurl and --getopenfilename options to return multiple files"
++"Allows the --getopenurl and --getopenfilename options to return multiple "
++"files"
+ msgstr "允許 --getopenurl 與 --getopenfilename 選項傳回多個檔案"
+
+ #: kdialog.cpp:95
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kdmconfig.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kdmconfig.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kdmconfig.po 2008-02-13 10:55:26.000000000 +0100
++++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kdmconfig.po 2011-11-11 15:45:17.000000000 +0100
+@@ -8,7 +8,7 @@
+ "Project-Id-Version: kdmconfig\n"
+ "POT-Creation-Date: 2007-11-17 01:14+0100\n"
+ "PO-Revision-Date: 2005-10-29 20:31+0800\n"
+-"Last-Translator: Chao-Hsiung Liao \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Chinese(traditional) \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -16,49 +16,39 @@
+
+ #: background.cpp:47
+ msgid "E&nable background"
+-msgstr "啟動背景 (&N)"
++msgstr "啟動背景(&N)"
+
+ #: background.cpp:49
+ msgid ""
+-"If this is checked, KDM will use the settings below for the background. If it "
+-"is disabled, you have to look after the background yourself. This is done by "
+-"running some program (possibly xsetroot) in the script specified in the Setup= "
+-"option in kdmrc (usually Xsetup)."
+-msgstr ""
+-"如果這個選項被選取了,KDM 將會使用下面關於背景的設定。如果停用它,您就必須自己管理背景。這是利用在設定中指定命令稿執行某些程式(可能是 "
+-"xsetroot)來完成的 = kdmrc (通常是 Xsetup)中的選項。"
++"If this is checked, KDM will use the settings below for the background. If "
++"it is disabled, you have to look after the background yourself. This is done "
++"by running some program (possibly xsetroot) in the script specified in the "
++"Setup= option in kdmrc (usually Xsetup)."
++msgstr ""
++"如果這個選項被選取了,KDM 將會使用下面關於背景的設定。如果停用它,您就必須自"
++"己管理背景。這是利用在設定中指定命令稿執行某些程式(可能是 xsetroot)來完成的 "
++"= kdmrc (通常是 Xsetup)中的選項。"
+
+ #: kdm-appear.cpp:71
+ msgid "&Greeting:"
+-msgstr "問候 (&G):"
++msgstr "問候(&G):"
+
+ #: kdm-appear.cpp:76
+ msgid ""
+-"This is the \"headline\" for KDM's login window. You may want to put some nice "
+-"greeting or information about the operating system here."
+-"KDM will substitute the following character pairs with the respective "
+-"contents:"
+-"
"
+-"
"
+-"- %d -> current display
"
+-"- %h -> host name, possibly with domain name
"
+-"- %n -> node name, most probably the host name without domain name
"
+-"- %s -> the operating system
"
+-"- %r -> the operating system's version
"
+-"- %m -> the machine (hardware) type
"
+-"- %% -> a single %
"
+-msgstr ""
+-"這是 KDM 登入視窗中的「標題」。您可能會想要在這裏放一些不錯的歡迎詞或者作業系統的相關資訊。"
+-"KDM 會將下列字元替代為個別的內容:"
+-"
"
+-"
"
+-"- %d -> 目前的顯示
"
+-"- %h -> 主機名稱,可能會加上網域名稱
"
+-"- %n -> 節點名稱,通常是去掉網域名稱的主機名稱
"
+-"- %s -> 作業系統
"
+-"- %r -> 作業系統的版本
"
+-"- %m -> 電腦(硬體)類型
"
+-"- %% -> 單獨的 %
"
++"This is the \"headline\" for KDM's login window. You may want to put some "
++"nice greeting or information about the operating system here.KDM will "
++"substitute the following character pairs with the respective contents:"
++"
- %d -> current display
- %h -> host name, possibly with "
++"domain name
- %n -> node name, most probably the host name without "
++"domain name
- %s -> the operating system
- %r -> the operating "
++"system's version
- %m -> the machine (hardware) type
- %% -> a "
++"single %
"
++msgstr ""
++"這是 KDM 登入視窗中的「標題」。您可能會想要在這裏放一些不錯的歡迎詞或者作業系"
++"統的相關資訊。KDM 會將下列字元替代為個別的內容:
- %d -> 目前的顯"
++"示
- %h -> 主機名稱,可能會加上網域名稱
- %n -> 節點名稱,通常是"
++"去掉網域名稱的主機名稱
- %s -> 作業系統
- %r -> 作業系統的版本"
++"li>
- %m -> 電腦(硬體)類型
- %% -> 單獨的 %
"
+
+ #: kdm-appear.cpp:95
+ msgid "Logo area:"
+@@ -72,15 +62,16 @@
+
+ #: kdm-appear.cpp:100
+ msgid "Show cloc&k"
+-msgstr "顯示時鐘 (&K)"
++msgstr "顯示時鐘(&K)"
+
+ #: kdm-appear.cpp:101
+ msgid "Sho&w logo"
+-msgstr "顯示標誌 (&W)"
++msgstr "顯示標誌(&W)"
+
+ #: kdm-appear.cpp:113
+ msgid ""
+-"You can choose to display a custom logo (see below), a clock or no logo at all."
++"You can choose to display a custom logo (see below), a clock or no logo at "
++"all."
+ msgstr "您可以選擇顯示自訂標題 (詳下述) 或時鐘或不要標題"
+
+ #: kdm-appear.cpp:119
+@@ -89,9 +80,10 @@
+
+ #: kdm-appear.cpp:129
+ msgid ""
+-"Click here to choose an image that KDM will display. You can also drag and drop "
+-"an image onto this button (e.g. from Konqueror)."
+-msgstr "按下這邊以選擇一個 KDM 要顯示的影像. 您也可以拖曳一個影像到這個按鈕上. "
++"Click here to choose an image that KDM will display. You can also drag and "
++"drop an image onto this button (e.g. from Konqueror)."
++msgstr ""
++"按下這邊以選擇一個 KDM 要顯示的影像. 您也可以拖曳一個影像到這個按鈕上. "
+
+ #: kdm-appear.cpp:141
+ msgid "Position:"
+@@ -99,11 +91,11 @@
+
+ #: kdm-appear.cpp:144
+ msgid "&X:"
+-msgstr "X 座標 (&X):"
++msgstr "X 座標(&X):"
+
+ #: kdm-appear.cpp:151
+ msgid "&Y:"
+-msgstr "Y 座標 (&Y):"
++msgstr "Y 座標(&Y):"
+
+ #: kdm-appear.cpp:158
+ msgid ""
+@@ -125,7 +117,7 @@
+
+ #: kdm-appear.cpp:189
+ msgid "&Color scheme:"
+-msgstr "顏色 (&C):"
++msgstr "顏色(&C):"
+
+ #: kdm-appear.cpp:193
+ msgid "You can choose a basic Color Scheme here that will be used by KDM only."
+@@ -164,7 +156,9 @@
+ msgid ""
+ "Here you can choose the language used by KDM. This setting does not affect a "
+ "user's personal settings; that will take effect after login."
+-msgstr "您可以在這邊選擇 KDM 所使用的語言。這個設定不會影響使用者登入後的個人設定;它會在登入後才生效。"
++msgstr ""
++"您可以在這邊選擇 KDM 所使用的語言。這個設定不會影響使用者登入後的個人設定;它"
++"會在登入後才生效。"
+
+ #: kdm-appear.cpp:264
+ msgid "without name"
+@@ -188,12 +182,11 @@
+ #: kdm-appear.cpp:504
+ msgid ""
+ "KDM - Appearance
Here you can configure the basic appearance of the "
+-"KDM login manager, i.e. a greeting string, an icon etc."
+-" For further refinement of KDM's appearance, see the \"Font\" and "
+-"\"Background\" tabs."
++"KDM login manager, i.e. a greeting string, an icon etc.
For further "
++"refinement of KDM's appearance, see the \"Font\" and \"Background\" tabs."
+ msgstr ""
+-"
KDM - 外觀
您可以在這編組態基本的 KDM 登入管理員顯示, 例如: 問候訊息, 圖示等等."
+-" 對於更進一步的微調, 請參見 \"字型\" 與 \"背景\" 標籤."
++"
KDM - 外觀
您可以在這編組態基本的 KDM 登入管理員顯示, 例如: 問候訊"
++"息, 圖示等等. 對於更進一步的微調, 請參見 \"字型\" 與 \"背景\" 標籤."
+
+ #: kdm-font.cpp:46
+ msgid "&General:"
+@@ -211,7 +204,8 @@
+
+ #: kdm-font.cpp:57
+ msgid ""
+-"This changes the font which is used for failure messages in the login manager."
++"This changes the font which is used for failure messages in the login "
++"manager."
+ msgstr "這會改變在登入管理程式中用於安全模式訊息的字型。"
+
+ #: kdm-font.cpp:62
+@@ -231,8 +225,8 @@
+ "If you check this box and your X-Server has the Xft extension, fonts will be "
+ "antialiased (smoothed) in the login dialog."
+ msgstr ""
+-"當您選擇了這個選項,同時您的 X-Server 也有 Xft 擴充模組,那麼在您登錄視窗中的字形,將會使用 AntiAliased (smoothed) "
+-"的功能。"
++"當您選擇了這個選項,同時您的 X-Server 也有 Xft 擴充模組,那麼在您登錄視窗中的"
++"字形,將會使用 AntiAliased (smoothed) 的功能。"
+
+ #: kdm-shut.cpp:49
+ msgid "Allow Shutdown"
+@@ -260,20 +254,17 @@
+
+ #: kdm-shut.cpp:63
+ msgid ""
+-"Here you can select who is allowed to shutdown the computer using KDM. You can "
+-"specify different values for local (console) and remote displays. Possible "
+-"values are:"
+-"
"
+-"- Everybody: everybody can shutdown the computer using KDM
"
+-"- Only root: KDM will only allow shutdown after the user has entered "
+-"the root password
"
+-"- Nobody: nobody can shutdown the computer using KDM
"
+-msgstr ""
+-"您可以在這邊設定哪些使用者允許使用 KDM 關閉這台電腦。可選擇的項目有: "
+-" "
+-"- 所有人: 所有使用者都可以使用透過 KDM 關閉這台電腦。
"
+-"- 系統管理者: 只允許輸入 root 密碼後才能夠進行關閉這台電腦。
"
+-"- 都不允許: 不允許任何人使用 KDM 關閉這台電腦。
"
++"Here you can select who is allowed to shutdown the computer using KDM. You "
++"can specify different values for local (console) and remote displays. "
++"Possible values are: - Everybody: everybody can shutdown the "
++"computer using KDM
- Only root: KDM will only allow shutdown "
++"after the user has entered the root password
- Nobody: "
++"nobody can shutdown the computer using KDM
"
++msgstr ""
++"您可以在這邊設定哪些使用者允許使用 KDM 關閉這臺電腦。可選擇的項目有: "
++"- 所有人: 所有使用者都可以使用透過 KDM 關閉這臺電腦。
"
++"- 系統管理者: 只允許輸入 root 密碼後才能夠進行關閉這臺電腦。
"
++"- 都不允許: 不允許任何人使用 KDM 關閉這臺電腦。
"
+
+ #: kdm-shut.cpp:71
+ msgid "Commands"
+@@ -315,7 +306,7 @@
+
+ #: kdm-shut.cpp:100
+ msgid "Enable boot options in the \"Shutdown...\" dialog."
+-msgstr "在「關機...」對話盒內啟用開機選項的功能。"
++msgstr "在「關機…」對話盒內啟用開機選項的功能。"
+
+ #: kdm-users.cpp:81
+ #, c-format
+@@ -324,18 +315,19 @@
+
+ #: kdm-users.cpp:88
+ msgid "System U&IDs"
+-msgstr "系統 UID (&I)"
++msgstr "系統 UID(&I)"
+
+ #: kdm-users.cpp:89
+ msgid ""
+-"Users with a UID (numerical user identification) outside this range will not be "
+-"listed by KDM and this setup dialog. Note that users with the UID 0 (typically "
+-"root) are not affected by this and must be explicitly hidden in \"Not hidden\" "
+-"mode."
+-msgstr ""
+-"KDM 只會列出定義在此範圍內的使用者的識別碼 UID(numerical user identification)。超過了這個範圍之外的 UID 將不會被 "
+-"KDM 和這個設定視窗列出。請注意,當使用者的 UID 為 0 時(通常是 "
+-"root),是不會受到影響的。除非您在「不隱藏」的模式設定中,明確的定義它必須被隱藏。"
++"Users with a UID (numerical user identification) outside this range will not "
++"be listed by KDM and this setup dialog. Note that users with the UID 0 "
++"(typically root) are not affected by this and must be explicitly hidden in "
++"\"Not hidden\" mode."
++msgstr ""
++"KDM 只會列出定義在此範圍內的使用者的識別碼 UID(numerical user "
++"identification)。超過了這個範圍之外的 UID 將不會被 KDM 和這個設定視窗列出。"
++"請注意,當使用者的 UID 為 0 時(通常是 root),是不會受到影響的。除非您在「不"
++"隱藏」的模式設定中,明確的定義它必須被隱藏。"
+
+ #: kdm-users.cpp:94
+ msgid "Below:"
+@@ -355,9 +347,11 @@
+
+ #: kdm-users.cpp:113
+ msgid ""
+-"If this option is checked, KDM will show a list of users, so users can click on "
+-"their name or image rather than typing in their login."
+-msgstr "如果選擇了這個選項,KDM 將會顯示使用者列表,使用者在登入時可以點選他們的名稱或影像而不需要輸入使用者名稱。"
++"If this option is checked, KDM will show a list of users, so users can click "
++"on their name or image rather than typing in their login."
++msgstr ""
++"如果選擇了這個選項,KDM 將會顯示使用者列表,使用者在登入時可以點選他們的名稱"
++"或影像而不需要輸入使用者名稱。"
+
+ #: kdm-users.cpp:115
+ msgid "Autocompletion"
+@@ -380,18 +374,21 @@
+ "only the checked users. If checked, select all non-system users, except the "
+ "checked ones."
+ msgstr ""
+-"這個選項指定使用者在「選擇使用者與群組」中如何選擇「顯示列表」與「自動補齊」:如果沒有核取,只會選擇被核取的使用者。如果核取,會選擇除了核取的使用者之外,所有的"
+-"非系統管理使用者。"
++"這個選項指定使用者在「選擇使用者與群組」中如何選擇「顯示列表」與「自動補"
++"齊」:如果沒有核取,只會選擇被核取的使用者。如果核取,會選擇除了核取的使用者"
++"之外,所有的非系統管理使用者。"
+
+ #: kdm-users.cpp:123
+ msgid "Sor&t users"
+-msgstr "使用者排序 (&T)"
++msgstr "使用者排序(&T)"
+
+ #: kdm-users.cpp:125
+ msgid ""
+-"If this is checked, KDM will alphabetically sort the user list. Otherwise users "
+-"are listed in the order they appear in the password file."
+-msgstr "如果這個選項被選取了之後,KDM 將會依照字母的先後順序來為使用者列表排序,否則使用者列表將會依照使用者在密碼檔內的順序來顯示。"
++"If this is checked, KDM will alphabetically sort the user list. Otherwise "
++"users are listed in the order they appear in the password file."
++msgstr ""
++"如果這個選項被選取了之後,KDM 將會依照字母的先後順序來為使用者列表排序,否則"
++"使用者列表將會依照使用者在密碼檔內的順序來顯示。"
+
+ #: kdm-users.cpp:129
+ msgid "S&elect users and groups:"
+@@ -405,7 +402,9 @@
+ msgid ""
+ "KDM will show all checked users. Entries denoted with '@' are user groups. "
+ "Checking a group is like checking all users in that group."
+-msgstr "KDE 會顯示所有核取的使用者。標示「@」的項目是使用者群組。核取群組就如同核取群組中所有的使用者。"
++msgstr ""
++"KDE 會顯示所有核取的使用者。標示「@」的項目是使用者群組。核取群組就如同核取群"
++"組中所有的使用者。"
+
+ #: kdm-users.cpp:140
+ msgid "Hidden Users"
+@@ -415,7 +414,9 @@
+ msgid ""
+ "KDM will show all non-checked non-system users. Entries denoted with '@' are "
+ "user groups. Checking a group is like checking all users in that group."
+-msgstr "KDE 會顯示所有未核取的非系統管理使用者。標示「@」的項目是使用者群組。核取群組就如同核取群組中所有的使用者。"
++msgstr ""
++"KDE 會顯示所有未核取的非系統管理使用者。標示「@」的項目是使用者群組。核取群組"
++"就如同核取群組中所有的使用者。"
+
+ #: kdm-users.cpp:149
+ msgid "User Image Source"
+@@ -426,11 +427,13 @@
+ "Here you can specify where KDM will obtain the images that represent users. "
+ "\"Admin\" represents the global folder; these are the pictures you can set "
+ "below. \"User\" means that KDM should read the user's $HOME/.face.icon file. "
+-"The two selections in the middle define the order of preference if both sources "
+-"are available."
++"The two selections in the middle define the order of preference if both "
++"sources are available."
+ msgstr ""
+-"這裡您可以設定 KDM 可以從哪裡找到代表使用者的圖示。「Admin」代表使用通用的目錄;下方這些是您可以設定的圖示。而「User」代表 KDM "
+-"必須讀取使用者 $HOME/.face.icon 的這個圖示。在中間的兩個選擇區則定義了當兩種來源都可以使用的時候優先使用的順序。"
++"這裡您可以設定 KDM 可以從哪裡找到代表使用者的圖示。「Admin」代表使用通用的目"
++"錄;下方這些是您可以設定的圖示。而「User」代表 KDM 必須讀取使用者 $HOME/."
++"face.icon 的這個圖示。在中間的兩個選擇區則定義了當兩種來源都可以使用的時候優"
++"先使用的順序。"
+
+ #: kdm-users.cpp:156
+ msgid "Admin"
+@@ -469,7 +472,9 @@
+ "Here you can see the image assigned to the user selected in the combo box "
+ "above. Click on the image button to select from a list of images or drag and "
+ "drop your own image on to the button (e.g. from Konqueror)."
+-msgstr "您可以在這邊看到使用者名稱與所指定的對應影像。您可以按下影像按鈕以選擇其他的影像,或拖曳一個影像到這邊。"
++msgstr ""
++"您可以在這邊看到使用者名稱與所指定的對應影像。您可以按下影像按鈕以選擇其他的"
++"影像,或拖曳一個影像到這邊。"
+
+ #: kdm-users.cpp:178
+ msgid "Unset"
+@@ -508,17 +513,15 @@
+
+ #: kdm-conv.cpp:47
+ msgid ""
+-""
+-"Attention!"
+-"
Read help!"
+-msgstr ""
+-""
+-"注意!"
+-"
請閱讀說明!"
++"Attention!
Read help!"
++"font>"
++msgstr ""
++"注意!
請閱讀說明!"
++"center>"
+
+ #: kdm-conv.cpp:51
+ msgid "Enable Au&to-Login"
+-msgstr "啟用自動登入 (&T)"
++msgstr "啟用自動登入(&T)"
+
+ #: kdm-conv.cpp:55
+ msgid ""
+@@ -564,7 +567,9 @@
+ msgid ""
+ "Normally, automatic login is performed only when KDM starts up. If this is "
+ "checked, automatic login will kick in after finishing a session as well."
+-msgstr "通常,自動登入只有在 KDM 啟動時才運作。如果核取此項,自動登入也會在工作階段結束時運作。"
++msgstr ""
++"通常,自動登入只有在 KDM 啟動時才運作。如果核取此項,自動登入也會在工作階段結"
++"束時運作。"
+
+ #: kdm-conv.cpp:87
+ msgid "Loc&k session"
+@@ -573,9 +578,11 @@
+ #: kdm-conv.cpp:89
+ msgid ""
+ "If checked, the automatically started session will be locked immediately "
+-"(provided it is a KDE session). This can be used to obtain a super-fast login "
+-"restricted to one user."
+-msgstr "如果選擇,自動啟動的工作階段會立刻被鎖定(如果它是 KDE 工作階段。這可用在限制單一使用者的超快速登入上。"
++"(provided it is a KDE session). This can be used to obtain a super-fast "
++"login restricted to one user."
++msgstr ""
++"如果選擇,自動啟動的工作階段會立刻被鎖定(如果它是 KDE 工作階段。這可用在限制"
++"單一使用者的超快速登入上。"
+
+ #: kdm-conv.cpp:94
+ msgid "Preselect User"
+@@ -595,7 +602,9 @@
+ msgid ""
+ "Preselect the user that logged in previously. Use this if this computer is "
+ "usually used several consecutive times by one user."
+-msgstr "預先選取先前登入的使用者。當您經常的使用同一個使用者來登入這部電腦時,您可以考慮使用這個功能。"
++msgstr ""
++"預先選取先前登入的使用者。當您經常的使用同一個使用者來登入這部電腦時,您可以"
++"考慮使用這個功能。"
+
+ #: kdm-conv.cpp:103
+ msgid "Specif&y"
+@@ -603,8 +612,8 @@
+
+ #: kdm-conv.cpp:104
+ msgid ""
+-"Preselect the user specified in the combo box below. Use this if this computer "
+-"is predominantly used by a certain user."
++"Preselect the user specified in the combo box below. Use this if this "
++"computer is predominantly used by a certain user."
+ msgstr "預先"
+
+ #: kdm-conv.cpp:108
+@@ -613,9 +622,11 @@
+
+ #: kdm-conv.cpp:110
+ msgid ""
+-"Select the user to be preselected for login. This box is editable, so you can "
+-"specify an arbitrary non-existent user to mislead possible attackers."
+-msgstr "選取一個使用者來為預設的登入帳號。這是可以編輯的,所以您可以設定一個不存在的使用者,來誤導可能攻擊您機器的人。"
++"Select the user to be preselected for login. This box is editable, so you "
++"can specify an arbitrary non-existent user to mislead possible attackers."
++msgstr ""
++"選取一個使用者來為預設的登入帳號。這是可以編輯的,所以您可以設定一個不存在的"
++"使用者,來誤導可能攻擊您機器的人。"
+
+ #: kdm-conv.cpp:119
+ msgid "Focus pass&word"
+@@ -623,10 +634,12 @@
+
+ #: kdm-conv.cpp:120
+ msgid ""
+-"When this option is on, KDM will place the cursor in the password field instead "
+-"of the user field after preselecting a user. Use this to save one key press per "
+-"login, if the preselection usually does not need to be changed."
+-msgstr "當這個項目啟用後,KDM 會把游標停留在密碼輸入欄位的地方,而不是停留在系統預先送出要自動登入的使用者欄位處。這可以簡化一些登入動作。"
++"When this option is on, KDM will place the cursor in the password field "
++"instead of the user field after preselecting a user. Use this to save one "
++"key press per login, if the preselection usually does not need to be changed."
++msgstr ""
++"當這個項目啟用後,KDM 會把游標停留在密碼輸入欄位的地方,而不是停留在系統預先"
++"送出要自動登入的使用者欄位處。這可以簡化一些登入動作。"
+
+ #: kdm-conv.cpp:126
+ msgid "Enable Password-&Less Logins"
+@@ -635,35 +648,40 @@
+ #: kdm-conv.cpp:129
+ msgid ""
+ "When this option is checked, the checked users from the list below will be "
+-"allowed to log in without entering their password. This applies only to KDM's "
+-"graphical login. Think twice before enabling this!"
+-msgstr "當選取這個選項, 右邊列表中的使用這可以不需要輸入密碼而登入. 這只會套用在 KDM 的圖形介面登入. 請三思而後啟動!"
++"allowed to log in without entering their password. This applies only to "
++"KDM's graphical login. Think twice before enabling this!"
++msgstr ""
++"當選取這個選項, 右邊列表中的使用這可以不需要輸入密碼而登入. 這只會套用在 KDM "
++"的圖形介面登入. 請三思而後啟動!"
+
+ #: kdm-conv.cpp:136
+ msgid "No password re&quired for:"
+-msgstr "不需要密碼 (&Q)"
++msgstr "不需要密碼(&Q)"
+
+ #: kdm-conv.cpp:142
+ msgid ""
+ "Check all users you want to allow a password-less login for. Entries denoted "
+-"with '@' are user groups. Checking a group is like checking all users in that "
+-"group."
+-msgstr "核取所有您允許不使用密碼登入的使用者。標示「@」的項目是使用者群組。核取群組就如同核取群組中所有的使用者。"
++"with '@' are user groups. Checking a group is like checking all users in "
++"that group."
++msgstr ""
++"核取所有您允許不使用密碼登入的使用者。標示「@」的項目是使用者群組。核取群組就"
++"如同核取群組中所有的使用者。"
+
+ #: kdm-conv.cpp:149
+ msgid "Automatically log in again after &X server crash"
+-msgstr "在 X 伺服器關閉後自動重新登入 (&G)"
++msgstr "在 X 伺服器關閉後自動重新登入(&G)"
+
+ #: kdm-conv.cpp:150
+ msgid ""
+-"When this option is on, a user will be logged in again automatically when their "
+-"session is interrupted by an X server crash; note that this can open a security "
+-"hole: if you use a screen locker than KDE's integrated one, this will make "
+-"circumventing a password-secured screen lock possible."
+-msgstr ""
+-"如果這個選項是啟動的話,那麼當使用者的視窗管理程式因為 X-Server 的 Crash "
+-"而中斷時,將會自動的再行登入;請注意這個選項會造成系統在安全上的漏洞:如果您使用其他的非整合在 KDE 中的螢幕鎖定程式 (Screen "
+-"Locker),那麼這將會是當螢幕鎖定程式,在解除鎖定時詢問密碼的一種迴避方式。"
++"When this option is on, a user will be logged in again automatically when "
++"their session is interrupted by an X server crash; note that this can open a "
++"security hole: if you use a screen locker than KDE's integrated one, this "
++"will make circumventing a password-secured screen lock possible."
++msgstr ""
++"如果這個選項是啟動的話,那麼當使用者的視窗管理程式因為 X-Server 的 Crash 而中"
++"斷時,將會自動的再行登入;請注意這個選項會造成系統在安全上的漏洞:如果您使用"
++"其他的非整合在 KDE 中的螢幕鎖定程式 (Screen Locker),那麼這將會是當螢幕鎖定程"
++"式,在解除鎖定時詢問密碼的一種迴避方式。"
+
+ #: main.cpp:67
+ msgid ""
+@@ -697,41 +715,40 @@
+
+ #: main.cpp:96
+ msgid ""
+-"Login Manager
In this module you can configure the various aspects of "
+-"the KDE Login Manager. This includes the look and feel as well as the users "
+-"that can be selected for login. Note that you can only make changes if you run "
+-"the module with superuser rights. If you have not started the KDE Control "
+-"Center with superuser rights (which is absolutely the right thing to do, by the "
+-"way), click on the Modify button to acquire superuser rights. You will "
+-"be asked for the superuser password."
+-"Appearance
On this tab page, you can configure how the Login Manager "
+-"should look, which language it should use, and which GUI style it should use. "
+-"The language settings made here have no influence on the user's language "
+-"settings."
++"Login Manager
In this module you can configure the various aspects "
++"of the KDE Login Manager. This includes the look and feel as well as the "
++"users that can be selected for login. Note that you can only make changes if "
++"you run the module with superuser rights. If you have not started the KDE "
++"Control Center with superuser rights (which is absolutely the right thing to "
++"do, by the way), click on the Modify button to acquire superuser "
++"rights. You will be asked for the superuser password.Appearance
On "
++"this tab page, you can configure how the Login Manager should look, which "
++"language it should use, and which GUI style it should use. The language "
++"settings made here have no influence on the user's language settings."
+ "Font
Here you can choose the fonts that the Login Manager should use "
+-"for various purposes like greetings and user names. "
+-"Background
If you want to set a special background for the login "
+-"screen, this is where to do it."
+-"Shutdown
Here you can specify who is allowed to shutdown/reboot the "
+-"machine and whether a boot manager should be used."
+-"Users
On this tab page, you can select which users the Login Manager "
+-"will offer you for logging in."
+-"Convenience
Here you can specify a user to be logged in automatically, "
+-"users not needing to provide a password to log in, and other convenience "
+-"features."
+-"
Note, that these settings are security holes by their nature, so use them "
+-"very carefully."
+-msgstr ""
+-"登入管理員
在這個模組之中,您可以設定由 KDE "
+-"登入管理員所接受的變數。這包括了使用者登入時所能選擇的外觀與感覺。請注意您只能以管理者的權限執行這個模組。如果您沒有使用超級使用者的權限,來啟動 KDE "
+-"的控制中心(當然,這是正確的作法),您可以按下變更 (Modify)按鈕以取得管理者權限。同時,您將被詢問超級使用者密碼。"
+-"外觀
在這個標籤頁,您可以設定登入管理員的外觀、使用的語言,以及 GUI 樣式。語言設定與使用者的語言設定並不會互相衝突。"
+-"字型
您可以在這邊選擇字型,讓登入管理員使用不同的字型,例如問候語及使用者名稱。"
+-"背景
如果您希望為登入畫面設定特定的背景,在這邊可以完成您的願望。"
+-"關機
您可以在這裡設定誰能夠停止、重新啟動這部機器,以及是否使用開機管理程式。"
+-"使用者
在這個標籤頁,您可以選擇登入管理員所要提供的使用者清單,以供您在登入系統時使用。"
+-"便利設施
您可以在這邊指定能自動登入的使用者,不需要提供密碼就可以登入的使用者,以及其他給懶人使用的功能。 "
+-"
注意:這些選項的性質可說是個系統安全上的漏洞,請非常您一定要小心的使用。"
++"for various purposes like greetings and user names. Background
If "
++"you want to set a special background for the login screen, this is where to "
++"do it.Shutdown
Here you can specify who is allowed to shutdown/"
++"reboot the machine and whether a boot manager should be used.Users"
++"h2>On this tab page, you can select which users the Login Manager will offer "
++"you for logging in.Convenience
Here you can specify a user to be "
++"logged in automatically, users not needing to provide a password to log in, "
++"and other convenience features.
Note, that these settings are security "
++"holes by their nature, so use them very carefully."
++msgstr ""
++"登入管理員
在這個模組之中,您可以設定由 KDE 登入管理員所接受的變數。"
++"這包括了使用者登入時所能選擇的外觀與感覺。請注意您只能以管理者的權限執行這個"
++"模組。如果您沒有使用超級使用者的權限,來啟動 KDE 的控制中心(當然,這是正確的"
++"作法),您可以按下變更 (Modify)按鈕以取得管理者權限。同時,您將被詢"
++"問超級使用者密碼。外觀
在這個標籤頁,您可以設定登入管理員的外觀、使"
++"用的語言,以及 GUI 樣式。語言設定與使用者的語言設定並不會互相衝突。字型"
++"h2>您可以在這邊選擇字型,讓登入管理員使用不同的字型,例如問候語及使用者名稱。"
++"背景
如果您希望為登入畫面設定特定的背景,在這邊可以完成您的願望。"
++"關機
您可以在這裡設定誰能夠停止、重新啟動這部機器,以及是否使用開機管理程"
++"式。使用者
在這個標籤頁,您可以選擇登入管理員所要提供的使用者清單,以"
++"供您在登入系統時使用。便利設施
您可以在這邊指定能自動登入的使用者,不"
++"需要提供密碼就可以登入的使用者,以及其他給懶人使用的功能。
注意:這些選項"
++"的性質可說是個系統安全上的漏洞,請非常您一定要小心的使用。"
+
+ #: main.cpp:186
+ msgid "A&ppearance"
+@@ -755,7 +772,7 @@
+
+ #: main.cpp:210
+ msgid "Con&venience"
+-msgstr "便利設施 (&V)"
++msgstr "便利設施(&V)"
+
+ #: _translatorinfo.cpp:1
+ msgid ""
+@@ -770,7 +787,7 @@
+ msgstr "kenduest@i18n.linux.org.tw,paladin@ms1.hinet.net"
+
+ #~ msgid "&None"
+-#~ msgstr "無 (&N)"
++#~ msgstr "無(&N)"
+
+ #~ msgid "LILO"
+ #~ msgstr "LILO"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kdmgreet.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kdmgreet.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kdmgreet.po 2008-02-13 10:55:26.000000000 +0100
++++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kdmgreet.po 2011-11-11 15:45:17.000000000 +0100
+@@ -13,8 +13,7 @@
+ "Project-Id-Version: kdmgreet\n"
+ "POT-Creation-Date: 2007-12-08 01:14+0100\n"
+ "PO-Revision-Date: 2006-06-21 08:43+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Chinese Traditional \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -86,7 +85,7 @@
+
+ #: kchooser.cpp:85
+ msgid "&Accept"
+-msgstr "接受 (&A)"
++msgstr "接受(&A)"
+
+ #: kchooser.cpp:87
+ msgid "&Refresh"
+@@ -94,7 +93,7 @@
+
+ #: kchooser.cpp:95 kgreeter.cpp:694
+ msgid "&Menu"
+-msgstr "選單 (&M)"
++msgstr "選單(&M)"
+
+ #: kchooser.cpp:177
+ msgid ""
+@@ -145,7 +144,7 @@
+
+ #: kgreeter.cpp:724 kgreeter.cpp:865
+ msgid "Session &Type"
+-msgstr "工作階段類型 (&T):"
++msgstr "工作階段類型(&T):"
+
+ #: kgreeter.cpp:729 kgreeter.cpp:871
+ msgid "&Authentication Method"
+@@ -153,7 +152,7 @@
+
+ #: kgreeter.cpp:734 kgreeter.cpp:876
+ msgid "&Remote Login"
+-msgstr "遠端登入 (&R)"
++msgstr "遠端登入(&R)"
+
+ #: kgreeter.cpp:812
+ msgid "Login Failed."
+@@ -161,7 +160,7 @@
+
+ #: kconsole.cpp:75
+ msgid "Cannot open console"
+-msgstr "無法開啟主控台"
++msgstr "無法開啟主控臺"
+
+ #: kconsole.cpp:159
+ msgid ""
+@@ -169,7 +168,7 @@
+ "*** Cannot open console log source ***"
+ msgstr ""
+ "\n"
+-"*** 無法開啟主控台的記錄來源 ***"
++"*** 無法開啟主控臺的記錄來源 ***"
+
+ #: kgdialog.cpp:61
+ msgid "Sw&itch User"
+@@ -177,19 +176,19 @@
+
+ #: kgdialog.cpp:73
+ msgid "R&estart X Server"
+-msgstr "重新啟動 X 伺服器 (&E)"
++msgstr "重新啟動 X 伺服器(&E)"
+
+ #: kgdialog.cpp:73
+ msgid "Clos&e Connection"
+-msgstr "主控台連線"
++msgstr "主控臺連線"
+
+ #: kgdialog.cpp:84
+ msgid "Co&nsole Login"
+-msgstr "主控台登入 (&N)"
++msgstr "主控臺登入(&N)"
+
+ #: kgdialog.cpp:87
+ msgid "&Shutdown..."
+-msgstr "關機 (&S)..."
++msgstr "關機(&S)…"
+
+ #: kgdialog.cpp:227
+ msgid ""
+@@ -282,17 +281,15 @@
+ msgstr "驗證失敗"
+
+ #: kgverify.cpp:695
+-msgid ""
+-"Authenticated user (%1) does not match requested user (%2).\n"
+-msgstr ""
+-"已驗證的使用者(%1)不符合要求的使用者(%2)。\n"
++msgid "Authenticated user (%1) does not match requested user (%2).\n"
++msgstr "已驗證的使用者(%1)不符合要求的使用者(%2)。\n"
+
+ #: kgverify.cpp:988
+ #, c-format
+ msgid ""
+ "_n: Automatic login in 1 second...\n"
+ "Automatic login in %n seconds..."
+-msgstr "於 %n 秒後自動登入..."
++msgstr "於 %n 秒後自動登入…"
+
+ #: kgverify.cpp:997
+ msgid "Warning: Caps Lock on"
+@@ -308,7 +305,7 @@
+
+ #: kgverify.cpp:1038
+ msgid "Theme not usable with authentication method '%1'."
+-msgstr "佈景主題不可用於驗證方式 '%1'。"
++msgstr "布景主題不可用於驗證方式 '%1'。"
+
+ #: kgverify.cpp:1093
+ msgid "Changing authentication token"
+@@ -320,7 +317,7 @@
+
+ #: kdmshutdown.cpp:123 kdmshutdown.cpp:516
+ msgid "&Schedule..."
+-msgstr "工作排程(&S)..."
++msgstr "工作排程(&S)…"
+
+ #: kdmshutdown.cpp:246
+ msgid "Shutdown Type"
+@@ -328,11 +325,11 @@
+
+ #: kdmshutdown.cpp:250
+ msgid "&Turn off computer"
+-msgstr "關閉電腦 (&T)"
++msgstr "關閉電腦(&T)"
+
+ #: kdmshutdown.cpp:254
+ msgid "&Restart computer"
+-msgstr "重新啟動電腦 (&R)"
++msgstr "重新啟動電腦(&R)"
+
+ #: kdmshutdown.cpp:282
+ msgid "Scheduling"
+@@ -360,11 +357,11 @@
+
+ #: kdmshutdown.cpp:482
+ msgid "&Turn Off Computer"
+-msgstr "關閉電腦 (&T)"
++msgstr "關閉電腦(&T)"
+
+ #: kdmshutdown.cpp:489
+ msgid "&Restart Computer"
+-msgstr "重新啟動電腦 (&R)"
++msgstr "重新啟動電腦(&R)"
+
+ #: kdmshutdown.cpp:504
+ msgid ""
+@@ -378,7 +375,7 @@
+
+ #: kdmshutdown.cpp:611
+ msgid "Switch to Console"
+-msgstr "切換至主控台"
++msgstr "切換至主控臺"
+
+ #: kdmshutdown.cpp:613
+ msgid "Restart Computer"
+@@ -434,7 +431,7 @@
+
+ #: kdmshutdown.cpp:691
+ msgid "console user"
+-msgstr "主控台使用者"
++msgstr "主控臺使用者"
+
+ #: kdmshutdown.cpp:693
+ msgid "control socket"
+@@ -546,9 +543,9 @@
+ #: themer/kdmthemer.cpp:67
+ #, c-format
+ msgid "Cannot open theme file %1"
+-msgstr "無法開啟佈景主題檔案 %1"
++msgstr "無法開啟布景主題檔案 %1"
+
+ #: themer/kdmthemer.cpp:71
+ #, c-format
+ msgid "Cannot parse theme file %1"
+-msgstr "無法分析佈景主題檔案 %1"
++msgstr "無法分析布景主題檔案 %1"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kfindpart.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kfindpart.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kfindpart.po 2007-01-15 10:56:32.000000000 +0100
++++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kfindpart.po 2011-11-11 15:45:17.000000000 +0100
+@@ -9,8 +9,7 @@
+ "Project-Id-Version: kfindpart\n"
+ "POT-Creation-Date: 2006-10-10 02:32+0200\n"
+ "PO-Revision-Date: 2006-06-19 09:51+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Chinese Traditional \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -39,7 +38,7 @@
+
+ #: kfinddlg.cpp:54
+ msgid "AMiddleLengthText..."
+-msgstr "AMiddleLengthText..."
++msgstr "AMiddleLengthText…"
+
+ #: kfinddlg.cpp:55 kfinddlg.cpp:177
+ msgid "Ready."
+@@ -54,7 +53,7 @@
+
+ #: kfinddlg.cpp:152
+ msgid "Searching..."
+-msgstr "正在搜尋..."
++msgstr "正在搜尋…"
+
+ #: kfinddlg.cpp:179
+ msgid "Aborted."
+@@ -98,7 +97,7 @@
+
+ #: kftabdlg.cpp:71
+ msgid "&Browse..."
+-msgstr "瀏覽(&B)..."
++msgstr "瀏覽(&B)…"
+
+ #: kftabdlg.cpp:72
+ msgid "&Use files index"
+@@ -106,44 +105,33 @@
+
+ #: kftabdlg.cpp:90
+ msgid ""
+-"Enter the filename you are looking for. "
+-"
Alternatives may be separated by a semicolon \";\"."
+-"
"
+-"
The filename may contain the following special characters:"
+-""
+-"- ? matches any single character
"
+-"- * matches zero or more of any characters
"
+-"- [...] matches any of the characters in braces
"
+-"
Example searches:"
+-""
+-"- *.kwd;*.txt finds all files ending with .kwd or .txt
"
+-"- go[dt] finds god and got
"
+-"- Hel?o finds all files that start with \"Hel\" and end with \"o\", "
+-"having one character in between
"
+-"- My Document.kwd finds a file of exactly that name
"
++"Enter the filename you are looking for.
Alternatives may be "
++"separated by a semicolon \";\".
The filename may contain the "
++"following special characters:- ? matches any single character"
++"li>
- * matches zero or more of any characters
- [...] "
++"matches any of the characters in braces
Example searches:"
++"- *.kwd;*.txt finds all files ending with .kwd or .txt"
++"li>
- go[dt] finds god and got
- Hel?o finds all files "
++"that start with \"Hel\" and end with \"o\", having one character in between"
++"li>
- My Document.kwd finds a file of exactly that name
"
++"qt>"
+ msgstr ""
+-"輸入你所要找的檔案名稱。"
+-"
多個名稱可以使用分號「;」隔開。"
+-"
"
+-"
檔案名稱中可以包含下列特殊字元:"
+-""
+-"- ? 比對任何單一字元
"
+-"- * 比對零個或多個任意字元
"
+-"- [...] 比對任何在中括號中的字元
"
+-"
搜尋範例:"
+-""
+-"- *.kwd;*.txt 找尋所有檔名結尾為 .kwd 或是 .txt 的檔案。
"
+-"- go[dt] 找到檔案 god 與 got
"
+-"- Hel?o 找出所有以「Hel」起頭且以「o」結尾,且其中只有一個字元的所有檔案
"
+-"- My Document.kwd 找到一個檔名完全相符的檔案
"
++"輸入你所要找的檔案名稱。
多個名稱可以使用分號「;」隔開。
檔案名"
++"稱中可以包含下列特殊字元:- ? 比對任何單一字元
- * "
++"比對零個或多個任意字元
- [...] 比對任何在中括號中的字元
"
++"ul>
搜尋範例:- *.kwd;*.txt 找尋所有檔名結尾為 .kwd 或是 .txt "
++"的檔案。
- go[dt] 找到檔案 god 與 got
- Hel?o 找出"
++"所有以「Hel」起頭且以「o」結尾,且其中只有一個字元的所有檔案
- My "
++"Document.kwd 找到一個檔名完全相符的檔案
"
+
+ #: kftabdlg.cpp:111
+ msgid ""
+-"This lets you use the files' index created by the slocate "
+-"package to speed-up the search; remember to update the index from time to time "
++"This lets you use the files' index created by the slocate package "
++"to speed-up the search; remember to update the index from time to time "
+ "(using updatedb)."
+ msgstr ""
+-"這讓您使用slocate所建立的檔案索引包來加速搜尋。 別忘了要不時更新檔案索引(使用updatedb)。"
++"這讓您使用slocate所建立的檔案索引包來加速搜尋。 別忘了要不時更新檔"
++"案索引(使用updatedb)。"
+
+ #: kftabdlg.cpp:147
+ msgid "Find all files created or &modified:"
+@@ -238,7 +226,9 @@
+ "If specified, only files that contain this text are found. Note that not "
+ "all file types from the list above are supported. Please refer to the "
+ "documentation for a list of supported file types."
+-msgstr "如果選擇此項,只會找到包含這些文字的檔案。請注意並非所有 上列的檔案格式都有支援。請參考文件,以得知所支援的檔案格 式。"
++msgstr ""
++"如果選擇此項,只會找到包含這些文字的檔案。請注意並非所有 上列的檔案格式都"
++"有支援。請參考文件,以得知所支援的檔案格 式。"
+
+ #: kftabdlg.cpp:264
+ msgid "Case s&ensitive"
+@@ -256,11 +246,13 @@
+ msgid ""
+ "This lets you search in any type of file, even those that usually do not "
+ "contain text (for example program files and images)."
+-msgstr "這讓您在檔任何格式的檔案中搜尋,儘管這些檔案常常不包含文字(例如程式檔或圖像檔) "
++msgstr ""
++"這讓您在檔任何格式的檔案中搜尋,儘管這些檔案常常不包含文字(例如程式檔或圖"
++"像檔) "
+
+ #: kftabdlg.cpp:277
+ msgid "&Edit..."
+-msgstr "編輯 (&E)"
++msgstr "編輯(&E)"
+
+ #: kftabdlg.cpp:282
+ msgid "fo&r:"
+@@ -268,7 +260,7 @@
+
+ #: kftabdlg.cpp:283
+ msgid "Search &metainfo sections:"
+-msgstr "搜尋檔案的格式資訊 (&M):"
++msgstr "搜尋檔案的格式資訊(&M):"
+
+ #: kftabdlg.cpp:286
+ msgid "All Files & Folders"
+@@ -284,7 +276,7 @@
+
+ #: kftabdlg.cpp:290
+ msgid "Special Files (Sockets, Device Files, ...)"
+-msgstr "特別檔案 (Sockets, 設備檔案, ...)"
++msgstr "特別檔案 (Sockets, 設備檔案,…)"
+
+ #: kftabdlg.cpp:291
+ msgid "Executable Files"
+@@ -308,46 +300,37 @@
+
+ #: kftabdlg.cpp:343
+ msgid "Name/&Location"
+-msgstr "名稱/位置 (&L)"
++msgstr "名稱/位置(&L)"
+
+ #: kftabdlg.cpp:344
+ msgid "C&ontents"
+-msgstr "內容 (&O)"
++msgstr "內容(&O)"
+
+ #: kftabdlg.cpp:345
+ msgid "&Properties"
+-msgstr "選項 (&P)"
++msgstr "選項(&P)"
+
+ #: kftabdlg.cpp:350
+ msgid ""
+-"Search within files' specific comments/metainfo"
+-"
These are some examples:"
+-"
"
+-""
+-"- Audio files (mp3...) Search in id3 tag for a title, an album
"
+-"- Images (png...) Search images with a special resolution, "
+-"comment...
"
++"Search within files' specific comments/metainfo
These are some "
++"examples:
- Audio files (mp3...) Search in id3 tag for a "
++"title, an album
- Images (png...) Search images with a special "
++"resolution, comment...
"
+ msgstr ""
+-"搜尋檔案的備註或格式資訊"
+-"
這裡有一些範例:"
+-"
"
+-""
+-"- 音訊檔案 (mp3...)搜尋 mp3 檔案內的 id3 標籤資訊, 例如歌名、專輯名稱...
"
+-"- 影像檔案 (png...)依照所定義的解析度、 備註等來搜尋影像檔案
"
++"搜尋檔案的備註或格式資訊
這裡有一些範例:
- 音訊檔案 "
++"(mp3...)搜尋 mp3 檔案內的 id3 標籤資訊, 例如歌名、專輯名稱..."
++"li>
- 影像檔案 (png...)依照所定義的解析度、 備註等來搜尋影像檔案"
++"li>
"
+
+ #: kftabdlg.cpp:358
+ msgid ""
+-"If specified, search only in this field"
+-"
"
+-""
+-"- Audio files (mp3...) This can be Title, Album...
"
+-"- Images (png...) Search only in Resolution, Bitdepth...
"
++"If specified, search only in this field
- Audio files "
++"(mp3...) This can be Title, Album...
- Images (png...) "
++"Search only in Resolution, Bitdepth...
"
+ msgstr ""
+-"如果這個選項被設定了,那麼只會搜尋這個欄位內的內容。"
+-"
"
+-""
+-"- 音訊檔案(mp3...)這可以是歌名、 專輯、...
"
+-"- 影像檔案 (png...)只會依照解析度、 色階、...搜尋
"
++"如果這個選項被設定了,那麼只會搜尋這個欄位內的內容。
- 音訊檔"
++"案(mp3...)這可以是歌名、 專輯、...
- 影像檔案 (png...)只會依"
++"照解析度、 色階、...搜尋
"
+
+ #: kftabdlg.cpp:552
+ msgid "Unable to search within a period which is less than a minute."
+@@ -415,11 +398,11 @@
+
+ #: kfwin.cpp:124
+ msgid "First Matching Line"
+-msgstr "符合的第一行"
++msgstr "符合的第一列"
+
+ #: kfwin.cpp:194
+ msgid "Save Results As"
+-msgstr "儲存結果為..."
++msgstr "儲存結果為…"
+
+ #: kfwin.cpp:219
+ msgid "Unable to save results."
+@@ -430,10 +413,8 @@
+ msgstr "KFind 結果檔案"
+
+ #: kfwin.cpp:259
+-msgid ""
+-"Results were saved to file\n"
+-msgstr ""
+-"搜尋結果被存到檔案\n"
++msgid "Results were saved to file\n"
++msgstr "搜尋結果被存到檔案\n"
+
+ #: kfwin.cpp:289
+ #, c-format
+@@ -454,7 +435,7 @@
+
+ #: kfwin.cpp:418
+ msgid "Open With..."
+-msgstr "用...開啟"
++msgstr "用…開啟"
+
+ #: kfwin.cpp:424
+ msgid "Selected Files"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kfmclient.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kfmclient.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kfmclient.po 2006-10-01 18:34:18.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kfmclient.po 2011-11-11 15:45:17.000000000 +0100
+@@ -7,7 +7,7 @@
+ "Project-Id-Version: kfmclient\n"
+ "POT-Creation-Date: 2006-08-04 03:58+0200\n"
+ "PO-Revision-Date: 2005-10-30 09:02+0800\n"
+-"Last-Translator: Chao-Hsiung Liao \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: zh-l10n \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -64,7 +64,8 @@
+ #: kfmclient.cc:89
+ msgid ""
+ " # If 'mimetype' is specified, it will be used to determine the\n"
+-" # component that Konqueror should use. For instance, set it to\n"
++" # component that Konqueror should use. For instance, set it "
++"to\n"
+ " # text/html for a web page, to make it appear faster\n"
+ "\n"
+ msgstr ""
+@@ -90,14 +91,15 @@
+ msgid ""
+ " kfmclient openProfile 'profile' ['url']\n"
+ " # Opens a window using the given profile.\n"
+-" # 'profile' is a file under "
+-"~/.kde/share/apps/konqueror/profiles.\n"
++" # 'profile' is a file under ~/.kde/share/apps/konqueror/"
++"profiles.\n"
+ " # 'url' is an optional URL to open.\n"
+ "\n"
+ msgstr ""
+ " kfmclient openProfile 'profile' ['url']\n"
+ " # 給一個個人化設定檔來開啟一個視窗。\n"
+-" # 個人化設定檔是一個檔案在 ~/.kde/share/apps/konqueror/profiles.\n"
++" # 個人化設定檔是一個檔案在 ~/.kde/share/apps/konqueror/"
++"profiles.\n"
+ " # 'url' 是要開啟的一個選擇性的 URL。\n"
+ "\n"
+
+@@ -282,32 +284,24 @@
+ "\n"
+
+ #: kfmclient.cc:405
+-msgid ""
+-"Profile %1 not found\n"
+-msgstr ""
+-"無法找到 profile %1\n"
++msgid "Profile %1 not found\n"
++msgstr "無法找到 profile %1\n"
+
+ #: kfmclient.cc:434
+-msgid ""
+-"Syntax Error: Not enough arguments\n"
+-msgstr ""
+-"語法錯誤: 參數過少\n"
++msgid "Syntax Error: Not enough arguments\n"
++msgstr "語法錯誤: 參數過少\n"
+
+ #: kfmclient.cc:439
+-msgid ""
+-"Syntax Error: Too many arguments\n"
+-msgstr ""
+-"語法錯誤: 參數過多\n"
++msgid "Syntax Error: Too many arguments\n"
++msgstr "語法錯誤: 參數過多\n"
+
+ #: kfmclient.cc:559
+ msgid "Unable to download from an invalid URL."
+ msgstr "無法從無效的 URL 下載。"
+
+ #: kfmclient.cc:623
+-msgid ""
+-"Syntax Error: Unknown command '%1'\n"
+-msgstr ""
+-"語法錯誤: 未知的命令 '%1'\n"
++msgid "Syntax Error: Unknown command '%1'\n"
++msgstr "語法錯誤: 未知的命令 '%1'\n"
+
+ #~ msgid ""
+ #~ " kfmclient selectDesktopIcons x y w h add\n"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kfontinst.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kfontinst.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kfontinst.po 2008-08-19 20:43:10.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kfontinst.po 2011-11-11 15:45:17.000000000 +0100
+@@ -7,7 +7,7 @@
+ "Project-Id-Version: kfontinst\n"
+ "POT-Creation-Date: 2008-06-16 02:37+0200\n"
+ "PO-Revision-Date: 2005-10-31 21:34+0800\n"
+-"Last-Translator: Chao-Hsiung Liao \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Chinese(traditional) \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -32,14 +32,15 @@
+
+ #: kcmfontinst/KCmFontInst.cpp:157 kcmfontinst/KCmFontInst.cpp:220
+ msgid "Add Fonts..."
+-msgstr "新增字型..."
++msgstr "新增字型…"
+
+ #: kcmfontinst/KCmFontInst.cpp:172
+ msgid ""
+-"The fonts shown are your personal fonts."
+-"
To see (and install) system-wide fonts, click on the \"Administrator Mode\" "
+-"button below."
+-msgstr "顯示的字型是您的個人字型。
要查看(和安裝)系統層級的字型,請按下方的「系統管理者模式」按鈕。"
++"The fonts shown are your personal fonts.
To see (and install) "
++"system-wide fonts, click on the \"Administrator Mode\" button below."
++msgstr ""
++"顯示的字型是您的個人字型。
要查看(和安裝)系統層級的字型,請按下方的"
++"「系統管理者模式」按鈕。"
+
+ #: kcmfontinst/KCmFontInst.cpp:213
+ msgid "Show Bitmap Fonts"
+@@ -47,43 +48,41 @@
+
+ #: kcmfontinst/KCmFontInst.cpp:234
+ msgid "Configure..."
+-msgstr "設定..."
++msgstr "設定…"
+
+ #: kcmfontinst/KCmFontInst.cpp:238
+ msgid "Print..."
+-msgstr "列印..."
++msgstr "列印…"
+
+ #: kcmfontinst/KCmFontInst.cpp:317
+ msgid ""
+-"Font Installer
"
+-" This module allows you to install TrueType, Type1, and Bitmap fonts.
"
+-"You may also install fonts using Konqueror: type fonts:/ into Konqueror's "
+-"location bar and this will display your installed fonts. To install a font, "
+-"simply copy one into the folder.
"
+-msgstr ""
+-"字型安裝程式
"
+-"這個模組用來安裝 TrueType、Type1 以及Bitmap字型。
"
+-"您也可以利用 Konqueror 來安裝 字型:在 Konqueror 的位址列鍵入 "
+-"fonts:/,就會顯示出您目前已安裝的字型。要安裝新字型,只要複製一份到此資料夾即可。
"
++"Font Installer
This module allows you to install TrueType, "
++"Type1, and Bitmap fonts.
You may also install fonts using Konqueror: "
++"type fonts:/ into Konqueror's location bar and this will display your "
++"installed fonts. To install a font, simply copy one into the folder.
"
++msgstr ""
++"字型安裝程式
這個模組用來安裝 TrueType、Type1 以及Bitmap字型。"
++"p>
您也可以利用 Konqueror 來安裝 字型:在 Konqueror 的位址列鍵入 fonts:/,"
++"就會顯示出您目前已安裝的字型。要安裝新字型,只要複製一份到此資料夾即可。
"
+
+ #: kcmfontinst/KCmFontInst.cpp:324
+ msgid ""
+-"Font Installer
"
+-" This module allows you to install TrueType, Type1, and Bitmap fonts.
"
+-"You may also install fonts using Konqueror: type fonts:/ into Konqueror's "
+-"location bar and this will display your installed fonts. To install a font, "
+-"simply copy it into the appropriate folder - \"Personal\" for fonts available "
+-"to just yourself, or \"System\" for system-wide fonts (available to all).
"
+-"NOTE: As you are not logged in as \"root\", any fonts installed will "
+-"only be available to you. To install fonts system-wide, use the \"Administrator "
+-"Mode\" button to run this module as \"root\".
"
+-msgstr ""
+-"字型安裝程式
"
+-"這個模組用來安裝TrueType、Type1 以及Bitmap字型。
"
+-"您也可以利用 Konqueror 來安裝 字型:在 Konqueror 的位址列鍵入 "
+-"fonts:/,就會顯示出您目前已安裝的字型。要安裝新字型,只要複製一份到適當的資料夾即可─「個人」代表只供您自己使用的字型,而「系統」則是全系統的字型(所有人"
+-"皆可用)。
"
+-"注意:當您不是以「root」登入時,任何安裝的字型都只有您能用。要安裝全系統的字型,請使用「系統管理者模式」按鈕來以「root」執行此模組。"
++"
Font Installer
This module allows you to install TrueType, "
++"Type1, and Bitmap fonts.
You may also install fonts using Konqueror: "
++"type fonts:/ into Konqueror's location bar and this will display your "
++"installed fonts. To install a font, simply copy it into the appropriate "
++"folder - \"Personal\" for fonts available to just yourself, or \"System\" "
++"for system-wide fonts (available to all).
NOTE: As you are not "
++"logged in as \"root\", any fonts installed will only be available to you. To "
++"install fonts system-wide, use the \"Administrator Mode\" button to run this "
++"module as \"root\".
"
++msgstr ""
++"字型安裝程式
這個模組用來安裝TrueType、Type1 以及Bitmap字型。"
++"p>
您也可以利用 Konqueror 來安裝 字型:在 Konqueror 的位址列鍵入 fonts:/,"
++"就會顯示出您目前已安裝的字型。要安裝新字型,只要複製一份到適當的資料夾即可─"
++"「個人」代表只供您自己使用的字型,而「系統」則是全系統的字型(所有人皆可"
++"用)。
注意:當您不是以「root」登入時,任何安裝的字型都只有您能"
++"用。要安裝全系統的字型,請使用「系統管理者模式」按鈕來以「root」執行此模組。"
+ "
"
+
+ #: kcmfontinst/KCmFontInst.cpp:421
+@@ -154,19 +153,17 @@
+ #: kcmfontinst/KCmFontInst.cpp:611
+ msgid ""
+ "Please note that any open applications will need to be restarted in order "
+-"for any changes to be noticed."
+-"
"
+-"
(You will also have to restart this application in order to use its print "
+-"function on any newly installed fonts.)
"
+-msgstr ""
+-"請注意任何已開啟的應用程式將須要重新啟動才能反應出所做的變更。"
+-"
"
+-"
(您也必須重新啟動這個應用程式才能讓新安裝的字型使用其列印功能。)
"
++"for any changes to be noticed.(You will also have to restart this "
++"application in order to use its print function on any newly installed fonts.)"
++"
"
++msgstr ""
++"請注意任何已開啟的應用程式將須要重新啟動才能反應出所做的變更。
(您也"
++"必須重新啟動這個應用程式才能讓新安裝的字型使用其列印功能。)
"
+
+ #: kcmfontinst/KCmFontInst.cpp:615
+ msgid ""
+-"Please note that any open applications will need to be restarted in order for "
+-"any changes to be noticed."
++"Please note that any open applications will need to be restarted in order "
++"for any changes to be noticed."
+ msgstr "請注意任何已開啟的應用程式將須要重新啟動才能反應出所做的變更。"
+
+ #: kcmfontinst/KCmFontInst.cpp:618 viewpart/FontViewPart.cpp:244
+@@ -243,19 +240,17 @@
+
+ #: kcmfontinst/SettingsDialog.cpp:52
+ msgid ""
+-"Modern applications use a system called \"FontConfig\" to obtain the list of "
+-"fonts. Older applications, such as OpenOffice 1.x, GIMP 1.x, etc. use the "
+-"previous \"core X fonts\" mechanism for this.
"
+-"Selecting this option will inform the installer to create the necessary "
+-"files so that these older applications can use the fonts you install.
"
+-"Please note, however, that this will slow down the installation process."
+-"
"
+-msgstr ""
+-"
現代的應用程式使用稱為「FontConfig」的系統來獲得字型清單。較舊的應用程式像 OpenOffice 1.x、GIMP 1.x "
+-"等等則使用過去的「core X fonts」來達到目的。
"
+-"選擇這個選項會通知安裝程式建立必要的檔案以便那些舊程式可以使用您所安裝的字型。
"
+-"然而,請您注意這會降低安裝過程的速度。"
+-"
"
++"
Modern applications use a system called \"FontConfig\" to obtain the list "
++"of fonts. Older applications, such as OpenOffice 1.x, GIMP 1.x, etc. use the "
++"previous \"core X fonts\" mechanism for this.
Selecting this option "
++"will inform the installer to create the necessary files so that these older "
++"applications can use the fonts you install.
Please note, however, that "
++"this will slow down the installation process.
"
++msgstr ""
++"
現代的應用程式使用稱為「FontConfig」的系統來獲得字型清單。較舊的應用程式"
++"像 OpenOffice 1.x、GIMP 1.x 等等則使用過去的「core X fonts」來達到目的。"
++"p>
選擇這個選項會通知安裝程式建立必要的檔案以便那些舊程式可以使用您所安裝的"
++"字型。
然而,請您注意這會降低安裝過程的速度。
"
+
+ #: kcmfontinst/SettingsDialog.cpp:57
+ msgid "Configure fonts for Ghostscript"
+@@ -263,31 +258,33 @@
+
+ #: kcmfontinst/SettingsDialog.cpp:58
+ msgid ""
+-"
When printing, most applications create what is know as PostScript. This is "
+-"then sent to a special application, named Ghostscript, which can interpret the "
+-"PostScript and send the appropriate instructions to your printer. If your "
+-"application does not embed whatever fonts it uses into the PostScript, then "
+-"Ghostscript needs to be informed as to which fonts you have installed, and "
+-"where they are located.
"
+-"Selecting this option will create the necessary Ghostscript config files.
"
+-"Please note, however, that this will also slow down the installation "
+-"process.
"
+-"As most applications can, and do, embed the fonts into the PostScript before "
+-"sending this to Ghostscript, this option can safely be disabled."
+-msgstr ""
+-"
在列印時,大多數應用程式都是使用 PostScript。亦即將其送至特定的應用程式,其名為 Ghostscript,它能解譯 PostScript "
+-"並送出正確的指令到您的印表機。如果您的應用程式沒有內嵌任何 PostScript 使用的字型,那就需要通知 Ghostscript "
+-"您已安裝何種字型以及安裝在何處。
"
+-"選擇這個選項會建立必要的 Ghostscript 設定檔。
"
+-"請注意,這會減低安裝過程的速度。
"
+-"當大部分應用程式在送出資料到 Ghostscript 之前都可以,並確實內嵌字型到 PostScript,您便可以安心停用這個選項。"
++"
When printing, most applications create what is know as PostScript. This "
++"is then sent to a special application, named Ghostscript, which can "
++"interpret the PostScript and send the appropriate instructions to your "
++"printer. If your application does not embed whatever fonts it uses into the "
++"PostScript, then Ghostscript needs to be informed as to which fonts you have "
++"installed, and where they are located.
Selecting this option will "
++"create the necessary Ghostscript config files.
Please note, however, "
++"that this will also slow down the installation process.
As most "
++"applications can, and do, embed the fonts into the PostScript before sending "
++"this to Ghostscript, this option can safely be disabled."
++msgstr ""
++"
在列印時,大多數應用程式都是使用 PostScript。亦即將其送至特定的應用程式,"
++"其名為 Ghostscript,它能解譯 PostScript 並送出正確的指令到您的印表機。如果您"
++"的應用程式沒有內嵌任何 PostScript 使用的字型,那就需要通知 Ghostscript 您已安"
++"裝何種字型以及安裝在何處。
選擇這個選項會建立必要的 Ghostscript 設定"
++"檔。
請注意,這會減低安裝過程的速度。
當大部分應用程式在送出資料"
++"到 Ghostscript 之前都可以,並確實內嵌字型到 PostScript,您便可以安心停用這個"
++"選項。"
+
+ #: kcmfontinst/SettingsDialog.cpp:84
+ msgid ""
+-"You have enabled a previously disabled option. Would you like the config files "
+-"updated now? (Normally they are only updated upon installing, or removing, a "
+-"font.)"
+-msgstr "您已經啟用一個原本停用的選項。您是否希望設定檔現在就更新?(它們通常只有在安裝或移除字型時才會更新。)"
++"You have enabled a previously disabled option. Would you like the config "
++"files updated now? (Normally they are only updated upon installing, or "
++"removing, a font.)"
++msgstr ""
++"您已經啟用一個原本停用的選項。您是否希望設定檔現在就更新?(它們通常只有在安裝"
++"或移除字型時才會更新。)"
+
+ #: kcmfontinst/SettingsDialog.cpp:86
+ msgid "Update"
+@@ -335,17 +332,17 @@
+ msgstr "抱歉,字型不能重新命名。"
+
+ #: kio/KioFonts.cpp:1920
+-msgid ""
+-"Incorrect password.\n"
+-msgstr ""
+-"密碼錯誤。\n"
++msgid "Incorrect password.\n"
++msgstr "密碼錯誤。\n"
+
+ #: kio/KioFonts.cpp:1963
+ msgid ""
+-"Do you wish to install the font into \"%1\" (in which case the font will only "
+-"be usable by you), or \"%2\" (the font will be usable by all users - but you "
+-"will need to know the administrator's password)?"
+-msgstr "您想要將字型安裝在「%1」(只有您可以使用),或是「%2」(讓全部使 用者使用,不過您需要管理者密碼才能安裝) ?"
++"Do you wish to install the font into \"%1\" (in which case the font will "
++"only be usable by you), or \"%2\" (the font will be usable by all users - "
++"but you will need to know the administrator's password)?"
++msgstr ""
++"您想要將字型安裝在「%1」(只有您可以使用),或是「%2」(讓全部使 用者使用,不過"
++"您需要管理者密碼才能安裝) ?"
+
+ #: kio/KioFonts.cpp:1968
+ msgid "Where to Install"
+@@ -361,51 +358,43 @@
+
+ #: kio/KioFonts.cpp:2146
+ msgid ""
+-"
Only fonts may be installed.
"
+-"If installing a fonts package (*%1), then extract the components, and "
+-"install individually.
"
+-msgstr "只有要被安裝的字型。
如果安裝一個字型套件 (*%1),則解開其元件並各別安裝。
"
++"Only fonts may be installed.
If installing a fonts package (*%1), "
++"then extract the components, and install individually.
"
++msgstr ""
++"只有要被安裝的字型。
如果安裝一個字型套件 (*%1),則解開其元件並各別"
++"安裝。
"
+
+ #: kio/KioFonts.cpp:2309
+ msgid ""
+ "This font is located in a file alongside other fonts; in order to proceed "
+-"with the moving they will all have to be moved. The other affected fonts "
+-"are:
"
+-""
+-"\n"
++"with the moving they will all have to be moved. The other affected fonts are:"
++"
\n"
+ " Do you wish to move all of these?
"
+ msgstr ""
+-"這個字型位於一個包含其他字型的檔案;為了進行這次移動的動作其他所有字型也會被移動。其他會被影響的字型有:
"
+-""
+-"\n"
++"
這個字型位於一個包含其他字型的檔案;為了進行這次移動的動作其他所有字型也會"
++"被移動。其他會被影響的字型有:
\n"
+ "您是否希望移動它們全部?
"
+
+ #: kio/KioFonts.cpp:2314
+ msgid ""
+ "This font is located in a file alongside other fonts; in order to proceed "
+ "with the copying they will all have to be copied. The other affected fonts "
+-"are:
"
+-""
+-"\n"
++"are:
\n"
+ " Do you wish to copy all of these?
"
+ msgstr ""
+-"這個字型位於一個包含其他字型的檔案;為了進行這次複製的動作其他所有字型也會被複製。其他會被影響的字型有:
"
+-""
+-"\n"
++"
這個字型位於一個包含其他字型的檔案;為了進行這次複製的動作其他所有字型也會"
++"被複製。其他會被影響的字型有:
\n"
+ "您是否希望複製它們全部?
"
+
+ #: kio/KioFonts.cpp:2318
+ msgid ""
+ "This font is located in a file alongside other fonts; in order to proceed "
+ "with the deleting they will all have to be deleted. The other affected fonts "
+-"are:
"
+-""
+-"\n"
++"are:
\n"
+ " Do you wish to delete all of these?
"
+ msgstr ""
+-"這個字型位於一個包含其他字型的檔案;為了進行這次刪除的動作其他所有字型也會被刪除。其他會被影響的字型有:
"
+-""
+-"\n"
++"
這個字型位於一個包含其他字型的檔案;為了進行這次刪除的動作其他所有字型也會"
++"被刪除。其他會被影響的字型有:
\n"
+ "您是否希望刪除它們全部?
"
+
+ #: kio/KioFonts.cpp:2391
+@@ -461,11 +450,11 @@
+
+ #: viewpart/FontViewPart.cpp:94
+ msgid "Install..."
+-msgstr "安裝..."
++msgstr "安裝…"
+
+ #: viewpart/FontViewPart.cpp:110
+ msgid "Change Text..."
+-msgstr "改變文字..."
++msgstr "改變文字…"
+
+ #: viewpart/FontViewPart.cpp:208
+ msgid ""
+@@ -632,8 +621,14 @@
+ #~ msgid "Disable"
+ #~ msgstr "停用"
+
+-#~ msgid "NOTE: As you are not logged in as \"root\", any fonts installed will only be available to you. To install fonts system wide, use the \"Administrator Mode\" button to run this module as \"root\".
"
+-#~ msgstr "注意:由於您並未以\"root\"身份登入,所安裝的字型 只有你可以使用。如果您想要安裝字型讓整個系統使用,請按 \"Administrator Mode\"鍵,以\"root\"身份來執行本模組。"
++#~ msgid ""
++#~ "
NOTE: As you are not logged in as \"root\", any fonts installed "
++#~ "will only be available to you. To install fonts system wide, use the "
++#~ "\"Administrator Mode\" button to run this module as \"root\".
"
++#~ msgstr ""
++#~ "注意:由於您並未以\"root\"身分登入,所安裝的字型 只有你可以使"
++#~ "用。如果您想要安裝字型讓整個系統使用,請按 \"Administrator Mode\"鍵,以"
++#~ "\"root\"身分來執行本模組。"
+
+ #, fuzzy
+ #~ msgid ""
+@@ -713,12 +708,22 @@
+ #~ "請將這個字型改名/停用。"
+
+ #, fuzzy
+-#~ msgid "You cannot create a folder named \"CID\", \"encodings\", \"util\", \"%1\", or \"%2\", - as these are special system folders (\"CID\" is for \"CID\" fonts - these are not handled - and \"encodings\" and \"util\" are for X11 encoding files"
+-#~ msgstr "您無法新增名為\"CID\"、\"encodings\"、或是\"util\"的資料夾, 因為他們是特定的系統資料夾(\"CID\"是給\"CID\"字型使用, 不該由此處理,而\"encodings\"和\"util\"是X11的編碼 檔案。"
++#~ msgid ""
++#~ "You cannot create a folder named \"CID\", \"encodings\", \"util\", \"%1"
++#~ "\", or \"%2\", - as these are special system folders (\"CID\" is for \"CID"
++#~ "\" fonts - these are not handled - and \"encodings\" and \"util\" "
++#~ "are for X11 encoding files"
++#~ msgstr ""
++#~ "您無法新增名為\"CID\"、\"encodings\"、或是\"util\"的資料夾, 因為他們是特"
++#~ "定的系統資料夾(\"CID\"是給\"CID\"字型使用, 不該由此處理,而"
++#~ "\"encodings\"和\"util\"是X11的編碼 檔案。"
+
+ #, fuzzy
+-#~ msgid "You cannot create a folder named \"kde-override\", \"%1\", or \"%2\", as these are special KDE folders."
+-#~ msgstr "您無法新增名為\"kde-override\"的資料夾,因為這是KDE的一個特定 資料夾。"
++#~ msgid ""
++#~ "You cannot create a folder named \"kde-override\", \"%1\", or \"%2\", as "
++#~ "these are special KDE folders."
++#~ msgstr ""
++#~ "您無法新增名為\"kde-override\"的資料夾,因為這是KDE的一個特定 資料夾。"
+
+ #~ msgid ""
+ #~ "A hidden/disabled folder (starting with a '.') already exists.\n"
+@@ -743,7 +748,7 @@
+ #~ msgstr "%1:%2 已經安裝了!"
+
+ #~ msgid "Loading file..."
+-#~ msgstr "載入檔案..."
++#~ msgstr "載入檔案…"
+
+ #~ msgid "Install Fonts"
+ #~ msgstr "安裝字型"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kgreet_classic.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kgreet_classic.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kgreet_classic.po 2008-02-13 10:55:26.000000000 +0100
++++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kgreet_classic.po 2011-11-11 15:45:17.000000000 +0100
+@@ -6,8 +6,7 @@
+ "Project-Id-Version: kgreet_classic\n"
+ "POT-Creation-Date: 2007-12-16 01:17+0100\n"
+ "PO-Revision-Date: 2006-01-20 15:23+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Traditional Chinese \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kgreet_winbind.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kgreet_winbind.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kgreet_winbind.po 2008-02-13 10:55:26.000000000 +0100
++++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kgreet_winbind.po 2011-11-11 15:45:17.000000000 +0100
+@@ -6,8 +6,7 @@
+ "Project-Id-Version: kgreet_winbind\n"
+ "POT-Creation-Date: 2007-12-16 01:17+0100\n"
+ "PO-Revision-Date: 2006-01-20 15:24+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Traditional Chinese \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/khelpcenter.po kde-i18n-zh_TW-3.5.10/messages/kdebase/khelpcenter.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/khelpcenter.po 2007-07-12 10:27:45.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdebase/khelpcenter.po 2011-11-11 15:45:17.000000000 +0100
+@@ -9,7 +9,7 @@
+ "Project-Id-Version: khelpcenter\n"
+ "POT-Creation-Date: 2007-05-19 02:14+0200\n"
+ "PO-Revision-Date: 2005-10-31 21:34+0800\n"
+-"Last-Translator: Chao-Hsiung Liao \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Chinese (traditional) \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -131,15 +131,16 @@
+
+ #: glossary.cpp:147
+ msgid "Rebuilding cache..."
+-msgstr "正在重建快取..."
++msgstr "正在重建快取…"
+
+ #: glossary.cpp:177
+ msgid "Rebuilding cache... done."
+-msgstr "正在重建快取...完成。"
++msgstr "正在重建快取…完成。"
+
+ #: glossary.cpp:272
+ msgid ""
+-"Unable to show selected glossary entry: unable to open file 'glossary.html.in'!"
++"Unable to show selected glossary entry: unable to open file 'glossary.html."
++"in'!"
+ msgstr "無法顯示選擇的辭典項目:無法開啟檔案 'glossary.html.in'!"
+
+ #: glossary.cpp:277
+@@ -156,9 +157,10 @@
+
+ #: htmlsearchconfig.cpp:51
+ msgid ""
+-"The fulltext search feature makes use of the ht://dig HTML search engine. You "
+-"can get ht://dig at the"
+-msgstr "全文搜尋的功能使用了 ht://dig HTML 搜尋引擎。您可以在下列位址取得 ht://dig:"
++"The fulltext search feature makes use of the ht://dig HTML search engine. "
++"You can get ht://dig at the"
++msgstr ""
++"全文搜尋的功能使用了 ht://dig HTML 搜尋引擎。您可以在下列位址取得 ht://dig:"
+
+ #: htmlsearchconfig.cpp:57
+ msgid "Information about where to get the ht://dig package."
+@@ -249,8 +251,7 @@
+ msgid ""
+ "To create an index check the box in the list and press the\n"
+ "\"Build Index\" button.\n"
+-msgstr ""
+-"要建立一份索引,請選取清單中的方格,然後按下\"建立索引\"。\n"
++msgstr "要建立一份索引,請選取清單中的方格,然後按下\"建立索引\"。\n"
+
+ #: kcmhelpcenter.cpp:278
+ msgid "Search Scope"
+@@ -262,7 +263,7 @@
+
+ #: kcmhelpcenter.cpp:293
+ msgid "Change..."
+-msgstr "更改..."
++msgstr "更改…"
+
+ #: kcmhelpcenter.cpp:312
+ msgid "The folder %1 does not exist; unable to create index."
+@@ -273,10 +274,8 @@
+ msgstr "沒有找到"
+
+ #: kcmhelpcenter.cpp:397
+-msgid ""
+-"Document '%1' (%2):\n"
+-msgstr ""
+-"文件 '%1' (%2):\n"
++msgid "Document '%1' (%2):\n"
++msgstr "文件 '%1' (%2):\n"
+
+ #: kcmhelpcenter.cpp:402
+ msgid "No document type."
+@@ -365,11 +364,11 @@
+
+ #: mainwindow.cpp:230
+ msgid "&Last Search Result"
+-msgstr "上一個搜尋結果 (&L)"
++msgstr "上一個搜尋結果(&L)"
+
+ #: mainwindow.cpp:235
+ msgid "Build Search Index..."
+-msgstr "建立搜尋索引..."
++msgstr "建立搜尋索引…"
+
+ #: mainwindow.cpp:243
+ msgid "Show Search Error Log"
+@@ -377,7 +376,7 @@
+
+ #: mainwindow.cpp:250
+ msgid "Configure Fonts..."
+-msgstr "設定字型..."
++msgstr "設定字型…"
+
+ #: mainwindow.cpp:251
+ msgid "Increase Font Sizes"
+@@ -494,7 +493,7 @@
+
+ #: searchwidget.cpp:59
+ msgid "&Method:"
+-msgstr "方式 (&M):"
++msgstr "方式(&M):"
+
+ #: searchwidget.cpp:73
+ msgid "Max. &results:"
+@@ -510,7 +509,7 @@
+
+ #: searchwidget.cpp:97
+ msgid "Build Search &Index..."
+-msgstr "建立搜尋索引(&I)..."
++msgstr "建立搜尋索引(&I)…"
+
+ #: searchwidget.cpp:352
+ msgid "Custom"
+@@ -547,7 +546,8 @@
+ #: view.cpp:122
+ msgid ""
+ "KDE is a powerful graphical desktop environment for UNIX workstations. A\n"
+-"KDE desktop combines ease of use, contemporary functionality and outstanding\n"
++"KDE desktop combines ease of use, contemporary functionality and "
++"outstanding\n"
+ "graphical design with the technological superiority of the UNIX operating\n"
+ "system."
+ msgstr ""
+@@ -618,7 +618,7 @@
+ #~ msgstr "HTML 搜尋"
+
+ #~ msgid "Create Search &Index..."
+-#~ msgstr "建立搜尋索引 (&I)..."
++#~ msgstr "建立搜尋索引(&I)…"
+
+ #, fuzzy
+ #~ msgid "Index directory:"
+@@ -631,8 +631,12 @@
+ #~ msgid "Indexing '%1'."
+ #~ msgstr "索引 '%1'。"
+
+-#~ msgid "Help Index
With this control module you configure and build the index files required by the search function of the help center."
+-#~ msgstr "輔助索引
這個控制模組可以讓您設定並建立,在輔助中心的搜尋功能中,所需要的索引檔。"
++#~ msgid ""
++#~ "Help Index
With this control module you configure and build the "
++#~ "index files required by the search function of the help center."
++#~ msgstr ""
++#~ "輔助索引
這個控制模組可以讓您設定並建立,在輔助中心的搜尋功能中,"
++#~ "所需要的索引檔。"
+
+ #~ msgid "KCMHelpCenter"
+ #~ msgstr "KCMHelpCenter"
+@@ -646,13 +650,19 @@
+ #~ msgid "Browse info pages"
+ #~ msgstr "瀏覽資訊頁"
+
+-#~ msgid "One or more files containing info nodes belonging to the subject '%1' do(es) not exist."
++#~ msgid ""
++#~ "One or more files containing info nodes belonging to the subject '%1' do"
++#~ "(es) not exist."
+ #~ msgstr "一個或多個包含關於主題 '%1' 的 Info Node 並未存在。"
+
+-#~ msgid "Info nodes belonging to the subject '%1' seem to be not ordered in a hierarchy."
++#~ msgid ""
++#~ "Info nodes belonging to the subject '%1' seem to be not ordered in a "
++#~ "hierarchy."
+ #~ msgstr "關於主題 '%1' 的 Info Node,在階層中看起來並未被排序過。"
+
+-#~ msgid "An unknown error occurred while creating the hierarchy of info nodes belonging to the subject '%1'."
++#~ msgid ""
++#~ "An unknown error occurred while creating the hierarchy of info nodes "
++#~ "belonging to the subject '%1'."
+ #~ msgstr "當建立關於主題 '%1' 的 Info Node 階層時,發生無法預期的錯誤。"
+
+ #~ msgid "Cannot Create Hierarchy of Info Nodes"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/khotkeys.po kde-i18n-zh_TW-3.5.10/messages/kdebase/khotkeys.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/khotkeys.po 2008-08-19 20:43:10.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdebase/khotkeys.po 2011-11-11 15:45:17.000000000 +0100
+@@ -7,7 +7,7 @@
+ "Project-Id-Version: khotkeys\n"
+ "POT-Creation-Date: 2008-07-08 01:18+0200\n"
+ "PO-Revision-Date: 2005-11-01 21:11+0800\n"
+-"Last-Translator: Chao-Hsiung Liao \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Chinese (traditional) \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -48,7 +48,7 @@
+ #: rc.cpp:18 rc.cpp:39 rc.cpp:170 rc.cpp:225
+ #, no-c-format
+ msgid "&Modify..."
+-msgstr "修改(&M)..."
++msgstr "修改(&M)…"
+
+ #. i18n: file kcontrol/ui/actions_listview_widget_ui.ui line 30
+ #: kcontrol/tab_widget.cpp:425 rc.cpp:27
+@@ -108,7 +108,7 @@
+ #: rc.cpp:69
+ #, no-c-format
+ msgid "Import New Actions..."
+-msgstr "匯入新的動作..."
++msgstr "匯入新的動作…"
+
+ #. i18n: file kcontrol/ui/general_tab_ui.ui line 30
+ #: rc.cpp:72
+@@ -132,7 +132,7 @@
+ #: rc.cpp:87 rc.cpp:90 rc.cpp:93
+ #, no-c-format
+ msgid "Edit..."
+-msgstr "編輯..."
++msgstr "編輯…"
+
+ #. i18n: file kcontrol/ui/gestures_settings_tab_ui.ui line 24
+ #: rc.cpp:96
+@@ -168,15 +168,17 @@
+ #: rc.cpp:111
+ #, no-c-format
+ msgid ""
+-"This module allows configuring input actions, like mouse gestures, keyboard "
+-"shortcuts for performing commands, launching applications or DCOP calls, and "
+-"similar.
\n"
+-"NOTE: If you are not an experienced user, you should be careful with "
+-"modifying the actions, and should limit your changes mainly to "
+-"enabling/disabling actions, and changing triggers.
"
++"This module allows configuring input actions, like mouse gestures, "
++"keyboard shortcuts for performing commands, launching applications or DCOP "
++"calls, and similar.
\n"
++"NOTE: If you are not an experienced user, you should be careful "
++"with modifying the actions, and should limit your changes mainly to enabling/"
++"disabling actions, and changing triggers.
"
+ msgstr ""
+-"這個模組允許配置輸入的動作,如滑鼠手勢,鍵盤快速鍵完成指令,起動應用程式或 DCOP 呼叫,及諸如此類的。
\n"
+-"注意:如果您不是有經驗的使用者,在修改這些動作時要小心,主要就是要有節制地對啟動/關閉動作和觸發器進行變更。
"
++"這個模組允許配置輸入的動作,如滑鼠手勢,鍵盤快速鍵完成指令,起動應用程式"
++"或 DCOP 呼叫,及諸如此類的。
\n"
++"注意:如果您不是有經驗的使用者,在修改這些動作時要小心,主要就是要"
++"有節制地對啟動/關閉動作和觸發器進行變更。
"
+
+ #. i18n: file kcontrol/ui/keyboard_input_widget_ui.ui line 16
+ #: rc.cpp:115
+@@ -194,7 +196,7 @@
+ #: rc.cpp:121
+ #, no-c-format
+ msgid "Modify..."
+-msgstr "修改..."
++msgstr "修改…"
+
+ #. i18n: file kcontrol/ui/keyboard_input_widget_ui.ui line 76
+ #: rc.cpp:124
+@@ -206,20 +208,19 @@
+ #: rc.cpp:127
+ #, no-c-format
+ msgid ""
+-"Specify the window where the keyboard input should be sent to:"
+-"\n"
++"Specify the window where the keyboard input should be sent to:\n"
+ "- Action window: The window where the triggering action happened; "
+-"this is usually the currently active window, except for mouse gesture triggers "
+-"- where it is the window under mouse - and window triggers -where it is the "
+-"window triggering the action.
\n"
++"this is usually the currently active window, except for mouse gesture "
++"triggers - where it is the window under mouse - and window triggers -where "
++"it is the window triggering the action.\n"
+ "- Active window: The currently active window.
\n"
+ "- Specific window: Any window matching the given criteria.
\n"
+ "
"
+ msgstr ""
+-"指定鍵盤輸入應送出至哪個視窗:"
+-"\n"
+-"- 動作視窗: "
+-"觸發動作發生的視窗;這通常是目前作用中視窗,除了滑鼠手勢觸發─它是發生於該滑鼠之下的視窗─與視窗觸發─它是由觸發該動作的視窗。
\n"
++"指定鍵盤輸入應送出至哪個視窗:\n"
++"- 動作視窗: 觸發動作發生的視窗;這通常是目前作用中視窗,除了滑鼠"
++"手勢觸發─它是發生於該滑鼠之下的視窗─與視窗觸發─它是由觸發該動作的視窗。"
++"li>\n"
+ "
- 作用中視窗: 目前作用中的視窗
\n"
+ "- 指定的視窗: 任何合於指定條件的視窗。
\n"
+ "
"
+@@ -282,7 +283,7 @@
+ #: rc.cpp:161
+ #, no-c-format
+ msgid "&Browse..."
+-msgstr "瀏覽(&B)..."
++msgstr "瀏覽(&B)…"
+
+ #. i18n: file kcontrol/ui/voice_input_widget_ui.ui line 46
+ #: rc.cpp:179
+@@ -306,10 +307,12 @@
+ #: rc.cpp:188
+ #, no-c-format
+ msgid ""
+-"In order to trigger a spoken action, you have to press the key (or combination "
+-"of keys) configured below, speak the command and then press the same key again "
+-"once you have finished speaking."
+-msgstr "為了觸發語音動作,您須要按下下面設定的按鍵(或組合鍵),說話,並且在您說完語音指令後再按一次相同的快速鍵"
++"In order to trigger a spoken action, you have to press the key (or "
++"combination of keys) configured below, speak the command and then press the "
++"same key again once you have finished speaking."
++msgstr ""
++"為了觸發語音動作,您須要按下下面設定的按鍵(或組合鍵),說話,並且在您說完語音"
++"指令後再按一次相同的快速鍵"
+
+ #. i18n: file kcontrol/ui/voice_settings_tab_ui.ui line 43
+ #: rc.cpp:191
+@@ -331,7 +334,8 @@
+ "mode: \n"
+ "make sure Full duplex is checked in your Sound System options."
+ msgstr ""
+-"注意: 要讓語音辨識功能正確執行,您須要有能正常運作的 arts,並使用全雙工模式: \n"
++"注意: 要讓語音辨識功能正確執行,您須要有能正常運作的 arts,並"
++"使用全雙工模式: \n"
+ "請確定您的 聲音伺服器 選項中的 全雙工 核取方塊已核取。"
+
+ #. i18n: file kcontrol/ui/window_trigger_widget_ui.ui line 30
+@@ -516,16 +520,18 @@
+
+ #: shared/settings.cpp:70
+ msgid ""
+-"This \"actions\" file has already been imported before. Are you sure you want "
+-"to import it again?"
++"This \"actions\" file has already been imported before. Are you sure you "
++"want to import it again?"
+ msgstr "這個「動作」以前就匯入過了。您是否確定要再次匯入它們?"
+
+ #: shared/settings.cpp:81
+ msgid ""
+ "This \"actions\" file has no ImportId field and therefore it cannot be "
+-"determined whether or not it has been imported already. Are you sure you want "
+-"to import it?"
+-msgstr "這個「動作」沒有 ImportId 欄位因此無法確認是否已經匯入過了。您是否確定要匯入它們?"
++"determined whether or not it has been imported already. Are you sure you "
++"want to import it?"
++msgstr ""
++"這個「動作」沒有 ImportId 欄位因此無法確認是否已經匯入過了。您是否確定要匯入"
++"它們?"
+
+ #: kcontrol/menuedit.cpp:95 shared/settings.cpp:250
+ msgid "These entries were created using Menu Editor."
+@@ -565,31 +571,31 @@
+
+ #: kcontrol/action_list_widget.cpp:46
+ msgid "Command/URL..."
+-msgstr "命令/URL..."
++msgstr "命令/URL…"
+
+ #: kcontrol/action_list_widget.cpp:47
+ msgid "K-Menu Entry..."
+-msgstr "K-選單 條目..."
++msgstr "K-選單 條目…"
+
+ #: kcontrol/action_list_widget.cpp:48
+ msgid "DCOP Call..."
+-msgstr "DCOP 呼叫..."
++msgstr "DCOP 呼叫…"
+
+ #: kcontrol/action_list_widget.cpp:49
+ msgid "Keyboard Input..."
+-msgstr "鍵盤輸入..."
++msgstr "鍵盤輸入…"
+
+ #: kcontrol/action_list_widget.cpp:50
+ msgid "Activate Window..."
+-msgstr "動用視窗..."
++msgstr "動用視窗…"
+
+ #: kcontrol/condition_list_widget.cpp:47
+ msgid "Active Window..."
+-msgstr "動用中的視窗..."
++msgstr "動用中的視窗…"
+
+ #: kcontrol/condition_list_widget.cpp:48
+ msgid "Existing Window..."
+-msgstr "存在的視窗..."
++msgstr "存在的視窗…"
+
+ #: kcontrol/condition_list_widget.cpp:159
+ msgid ""
+@@ -653,22 +659,25 @@
+
+ #: kcontrol/gesturerecordpage.cpp:35
+ msgid ""
+-"Draw the gesture you would like to record below. Press and hold the left mouse "
+-"button while drawing, and release when you have finished.\n"
++"Draw the gesture you would like to record below. Press and hold the left "
++"mouse button while drawing, and release when you have finished.\n"
+ "\n"
+-"You will be required to draw the gesture 3 times. After each drawing, if they "
+-"match, the indicators below will change to represent which step you are on.\n"
++"You will be required to draw the gesture 3 times. After each drawing, if "
++"they match, the indicators below will change to represent which step you are "
++"on.\n"
+ "\n"
+-"If at any point they do not match, you will be required to restart. If you want "
+-"to force a restart, use the reset button below.\n"
++"If at any point they do not match, you will be required to restart. If you "
++"want to force a restart, use the reset button below.\n"
+ "\n"
+ "Draw here:"
+ msgstr ""
+ "在下方繪畫出您要紀錄的手勢。繪畫時要按住滑鼠左鍵,當您完成時再放開。\n"
+ "\n"
+-"您需要繪畫手勢三次。如果有符合的話,在每次畫完後,下方的指示會改變並顯示出您所在的步驟。\n"
++"您需要繪畫手勢三次。如果有符合的話,在每次畫完後,下方的指示會改變並顯示出您"
++"所在的步驟。\n"
+ "\n"
+-"如果有任何特點沒有相符合,您將被要求重新開始。如果您要強制重新開始,就使用下方的重設按鈕。\n"
++"如果有任何特點沒有相符合,您將被要求重新開始。如果您要強制重新開始,就使用下"
++"方的重設按鈕。\n"
+ "\n"
+ "在這裡繪畫:"
+
+@@ -740,8 +749,8 @@
+
+ #: kcontrol/kcmkhotkeys.cpp:283
+ msgid ""
+-"Import of the specified file failed. Most probably the file is not a valid file "
+-"with actions."
++"Import of the specified file failed. Most probably the file is not a valid "
++"file with actions."
+ msgstr "匯入指定的檔案失敗。很可能這不是個有效的附動作檔案。"
+
+ #: kcontrol/menuedit.cpp:236 kcontrol/menuedit.cpp:237
+@@ -811,11 +820,11 @@
+
+ #: kcontrol/triggers_tab.cpp:53
+ msgid "Window Trigger..."
+-msgstr "視窗觸發器..."
++msgstr "視窗觸發器…"
+
+ #: kcontrol/triggers_tab.cpp:56
+ msgid "Voice Trigger..."
+-msgstr "語音觸發器..."
++msgstr "語音觸發器…"
+
+ #: kcontrol/triggers_tab.cpp:226
+ msgid "Select keyboard shortcut:"
+@@ -823,7 +832,7 @@
+
+ #: kcontrol/voicerecorder.cpp:74
+ msgid "Recording..."
+-msgstr "錄音中..."
++msgstr "錄音中…"
+
+ #: kcontrol/voicerecorder.cpp:124
+ msgid ""
+@@ -842,8 +851,8 @@
+
+ #: kcontrol/voicerecordpage.cpp:31
+ msgid ""
+-"Enter a code for the sound (e.g. the word you are saying) and record the same "
+-"word twice."
++"Enter a code for the sound (e.g. the word you are saying) and record the "
++"same word twice."
+ msgstr "輸入此語音的代號(如:您所說的單字)然後錄製同一個單字兩次"
+
+ #: kcontrol/voicerecordpage.cpp:81
+@@ -852,13 +861,13 @@
+
+ #: kcontrol/voicerecordpage.cpp:89
+ msgid ""
+-"%1"
+-"
One of the sound references is not correct"
++"%1
One of the sound references is not correct"
++"font>"
+ msgstr "%1
其中一個語音參照不正確"
+
+ #: kcontrol/windowdef_list_widget.cpp:45
+ msgid "Simple Window..."
+-msgstr "簡易視窗..."
++msgstr "簡易視窗…"
+
+ #: _translatorinfo.cpp:1
+ msgid ""
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/khtmlkttsd.po kde-i18n-zh_TW-3.5.10/messages/kdebase/khtmlkttsd.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/khtmlkttsd.po 2006-07-22 10:04:12.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdebase/khtmlkttsd.po 2011-11-11 15:45:17.000000000 +0100
+@@ -6,8 +6,7 @@
+ "Project-Id-Version: khtmlkttsd\n"
+ "POT-Creation-Date: 2006-01-04 03:13+0100\n"
+ "PO-Revision-Date: 2006-01-20 15:27+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Traditional Chinese \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kickermenu_kate.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kickermenu_kate.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kickermenu_kate.po 2007-01-15 10:56:32.000000000 +0100
++++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kickermenu_kate.po 2011-11-11 15:45:17.000000000 +0100
+@@ -6,8 +6,7 @@
+ "Project-Id-Version: kickermenu_kate\n"
+ "POT-Creation-Date: 2006-11-16 02:36+0100\n"
+ "PO-Revision-Date: 2006-11-20 09:13+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Chinese Traditional \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -40,8 +39,8 @@
+
+ #: katesessionmenu.cpp:120
+ msgid ""
+-"An unnamed session will not be saved automatically. Do you want to create such "
+-"a session?"
++"An unnamed session will not be saved automatically. Do you want to create "
++"such a session?"
+ msgstr "未命名的工作階段將不會被自動儲存。您確定要建立這樣的工作階段嗎?"
+
+ #: katesessionmenu.cpp:122
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kicker.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kicker.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kicker.po 2008-08-19 20:43:10.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kicker.po 2011-11-11 15:45:17.000000000 +0100
+@@ -8,8 +8,7 @@
+ "Project-Id-Version: kicker\n"
+ "POT-Creation-Date: 2008-08-19 01:16+0200\n"
+ "PO-Revision-Date: 2007-02-27 09:10+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Chinese Traditional \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -87,8 +86,8 @@
+
+ #: core/extensionmanager.cpp:117
+ msgid ""
+-"The KDE panel (kicker) could not load the main panel due to a problem with your "
+-"installation. "
++"The KDE panel (kicker) could not load the main panel due to a problem with "
++"your installation. "
+ msgstr "由於您安裝上的問題 KDE 面板(kicker)無法載入主面板。"
+
+ #: core/extensionmanager.cpp:119
+@@ -129,11 +128,11 @@
+
+ #: core/panelextension.cpp:341
+ msgid "Add &Applet to Menubar..."
+-msgstr "加入小程式到選單列(&A)..."
++msgstr "加入小程式到選單列(&A)…"
+
+ #: core/panelextension.cpp:342
+ msgid "Add &Applet to Panel..."
+-msgstr "加入小程式到面板(&A)..."
++msgstr "加入小程式到面板(&A)…"
+
+ #: core/panelextension.cpp:345
+ msgid "Add Appli&cation to Menubar"
+@@ -169,7 +168,7 @@
+
+ #: core/panelextension.cpp:380
+ msgid "&Configure Panel..."
+-msgstr "設定面板 (&C)..."
++msgstr "設定面板(&C)…"
+
+ #: ui/addapplet.cpp:234
+ msgid "Add Applet"
+@@ -181,46 +180,46 @@
+
+ #: ui/appletop_mnu.cpp:51
+ msgid "&Move %1 Menu"
+-msgstr "移動 %1 選單 (&M)"
++msgstr "移動 %1 選單(&M)"
+
+ #: ui/appletop_mnu.cpp:52
+ msgid "&Move %1 Button"
+-msgstr "移動 %1 按鈕 (&M)"
++msgstr "移動 %1 按鈕(&M)"
+
+ #: ui/appletop_mnu.cpp:53
+ #, c-format
+ msgid "&Move %1"
+-msgstr "移動 %1 (&M)"
++msgstr "移動 %1(&M)"
+
+ #: ui/appletop_mnu.cpp:75
+ msgid "&Remove %1 Menu"
+-msgstr "刪除 %1 選單 (&R)"
++msgstr "刪除 %1 選單(&R)"
+
+ #: ui/appletop_mnu.cpp:76
+ msgid "&Remove %1 Button"
+-msgstr "移除 %1 按鈕 (&R)"
++msgstr "移除 %1 按鈕(&R)"
+
+ #: ui/appletop_mnu.cpp:77
+ #, c-format
+ msgid "&Remove %1"
+-msgstr "移除 %1 (&R)"
++msgstr "移除 %1(&R)"
+
+ #: ui/appletop_mnu.cpp:91 ui/extensionop_mnu.cpp:43
+ msgid "Report &Bug..."
+-msgstr "回報問題(&B)..."
++msgstr "回報問題(&B)…"
+
+ #: ui/appletop_mnu.cpp:105
+ #, c-format
+ msgid "&About %1"
+-msgstr "關於 %1 (&A)"
++msgstr "關於 %1(&A)"
+
+ #: ui/appletop_mnu.cpp:125
+ msgid "&Configure %1 Button..."
+-msgstr "設定 %1 按鈕(&C)..."
++msgstr "設定 %1 按鈕(&C)…"
+
+ #: ui/appletop_mnu.cpp:130 ui/extensionop_mnu.cpp:62
+ msgid "&Configure %1..."
+-msgstr "設定 %1 (&C)..."
++msgstr "設定 %1(&C)…"
+
+ #: ui/appletop_mnu.cpp:143
+ msgid "Applet Menu"
+@@ -256,7 +255,7 @@
+
+ #: ui/browser_dlg.cpp:63
+ msgid "&Browse..."
+-msgstr "瀏覽 (&B)..."
++msgstr "瀏覽(&B)…"
+
+ #: ui/browser_dlg.cpp:87
+ msgid "Select Folder"
+@@ -328,7 +327,7 @@
+
+ #: ui/k_mnu.cpp:280
+ msgid "Run Command..."
+-msgstr "執行命令..."
++msgstr "執行命令…"
+
+ #: ui/k_mnu.cpp:289
+ msgid "Switch User"
+@@ -344,7 +343,7 @@
+
+ #: ui/k_mnu.cpp:311
+ msgid "Log Out..."
+-msgstr "登出..."
++msgstr "登出…"
+
+ #: ui/k_mnu.cpp:364
+ msgid "Lock Current && Start New Session"
+@@ -356,18 +355,17 @@
+
+ #: ui/k_mnu.cpp:397
+ msgid ""
+-"You have chosen to open another desktop session."
+-"
The current session will be hidden and a new login screen will be "
+-"displayed."
+-"
An F-key is assigned to each session; F%1 is usually assigned to the first "
+-"session, F%2 to the second session and so on. You can switch between sessions "
+-"by pressing Ctrl, Alt and the appropriate F-key at the same time. Additionally, "
+-"the KDE Panel and Desktop menus have actions for switching between sessions.
"
++"You have chosen to open another desktop session.
The current session "
++"will be hidden and a new login screen will be displayed.
An F-key is "
++"assigned to each session; F%1 is usually assigned to the first session, F%2 "
++"to the second session and so on. You can switch between sessions by pressing "
++"Ctrl, Alt and the appropriate F-key at the same time. Additionally, the KDE "
++"Panel and Desktop menus have actions for switching between sessions.
"
+ msgstr ""
+-"您選項了其他的工作階段。"
+-"
目前的工作階段將會被隱藏,同時顯示新的登入視窗。"
+-"
功能鍵可以用來切換不同的工作階段;F%1 通常設定為第一個工作階段,而 F%2為第二個,其他的依此類推。您可以同時按下 "
+-"CTRL、ALT,以及功能鍵來切換你的工作階段。此外,KDE 面板和桌面選單也提供在工作階段之間切換的動作。
"
++"您選項了其他的工作階段。
目前的工作階段將會被隱藏,同時顯示新的登入視"
++"窗。
功能鍵可以用來切換不同的工作階段;F%1 通常設定為第一個工作階段,而 F%"
++"2為第二個,其他的依此類推。您可以同時按下 CTRL、ALT,以及功能鍵來切換你的工作"
++"階段。此外,KDE 面板和桌面選單也提供在工作階段之間切換的動作。
"
+
+ #: ui/k_mnu.cpp:408
+ msgid "Warning - New Session"
+@@ -536,8 +534,8 @@
+ #: rc.cpp:24
+ #, no-c-format
+ msgid ""
+-"This is the applet list. Select an applet and click on Add to panel "
+-"to add it"
++"This is the applet list. Select an applet and click on Add to panel"
++"b> to add it"
+ msgstr "這是小程式清單。選擇一個小程式並按 加入至面板 來加入它"
+
+ #. i18n: file ui/appletview.ui line 156
+@@ -550,9 +548,12 @@
+ #: rc.cpp:33 rc.cpp:58
+ #, no-c-format
+ msgid ""
+-"Enter the name of the executable file to be run when this button is selected. "
+-"If it is not in your $PATH then you will need to provide an absolute path."
+-msgstr "輸入當這個按鈕被選擇時要執行的可執行檔名稱。如果它不在您的 $PATH 中,您就須要提供絕對路徑。"
++"Enter the name of the executable file to be run when this button is "
++"selected. If it is not in your $PATH then you will need to provide an "
++"absolute path."
++msgstr ""
++"輸入當這個按鈕被選擇時要執行的可執行檔名稱。如果它不在您的 $PATH 中,您就須要"
++"提供絕對路徑。"
+
+ #. i18n: file ui/nonKDEButtonSettings.ui line 38
+ #: rc.cpp:36
+@@ -582,8 +583,8 @@
+ #: rc.cpp:47
+ #, no-c-format
+ msgid ""
+-"Select this option if the command is a command line application and you wish to "
+-"be able to see its output when run."
++"Select this option if the command is a command line application and you wish "
++"to be able to see its output when run."
+ msgstr "如果指令是命令列應用程式而您希望在執行時能看到它的輸出請選擇此選項。"
+
+ #. i18n: file ui/nonKDEButtonSettings.ui line 75
+@@ -615,9 +616,11 @@
+ #, no-c-format
+ msgid ""
+ "Whether this panel actually exists or not. Primarily to work around the fact "
+-"that KConfigXT won't write a config file unless there is at least one "
+-"non-default entry."
+-msgstr "這個面板是否存在。主要是修正 KConfigXT 在沒有至少一個非預設項目時不會寫入設定檔案。"
++"that KConfigXT won't write a config file unless there is at least one non-"
++"default entry."
++msgstr ""
++"這個面板是否存在。主要是修正 KConfigXT 在沒有至少一個非預設項目時不會寫入設定"
++"檔案。"
+
+ #. i18n: file core/extensionSettings.kcfg line 18
+ #: rc.cpp:82
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kio_finger.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kio_finger.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kio_finger.po 2005-09-10 13:15:15.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kio_finger.po 2011-11-11 15:45:17.000000000 +0100
+@@ -3,7 +3,7 @@
+ "Project-Id-Version: kio_finger\n"
+ "POT-Creation-Date: 2005-05-18 21:24+0200\n"
+ "PO-Revision-Date: 2001-08-27 17:07+CST\n"
+-"Last-Translator: Tung-Han Hsieh \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Traditional Chinese \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kio_fish.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kio_fish.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kio_fish.po 2007-01-15 10:56:32.000000000 +0100
++++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kio_fish.po 2011-11-11 15:45:17.000000000 +0100
+@@ -7,7 +7,7 @@
+ "Project-Id-Version: kio_fish\n"
+ "POT-Creation-Date: 2006-11-05 02:34+0100\n"
+ "PO-Revision-Date: 2005-11-02 21:46+0800\n"
+-"Last-Translator: Chao-Hsiung Liao \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Chinese (traditional) \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -16,11 +16,11 @@
+
+ #: fish.cpp:317
+ msgid "Connecting..."
+-msgstr "連線中..."
++msgstr "連線中…"
+
+ #: fish.cpp:570
+ msgid "Initiating protocol..."
+-msgstr "初始化通訊協定中..."
++msgstr "初始化通訊協定中…"
+
+ #: fish.cpp:604
+ msgid "Local Login"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kio_floppy.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kio_floppy.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kio_floppy.po 2006-07-22 10:04:12.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kio_floppy.po 2011-11-11 15:45:17.000000000 +0100
+@@ -4,7 +4,7 @@
+ "Project-Id-Version: kio_floppy\n"
+ "POT-Creation-Date: 2005-09-21 02:57+0200\n"
+ "PO-Revision-Date: 2005-11-02 22:15+0800\n"
+-"Last-Translator: Chao-Hsiung Liao \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Chinese (traditional) \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -40,8 +40,8 @@
+ #: kio_floppy.cpp:218
+ msgid ""
+ "Could not access %1.\n"
+-"There is probably no disk in the drive %2 or you do not have enough permissions "
+-"to access the drive."
++"There is probably no disk in the drive %2 or you do not have enough "
++"permissions to access the drive."
+ msgstr ""
+ "無法存取 %1。\n"
+ "可能在磁碟機 %2中沒有磁片或是你沒有足夠的權限存取磁碟機。"
+@@ -58,8 +58,8 @@
+ msgid ""
+ "Could not access %1.\n"
+ "Make sure the floppy in drive %2 is a DOS-formatted floppy disk \n"
+-"and that the permissions of the device file (e.g. /dev/fd0) are set correctly "
+-"(e.g. rwxrwxrwx)."
++"and that the permissions of the device file (e.g. /dev/fd0) are set "
++"correctly (e.g. rwxrwxrwx)."
+ msgstr ""
+ "無法存取 %1。\n"
+ "請確認磁碟機 %2 中的磁碟片是 DOS 格式化的磁片\n"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kio_home.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kio_home.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kio_home.po 2006-07-22 10:04:12.000000000 +0200
++++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kio_home.po 2011-11-11 15:45:17.000000000 +0100
+@@ -6,8 +6,7 @@
+ "Project-Id-Version: kio_home\n"
+ "POT-Creation-Date: 2006-04-28 03:54+0200\n"
+ "PO-Revision-Date: 2006-01-20 15:27+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin) \n"
++"Last-Translator: Wei-Lun Chao \n"
+ "Language-Team: Traditional Chinese \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kio_ldap.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kio_ldap.po
+--- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kio_ldap.po 2008-02-13 10:55:26.000000000 +0100
++++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kio_ldap.po 2011-11-11 15:45:17.000000000 +0100
+@@ -6,8 +6,7 @@
+ "Project-Id-Version: kio_ldap\n"
+ "POT-Creation-Date: 2007-11-01 01:14+0100\n"
+ "PO-Revision-Date: 2006-01-20 15:29+0800\n"
+-"Last-Translator: Frank Weng (a.k.a. Franklin)